version bump

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

4 files changed, 148 insertions, 3 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index e4345168d097..d23dea3a128b 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.95 2009/09/15 11:51:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.96 2009/10/08 17:47:26 williamh Exp $
+
+*brltty-4.1 (08 Oct 2009)
+
+  08 Oct 2009; William Hubbs <williamh@gentoo.org> +brltty-4.1.ebuild,
+  metadata.xml:
+  version bump
 
   15 Sep 2009; Jeroen Roovers <jer@gentoo.org> brltty-4.0.ebuild:
   Stable for HPPA (bug #281126).
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 861c15921643..3bb9b221aa2a 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -6,7 +6,9 @@ AUX brltty-4.0-api-socket-dir.patch 562 RMD160 8f037ae75107ce3b7a4c82fe33509b5e0
 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
+DIST brltty-4.1.tar.gz 2169303 RMD160 a46c0e42dd3504b6b3ef24309042d2915dee770a SHA1 3e81746cb1e455ca5116d11fcce1e158371146df SHA256 29d0bd271ed3b8ec92c378bdf90489936c26d375515aa326f74bd515dfcb36a4
 EBUILD brltty-3.10.ebuild 3126 RMD160 0b3fa1bd8805b16661430543c1b626326dfdfabf SHA1 929b7d9c433c8ea90061540ff977fe827f4c0807 SHA256 7edc69108ea252f21ef206cfb808c399d9e393a519f0ef8a4dbcc6b8d9b0fa43
 EBUILD brltty-4.0.ebuild 3207 RMD160 f7ec4f9d627e8c52a982e61de6556cfa93711930 SHA1 c47dd273f5b184643cf329d8cef85cac69abd91d SHA256 51772a18233731c3554088e22d0734bc81a6a97080b934f2847e6fe946e3c6af
-MISC ChangeLog 11657 RMD160 b95218a6ffe2735176eb19f23ad5cacdad498e0b SHA1 1335c55a10c9158a7e1d28e17b17095750352790 SHA256 4b76410a27a7312bf6b655d2d259211b306d3e511e410c7015820d76b9d15f96
-MISC metadata.xml 1369 RMD160 f0aa05366cea60a6c6fcf6c571d092c4ed90b79a SHA1 0b429c95350460c3a22ba05c7894b519e7a046dc SHA256 66e8c95b51326f8a993ce54b41590035e01d1e81438f6f187ccccb9392cbedf9
+EBUILD brltty-4.1.ebuild 3631 RMD160 fc5b46000e3460d8b0d82384f68bca2b0e0ad81e SHA1 e3a89ce0dee4c56168921b71591c965c18105125 SHA256 29f30185467aa8f311bd1f7d4192d4f9d5615ef76cab2a4d8aa2eeef859d9805
+MISC ChangeLog 11792 RMD160 bf323b1ddc3e9684415cef504273ae665cdae20a SHA1 94ff8e8b72860edb2b3c9e074598dd641d0160bb SHA256 4b183bb1f47035b75f835ff817ce6bc1f057f3587c9e8f2294d550c251340b03
+MISC metadata.xml 1982 RMD160 3d40e297c89d9229fc36ec438b768f4332758e83 SHA1 5dff738da647498e9db6429d7b83aee9bd580a44 SHA256 7ac0165ae761e7474b97c5c89c798dcb7a7f365db1f06f52085dfee70a915e43
diff --git a/app-accessibility/brltty/brltty-4.1.ebuild b/app-accessibility/brltty/brltty-4.1.ebuild
new file mode 100644
index 000000000000..403295c6110d
--- /dev/null
+++ b/app-accessibility/brltty/brltty-4.1.ebuild
@@ -0,0 +1,126 @@
+# 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.1.ebuild,v 1.1 2009/10/08 17:47:26 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="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+		java +learn-mode +midi nls ocaml +pcm +pm python usb +speech
+		static 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_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 bluetooth bluetooth-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 pm pm-configfile) \
+		$(use_enable python python-bindings) \
+		$(use_enable speech speech-support) \
+		$(use_enable static standalone-programs) \
+		$(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 || 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/metadata.xml b/app-accessibility/brltty/metadata.xml
index f049738fdb2a..5a81ad3003c5 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -6,6 +6,17 @@
   <email>williamh@gentoo.org</email>
   <name>William Hubbs</name>
 </maintainer>
+ <use>
+  <flag name="api">build brltty's application program interface</flag>
+  <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="pm">user customization of Papenmeier driver</flag>
+  <flag name="speech">speech support</flag>
+</use>
 <longdescription lang="en">
 BRLTTY is a background process (daemon) which provides access to the Linux/Unix
 console (when in text mode) for a blind person using a refreshable braille