[gentoo-commits] proj/gnome:gnome-next commit in: app-accessibility/orca/

[Alexandre Restovtsev]

commit:     41869c43df715cce6d806ba61965d91c1d743122
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Sep 27 23:19:03 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Sep 27 23:30:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=41869c43

app-accessibility/orca: 3.1.5 → 3.2.0

Bump. Update dependencies since orca was ported to gtk3 and pygobject:3.
Remove the workarounds in src_configure (configure no longer checks for
pyatspi) and src_compile (orca should now be using gsettings instead of
gconf).

---
 .../orca/{orca-3.1.5.ebuild => orca-3.2.0.ebuild}  |   38 ++++++--------------
 1 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/app-accessibility/orca/orca-3.1.5.ebuild b/app-accessibility/orca/orca-3.2.0.ebuild
similarity index 67%
rename from app-accessibility/orca/orca-3.1.5.ebuild
rename to app-accessibility/orca/orca-3.2.0.ebuild
index e0427c6..db69332 100644
--- a/app-accessibility/orca/orca-3.1.5.ebuild
+++ b/app-accessibility/orca/orca-3.2.0.ebuild
@@ -23,22 +23,19 @@ IUSE=""
 # liblouis is not in portage yet
 # it is used to provide contracted braille support
 # XXX: Check deps for correctness
-RDEPEND=">=dev-libs/glib-2.10:2
-	>=gnome-extra/at-spi-1.32:1
-
+COMMON_DEPEND=">=app-accessibility/at-spi2-core-2.1.5:2
+	>=dev-libs/glib-2.28:2
+	>=dev-python/pygobject-2.90.3:3
+	>=x11-libs/gtk+-3.1.13:3[introspection]"
+RDEPEND="${COMMON_DEPEND}
+	app-accessibility/speech-dispatcher
+	dev-libs/atk[introspection]
+	>=dev-python/dbus-python-0.83
 	dev-python/pyatspi
-	dev-python/pygobject:2
-	dev-python/pycairo
 	dev-python/pyxdg
-	>=dev-python/dbus-python-0.83
-	>=dev-python/pygtk-2.12:2
-
-	>=dev-python/libwnck-python-2.24
-	>=dev-python/libgnome-python-2.14:2
-
-	app-accessibility/speech-dispatcher"
-
-DEPEND="${RDEPEND}
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]"
+DEPEND="${COMMON_DEPEND}
 	>=app-text/gnome-doc-utils-0.17.3
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9"
@@ -57,19 +54,6 @@ src_prepare() {
 	ln -s $(type -P true) py-compile
 }
 
-src_configure() {
-	# Needed for import pyatspi
-	unset DBUS_SESSION_BUS_ADDRESS
-	PYTHON="$(PYTHON)" gnome2_src_configure
-}
-
-src_compile() {
-	# FIXME: Workaround for bug #325611 until root cause is found
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	gnome2_src_compile
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_mod_optimize "${PN}"