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

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 22 insertions, 79 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/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() {