Version bump for gnome-3.4 with lots of bug fixes. Depend on speech-dispatcher with python support. Drop old.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

3 files changed, 21 insertions, 10 deletions

diff --git a/app-accessibility/orca/ChangeLog b/app-accessibility/orca/ChangeLog
index c36fc25cb7b7..c1bda54c1c3f 100644
--- a/app-accessibility/orca/ChangeLog
+++ b/app-accessibility/orca/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/orca
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.108 2012/05/03 01:48:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.109 2012/05/20 09:32:52 tetromino Exp $
+
+*orca-3.4.2 (20 May 2012)
+
+  20 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -orca-3.2.1.ebuild,
+  orca-3.2.2.ebuild, +orca-3.4.2.ebuild:
+  Version bump for gnome-3.4 with lots of bug fixes. Depend on
+  speech-dispatcher with python support. Drop old.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> orca-2.32.1.ebuild,
   orca-3.2.1.ebuild, orca-3.2.2.ebuild:
diff --git a/app-accessibility/orca/orca-3.2.2.ebuild b/app-accessibility/orca/orca-3.2.2.ebuild
index 9474a08e3882..05514d5f7df2 100644
--- a/app-accessibility/orca/orca-3.2.2.ebuild
+++ b/app-accessibility/orca/orca-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.2.2.ebuild,v 1.4 2012/05/03 01:48:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.2.2.ebuild,v 1.5 2012/05/20 09:32:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -27,7 +27,7 @@ COMMON_DEPEND=">=app-accessibility/at-spi2-core-2.1.5:2
 	>=dev-python/pygobject-3.0.2:3
 	>=x11-libs/gtk+-3.1.13:3[introspection]"
 RDEPEND="${COMMON_DEPEND}
-	app-accessibility/speech-dispatcher
+	app-accessibility/speech-dispatcher[python]
 	dev-libs/atk[introspection]
 	>=dev-python/dbus-python-0.83
 	dev-python/pyatspi
diff --git a/app-accessibility/orca/orca-3.2.1.ebuild b/app-accessibility/orca/orca-3.4.2.ebuild
index 74cc5cf5f91c..fef54ca4bc83 100644
--- a/app-accessibility/orca/orca-3.2.1.ebuild
+++ b/app-accessibility/orca/orca-3.4.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.2.1.ebuild,v 1.4 2012/05/03 01:48:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.4.2.ebuild,v 1.1 2012/05/20 09:32:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
+PYTHON_DEPEND="2:2.7"
 PYTHON_USE_WITH="threads"
 # FIXME: multiple python support
 
@@ -22,17 +22,18 @@ IUSE=""
 # 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-core-2.1.5:2
+COMMON_DEPEND=">=app-accessibility/at-spi2-core-2.3.5:2
 	>=dev-libs/glib-2.28:2
-	>=dev-python/pygobject-2.90.3:3
+	>=dev-python/pygobject-3.0.2:3
 	>=x11-libs/gtk+-3.1.13:3[introspection]"
 RDEPEND="${COMMON_DEPEND}
-	app-accessibility/speech-dispatcher
+	app-accessibility/speech-dispatcher[python]
 	dev-libs/atk[introspection]
 	>=dev-python/dbus-python-0.83
 	dev-python/pyatspi
 	dev-python/pycairo
 	dev-python/pyxdg
+	dev-python/setproctitle
 	x11-libs/libwnck:3[introspection]
 	x11-libs/pango[introspection]"
 DEPEND="${COMMON_DEPEND}
@@ -44,13 +45,16 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
 	python_set_active_version 2
 	python_pkg_setup
+	G2CONF="${G2CONF} PYTHON=$(PYTHON -2 -a)"
 }
 
 src_prepare() {
 	gnome2_src_prepare
 
-	# disable pyc compiling
-	echo > py-compile
+	python_clean_py-compile_files
+
+	# Workaround missing file in po files
+	# echo "src/orca/scripts/toolkits/WebKitGtk/script.py" >> "${S}"/po/POTFILES.in
 }
 
 pkg_postinst() {