Version bump.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 224 insertions, 15 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index eb7f55b52310..afacd1e81977 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.127 2013/06/18 16:51:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.128 2013/06/21 20:19:15 vapier Exp $
+
+*brltty-4.5 (21 Jun 2013)
+
+  21 Jun 2013; Mike Frysinger <vapier@gentoo.org> +brltty-4.5.ebuild,
+  +files/brltty-4.5-fix-ldflags.patch:
+  Version bump.
 
   18 Jun 2013; Mike Frysinger <vapier@gentoo.org> brltty-4.2-r1.ebuild:
   Add arm love.
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 0fde199d78d2..92e37dd3bccc 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -6,26 +6,29 @@ AUX brltty-4.2-fix-ldflags.patch 2404 SHA256 5ebc7140937b3f2e43a8c7cd20a8ca5269d
 AUX brltty-4.2-fix-ocaml-install.patch 842 SHA256 4b9e48655afb62b758f72e49bc05ad6feb3ea0839bbac7ef5b4757b116f1b284 SHA512 02ea63a69acf552c82f47bf33caaeed26b53e935687e6ca854dab001b5431c53c786437688dfe0165fc27f3d386866d34d839219e39e9fe0c51a0138efc2849c WHIRLPOOL 82344158dd972bb72e25733e8ec4965dd7e0771fb121affc2ef93c695d530cf3a17f309e8b1c476052288f31237a76ad846a268d62141f3cb1dfaf6eb98513fb
 AUX brltty-4.2-fix-svnversion.patch 918 SHA256 7ea5ba1d7521bc2382629c023dc862acd6b2a9ed1c059274cbcd218a4aa8a9fa SHA512 dbf23b5d454732fc61e368faca2292066a9f3ec454297170aed7d06dee61a23de69ecf160415fa873e5073a703ac850db0c90def426658b591ff8c91ec1252f5 WHIRLPOOL b65cefa5493629494c029240109a05d6789955d132587b298be10b09ea4bd4ca6292c6da3a204a1ad19a2655ab81bfcfa5c5c52588d547819821dac1bc56e789
 AUX brltty-4.2-glibc-212.patch 287 SHA256 6fb14f246788b6668b0442201144a31dcae003f5e70185e643e14e3f01ce1516 SHA512 75f58735665d67eed57dcb1031b588d7da80c6316c3180d3550b4440165740f077516fab133751264ff5c0220463cf452ccf8cedcf760042f37e66ea97c9ef64 WHIRLPOOL 110dc8464f74991c0f06a96620fefb5b2155d6c50c2a945696d0849f4eef062c82abbb4c91fb29d8ed7af323c34c86ea46d5b3d1915cc14bbd3f6ae9c69faf70
+AUX brltty-4.5-fix-ldflags.patch 2168 SHA256 6d9022614cb0d1d65ad11f0f924c369a860a7f2e02bfec77f8a61c60350daa75 SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8 WHIRLPOOL 9214b7f5810aee65e5bbaf16830eb9c5f63e4c25d26a2f484fc7b700412db32ddc3adf34026f9dc7c98fe111c28d11431e28346d6d6bab8c7a017702a0649df2
 AUX brltty.rc 530 SHA256 c6899cab19f94feb83030c9df4541a025891869d72009bac944b3cd3535a24c2 SHA512 bbe5914816f66af4dde3f4c8e20872fc1ee7a5ae0e3fb4d9afbcd10f9f12cbf0d38c588a29e8a5296f61ff4e9759d216459f4fa5c0dc2fc5ee4ed9c4bf9d8f25 WHIRLPOOL 8e8982317eb2eb1ee1548715eded96e2c993fefc15547e805dd50d0e231bf033b09931672779b0daaa92460a01b77621c7a1f92213ca78ef2c6ed8fbd9b27f88
 DIST brltty-4.2.tar.gz 2234191 SHA256 fc2b1a96255afc26ac43cadd3f730fabb73d0b1d991ffefd4c2214c5e20a8aa2 SHA512 94b7fe40593d06a242be57c8cee1f06c0869515bc0be97eccc1d81dd57549bf2197e7ebdf1f9cb173dd4b6048df9a85adb327b5cd1cc74888b06145755a27cb5 WHIRLPOOL 0109b1e7d57f4246af84a5cd3fe48a6190a374787e059c058de758d4e38368a61015b25912efa71065ece5dd2e0bf5900af4d72ae111bab235c0e8807c039b73
+DIST brltty-4.5.tar.gz 3260872 SHA256 87af9ecff2ff563f4dc62e0ca4e8d8217ee7ee57e8344508cf0096c47ff77da0 SHA512 55efa7fffef3914638bfda2df4d4369fb4b72dd19897153bba69b11960732eda583c02a578fef6919e7d620d08beda8010d4352e4d4d8fabbbefa44b3e1c8d90 WHIRLPOOL 3d677445675da3fafa64bbad0dcfb13b85de57f7c6473ceaf2cd51a7e60fee2c425f1584ccca44ce95dcaabf5b50fede0b5c1cd35c20f556921aa7c1d7859ff5
 EBUILD brltty-4.2-r1.ebuild 4163 SHA256 46e613ed1ac40e8805302d9cb9fde8910d8a6f4adfcc36070ec0e3af99649d72 SHA512 371fb3cbfeec164e519048e96ba9270fda8dde3317d136f292be1a91c35c557e5567b2634b2c76f5cef235f69bf6c33725bdc6f5e80543ba9380caf0218dd340 WHIRLPOOL 241aedf9ff83b2cf8eef11436626f5a591162fb96f8283e32977abff740693f5518b0d632d0d1835e92491a4bc254b81ef0d2cf693f3af81fd46416a33ed8b3e
 EBUILD brltty-4.2.ebuild 4133 SHA256 b0e521c09b7b5b5621a6fbd537ae22d8a22cf7b68d558c0ae2203a20d7365884 SHA512 8ecf0911f15710bbd760ec4b3e55503914efad8ef29a4594dd3bad982d209e1e07aa401a603a9458009c3e70b667757757e2ba3d6aa58e9f50d073bf3ecafb5e WHIRLPOOL 839206b4c32db6d5639cce90b07e4f2699a4b0e99718dd03d37efe20e6c6d0cbf2c56a86902eecf54ae47c0af6b3cfffdcd08512465eeb69545337116d6d6b30
-MISC ChangeLog 15723 SHA256 f9dfc138f7e83bf24c1b3c41c89c8159d5590e4e135a9ca9af0d1ce323e1688d SHA512 d84c25356a6a3691f870a69490cb58767b9fbf2561e6bebf088928ca7abcd04fc74b7a3058b8bc998aece9d0caddd75f0e554bbd84fb6415d02923063f24f133 WHIRLPOOL ce4f73085ec75f87cc34684446ee37342781ebc9ac0d4b318dfecb03d16c46102755ffcbf1f4bbe873804208793bae69eb058a9955fdbce27aa26092de853243
+EBUILD brltty-4.5.ebuild 4055 SHA256 237a333ec7434d3d03825c1567fb1f7936b8ce1cdc245384c1f954f999adba54 SHA512 286816629b06a142b91efffb68b89410f2b5fa5c5e503e2738228995a6b5948e6e2e7c7ece1824b224fb34d0288f365c4b137f74a4cae80da20a806cbeffbd64 WHIRLPOOL d34ad744a24c8b3c17174d9b24eae6eef067806c1d7ca1e32397eafac16cf628a5fc54bf51a74c6f0a78735b182a0121aa5f6f29bd21c0120b8efaad1faffd56
+MISC ChangeLog 15876 SHA256 a76fae7fc9da8fda799b36d2827823366a898ecee9d4a2384f85fe9b1ee931d3 SHA512 281c3927029af2eb33e8453f15524ad191bfa3306218fdce689645dbd9375cd66aa2468253ca98f6d15c08022a63bf504f5e6f3bbad95f5008c8d15672f4a359 WHIRLPOOL 580357a39f5c9d0dd9c51169dd6632d1f337ef6ec16ff1e690cbf2cb636b53d30ab99b2a9db326e5d1381881dadce1877e01a10c8bf32815b94deb8d630029e2
 MISC metadata.xml 1917 SHA256 f957f9853a05c0ec1aed09b4f01e78b0b50cd8a554a53a3c4c3917a50459f8e0 SHA512 b895695cf6f214e2acaf2409cd6f7dce1cb3bbaed1374b7b73c5193a794412325d2d09268725aa533b2e497d3c98c7cec83e72b8cd0066822ad6bb9440abe854 WHIRLPOOL f08f4ef21fa745e1ffd07e664e05283230abb5276cee5f91340f0bc818a46addfbc4dbcdd73fe19cea2d301ecef7f8994f7350109cbf390ae9b9ab8c7bc5f6d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRwJASAAoJELEHsLL7fEFWpawQAIsNHrmruMX3d2r7Ztl17/s4
-KaxRRBkXwsWpTNW5NW8erz7XcJWwZhDvcdP3Vu7RRM/Kmztw9kYuDV1NBq9TUCdp
-192PVIBQdP2hI+x4ZHTTZ5nQfD19NNOSyD5wOWZikN0duinEV1chSrpN9Mx9+V2W
-wjA+NtfFRRQU06Q8lsB2Uzozxot6N6U+83dGh28dnlNPCTANS7ytBcFQlYy6WZr3
-OZmgpaULdW561LCuz35jhybTf+p9LM99v+zsLR2aEDC9sYVUA4VKqol18gkGnuZS
-sLw6JGOq0DJWwZY8MuVV9ueFI1CmYh1//PsUiuIwXBV2WhA32o232rC6TZdFrcnT
-wjNP2V7Ui3Yo4qA5JdJ1zXKIA5tZqGIRl8BI/Pvf1/OHVBiyKcnQ92KCkxXSNd6r
-rGr6PLrhY8joWVcpnyKzx6PYtK883E0BPm4EaxJBoLb3PmywyLNvg1dVPXbpiZP7
-V4xTUcDwKc7a9mbbdCs9dwyjOiuPOBcM70MuY9AOZsvdjKU+SxqEXl6cvM7EF1/6
-SRKVcSFbySNreH3f2A98yCP8bmoYnDfhIbYo0LT+rVmprpOa8BeTL78mrQhcUIwK
-yaQzUK/z3LJL/Lr1WGmyzluUpmJ2fZDlPxRRtQXV+UMmwr7fLbb7diSFDOPE/toR
-dlHleNEktmIY7tDsudB2
-=QCat
+iQIcBAEBCAAGBQJRxLVIAAoJELEHsLL7fEFWI+AP/1jd70cCfY/kZx+ghDE92jz6
+gZja7v+PU7dwaqZ91AcvwK1uKnbkQLixfV0Z/lD7zkHFpiRCNgFOVD8QEx/nODoa
+8nLTLCQ+SUNxohNwd1WSUy/nhkIETuN0g3piulCGDReesylA17ocB+t6kNo9tToz
+AuT9lkHIL7pgTYSHa4OgDzQdWdpHakB9CM2S64Ls5BzMQMbYlxBSP0zo1j+UIfgO
+PwqI/DCnhKunm6uM2BT9d2IEbXNIuu4yNguCGvCez8AJoWqLtzPj7RpmMr57sUV9
+WkNDNz+Gi0Dl2f6H0cGxra+GmGtgUpOzTgnzyA84vvpBGp0kyTIGxP2gp1L8qREm
+zZs5IcBm391rrpvmYGvMLivk4Nd08C0/lcK3efeOUQp1iRbp06f2+isS8rfjXVxt
+mzalDdCrif954DsxbiTtnwwSzuYGSeBYxj2eaWUy+c5gSmQPCFhtf5czWXPu41/R
+uyggrjXVU/RQSRt7EjPCMtDZuNbmdh0NBVyCtHxEVhSiXGzoLKQNJRloZMXzOHlP
+gKY6k/kJfSnRs3LHbd7XhBopsLxgFvJehrSAmFFxuXcwaElPEj8KUm61t8TLlSBP
+DDSjNI7Dmh4xQ5X6YcMQNG+9LymEySWWhcWdN2hCLA9DPylFI+qIGmXCkKUKS4gB
+nnkYXAXK1tRsuwH4tjFz
+=fFvv
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/brltty/brltty-4.5.ebuild b/app-accessibility/brltty/brltty-4.5.ebuild
new file mode 100644
index 000000000000..dfdaac298d44
--- /dev/null
+++ b/app-accessibility/brltty/brltty-4.5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5.ebuild,v 1.1 2013/06/21 20:19:15 vapier Exp $
+
+EAPI="4"
+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/pyrex-0.9.4.1 )
+	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}"/${PN}-4.5-fix-ldflags.patch
+
+	java-pkg-opt-2_src_prepare
+
+	# 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() {
+	# 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
+
+	# workaround for parallel build failure, bug #340903.
+	emake -j1 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/files/brltty-4.5-fix-ldflags.patch b/app-accessibility/brltty/files/brltty-4.5-fix-ldflags.patch
new file mode 100644
index 000000000000..e60ea9a4e509
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-4.5-fix-ldflags.patch
@@ -0,0 +1,56 @@
+--- 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