removed old versions

(Portage version: 2.2_rc62/cvs/Linux i686)

8 files changed, 8 insertions, 338 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 76a16c2385f0..9c70d9336d44 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.103 2010/02/13 16:27:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.104 2010/02/13 16:44:16 williamh Exp $
+
+  13 Feb 2010; William Hubbs <williamh@gentoo.org>
+  -files/brltty-3.9-autoconf.patch, -files/brltty-3.9-gnusource.patch,
+  -files/brltty-3.9-parallel.patch, -brltty-3.10.ebuild,
+  -files/brltty-3.10-api-socket-dir.patch, -brltty-4.0.ebuild,
+  -files/brltty-4.0-api-socket-dir.patch:
+  removed old versions
 
   13 Feb 2010; Raúl Porcel <armin76@gentoo.org> brltty-4.1.ebuild:
   alpha/ia64 stable wrt #303049
diff --git a/app-accessibility/brltty/brltty-3.10.ebuild b/app-accessibility/brltty/brltty-3.10.ebuild
deleted file mode 100644
index 535e534a9d2c..000000000000
--- a/app-accessibility/brltty/brltty-3.10.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.10.ebuild,v 1.13 2009/11/01 18:41:04 eva Exp $
-
-FINDLIB_USE="ocaml"
-EAPI=1
-
-inherit autotools findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic
-
-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="bluetooth doc gpm iconv icu java nls ocaml python usb tcl X"
-
-# libusb-compat untested
-COMMON_DEP="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-3.9-gnusource.patch
-	epatch "${FILESDIR}"/${PN}-3.9-parallel.patch
-	epatch "${FILESDIR}"/${PN}-3.9-autoconf.patch
-	epatch "${FILESDIR}"/${PN}-3.10-api-socket-dir.patch
-
-	eautoconf
-}
-
-src_compile() {
-	local JAVAC_CONF=""
-	if use java; then
-		append-flags "$(java-pkg_get-jni-cflags)"
-		JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
-	fi
-
-	# override prefix in order to install into /
-	# braille terminal needs to be available as soon in the boot process as
-	# possible
-	econf \
-		--prefix=/ \
-		--includedir=/usr/include \
-		$(use_enable bluetooth bluetooth-support) \
-		$(use_enable gpm) \
-		$(use_enable iconv) \
-		$(use_enable icu) \
-		$(use_enable java java-bindings) \
-		$(use_enable nls i18n) \
-		$(use_enable ocaml caml-bindings) \
-		$(use_enable python python-bindings) \
-		$(use_enable usb usb-support) \
-		$(use_enable tcl tcl-bindings) \
-		$(use_enable X x) \
-		|| die
-	emake JAVAC="${JAVAC_CONF}" || die
-}
-
-src_install() {
-	if use ocaml; then
-		findlib_src_preinst
-	fi
-	emake INSTALL_PROGRAM="\${INSTALL_SCRIPT}" INSTALL_ROOT="${D}" install || die
-
-	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
-
-	cd Documents
-	rm *.made
-	dodoc ChangeLog README* Manual.* TODO
-	dohtml -r Manual-HTML
-	if use doc; then
-		dodoc BrlAPI.* BrlAPIref.doxy
-		dohtml -r BrlAPI-HTML BrlAPIref-HTML
-	fi
-
-	insinto /etc
-	doins brltty.conf
-	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
-#	TMPDIR=../../Programs scanelf -RBXr "${D}" -o /dev/null
-}
-
-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.0.ebuild b/app-accessibility/brltty/brltty-4.0.ebuild
deleted file mode 100644
index a681c6d2d096..000000000000
--- a/app-accessibility/brltty/brltty-4.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.0.ebuild,v 1.9 2009/11/01 18:41:04 eva Exp $
-
-EAPI="2"
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic
-
-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="bluetooth doc gpm iconv icu java nls ocaml python usb tcl X"
-
-COMMON_DEP="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
-	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}-api-socket-dir.patch
-}
-
-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.
-	econf \
-		--prefix=/ \
-		--includedir=/usr/include \
-		--localstatedir=/var \
-		$(use_enable bluetooth bluetooth-support) \
-		$(use_enable gpm) \
-		$(use_enable iconv) \
-		$(use_enable icu) \
-		$(use_enable java java-bindings) \
-		$(use_enable nls i18n) \
-		$(use_enable ocaml caml-bindings) \
-		$(use_enable python python-bindings) \
-		$(use_enable usb usb-support) \
-		$(use_enable tcl tcl-bindings) \
-		$(use_enable X x) \
-		|| die
-}
-
-src_compile() {
-	local JAVAC_CONF=""
-	if use java; then
-		append-flags "$(java-pkg_get-jni-cflags)"
-		JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
-	fi
-
-	emake JAVAC="${JAVAC_CONF}" || die
-}
-
-src_install() {
-	if use ocaml; then
-		findlib_src_preinst
-	fi
-
-	emake INSTALL_PROGRAM="\${INSTALL_SCRIPT}" INSTALL_ROOT="${D}" install || die
-
-	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
-	insinto /etc/udev/rules.d
-	newins 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-3.10-api-socket-dir.patch b/app-accessibility/brltty/files/brltty-3.10-api-socket-dir.patch
deleted file mode 100644
index 65b08bc162f0..000000000000
--- a/app-accessibility/brltty/files/brltty-3.10-api-socket-dir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur brltty-3.10-orig/common.mk brltty-3.10/common.mk
---- brltty-3.10-orig/common.mk	2008-07-16 16:19:54.000000000 -0600
-+++ brltty-3.10/common.mk	2008-09-22 21:53:19.000000000 -0600
-@@ -73,8 +73,9 @@
- install-apihdr-directory:
- 	$(INSTALL_DIRECTORY) $(INSTALL_APIHDR_DIRECTORY)
- 
-+INSTALL_API_SOCKET_DIRECTORY = $(INSTALL_ROOT)$(API_SOCKET_DIRECTORY)
- install-apisoc-directory:
--	-$(INSTALL_DIRECTORY) -m 1777 $(API_SOCKET_DIRECTORY)
-+	-$(INSTALL_DIRECTORY) -m 1777 $(INSTALL_API_SOCKET_DIRECTORY)
- 
- clean::
- 	-rm -f *.$O *.auto.h *.auto.c core implib.a
-diff -Naur brltty-3.10-orig/configure.ac brltty-3.10/configure.ac
---- brltty-3.10-orig/configure.ac	2008-09-22 21:36:40.000000000 -0600
-+++ brltty-3.10/configure.ac	2008-09-22 21:52:11.000000000 -0600
-@@ -535,7 +535,7 @@
-       api_dynamic_library="api-dynamic-library"
-       install_api_libraries="install-api-libraries"
-       uninstall_api_libraries="uninstall-api-libraries"
--      api_socket_path="${localstatedir}/lib/BrlAPI"
-+      api_socket_path="${localstatedir}/BrlAPI"
- 
-       case "${host_os}"
-       in
diff --git a/app-accessibility/brltty/files/brltty-3.9-autoconf.patch b/app-accessibility/brltty/files/brltty-3.9-autoconf.patch
deleted file mode 100644
index 56a506a57ccc..000000000000
--- a/app-accessibility/brltty/files/brltty-3.9-autoconf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-2008-09-12  Stepan Kasal  <skasal@redhat.com>
-
-	* aclocal.m4 (BRLTTY_HELP_STRING, BRLTTY_TEXT_TABLE,
-	BRLTTY_ATTRIBUTES_TABLE): Expand parameters to AC_HELP_STRING
-	and m4_text_wrap, to be compatible with Autoconf 2.62+.
-
---- brltty-3.9.orig/aclocal.m4.orig	2007-10-17 17:19:31.000000000 +0200
-+++ brltty-3.9.orig/aclocal.m4	2008-09-12 18:05:21.000000000 +0200
-@@ -144,7 +144,7 @@
- 
- AC_DEFUN([BRLTTY_HELP_STRING], [dnl
- AC_HELP_STRING([$1], patsubst([$2], [
--.*$]), [brltty_help_prefix])dnl
-+.*$]), m4_defn([brltty_help_prefix]))dnl
- patsubst(patsubst([$2], [\`[^
- ]*]), [
- ], [\&brltty_help_prefix])[]dnl
-@@ -384,11 +384,11 @@
- 
- AC_DEFUN([BRLTTY_TEXT_TABLE], [dnl
- define([brltty_tables_text], ifdef([brltty_tables_text], [brltty_tables_text])[
--m4_text_wrap([$2], [           ], [- m4_format([%-8s ], [$1])], brltty_help_width)])])
-+m4_text_wrap([$2], [           ], [- ]m4_format([%-8s ], [$1]), brltty_help_width)])])
- 
- AC_DEFUN([BRLTTY_ATTRIBUTES_TABLE], [dnl
- define([brltty_tables_attributes], ifdef([brltty_tables_attributes], [brltty_tables_attributes])[
--m4_text_wrap([$2], [             ], [- m4_format([%-10s ], [$1])], brltty_help_width)])])
-+m4_text_wrap([$2], [             ], [- ]m4_format([%-10s ], [$1]), brltty_help_width)])])
- 
- AC_DEFUN([BRLTTY_SUMMARY_BEGIN], [dnl
- brltty_summary_lines="Options Summary:"
diff --git a/app-accessibility/brltty/files/brltty-3.9-gnusource.patch b/app-accessibility/brltty/files/brltty-3.9-gnusource.patch
deleted file mode 100644
index b80508c00ac7..000000000000
--- a/app-accessibility/brltty/files/brltty-3.9-gnusource.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-2008-09-17  Stepan Kasal  <skasal@redhat.com>
-
-	* configure.ac: Add -D_GNU_SOURCE to get struct ucred from
-	socket.h.
-
-diff -up brltty-3.10/configure.ac.gnusource brltty-3.10/configure.ac
---- brltty-3.10/configure.ac.gnusource	2008-07-17 00:19:54.000000000 +0200
-+++ brltty-3.10/configure.ac	2008-09-17 12:44:28.000000000 +0200
-@@ -779,7 +779,7 @@ AC_CACHE_CHECK([for system-dependent com
- case "${host_os}"
- in
-    linux*|gnu*|kfreebsd*)
--      brltty_cv_prog_cc_sysflags="-D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED"
-+      brltty_cv_prog_cc_sysflags="-D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE"
-       ;;
-    solaris*)
-       brltty_cv_prog_cc_sysflags="-D_XOPEN_SOURCE=500 -D__EXTENSIONS__"
diff --git a/app-accessibility/brltty/files/brltty-3.9-parallel.patch b/app-accessibility/brltty/files/brltty-3.9-parallel.patch
deleted file mode 100644
index e10b9683a5cb..000000000000
--- a/app-accessibility/brltty/files/brltty-3.9-parallel.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-2008-09-17  Stepan Kasal  <skasal@redhat.com>
-
-	* Programs/Makefile.in (braille-drivers): Add
-	prerequisity `all' to prevent race of this make with nested
-	"make brlapi" when parallel make is used.  Recursive make is
-	harmful.
-
-diff -up brltty-3.10/Makefile.in.parallel brltty-3.10/Makefile.in
-diff -up brltty-3.10/Programs/Makefile.in.parallel brltty-3.10/Programs/Makefile.in
---- brltty-3.10/Programs/Makefile.in.parallel	2008-07-17 00:19:08.000000000 +0200
-+++ brltty-3.10/Programs/Makefile.in	2008-09-17 11:24:35.000000000 +0200
-@@ -399,7 +399,7 @@ apitest.$O:
- 
- ###############################################################################
- 
--braille-drivers: txt2hlp
-+braille-drivers: txt2hlp api
- 	for driver in $(BRAILLE_EXTERNAL_DRIVER_NAMES); \
- 	do (cd $(BLD_TOP)$(BRL_DIR)/$$driver && $(MAKE) braille-driver braille-all) || exit 1; \
- 	done
diff --git a/app-accessibility/brltty/files/brltty-4.0-api-socket-dir.patch b/app-accessibility/brltty/files/brltty-4.0-api-socket-dir.patch
deleted file mode 100644
index 6e47343f3b1e..000000000000
--- a/app-accessibility/brltty/files/brltty-4.0-api-socket-dir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur brltty-3.10-orig/common.mk brltty-3.10/common.mk
---- brltty-3.10-orig/common.mk	2008-07-16 16:19:54.000000000 -0600
-+++ brltty-3.10/common.mk	2008-09-22 21:53:19.000000000 -0600
-@@ -73,8 +73,9 @@
- install-apihdr-directory:
- 	$(INSTALL_DIRECTORY) $(INSTALL_APIHDR_DIRECTORY)
- 
-+INSTALL_API_SOCKET_DIRECTORY = $(INSTALL_ROOT)$(API_SOCKET_DIRECTORY)
- install-apisoc-directory:
--	-$(INSTALL_DIRECTORY) -m 1777 $(API_SOCKET_DIRECTORY)
-+	-$(INSTALL_DIRECTORY) -m 1777 $(INSTALL_API_SOCKET_DIRECTORY)
- 
- clean::
- 	-rm -f *.$O *.auto.h *.auto.c core implib.a