Remove old versions.

Burn 'em with fire!

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)

13 files changed, 11 insertions, 858 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 99875546b300..ca5e1bd7bfec 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.166 2015/01/26 10:37:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.167 2015/01/27 23:41:40 teiresias Exp $
+
+  27 Jan 2015; Christopher Brannon <teiresias@gentoo.org>
+  -brltty-4.5-r3.ebuild, -brltty-5.0-r2.ebuild, -brltty-5.1.ebuild,
+  -files/brltty-4.5-fix-ldflags.patch,
+  -files/brltty-4.5-fix-mk4build-cross.patch,
+  -files/brltty-4.5-range-checking-and-array-bounds.patch,
+  -files/brltty-4.5-respect-AR.patch, -files/brltty-4.5-udev.patch,
+  -files/brltty-5.1-fix-ldflags.patch, -files/brltty-5.1-respect-AR.patch,
+  -files/brltty-5.1-udev.patch, metadata.xml:
+  Remove old versions.
 
   26 Jan 2015; Agostino Sarubbo <ago@gentoo.org> brltty-5.2.ebuild:
   Stable for x86, wrt bug #534800
diff --git a/app-accessibility/brltty/brltty-4.5-r3.ebuild b/app-accessibility/brltty/brltty-4.5-r3.ebuild
deleted file mode 100644
index 872fe0450b08..000000000000
--- a/app-accessibility/brltty/brltty-4.5-r3.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild,v 1.9 2014/04/07 18:35:50 vapier Exp $
-
-EAPI=5
-
-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 ncurses 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:= )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	python? ( >=dev-python/cython-0.16 )
-	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-ldflags.patch \
-		"${FILESDIR}"/${P}-udev.patch \
-		"${FILESDIR}"/${P}-fix-mk4build-cross.patch \
-		"${FILESDIR}"/${P}-range-checking-and-array-bounds.patch \
-		"${FILESDIR}"/${P}-respect-AR.patch
-
-	java-pkg-opt-2_src_prepare
-
-	# The code runs `pkg-config` directly instead of locating a suitable
-	# pkg-config wrapper (or respecting $PKG_CONFIG).
-	sed -i \
-		-e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \
-		aclocal.m4 configure.ac || die
-
-	# 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() {
-	tc-export AR LD PKG_CONFIG
-	# 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 ocaml-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 ncurses curses) \
-		$(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
-
-	emake 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-5.0-r2.ebuild b/app-accessibility/brltty/brltty-5.0-r2.ebuild
deleted file mode 100644
index 618321ee2a67..000000000000
--- a/app-accessibility/brltty/brltty-5.0-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0-r2.ebuild,v 1.2 2014/04/07 18:35:50 vapier Exp $
-
-EAPI=5
-
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
-	autotools udev systemd
-
-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/archive/${P}.tar.xz"
-
-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 +midi ncurses 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:= )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	python? ( >=dev-python/cython-0.16 )
-	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-ldflags.patch \
-		"${FILESDIR}"/${P}-udev.patch \
-		"${FILESDIR}"/${P}-respect-AR.patch
-
-	java-pkg-opt-2_src_prepare
-
-	# The code runs `pkg-config` directly instead of locating a suitable
-	# pkg-config wrapper (or respecting $PKG_CONFIG).
-	sed -i \
-		-e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \
-		aclocal.m4 configure.ac || die
-
-	# 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() {
-	tc-export AR LD PKG_CONFIG
-	# 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=/ \
-		--localedir=/usr/share/locale \
-		--includedir=/usr/include \
-		--localstatedir=/var \
-		--disable-stripping \
-		--with-install-root="${D}" \
-		--with-writable-directory="/run/brltty" \
-		$(use_enable api) \
-		$(use_with beeper beep-package) \
-		$(use_enable contracted-braille) \
-		$(use_with fm fm-package) \
-		$(use_enable gpm) \
-		$(use_enable iconv) \
-		$(use_enable icu) \
-		$(use_enable java java-bindings) \
-		$(use_with midi midi-package) \
-		$(use_enable nls i18n) \
-		$(use_enable ocaml ocaml-bindings) \
-		$(use_with pcm pcm-package) \
-		$(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 ncurses curses) \
-		$(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
-
-	emake 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 Autostart/Udev/udev.rules 70-brltty.rules
-	newinitd "${FILESDIR}"/brltty.rc brltty
-	systemd_dounit Autostart/Systemd/brltty.service
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-
-	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-5.1.ebuild b/app-accessibility/brltty/brltty-5.1.ebuild
deleted file mode 100644
index 1118f5b54055..000000000000
--- a/app-accessibility/brltty/brltty-5.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.1.ebuild,v 1.2 2014/11/27 10:15:11 pacho Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
-	autotools udev systemd python-r1
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
-HOMEPAGE="http://brltty.com/"
-SRC_URI="http://brltty.com/archive/${P}.tar.xz"
-
-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 +midi ncurses 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:= )
-	python? ( ${PYTHON_DEPS} )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	tcl? ( >=dev-lang/tcl-8.4.15 )
-	usb? ( virtual/libusb:0 )
-	X? ( x11-libs/libXaw )"
-DEPEND="virtual/pkgconfig
-	java? ( >=virtual/jdk-1.4 )
-	python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-	${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	${COMMON_DEP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-		"${FILESDIR}"/${P}-udev.patch \
-		"${FILESDIR}"/${P}-respect-AR.patch
-
-	java-pkg-opt-2_src_prepare
-
-	# The code runs `pkg-config` directly instead of locating a suitable
-	# pkg-config wrapper (or respecting $PKG_CONFIG).
-	sed -i \
-		-e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \
-		aclocal.m4 configure.ac || die
-
-	# We run eautoconf instead of using eautoreconf because brltty uses
-	# a custom build system that uses autoconf without the rest of the
-	# autotools.
-	eautoconf
-	python_copy_sources
-}
-
-src_configure() {
-	tc-export AR LD PKG_CONFIG
-	# 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.
-	local myconf=(
-		--prefix=/
-		--localedir=/usr/share/locale
-		--includedir=/usr/include
-		--localstatedir=/var
-		--disable-stripping
-		--with-install-root="${D}"
-		--with-writable-directory="/run/brltty"
-		$(use_enable api)
-		$(use_with beeper beep-package)
-		$(use_enable contracted-braille)
-		$(use_with fm fm-package)
-		$(use_enable gpm)
-		$(use_enable iconv)
-		$(use_enable icu)
-		$(use_enable java java-bindings)
-		$(use_with midi midi-package)
-		$(use_enable nls i18n)
-		$(use_enable ocaml ocaml-bindings)
-		$(use_with pcm pcm-package)
-		$(use_enable speech speech-support)
-		$(use_enable tcl tcl-bindings)
-		$(use_enable X x)
-		$(use_with bluetooth bluetooth-package)
-		$(use_with ncurses curses)
-		$(use_with usb usb-package) )
-
-	econf "${myconf[@]}"
-
-	if use python; then
-		myconf+=( $(use_enable python python-bindings ) )
-
-		python_configure() {
-			econf "${myconf[@]}"
-		}
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-}
-
-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
-
-	emake JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}"
-
-	if use python; then
-		python_build() {
-			cd "Bindings/Python" || die
-			emake
-		}
-		python_foreach_impl run_in_build_dir python_build
-	fi
-}
-
-src_install() {
-	if use ocaml; then
-		findlib_src_preinst
-	fi
-
-	emake OCAML_LDCONF= install
-
-	if use python; then
-		python_install() {
-			cd "Bindings/Python" || die
-			emake install
-		}
-		python_foreach_impl run_in_build_dir python_install
-	fi
-
-	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 Autostart/Udev/udev.rules 70-brltty.rules
-	newinitd "${FILESDIR}"/brltty.rc brltty
-	systemd_dounit Autostart/Systemd/brltty.service
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-
-	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
-
-	keepdir /var/lib/brlapi
-	rmdir "${D}/run/brltty"
-	rmdir "${D}/run"
-}
-
-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.5-fix-ldflags.patch b/app-accessibility/brltty/files/brltty-4.5-fix-ldflags.patch
deleted file mode 100644
index e60ea9a4e509..000000000000
--- a/app-accessibility/brltty/files/brltty-4.5-fix-ldflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -377,7 +377,7 @@
- case "${host_os}"
- in
-    linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*)
--      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*|elf*)
--      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])
---- a/Bindings/OCaml/Makefile.in
-+++ b/Bindings/OCaml/Makefile.in
-@@ -55,13 +55,13 @@
- all : $(OCAML_FILES)
- 
- $(OCAML_CLIBS) : brlapi_stubs.$O brlapi
--	$(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.5-fix-mk4build-cross.patch b/app-accessibility/brltty/files/brltty-4.5-fix-mk4build-cross.patch
deleted file mode 100644
index 7a516eb63a58..000000000000
--- a/app-accessibility/brltty/files/brltty-4.5-fix-mk4build-cross.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-this script generates forbuild.mk.  it takes config.mk and adds a "_FOR_BUILD"
-suffix to every variable it finds in there.  but it only matches vars that are
-all uppercase and miss things like "libdir".  normally this isn't a problem as
-the vars have the same value.  but when you cross-compile, this script will
-produce a different config.mk file which will have different paths (such as
-config.mk:libdir=/usr/lib64 but forbuild.mk:libdir=/usr/lib).  so update the
-script to convert all vars including lowercase ones.
-
-Patch by Peter Nilsson Lundblad
-
---- a/mk4build
-+++ b/mk4build
-@@ -106,7 +106,7 @@
- 
- sedScript="${outputName}.${sedExtension}"
- sed -n -e '
--s/^ *\([A-Z][A-Z_]*\) *=.*$/\1/
-+s/^ *\([[:alpha:]][[:alpha:]_]*\) *=.*$/\1/
- t found
- d
- :found
diff --git a/app-accessibility/brltty/files/brltty-4.5-range-checking-and-array-bounds.patch b/app-accessibility/brltty/files/brltty-4.5-range-checking-and-array-bounds.patch
deleted file mode 100644
index df9319000c64..000000000000
--- a/app-accessibility/brltty/files/brltty-4.5-range-checking-and-array-bounds.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff --git a/Programs/options.c b/Programs/options.c
---- a/Programs/options.c	(revision 7568)
-+++ b/Programs/options.c	(revision 7570)
-@@ -219,10 +219,10 @@
- 
-         while (option->strings[index]) {
-           strings[index] = option->strings[index];
--          ++index;
-+          index += 1;
-         }
- 
--        while (index < count) strings[index++] = NULL;
-+        while (index < count) strings[index++] = "";
-         snprintf(buffer, sizeof(buffer),
-                  description, strings[0], strings[1], strings[2], strings[3]);
-         description = buffer;
-@@ -233,19 +233,36 @@
- 
-         while (1) {
-           unsigned int charCount = charsLeft;
-+
-           if (charCount > descriptionWidth) {
-             charCount = descriptionWidth;
--            while (description[charCount] != ' ') --charCount;
--            while (description[charCount] == ' ') --charCount;
--            ++charCount;
-+
-+            while (charCount > 0) {
-+              if (description[charCount] == ' ') break;
-+              charCount -= 1;
-+            }
-+
-+            while (charCount > 0) {
-+              if (description[--charCount] != ' ') {
-+                charCount += 1;
-+                break;
-+              }
-+            }
-           }
--          memcpy(line+lineLength, description, charCount);
--          lineLength += charCount;
- 
--          line[lineLength] = 0;
--          fprintf(outputStream, "%s\n", line);
-+          if (charCount > 0) {
-+            memcpy(line+lineLength, description, charCount);
-+            lineLength += charCount;
- 
--          while (description[charCount] == ' ') ++charCount;
-+            line[lineLength] = 0;
-+            fprintf(outputStream, "%s\n", line);
-+          }
-+
-+          while (charCount < charsLeft) {
-+            if (description[charCount] != ' ') break;
-+            charCount += 1;
-+          }
-+
-           if (!(charsLeft -= charCount)) break;
-           description += charCount;
- 
-diff --git a/Drivers/Speech/Alva/speech.c b/Drivers/Speech/Alva/speech.c
---- a/Drivers/Speech/Alva/speech.c	(revision 7568)
-+++ b/Drivers/Speech/Alva/speech.c	(revision 7570)
-@@ -33,7 +33,7 @@
- /* charset conversion table from iso latin-1 == iso 8859-1 to cp437==ibmpc
-  * for chars >=128. 
-  */
--static unsigned char latin2cp437[128] =
-+static unsigned char latin2cp437[0X80] =
-   {199, 252, 233, 226, 228, 224, 229, 231,
-    234, 235, 232, 239, 238, 236, 196, 197,
-    201, 181, 198, 244, 247, 242, 251, 249,
-@@ -75,7 +75,7 @@
-   for (i = 0; i < len; i++)
-     {
-       c = buffer[i];
--      if (c >= 128) c = latin2cp437[c];
-+      if (c >= 0X80) c = latin2cp437[c-0X80];
-       if (c < 33)	/* space or control character */
- 	{
- 	  buf[0] = ' ';
-diff --git a/Drivers/Speech/CombiBraille/speech.c b/Drivers/Speech/CombiBraille/speech.c
---- a/Drivers/Speech/CombiBraille/speech.c	(revision 7568)
-+++ b/Drivers/Speech/CombiBraille/speech.c	(revision 7570)
-@@ -43,7 +43,7 @@
- /* charset conversion table from iso latin-1 == iso 8859-1 to cp437==ibmpc
-  * for chars >=128. 
-  */
--static unsigned char latin2cp437[128] =
-+static unsigned char latin2cp437[0X80] =
-   {199, 252, 233, 226, 228, 224, 229, 231,
-    234, 235, 232, 239, 238, 236, 196, 197,
-    201, 181, 198, 244, 247, 242, 251, 249,
-@@ -99,7 +99,7 @@
-     unsigned char byte = buffer[i];
-     unsigned char *byte_address = &byte;
-     unsigned int byte_count = 1;
--    if (byte >= 0X80) byte = latin2cp437[byte];
-+    if (byte >= 0X80) byte = latin2cp437[byte-0X80];
-     if (byte < 33) {	/* space or control character */
-       byte = ' ';
-     } else if (byte <= MAX_TRANS) {
-diff --git a/Drivers/Speech/MultiBraille/speech.c b/Drivers/Speech/MultiBraille/speech.c
---- a/Drivers/Speech/MultiBraille/speech.c	(revision 7568)
-+++ b/Drivers/Speech/MultiBraille/speech.c	(revision 7570)
-@@ -35,7 +35,7 @@
- /* charset conversion table from iso latin-1 == iso 8859-1 to cp437==ibmpc
-  * for chars >=128. 
-  */
--static unsigned char latin2cp437[128] =
-+static unsigned char latin2cp437[0X80] =
-   {199, 252, 233, 226, 228, 224, 229, 231,
-    234, 235, 232, 239, 238, 236, 196, 197,
-    201, 181, 198, 244, 247, 242, 251, 249,
-@@ -75,7 +75,7 @@
-   for (i = 0; i < len; i++)
-     {
-       c = buffer[i];
--      if (c >= 128) c = latin2cp437[c];
-+      if (c >= 0X80) c = latin2cp437[c-0X80];
-       if (c < 33)	/* space or control character */
- 	{
- 	  static const char blank = ' ';
-diff --git a/Drivers/Speech/BrailleLite/speech.c b/Drivers/Speech/BrailleLite/speech.c
---- a/Drivers/Speech/BrailleLite/speech.c	(revision 7568)
-+++ b/Drivers/Speech/BrailleLite/speech.c	(revision 7570)
-@@ -36,7 +36,7 @@
- /* charset conversion table from iso latin-1 == iso 8859-1 to cp437==ibmpc
-  * for chars >=128. 
-  */
--static unsigned char latin2cp437[128] =
-+static unsigned char latin2cp437[0X80] =
-   {199, 252, 233, 226, 228, 224, 229, 231,
-    234, 235, 232, 239, 238, 236, 196, 197,
-    201, 181, 198, 244, 247, 242, 251, 249,
-@@ -87,7 +87,7 @@
-   for (i = 0; i < len; i++)
-     {
-       c = buffer[i];
--      if (c >= 128) c = latin2cp437[c];
-+      if (c >= 0X80) c = latin2cp437[c-0X80];
-       if (c < 33)	/* space or control character */
- 	{
- 	  rawdata[0] = ' ';
diff --git a/app-accessibility/brltty/files/brltty-4.5-respect-AR.patch b/app-accessibility/brltty/files/brltty-4.5-respect-AR.patch
deleted file mode 100644
index 09ae62973c2e..000000000000
--- a/app-accessibility/brltty/files/brltty-4.5-respect-AR.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur brltty-4.5/Programs/Makefile.in brltty-4.5-new/Programs/Makefile.in
---- brltty-4.5/Programs/Makefile.in	2013-03-27 15:51:35.000000000 -0700
-+++ brltty-4.5-new/Programs/Makefile.in	2013-09-19 14:57:56.268106076 -0700
-@@ -387,7 +387,7 @@
- 	[ ! -f lib.def ] || mv lib.def $(API_DEF)
- 
- $(API_ARC): $(API_OBJS)
--	ar rc $@ $(API_OBJS)
-+	$(AR) rc $@ $(API_OBJS)
- 	$(RANLIB) $@
- 
- brlapi_client.$O:
diff --git a/app-accessibility/brltty/files/brltty-4.5-udev.patch b/app-accessibility/brltty/files/brltty-4.5-udev.patch
deleted file mode 100644
index edd2792c4b61..000000000000
--- a/app-accessibility/brltty/files/brltty-4.5-udev.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur brltty-4.5/Hotplug/udev.rules brltty-4.5.new/Hotplug/udev.rules
---- brltty-4.5/Hotplug/udev.rules	2013-03-27 15:51:37.000000000 -0700
-+++ brltty-4.5.new/Hotplug/udev.rules	2013-08-19 06:32:11.557621082 -0700
-@@ -172,19 +172,20 @@
- # FreedomScientific [Focus Blue]
- ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_DRIVER}="fs", GOTO="brltty_usb_run"
- 
-+# Seika rules are commented out.  They conflict with USB-to-serial converters.
- # Device: 10C4:EA60
- # Generic Identifier
- # Vendor: Cygnal Integrated Products, Inc.
- # Product: CP210x UART Bridge / myAVR mySmartUSB light
- # Seika [Braille Display]
--ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_DRIVER}="sk", GOTO="brltty_usb_run"
-+# ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_DRIVER}="sk", GOTO="brltty_usb_run"
- 
- # Device: 10C4:EA80
- # Generic Identifier
- # Vendor: Cygnal Integrated Products, Inc.
- # Product: CP210x UART Bridge
- # Seika [Note Taker]
--ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_DRIVER}="sk", GOTO="brltty_usb_run"
-+# ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_DRIVER}="sk", GOTO="brltty_usb_run"
- 
- # Device: 1C71:C005
- # HumanWare [all models]
diff --git a/app-accessibility/brltty/files/brltty-5.1-fix-ldflags.patch b/app-accessibility/brltty/files/brltty-5.1-fix-ldflags.patch
deleted file mode 100644
index e60ea9a4e509..000000000000
--- a/app-accessibility/brltty/files/brltty-5.1-fix-ldflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -377,7 +377,7 @@
- case "${host_os}"
- in
-    linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*)
--      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*|elf*)
--      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])
---- a/Bindings/OCaml/Makefile.in
-+++ b/Bindings/OCaml/Makefile.in
-@@ -55,13 +55,13 @@
- all : $(OCAML_FILES)
- 
- $(OCAML_CLIBS) : brlapi_stubs.$O brlapi
--	$(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-5.1-respect-AR.patch b/app-accessibility/brltty/files/brltty-5.1-respect-AR.patch
deleted file mode 100644
index 09ae62973c2e..000000000000
--- a/app-accessibility/brltty/files/brltty-5.1-respect-AR.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur brltty-4.5/Programs/Makefile.in brltty-4.5-new/Programs/Makefile.in
---- brltty-4.5/Programs/Makefile.in	2013-03-27 15:51:35.000000000 -0700
-+++ brltty-4.5-new/Programs/Makefile.in	2013-09-19 14:57:56.268106076 -0700
-@@ -387,7 +387,7 @@
- 	[ ! -f lib.def ] || mv lib.def $(API_DEF)
- 
- $(API_ARC): $(API_OBJS)
--	ar rc $@ $(API_OBJS)
-+	$(AR) rc $@ $(API_OBJS)
- 	$(RANLIB) $@
- 
- brlapi_client.$O:
diff --git a/app-accessibility/brltty/files/brltty-5.1-udev.patch b/app-accessibility/brltty/files/brltty-5.1-udev.patch
deleted file mode 100644
index 6500a2af8ed6..000000000000
--- a/app-accessibility/brltty/files/brltty-5.1-udev.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur brltty-5.0/Autostart/Udev/udev.rules brltty-5.0.new/Autostart/Udev/udev.rules
---- brltty-5.0/Autostart/Udev/udev.rules	2014-01-27 10:39:20.000000000 -0800
-+++ brltty-5.0.new/Autostart/Udev/udev.rules	2014-02-09 04:24:08.146802299 -0800
-@@ -174,20 +174,22 @@
- # FreedomScientific [Focus Blue]
- ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run"
- 
-+# Seika rules are commented out, because they conflict with USB-to-serial
-+# converters.
- # Device: 10C4:EA60
- # Generic Identifier
- # Vendor: Cygnal Integrated Products, Inc.
- # Product: CP210x UART Bridge / myAVR mySmartUSB light
- # BrailleMemo [all models]
- # Seika [Braille Display]
--ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
-+#ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
- 
- # Device: 10C4:EA80
- # Generic Identifier
- # Vendor: Cygnal Integrated Products, Inc.
- # Product: CP210x UART Bridge
- # Seika [Note Taker]
--ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
-+#ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
- 
- # Device: 1C71:C005
- # HumanWare [all models]
diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index 745cdc2145b1..5495015ab589 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -11,7 +11,6 @@
   <flag name="beeper">support the console tone generator</flag>
   <flag name="contracted-braille">support in-line contracted braille</flag>
   <flag name="fm">support for the sound card synthesizer</flag>
-  <flag name="learn-mode">support for interactive command learn mode</flag>
   <flag name="midi">support the musical instrument digital interface</flag>
   <flag name="pcm">support for sound card digital audio</flag>
   <flag name="speech">speech support</flag>