Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: now uses at-spi2-core and pygobject-3. Dropped alpha, ia64, ppc, ppc64, sparc keywords due to at-spi2-core dependency. Keywording bug will be filed later for all of gnome-3.2

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

3 files changed, 73 insertions, 88 deletions

diff --git a/app-accessibility/orca/ChangeLog b/app-accessibility/orca/ChangeLog
index 361d7b275240..7832d4cd8069 100644
--- a/app-accessibility/orca/ChangeLog
+++ b/app-accessibility/orca/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/orca
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.103 2011/08/19 11:33:49 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.104 2011/11/05 05:14:38 tetromino Exp $
+
+*orca-3.2.1 (05 Nov 2011)
+
+  05 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> -orca-3.0.3.ebuild,
+  +orca-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: now uses
+  at-spi2-core and pygobject-3. Dropped alpha, ia64, ppc, ppc64, sparc keywords
+  due to at-spi2-core dependency.
 
   19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> orca-2.32.1.ebuild:
   Fix slot dep on at-spi, etc.
diff --git a/app-accessibility/orca/orca-3.0.3.ebuild b/app-accessibility/orca/orca-3.0.3.ebuild
deleted file mode 100644
index 05c385ba2ebf..000000000000
--- a/app-accessibility/orca/orca-3.0.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.0.3.ebuild,v 1.1 2011/08/16 13:11:31 nirbheek Exp $
-
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
-# FIXME: multiple python support
-
-inherit gnome2 python
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="http://projects.gnome.org/orca/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-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
-	>=gnome-base/orbit-2:2
-	>=dev-python/pyorbit-2.24
-	>=gnome-base/libbonobo-2.24
-	>=dev-python/libbonobo-python-2.24:2
-
-	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/gconf-python-2.24:2
-	>=dev-python/libgnome-python-2.14:2
-
-	>=app-accessibility/gnome-speech-0.3.10:1
-	>=app-accessibility/gnome-mag-0.12.5:1"
-
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
-	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_configure() {
-	# FIXME: Workaround for bug #325611 until root cause is found
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	# 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}"
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup "${PN}"
-}
diff --git a/app-accessibility/orca/orca-3.2.1.ebuild b/app-accessibility/orca/orca-3.2.1.ebuild
new file mode 100644
index 000000000000..cd3cbb2a337b
--- /dev/null
+++ b/app-accessibility/orca/orca-3.2.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 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.1 2011/11/05 05:14:38 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="threads"
+# FIXME: multiple python support
+
+inherit gnome2 python
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="http://projects.gnome.org/orca/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+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
+	>=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/pyxdg
+	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"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_mod_optimize "${PN}"
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup "${PN}"
+}