Version bump.

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

3 files changed, 136 insertions, 1 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/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