Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 140 insertions, 2 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index c70d19fd0cf5..b5dddf70da43 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.88 2009/05/17 18:32:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.89 2009/05/18 13:35:03 williamh Exp $
+
+*brltty-4.0 (18 May 2009)
+
+  18 May 2009; William Hubbs <williamh@gentoo.org> +brltty-4.0.ebuild,
+  +files/brltty-4.0-api-socket-dir.patch:
+  Version bump.
 
   17 May 2009; Robin H. Johnson <robbat2@gentoo.org> brltty-3.10.ebuild:
   libusb-compat will work fine with brltty, code inspection plus upstream
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 094179b5257b..82d1bcc88d9b 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -2,8 +2,11 @@ AUX brltty-3.10-api-socket-dir.patch 1081 RMD160 22d88ba9ac71d4d96b8d26708080f3f
 AUX brltty-3.9-autoconf.patch 1331 RMD160 0dd4e5fc82442f37b1f66f812a40ac41d091e4eb SHA1 feca6b4e9ee7ce8f1aec0bdd0f821a0c1a2021f1 SHA256 551f506907ac01d5d6d0615079a7b28f5f7864d3c48032095b2d6ad273b0ca85
 AUX brltty-3.9-gnusource.patch 780 RMD160 4b1ddbd66b41f3ac4627d78f5fd043cde8ff9c57 SHA1 d67e53e6018e7638d459e922b94c0a4eaa558162 SHA256 b490f9459c82964c3946cc97fb61b6b5faee663b1cba55a9bc0cd9b3f9ca0904
 AUX brltty-3.9-parallel.patch 856 RMD160 7e66f17c75f89c54f88c15f504d105a648090145 SHA1 a9a42e466c09fc89bf75402fa9507bc05896534c SHA256 688ce57631525e7447ddd2e661da732654b40e104a73a1584a642c7a10f2748c
+AUX brltty-4.0-api-socket-dir.patch 562 RMD160 8f037ae75107ce3b7a4c82fe33509b5e09eb9fac SHA1 c71bec4f0e56c3cf71bf1b46c496b75680c3c0b2 SHA256 0d312cd69b920e48a3f5fd75d900d9e9b160284588d237abcb65924c399249e5
 AUX brltty.rc 535 RMD160 495be64b538963fe2cc7e85123a1d02a88078583 SHA1 faa41ace7feb80ce679cb47980a361bceb0cc148 SHA256 099077395b2160f3d7f73cb8df647675ad1cf8359961154f08ae9febf725eb55
 DIST brltty-3.10.tar.gz 1919631 RMD160 e8c4cfccb52eea4db86544d1ff218a4bdfef7615 SHA1 360a82d0c99a639fb15614c2abf7273dbead9a4f SHA256 8356287002a7b736969b9dcd92944817dda77f57349acfaac621fa415b674e06
+DIST brltty-4.0.tar.gz 2135287 RMD160 fb998ebe16971962d106140751a9037f5b32b80c SHA1 a966e0818bf2cc6927c7bd1e3ae52f9bbf13b031 SHA256 961ce89057600852674dc199f18d135261f27442e7ff69c767a12a9e07ca01ce
 EBUILD brltty-3.10.ebuild 3099 RMD160 5788066e2cb37deaeb2e56368dc0f9f937c75042 SHA1 2894b67a7cd0c5fb62f0777ca9c7898df7cd0401 SHA256 0cc2765cd36aa7ab89e57468a2ef65b766435c94e8abe9a2b659ad1671d3b703
-MISC ChangeLog 10898 RMD160 8526095b2fee271e930254c257d9e111490ed4dd SHA1 c850cad642e2fb224bca062906e005dcba814ef6 SHA256 b27334e72c1c461a461b30beb0603850a0bdc7833e32100d13a8a01235db5329
+EBUILD brltty-4.0.ebuild 3192 RMD160 ad5516ad66880e92cc9aabc616003e11c2fd2cb4 SHA1 f4c804cb46f641fa42e13625fdecc1f85bc7755f SHA256 e9eeeeff9d087684c830ce8482de2e894c7e4a7be8f96844383017585b57781e
+MISC ChangeLog 11056 RMD160 3604a62ccd9a5506be9a4851695ed8bcb0be6d6a SHA1 09dbd743959426ccfea8714cdca74002167ac4c9 SHA256 f7e923cc841b3804793cdf300a27d1eb191c30a970e3644b4d96677821bcc90e
 MISC metadata.xml 1369 RMD160 f0aa05366cea60a6c6fcf6c571d092c4ed90b79a SHA1 0b429c95350460c3a22ba05c7894b519e7a046dc SHA256 66e8c95b51326f8a993ce54b41590035e01d1e81438f6f187ccccb9392cbedf9
diff --git a/app-accessibility/brltty/brltty-4.0.ebuild b/app-accessibility/brltty/brltty-4.0.ebuild
new file mode 100644
index 000000000000..bb9c39da45a4
--- /dev/null
+++ b/app-accessibility/brltty/brltty-4.0.ebuild
@@ -0,0 +1,115 @@
+# 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.1 2009/05/18 13:35:03 williamh 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-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-4.0-api-socket-dir.patch b/app-accessibility/brltty/files/brltty-4.0-api-socket-dir.patch
new file mode 100644
index 000000000000..6e47343f3b1e
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-4.0-api-socket-dir.patch
@@ -0,0 +1,14 @@
+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