Bump for gnome-3.6 with numerous improvements; update to EAPI5 and python-r1.eclass. Update license. Drop old.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 90 insertions, 72 deletions

diff --git a/app-accessibility/orca/ChangeLog b/app-accessibility/orca/ChangeLog
index c1bda54c1c3f..969f5948ee45 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.109 2012/05/20 09:32:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.110 2012/12/16 07:53:08 tetromino Exp $
+
+*orca-3.6.3-r1 (16 Dec 2012)
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> orca-2.32.1.ebuild,
+  -orca-3.2.2.ebuild, orca-3.4.2.ebuild, +orca-3.6.3-r1.ebuild:
+  Bump for gnome-3.6 with numerous improvements; update to EAPI5 and
+  python-r1.eclass. Update license. Drop old.
 
 *orca-3.4.2 (20 May 2012)
 
diff --git a/app-accessibility/orca/orca-2.32.1.ebuild b/app-accessibility/orca/orca-2.32.1.ebuild
index a1ae0749b56b..ce421a264a27 100644
--- a/app-accessibility/orca/orca-2.32.1.ebuild
+++ b/app-accessibility/orca/orca-2.32.1.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-2.32.1.ebuild,v 1.10 2012/05/03 01:48:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-2.32.1.ebuild,v 1.11 2012/12/16 07:53:08 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit gnome2 python
 DESCRIPTION="Extensible screen reader that provides access to the desktop"
 HOMEPAGE="http://projects.gnome.org/orca/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
diff --git a/app-accessibility/orca/orca-3.2.2.ebuild b/app-accessibility/orca/orca-3.2.2.ebuild
deleted file mode 100644
index 05514d5f7df2..000000000000
--- a/app-accessibility/orca/orca-3.2.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.5 2012/05/20 09:32:52 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-3.0.2:3
-	>=x11-libs/gtk+-3.1.13:3[introspection]"
-RDEPEND="${COMMON_DEPEND}
-	app-accessibility/speech-dispatcher[python]
-	dev-libs/atk[introspection]
-	>=dev-python/dbus-python-0.83
-	dev-python/pyatspi
-	dev-python/pycairo
-	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
-	virtual/pkgconfig"
-
-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
-	echo > py-compile
-
-	# Workaround missing file in po files
-	echo "src/orca/scripts/toolkits/WebKitGtk/script.py" >> "${S}"/po/POTFILES.in
-}
-
-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.4.2.ebuild b/app-accessibility/orca/orca-3.4.2.ebuild
index fef54ca4bc83..a541ea3e2f2f 100644
--- a/app-accessibility/orca/orca-3.4.2.ebuild
+++ b/app-accessibility/orca/orca-3.4.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.4.2.ebuild,v 1.1 2012/05/20 09:32:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.4.2.ebuild,v 1.2 2012/12/16 07:53:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ inherit gnome2 python
 DESCRIPTION="Extensible screen reader that provides access to the desktop"
 HOMEPAGE="http://projects.gnome.org/orca/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
diff --git a/app-accessibility/orca/orca-3.6.3-r1.ebuild b/app-accessibility/orca/orca-3.6.3-r1.ebuild
new file mode 100644
index 000000000000..c1b39cbcae52
--- /dev/null
+++ b/app-accessibility/orca/orca-3.6.3-r1.ebuild
@@ -0,0 +1,78 @@
+# 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.6.3-r1.ebuild,v 1.1 2012/12/16 07:53:08 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 ) # incompatible with 3.2 syntax, crashes with 3.3
+PYTHON_REQ_USE="threads"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="http://projects.gnome.org/orca/"
+
+LICENSE="LGPL-2.1+ CCPL-Attribution-ShareAlike-3.0"
+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-atk-2.5.91:2
+	>=app-accessibility/at-spi2-core-2.5.91:2
+	>=dev-libs/atk-2.5.91
+	>=dev-libs/glib-2.28:2
+	>=dev-python/pygobject-3.2.2:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3.5.16:3[introspection]
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+	app-accessibility/speech-dispatcher[python]
+	dev-libs/atk[introspection]
+	dev-python/pyatspi[${PYTHON_USEDEP}]
+	dev-python/pycairo
+	dev-python/setproctitle
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+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
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}