Version bump, add braille support (#486794 by Chris Brannon), drop old.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 29 insertions, 98 deletions

diff --git a/app-accessibility/orca/ChangeLog b/app-accessibility/orca/ChangeLog
index a04591245643..9f681eaad0e4 100644
--- a/app-accessibility/orca/ChangeLog
+++ b/app-accessibility/orca/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/orca
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.134 2014/07/23 15:12:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.135 2014/10/03 09:39:16 pacho Exp $
+
+*orca-3.12.3 (03 Oct 2014)
+
+  03 Oct 2014; Pacho Ramos <pacho@gentoo.org> +orca-3.12.3.ebuild,
+  -orca-3.10.3.ebuild, -orca-3.12.1.ebuild, metadata.xml:
+  Version bump, add braille support (#486794 by Chris Brannon), drop old.
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> orca-3.12.2.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index b4e16fffb051..e4e0cb6f16f6 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -2,29 +2,17 @@
 Hash: SHA256
 
 DIST orca-2.32.1.tar.bz2 2653300 SHA256 44da9da70c1b47bc87fda8f3b9da4cc1df9993d92388434f5707d39b5a832629 SHA512 d51c5ddfc979e57404b44961bd244dd639551bf9fd086326a4274a9713ec6eebe9aee6a381ee4abf47f211e034ebd2985c8a90303590094997bc10021364f796 WHIRLPOOL 2dcc5168947a25c5b918a6e98daeec246d712c34bc12ce55aa1edc1258c73b83aa7cba23d94f521bc9aec8e763601f7523a9cd91d6abc6119eb2defc47835c55
-DIST orca-3.10.3.tar.xz 3842408 SHA256 04c8bdab6fd2d8678f6acb812664ced7c78fe3cd6b4b80531a9b66ae8d2dc0d8 SHA512 a6c7e0a9f7de78fd865183d9d0e6acc77cb907bf2d23841bcc39c9c21489aa3a7fbc82565d887884a0daca835d95a334c72be3ba364a4fa2b4088dda19492f1c WHIRLPOOL 5212086a2f59c7a66387b9ca39f2584dca38825da832841e723836102d2eae3dda494d2df032648ba844c5add8259e4e67f6a70c6c85d2b167bb77da570b18fd
-DIST orca-3.12.1.tar.xz 1949748 SHA256 abcc638021b8290f75a3081c07a732b58dad85d3a5b7f161c31daeeb097889ec SHA512 987b7ad1d829b8b7df9f36ddaecfb1518f5e3eaa5c9edaffcad7d3a2a7e92b6a1618f4ebd05ce4c0adfa4ce1b23b782373c283098c16ae11aa8e1192d67b08f9 WHIRLPOOL 18098ae47a4232eb2f655c5d2035af102a3c58f0b7ab7c561b92af9617d0df6348a24caeb34715662558ff530957bf33d581813568a454cc595481c9d7ae9683
 DIST orca-3.12.2.tar.xz 1918976 SHA256 4eb32f7e28c2509199166932e980aa93b7b01cf71a38f7f18e111980cdba52c6 SHA512 ecb142c12691de108721d22587ce8425d6b8a563b74820c23477df4faac83287baf5e496c19eb79ac1692a87a795af604fa7ac296db1ee21d4a7576a68d4b4cc WHIRLPOOL 874e4d43ebe244f5ee1bc9b869d74e0a1e424c63d96f46d92aa2786291540f74b9136243c68528a471d9bb77167b64c83a35ecc348d4c34a65ea33ec6949b0d3
+DIST orca-3.12.3.tar.xz 1918684 SHA256 11ab7ef7f4df5af6fe9e07936ae176e3f17577ef2e327203925a9ca3b258d5ce SHA512 48d06841e0dbbfb9de000bb1800ba40b83acb407ef48f042ebbd1db829bcb4e78caaea615cdbe5abff3f6abc14cd9ae2b5d380af07b50139f4ff0df3c63eebc9 WHIRLPOOL 503ecb56833aa031e74c76b2658e8c762401a66d3fcebc08621a677d0a5d82988230dcc772c76759527811c2fa6cbac5188a8af99ac32d9bb1366b21814cf058
 EBUILD orca-2.32.1.ebuild 1920 SHA256 b268e9f6d8be3f8fa4487ffa276b863c1266d7ae81b49df20952978fe98fd6a9 SHA512 dcc28a4b747f4e577038420265eb2892790d346539ab6c0ce363fb47d4591c1f2e49516ba59e76631e93fd89970cd0ebaf397f39e038ee772563b99e40360a50 WHIRLPOOL f1647c64dd7c24761a9105be3f419ebbebf4f6093ac8ba7a094baa2c3c2c2016f82d9736d2a793985b466bc55c83fee329f8c09d1abca5a807184fd3c327928a
-EBUILD orca-3.10.3.ebuild 1942 SHA256 195afc774412c8ed8540a2e40a4b666e3dd6edd28a389496d5a89b51305c974e SHA512 43e605e47fab61210c3ca0c3a4a37a125f268aae44bb6c040fa5328d78328ba07ec0f9fe9fe7e76a3f53c135a26a07e389f0419cb8d724b7ee35bb5278e97e63 WHIRLPOOL 874b8c47ea788b53192bac1889bcb76b94f35919a13bcaf16dff48f77a4125f23fab12711774572f7b7bbaaa368ef036a474ea8075030a832ba8eee6408107d8
-EBUILD orca-3.12.1.ebuild 1942 SHA256 7f99ab240465140637f8fc40a57b9efcbc477ba1b207b9c8c0b3928b8cbd704a SHA512 9513292592e47f3e0ff2ffb09347ef02f1a58cc8048d9eaf3817d2346dd667d1f05d8448695ee96447c05c4479e84c1f6e018ca2e71502f4aa739d3bfbefdfe9 WHIRLPOOL 12f79ed0ab15f4e6179ffe2eb2919dee90140c677baccf1c32b20e291a455714835b5ab3dfbb88d215d4311fffbe45960bce5823ba40b13749c77d461122970f
 EBUILD orca-3.12.2.ebuild 1940 SHA256 2ecc1332f21696fa93595c606d3009974f3d0f8eecc323758ed1011a6c58167f SHA512 5cec1ced51e8901c4e2fbe0911f00a7120888b998e10941b8c8d9f14d1d8f430d96c11a1b0992b3a342499d2a27dc84e2f920e711ce46cf655973000e42c1f84 WHIRLPOOL 5e29947aab4146961c52bbe97808fc3edb21ba523a7c061a5592091f19b7b36a3b3b12a364da2d369634650d2b15a98cc263f4c99f37bb3ebbe8cea3e1329cbc
-MISC ChangeLog 17428 SHA256 f6d75488d1ef8d2118f27835b1ef1163bffc3dddc159a3ebcf17b8f8ab4c22a4 SHA512 5449dbc4327b12ca0c3013e371da3a24966cd819d07b75ebf839f90b05cfce8596e712a34ae51149506bce22c42962e35bf2aead7f4f0181ea882ce3c6fb88f7 WHIRLPOOL 8ac4b644d227a5dcab9762fea57932b90ce27af271ece82253708902c11532a8088b6aad67ae63a211a2644c75bd72fe9cdb4fb2d14647918e270880e7138bfe
-MISC metadata.xml 519 SHA256 48c45478a56ea2509e36841e48ca51080f04615ae35561701152e412c24b62ef SHA512 2d824befa7ca862fb0312ecce44bc5506f94aac1159ad6716e997adeaea3620fb8a98889d7fd4db330d239f4c7ae939c296a31760ed4b569eff1d39b17b534e3 WHIRLPOOL 04b4d6da9107d54ede5665e95c23e4ebc36afacee7a7159e7ef8bcb43f1d0da244151fb6a627fd1fa284be05798526f85b228595567ba65f3fcf6fef09138c2c
+EBUILD orca-3.12.3.ebuild 2087 SHA256 5acaa52271fa6c08f7c3c3338623a6f4b3ce3c1a2cddcb2afca8d3fcf1a8a7bd SHA512 158875d09b06a8fcc0f9ef6e451858efc1e3220690bdf31eff46377d024ff2b2533c6606a0add3759a4469f102bfd5ebada800819dcb958e6a44aeddd8423db2 WHIRLPOOL 9e68f0bd412722b91885742405a994213261b813250204db871abf6f952b73ad95e0f493a9f89342efe48e4dbbf70b781a79a7107b5add5b61e63482405430ba
+MISC ChangeLog 17658 SHA256 1d180282d8d25e970f47d43b46e0727491c7a5aed23c116d898dc5775ec902e5 SHA512 c9b4cca651665261ff36cfb36cf92176e1ec19401377599193f90183c5b490ec4d0d5fe55df8d4cb8f1a7b999b8217a1b11823da945e137765d3a4fb5ed0d0e0 WHIRLPOOL 52594cf7022b8f3aaa7975ac21fd1dc09913c35cc7d65bd9f448de9d2f8717cf1e4c5013beba4855aef27e6a330f1b3a3cf533c021b1214cae78f961e2aa9a4c
+MISC metadata.xml 578 SHA256 eae3bdab93c7a089ae311df8bf154c321de7153863638c95f29379876eb123b1 SHA512 619224364cfc5828a5f4b9c1234e212e8237e6393c0920ea9f13f5e1d6dbf7d9c789d2549c780a12e1fc4d6014f179f2c8336a7c6b2c497e03b1d267e3141e32 WHIRLPOOL 8844254a6ed69f5d02c929b12b917a0ba82fb823064acc390185b435aa00770c035ebeb5488d54d94b690eb9beadb07dff285df4222023254ca2177d1455eabc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9D6AAoJELp701BxlEWf+ssP/jVhillwKCsn7BUh/jBotdAO
-t5Fvh36+96aVx9aZcljZs7puSV8vW3E7gBFcLTLcKLnEkMKeJqpHU86GiQ625Owp
-jK0e9s7MavAzqGWKua5HdL71GRS3FVFAjhsiar6ySo8k6FkYQkN0tZh+H905ttaA
-GmykdiPI4lBU+9HNDgP26MkJ8h6/N3mgEIm3XhgNrZCyZRfUEEYpLNHWw65tolpc
-SB6NPYCsurSSS+cjAE1M4L7G4E2FXxGCRrz3s/lFzHqyz6DUrwTZxSqnV6QfU0te
-BGONHRBnrW4pkTWzpWKcQsi0fO9FBOL8TGOQQ/mq9MbS+iEkVAZUsssi5TsRcJuu
-yWcxhKVyNXQQM7W7opLIgzM3m78gSvSxD8RwFyKorTqZ9PHwRqWLR7Ag1kOnZuH2
-iEOqFnwALguz6zsFbsgeqEvNr0Onmu9PP0HuewXgykXhaJtalVOnuNGnpijfgobf
-8vLN4KHlVyBUKuqXRnc4oBlSuhDQpDKM6DnSN5o8WjwGTxT+211mz4L2WhINuper
-RA3+Em5e5gbHZ0MKG2p4vdUMZZHM9k5d5IpTXcmIPrP3Zwuc9FsZOpJgE0SziVwo
-zTiHuZ+G6DHn0cLfi3wvo7rDWYQss7fECxM5a9mDQRs1aV9UAvv1DIoRP7IKcgBV
-3HGUBHpIOgGxvw1T5o9n
-=9kwQ
+iEYEAREIAAYFAlQubsUACgkQCaWpQKGI+9TbPQCggnHvZZkLSXxIPQjxHsiPqhUv
+q+IAn0I4+wek7HOgZZFy/wDC2FrYuTzM
+=VgIr
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/orca/metadata.xml b/app-accessibility/orca/metadata.xml
index f3b4c7f83bc8..c42f2333252f 100644
--- a/app-accessibility/orca/metadata.xml
+++ b/app-accessibility/orca/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome-accessibility</herd>
-  <longdescription>
+<herd>gnome-accessibility</herd>
+<use>
+	<flag name="braille">Enable braille support</flag>
+</use>
+<longdescription>
     Orca is a flexible, extensible, and powerful assistive technology
     for people with visual impairments. Using various combinations of
     speech synthesis, braille, and magnification, Orca helps provide
     access to applications and toolkits that support the AT-SPI (e.g.,
     the GNOME desktop).
-  </longdescription>
+</longdescription>
 </pkgmetadata>
diff --git a/app-accessibility/orca/orca-3.10.3.ebuild b/app-accessibility/orca/orca-3.10.3.ebuild
deleted file mode 100644
index 506828d2f6c2..000000000000
--- a/app-accessibility/orca/orca-3.10.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.10.3.ebuild,v 1.3 2014/05/04 12:09:05 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_3 )
-PYTHON_REQ_USE="threads"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# liblouis is not in portage yet
-# it is used to provide contracted braille support
-# XXX: Check deps for correctness
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.10:2
-	>=app-accessibility/at-spi2-core-2.10:2[introspection]
-	>=dev-libs/atk-2.10
-	>=dev-libs/glib-2.28:2
-	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-	dev-libs/atk[introspection]
-	dev-python/pyatspi[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_prepare() {
-	gnome2_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure ITSTOOL="$(type -P true)"
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
-	installing() {
-		gnome2_src_install
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
-			-i src/orca/orca || die
-		python_doscript src/orca/orca
-	}
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-accessibility/orca/orca-3.12.1.ebuild b/app-accessibility/orca/orca-3.12.3.ebuild
index 72984059515f..381a0571df09 100644
--- a/app-accessibility/orca/orca-3.12.1.ebuild
+++ b/app-accessibility/orca/orca-3.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.12.1.ebuild,v 1.1 2014/04/27 15:18:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.12.3.ebuild,v 1.1 2014/10/03 09:39:16 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,7 +16,8 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+
+IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # liblouis is not in portage yet
@@ -29,6 +30,9 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.28:2
 	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
 	>=x11-libs/gtk+-3.6.2:3[introspection]
+	braille? (
+		app-accessibility/brltty[${PYTHON_USEDEP}]
+		dev-libs/liblouis[${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}
 "
 RDEPEND="${COMMON_DEPEND}
@@ -52,7 +56,9 @@ src_prepare() {
 }
 
 src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure ITSTOOL="$(type -P true)"
+	python_foreach_impl run_in_build_dir gnome2_src_configure \
+		ITSTOOL="$(type -P true)" \
+		$(use_with braille liblouis)
 }
 
 src_compile() {