Remove old versions.

4.5-r3 is still waiting for stabilization on ARM,
but I just realized that 4.2 and 4.2-r1 are not stable on ARM either.
It is safe to remove them.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x6521E06D

9 files changed, 16 insertions, 444 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 24b863ca0289..8f05ce39e5d7 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.147 2014/02/22 19:52:12 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.148 2014/02/22 20:04:25 teiresias Exp $
+
+  22 Feb 2014; Christopher Brannon <teiresias@gentoo.org> -brltty-4.2.ebuild,
+  -brltty-4.2-r1.ebuild, -files/brltty-4.2-fix-a2.patch,
+  -files/brltty-4.2-fix-ldflags.patch,
+  -files/brltty-4.2-fix-ocaml-install.patch,
+  -files/brltty-4.2-fix-svnversion.patch, -files/brltty-4.2-glibc-212.patch:
+  Remove old versions.
 
 *brltty-5.0-r2 (22 Feb 2014)
 
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 53c81ef0d149..22749295e09a 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,11 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX brltty-4.2-fix-a2.patch 445 SHA256 01e9dcb3a0e758b33e0bc8e704769dc17dd09223a5739d1df48f7cf0c965a221 SHA512 2071261fe411d83604af38835ef6991718af2be528fc5935834972cdc4d756042b7be79e80af9550e1c1f11e2accadc951d12571bb450f0fb93a80fbd100fe50 WHIRLPOOL 2ddfe0de79e470ba33d87f259eaf67564f405ba4b3af3897fde19d220333e14c1f448571f57eaf51e2d09190c50aa9d863fd3b102747d25a05eeb0c12a2275c3
-AUX brltty-4.2-fix-ldflags.patch 2404 SHA256 5ebc7140937b3f2e43a8c7cd20a8ca5269d2874e150fcb65336d42b8f92e369b SHA512 20eae7b232b3b2c298fc78635cf6af5cc6dd626f8e7946b5bd98917f3c8f3376ad8129c7d4738df449fd7966b0584aec1b2b57163e4cadc84012fee63958ca63 WHIRLPOOL 0617eb0e6c63992f224a646dac3b525d1001b77c8b362248286965f0034d63dec0535c20f8815fe268442b376229434cf66e6ed52d2e490baa9391ad3542fc5d
-AUX brltty-4.2-fix-ocaml-install.patch 842 SHA256 4b9e48655afb62b758f72e49bc05ad6feb3ea0839bbac7ef5b4757b116f1b284 SHA512 02ea63a69acf552c82f47bf33caaeed26b53e935687e6ca854dab001b5431c53c786437688dfe0165fc27f3d386866d34d839219e39e9fe0c51a0138efc2849c WHIRLPOOL 82344158dd972bb72e25733e8ec4965dd7e0771fb121affc2ef93c695d530cf3a17f309e8b1c476052288f31237a76ad846a268d62141f3cb1dfaf6eb98513fb
-AUX brltty-4.2-fix-svnversion.patch 918 SHA256 7ea5ba1d7521bc2382629c023dc862acd6b2a9ed1c059274cbcd218a4aa8a9fa SHA512 dbf23b5d454732fc61e368faca2292066a9f3ec454297170aed7d06dee61a23de69ecf160415fa873e5073a703ac850db0c90def426658b591ff8c91ec1252f5 WHIRLPOOL b65cefa5493629494c029240109a05d6789955d132587b298be10b09ea4bd4ca6292c6da3a204a1ad19a2655ab81bfcfa5c5c52588d547819821dac1bc56e789
-AUX brltty-4.2-glibc-212.patch 287 SHA256 6fb14f246788b6668b0442201144a31dcae003f5e70185e643e14e3f01ce1516 SHA512 75f58735665d67eed57dcb1031b588d7da80c6316c3180d3550b4440165740f077516fab133751264ff5c0220463cf452ccf8cedcf760042f37e66ea97c9ef64 WHIRLPOOL 110dc8464f74991c0f06a96620fefb5b2155d6c50c2a945696d0849f4eef062c82abbb4c91fb29d8ed7af323c34c86ea46d5b3d1915cc14bbd3f6ae9c69faf70
 AUX brltty-4.5-fix-ldflags.patch 2168 SHA256 6d9022614cb0d1d65ad11f0f924c369a860a7f2e02bfec77f8a61c60350daa75 SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8 WHIRLPOOL 9214b7f5810aee65e5bbaf16830eb9c5f63e4c25d26a2f484fc7b700412db32ddc3adf34026f9dc7c98fe111c28d11431e28346d6d6bab8c7a017702a0649df2
 AUX brltty-4.5-fix-mk4build-cross.patch 759 SHA256 1abb970aa9e6797d6a859e0b861c50b7d7d48c34b9cac4f7ffdad02c2beb17a8 SHA512 c409e0ebccf929b0c49d6b4b9f014c1b4505d9c68e022b860ec53733f8b19538d304349d2640d610581a81e728699f5edc66f0eefdb534036f22640891e413ae WHIRLPOOL 9dcdbfe5a55ddb23fcd73f4d13684b3a4ee202f4b4217f9501b0a12f19b89abc4d3ae3a120df396c5dedaa890c9cb08aae1b41078b85ef25db78d364a8872a46
 AUX brltty-4.5-range-checking-and-array-bounds.patch 5168 SHA256 2838d9fa69343f540047fff61e183249d7713c105aadaee9693375024bfed5c2 SHA512 20ae848311b3688d8b6dc68cb681661070b33170e3dee2f814a1396c07bd78ccadb67f1daaa77624ef64635036800adc9e79220ac968b867ca8a39f4c1881b96 WHIRLPOOL e52751b98b22599bdd8663e8f4c5f5009494cfc2022dd4d4c14a3f50fcb05ea93f327c0318fcefa76b4515adf06887f1c214f97e3b7241c040ecf28619ca3054
@@ -16,23 +11,20 @@ AUX brltty-5.0-respect-AR.patch 403 SHA256 01786fd2e922f4595a59753a9e5fc7c0c8bfb
 AUX brltty-5.0-udev.patch 1215 SHA256 4f2deb06ad102126c3ad624aab09baf052fa2627c49340924688c9b5965f0721 SHA512 436ee879c1948eb6418fcb4d69431dae9640e4b1905971657143646de438541ed0bacca1d7b5b154e235b6e73915fbab843edd8c5dc8881965958fc4aac637e8 WHIRLPOOL 6f11252da78130050b4335e8aa8c8b9a597a4728684f50759d97003a98e3592e9f14cb9d28e087a7353ce5e585ef2b7846a826acf660042c5a73155f98d6181b
 AUX brltty.rc 356 SHA256 24950c773d16156fed8f71be72abefa77a4c45d930e2ea53b6371a0e659644f8 SHA512 4e4b363aa297f94c2078744417e630d13d5796ed55f24929e39f43108cce91c7dd49622d24d28fd91d3642371370feb9a62256d773ec052617bd4f015be81af2 WHIRLPOOL 26e7c5344218c79e4cbddbb0fd82a6589116fe43afe4439881c7f3d4dcafcf60f447cab8e5574d5f3aab83bbc85522f3b25f28497c1ad8a136b4b32abe9673d6
 AUX brltty.tmpfiles.conf 31 SHA256 45c13fe100502b1896bd758f6c59a46fa2250ce093ad719f41854911349a0a71 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7 WHIRLPOOL eb4e009f97fe75ac90c15a222ec4b85bc7888adf09e6e0ac699718376debd9907156838ff61ee9efa35a0df94419456864659c8c66f128af10e0ec7b447b2087
-DIST brltty-4.2.tar.gz 2234191 SHA256 fc2b1a96255afc26ac43cadd3f730fabb73d0b1d991ffefd4c2214c5e20a8aa2 SHA512 94b7fe40593d06a242be57c8cee1f06c0869515bc0be97eccc1d81dd57549bf2197e7ebdf1f9cb173dd4b6048df9a85adb327b5cd1cc74888b06145755a27cb5 WHIRLPOOL 0109b1e7d57f4246af84a5cd3fe48a6190a374787e059c058de758d4e38368a61015b25912efa71065ece5dd2e0bf5900af4d72ae111bab235c0e8807c039b73
 DIST brltty-4.5.tar.gz 3260872 SHA256 87af9ecff2ff563f4dc62e0ca4e8d8217ee7ee57e8344508cf0096c47ff77da0 SHA512 55efa7fffef3914638bfda2df4d4369fb4b72dd19897153bba69b11960732eda583c02a578fef6919e7d620d08beda8010d4352e4d4d8fabbbefa44b3e1c8d90 WHIRLPOOL 3d677445675da3fafa64bbad0dcfb13b85de57f7c6473ceaf2cd51a7e60fee2c425f1584ccca44ce95dcaabf5b50fede0b5c1cd35c20f556921aa7c1d7859ff5
 DIST brltty-5.0.tar.xz 2213768 SHA256 e3613fa2e8c3450d7e7bee7107235344c474dc310af5adcc19761f361e8c8b92 SHA512 2a66f2fcf0ada9a499450e14c11efe2cffd1e9b465755aab60093f383c596d4f4f3be0651e6559df143fc1547a5d5be24caf485596cb8ad691b029de110f8dcc WHIRLPOOL 3f36f036f5eb6479e9c42cc79eead215d7133cfb6d2c4de3e4eaa6f776299d021c7830e32c914b7cb7686bd4d31902c0762d309702ef686ab7b37aff6ee4161a
-EBUILD brltty-4.2-r1.ebuild 4163 SHA256 46e613ed1ac40e8805302d9cb9fde8910d8a6f4adfcc36070ec0e3af99649d72 SHA512 371fb3cbfeec164e519048e96ba9270fda8dde3317d136f292be1a91c35c557e5567b2634b2c76f5cef235f69bf6c33725bdc6f5e80543ba9380caf0218dd340 WHIRLPOOL 241aedf9ff83b2cf8eef11436626f5a591162fb96f8283e32977abff740693f5518b0d632d0d1835e92491a4bc254b81ef0d2cf693f3af81fd46416a33ed8b3e
-EBUILD brltty-4.2.ebuild 4133 SHA256 b0e521c09b7b5b5621a6fbd537ae22d8a22cf7b68d558c0ae2203a20d7365884 SHA512 8ecf0911f15710bbd760ec4b3e55503914efad8ef29a4594dd3bad982d209e1e07aa401a603a9458009c3e70b667757757e2ba3d6aa58e9f50d073bf3ecafb5e WHIRLPOOL 839206b4c32db6d5639cce90b07e4f2699a4b0e99718dd03d37efe20e6c6d0cbf2c56a86902eecf54ae47c0af6b3cfffdcd08512465eeb69545337116d6d6b30
 EBUILD brltty-4.5-r3.ebuild 4182 SHA256 f9ee3fa821ba2f5d390f020c610c20dc8f223184cbc4f5e8f2985e3ba5b48cc6 SHA512 9bf46d9c7ac2342f5b7ed3bc7fc8eeb1c91fbd50e844ed0edc2b89a4004f2626837f058ac2d07072696f89578dc91ad5dedf1025f055d0b130453aacf0a63f56 WHIRLPOOL 48e1b4d97f50e5e50f7847cb6ec41f6c2e06ac16d5b661ce6b2c5f22f5438c272da25e08f1d4604e0c6ba342e6c21d1fad0f6c35ec92e8ec6c4b2adf6dcb85f5
 EBUILD brltty-5.0-r2.ebuild 4231 SHA256 e0be59c0c7ace38a85da0bd67b7089498d3a97abab0bfd60cf6c0131b500deef SHA512 5b9a7bf186ecd8904acb7cf8fec6eca6a7787aa4df3c036f8ab2e53c5e25df8e9da24f2679a54f21b692a42f5e0d7010ebd8623027f210d5312f26f30f4a3a1e WHIRLPOOL 6129cbe2497dd0f6f7d933c75d96ff37d8a3eed426c975eb05f1c7f84506a3169118e80351b911d5a353abb3c851e883f09119d37ea78a6a9cfc76a6705ad436
-MISC ChangeLog 19350 SHA256 9912011f486c5eea9b07309aeb95afc4bac04b6aa0fad12471d68994fc3e260a SHA512 dbe00dc2c8a86c1fb8484ce0e5bfe8abe676ff58ae3ecd7130393516b7c33a359edad4b8781367415745f7652cb5c00c23ab75c33232a925d955508b1e3263fb WHIRLPOOL 336fda12e7b09c68c1fee86a79f604b22fdb7d72989631076288cfea4ed70e445fc1387fc487b0371c0e8e3cf4dbb7bbd887b1a70653625aebf239c5c7d4207f
+MISC ChangeLog 19670 SHA256 592fe9cef0891a174e4085c3ea453470a209881744faecbd68bfad9022d59d10 SHA512 ba30e5ba24cddabd26ef1329c5c3e1cac98b1c498b8d5822cc7aa519174d6e3c2a91c8f27c1ab0c788ab5179a202e43aefb3bd50d60980200c2a0cbd7957dae1 WHIRLPOOL f9e6afd14c5e677268610b9665a43dbe56f0f49dbc67514c38cf5694f135a41beb4c693eb9de5392c21be05bbb8ace928ad8b7740fea698ec9df4bf6489d65bf
 MISC metadata.xml 1918 SHA256 5cdd92581b4e46c8dc3c468f51bf04dd5456dbddc1f4f88fef47879953f35d88 SHA512 0dd12af812f22da964152898a256c957e2074d1ae9eb2f8dd471f8f3cfb0016439271636759b622756d67f0eadfc5f062556ff5f85be4445c03dc5fe097814e4 WHIRLPOOL 1c232cc5d306a62507be40fd18552a284e87ae2a10e920d4cc3886ea59e4bc075a0ce9636eb15f6d59fb07bfc29cf5b503b87b8425a275b079d4e91ffdf2ec78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTCP/0AAoJEH8qFnJlIeBtmQkH/AvPVdzq+sF/vlB9HyPLTWEi
-QRGXH56+ZYpKiePixDnL/bYGpiXWvS3ICakkfe6wNnCYFIzprLvJjsCLJbYhpCmu
-VNfNWYKsEDq2Eju1Ys1GMsW6YuBxOlTR0DswyBtJndliuUWyMwQm/hBmVTZ2mGQ0
-05ucaWb6H52hyLbmHrdKGaZ/o0m4LfradObz/HNsoUvMPHRDJHWqnmp4N94gIFvD
-9NREsvPX24j7vMENZqdy6acAeIMGLHxzRDPimaZ9f+3Qd6x8Cb0BBacaZdfjzGnu
-0tQtq9/zfiyNbuh2Su0j95N2txYrRlyIsCP4vaD5RDL7FuYRypPwBToK1PZXpT4=
-=U/4e
+iQEcBAEBCAAGBQJTCQLOAAoJEH8qFnJlIeBtP3cH/3P2vOjE/GYy+IB0TUg8S5KB
+MwmcuEMdmdqH7jPYtvT5SGxrctbLwkYcF3soOh6Iwo0H0tadhTB7OVP1juZIZa5Z
+q4gzUH+/gKNoYk+DS8Bez8WPqEirHyMQ8x1xcIcG35fgmwtqjcOUvPJ2YC42DGex
+tEdaThtB0XMC1vU7oS4vbCYVWKCc9w3kZkUHqYe6k9v63LvJfj4E2TOlZLoFx2rR
+fo4Bn/1epDASjU1y1C3B02iLhEBDZFGGowqTFzP7CvEKIhzabt+rigusDPvZjfl/
+GnePQTYzFpcmFdbtQvx5op21cjusaq/IapyM2AgHTYap7lBUD3y7JbetBg6mvlk=
+=oSir
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/brltty/brltty-4.2-r1.ebuild b/app-accessibility/brltty/brltty-4.2-r1.ebuild
deleted file mode 100644
index 1432fb8a60a6..000000000000
--- a/app-accessibility/brltty/brltty-4.2-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2-r1.ebuild,v 1.4 2013/06/18 16:51:25 vapier Exp $
-
-EAPI="4"
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
-	autotools udev
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
-HOMEPAGE="http://mielke.cc/brltty/"
-SRC_URI="http://mielke.cc/brltty/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-		java +learn-mode +midi nls ocaml +pcm python usb +speech
-		tcl X"
-REQUIRED_USE="doc? ( api )
-	java? ( api )
-	ocaml? ( api )
-	python? ( api )
-	tcl? ( api )"
-
-COMMON_DEP="bluetooth? ( net-wireless/bluez )
-	gpm? ( >=sys-libs/gpm-1.20 )
-	iconv? ( virtual/libiconv )
-	icu? ( dev-libs/icu )
-	nls? ( virtual/libintl )
-	python? ( >=dev-python/pyrex-0.9.4.1 )
-	tcl? ( >=dev-lang/tcl-8.4.15 )
-	usb? ( virtual/libusb:0 )
-	X? ( x11-libs/libXaw )"
-DEPEND="virtual/pkgconfig
-	java? ( >=virtual/jdk-1.4 )
-	${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	${COMMON_DEP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-a2.patch
-	epatch "${FILESDIR}"/${P}-fix-ldflags.patch
-	epatch "${FILESDIR}"/${P}-fix-ocaml-install.patch
-	epatch "${FILESDIR}"/${P}-fix-svnversion.patch
-	epatch "${FILESDIR}"/${P}-glibc-212.patch
-
-	java-pkg-opt-2_src_prepare
-
-	# We run eautoconf instead of using eautoreconf because brltty uses
-	# a custom build system that uses autoconf without the rest of the
-	# autotools.
-	eautoconf
-}
-
-src_configure() {
-	# override prefix in order to install into /
-	# braille terminal needs to be available as soon in the boot process as
-	# possible
-	# Also override localstatedir so that the lib/brltty directory is installed
-	# correctly.
-	# Disable stripping since we do that ourselves.
-	econf \
-		--prefix=/ \
-		--includedir=/usr/include \
-		--localstatedir=/var \
-		--disable-stripping \
-		--with-install-root="${D}" \
-		$(use_enable api) \
-		$(use_enable beeper beeper-support) \
-		$(use_enable contracted-braille) \
-		$(use_enable fm fm-support) \
-		$(use_enable gpm) \
-		$(use_enable iconv) \
-		$(use_enable icu) \
-		$(use_enable java java-bindings) \
-		$(use_enable learn-mode) \
-		$(use_enable midi midi-support) \
-		$(use_enable nls i18n) \
-		$(use_enable ocaml caml-bindings) \
-		$(use_enable pcm pcm-support) \
-		$(use_enable python python-bindings) \
-		$(use_enable speech speech-support) \
-		$(use_enable tcl tcl-bindings) \
-		$(use_enable X x) \
-		$(use_with bluetooth bluetooth-package) \
-		$(use_with usb usb-package)
-}
-
-src_compile() {
-	local JAVAC_CONF=""
-	local OUR_JNI_FLAGS=""
-	if use java; then
-		OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
-		JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
-	fi
-
-	# workaround for parallel build failure, bug #340903.
-	emake -j1 JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}"
-}
-
-src_install() {
-	if use ocaml; then
-		findlib_src_preinst
-	fi
-
-	emake OCAML_LDCONF= install
-
-	if use java; then
-		# make install puts the _java.so there, and no it's not $(get_libdir)
-		rm -rf "${D}/usr/lib/java"
-		java-pkg_doso Bindings/Java/libbrlapi_java.so
-		java-pkg_dojar Bindings/Java/brlapi.jar
-	fi
-
-	insinto /etc
-	doins Documents/brltty.conf
-	udev_newrules Hotplug/udev.rules 70-brltty.rules
-	newinitd "${FILESDIR}"/brltty.rc brltty
-
-	libdir="$(get_libdir)"
-	mkdir -p "${D}"/usr/${libdir}/
-	mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
-	gen_usr_ldscript libbrlapi.so
-
-	cd Documents
-	mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-	mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-	mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
-	dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-	dohtml -r Manual-BRLTTY
-	if use doc; then
-		dohtml -r Manual-BrlAPI
-		dodoc BrlAPI-*.txt
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
-	elog
-	elog To make brltty start on boot, type this command as root:
-	elog
-	elog rc-update add brltty boot
-}
diff --git a/app-accessibility/brltty/brltty-4.2.ebuild b/app-accessibility/brltty/brltty-4.2.ebuild
deleted file mode 100644
index b3252f949b0d..000000000000
--- a/app-accessibility/brltty/brltty-4.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.17 2012/12/11 14:46:38 ssuominen Exp $
-
-EAPI="4"
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
-	autotools udev
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
-HOMEPAGE="http://mielke.cc/brltty/"
-SRC_URI="http://mielke.cc/brltty/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-		java +learn-mode +midi nls ocaml +pcm python usb +speech
-		tcl X"
-REQUIRED_USE="doc? ( api )
-	java? ( api )
-	ocaml? ( api )
-	python? ( api )
-	tcl? ( api )"
-
-COMMON_DEP="bluetooth? ( net-wireless/bluez )
-	gpm? ( >=sys-libs/gpm-1.20 )
-	iconv? ( virtual/libiconv )
-	icu? ( dev-libs/icu )
-	nls? ( virtual/libintl )
-	python? ( >=dev-python/pyrex-0.9.4.1 )
-	tcl? ( >=dev-lang/tcl-8.4.15 )
-	usb? ( virtual/libusb:0 )
-	X? ( x11-libs/libXaw )"
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	${COMMON_DEP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-a2.patch
-	epatch "${FILESDIR}"/${P}-fix-ldflags.patch
-	epatch "${FILESDIR}"/${P}-fix-ocaml-install.patch
-	epatch "${FILESDIR}"/${P}-fix-svnversion.patch
-	epatch "${FILESDIR}"/${P}-glibc-212.patch
-
-	java-pkg-opt-2_src_prepare
-
-	# We run eautoconf instead of using eautoreconf because brltty uses
-	# a custom build system that uses autoconf without the rest of the
-	# autotools.
-	eautoconf
-}
-
-src_configure() {
-	# override prefix in order to install into /
-	# braille terminal needs to be available as soon in the boot process as
-	# possible
-	# Also override localstatedir so that the lib/brltty directory is installed
-	# correctly.
-	# Disable stripping since we do that ourselves.
-	econf \
-		--prefix=/ \
-		--includedir=/usr/include \
-		--localstatedir=/var \
-		--disable-stripping \
-		--with-install-root="${D}" \
-		$(use_enable api) \
-		$(use_enable beeper beeper-support) \
-		$(use_enable contracted-braille) \
-		$(use_enable fm fm-support) \
-		$(use_enable gpm) \
-		$(use_enable iconv) \
-		$(use_enable icu) \
-		$(use_enable java java-bindings) \
-		$(use_enable learn-mode) \
-		$(use_enable midi midi-support) \
-		$(use_enable nls i18n) \
-		$(use_enable ocaml caml-bindings) \
-		$(use_enable pcm pcm-support) \
-		$(use_enable python python-bindings) \
-		$(use_enable speech speech-support) \
-		$(use_enable tcl tcl-bindings) \
-		$(use_enable X x) \
-		$(use_with bluetooth bluetooth-package) \
-		$(use_with usb usb-package)
-}
-
-src_compile() {
-	local JAVAC_CONF=""
-	local OUR_JNI_FLAGS=""
-	if use java; then
-		OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
-		JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
-	fi
-
-	# workaround for parallel build failure, bug #340903.
-	emake -j1 JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}"
-}
-
-src_install() {
-	if use ocaml; then
-		findlib_src_preinst
-	fi
-
-	emake OCAML_LDCONF= install
-
-	if use java; then
-		# make install puts the _java.so there, and no it's not $(get_libdir)
-		rm -rf "${D}/usr/lib/java"
-		java-pkg_doso Bindings/Java/libbrlapi_java.so
-		java-pkg_dojar Bindings/Java/brlapi.jar
-	fi
-
-	insinto /etc
-	doins Documents/brltty.conf
-	udev_newrules Hotplug/udev.rules 70-brltty.rules
-	newinitd "${FILESDIR}"/brltty.rc brltty
-
-	libdir="$(get_libdir)"
-	mkdir -p "${D}"/usr/${libdir}/
-	mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
-	gen_usr_ldscript libbrlapi.so
-
-	cd Documents
-	mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-	mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-	mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
-	dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-	dohtml -r Manual-BRLTTY
-	if use doc; then
-		dohtml -r Manual-BrlAPI
-		dodoc BrlAPI-*.txt
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
-	elog
-	elog To make brltty start on boot, type this command as root:
-	elog
-	elog rc-update add brltty boot
-}
diff --git a/app-accessibility/brltty/files/brltty-4.2-fix-a2.patch b/app-accessibility/brltty/files/brltty-4.2-fix-a2.patch
deleted file mode 100644
index 55510523c7aa..000000000000
--- a/app-accessibility/brltty/files/brltty-4.2-fix-a2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 5483)
-+++ configure.ac	(working copy)
-@@ -1455,7 +1455,9 @@
- ])
- 
- BRLTTY_HAVE_PACKAGE([dbus], ["dbus-1 >= 1.0"], [dnl
--   BRLTTY_SCREEN_DRIVER([a2], [AtSpi2], [$(DBUS_LIBS)])
-+   AC_CHECK_HEADERS([X11/keysym.h], [dnl
-+      BRLTTY_SCREEN_DRIVER([a2], [AtSpi2], [$(DBUS_LIBS)])
-+   ])
- ])
- 
- BRLTTY_ARG_DRIVER([screen], [Screen])
diff --git a/app-accessibility/brltty/files/brltty-4.2-fix-ldflags.patch b/app-accessibility/brltty/files/brltty-4.2-fix-ldflags.patch
deleted file mode 100644
index c3b73ca14aed..000000000000
--- a/app-accessibility/brltty/files/brltty-4.2-fix-ldflags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 5474)
-+++ configure.ac	(working copy)
-@@ -377,7 +377,7 @@
- case "${host_os}"
- in
-    linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|eabi*)
--      brltty_mkmod_ld_make="-shared"
-+      brltty_mkmod_ld_make="-shared ${LDFLAGS}"
-       ;;
-    solaris*)
-       brltty_mkmod_ld_make="-G"
-@@ -404,7 +404,7 @@
- esac
- if test "${GCC}" = "yes"
- then
--   brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
-+   brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
- else
-    brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o"
- fi])
-@@ -414,7 +414,7 @@
- case "${host_os}"
- in
-    linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|eabi*)
--      brltty_mklib_ld_make="-shared"
-+      brltty_mklib_ld_make="-shared ${LDFLAGS}"
-       brltty_mklib_ld_options="-soname"
-       ;;
-    solaris*)
-@@ -449,7 +449,7 @@
- esac
- if test "${GCC}" = "yes"
- then
--   brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
-+   brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
- else
-    brltty_cv_prog_mklib="\$(LD) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o"
- fi])
-Index: Bindings/Caml/Makefile.in
-===================================================================
---- Bindings/Caml/Makefile.in	(revision 5474)
-+++ Bindings/Caml/Makefile.in	(working copy)
-@@ -55,13 +55,13 @@
- all : $(OCAML_FILES)
- 
- $(OCAML_CLIBS) : brlapi_stubs.$O
--	$(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
-+	$(OCAMLMKLIB) -ldopt "$(LDFLAGS)"  $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
- 
- $(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo
- 	$(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo
- 
- $(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx
--	$(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
-+	$(OCAMLMKLIB) -ldopt "$(LDFLAGS)"  $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
- 
- brlapi.cmi: brlapi.mli
- 	$(OCAMLC) -o $@ -c brlapi.mli
diff --git a/app-accessibility/brltty/files/brltty-4.2-fix-ocaml-install.patch b/app-accessibility/brltty/files/brltty-4.2-fix-ocaml-install.patch
deleted file mode 100644
index 24d7b012d03a..000000000000
--- a/app-accessibility/brltty/files/brltty-4.2-fix-ocaml-install.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: Bindings/Caml/Makefile.in
-===================================================================
---- Bindings/Caml/Makefile.in	(revision 5474)
-+++ Bindings/Caml/Makefile.in	(working copy)
-@@ -31,6 +31,7 @@
- OCAMLFIND = @OCAMLFIND@
- OCAML_INSTALL_TARGET = @OCAML_INSTALL_TARGET@
- OCAML_UNINSTALL_TARGET = @OCAML_UNINSTALL_TARGET@
-+OCAML_LDCONF = -ldconf "$(OCAML_DESTDIR)/ld.conf"
- 
- OCAML_LIB = $(API_NAME)
- OCAML_BCLIB = $(OCAML_LIB).cma
-@@ -102,7 +103,7 @@
- install-with-findlib:
- 	$(INSTALL_DIRECTORY) $(OCAML_DESTDIR)
- 	$(OCAMLFIND) remove -destdir "$(OCAML_DESTDIR)" $(OCAML_LIB)
--	$(OCAMLFIND) install -destdir "$(OCAML_DESTDIR)" -ldconf "$(OCAML_DESTDIR)/ld.conf" $(OCAML_LIB) $(OCAML_FILES) 
-+	$(OCAMLFIND) install -destdir "$(OCAML_DESTDIR)" $(OCAML_LDCONF) $(OCAML_LIB) $(OCAML_FILES) 
- 
- uninstall: $(OCAML_UNINSTALL_TARGET)
- 
diff --git a/app-accessibility/brltty/files/brltty-4.2-fix-svnversion.patch b/app-accessibility/brltty/files/brltty-4.2-fix-svnversion.patch
deleted file mode 100644
index d4db66bcb440..000000000000
--- a/app-accessibility/brltty/files/brltty-4.2-fix-svnversion.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: revision
-===================================================================
---- revision	(revision 5475)
-+++ revision	(working copy)
-@@ -18,15 +18,17 @@
- ###############################################################################
- 
- . "`dirname "${0}"`/prologue.sh"
-+set -e
- 
--[ "${#}" -eq 0 ] && syntaxError "missing source root."
-+[ "${#}" -gt 0 ] || syntaxError "missing source root"
- sourceRoot="${1}"
- shift
- 
--[ "${#}" -eq 0 ] || syntaxError "too many parameters."
-+[ "${#}" -eq 0 ] || syntaxError "too many parameters"
- 
--set -e
--revision="`svnversion -n "${sourceRoot}"`"
-+revision="`svnversion -n "${sourceRoot}" 2>/dev/null`" || semanticError "build revision cannot be determined - subversion not installed"
- [ "${revision}" != "exported" ] || revision=""
--[ -z "${revision}" ] || echo "${revision}"
-+[ -n "${revision}" ] || semanticError "build revision not known"
-+
-+echo "${revision}"
- exit 0
diff --git a/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch b/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch
deleted file mode 100644
index 20e472d305e0..000000000000
--- a/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/339846
-
---- Programs/sys_linux.c
-+++ Programs/sys_linux.c
-@@ -22,6 +22,8 @@
- #include <string.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <sys/types.h> /* sys/stat.h */
-+#include <sys/stat.h> /* S_ISCHR */
- #include <sys/ioctl.h>
- #include <linux/kd.h>
-