Version bump for Gnome 3.10, drop old

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

3 files changed, 17 insertions, 85 deletions

diff --git a/app-accessibility/orca/ChangeLog b/app-accessibility/orca/ChangeLog
index 56c01d51b310..d274b7cb1252 100644
--- a/app-accessibility/orca/ChangeLog
+++ b/app-accessibility/orca/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/orca
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.123 2013/12/08 17:33:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.124 2013/12/24 15:15:41 pacho Exp $
+
+*orca-3.10.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +orca-3.10.2.ebuild,
+  -orca-3.6.3-r1.ebuild, -orca-3.8.1.ebuild:
+  Version bump for Gnome 3.10, drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> orca-3.8.2.ebuild:
   x86 stable, bug #478252
diff --git a/app-accessibility/orca/orca-3.8.1.ebuild b/app-accessibility/orca/orca-3.10.2.ebuild
index ccf74b5009a5..ff1911fb0930 100644
--- a/app-accessibility/orca/orca-3.8.1.ebuild
+++ b/app-accessibility/orca/orca-3.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.8.1.ebuild,v 1.2 2013/06/08 23:03:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.10.2.ebuild,v 1.1 2013/12/24 15:15:41 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -23,28 +23,27 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # 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
+	>=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.2.2:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.5.16:3[introspection]
+	>=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/pycairo[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]
 	x11-libs/libwnck:3[introspection]
 	x11-libs/pango[introspection]
 "
 DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40
+	>=dev-util/intltool-0.50
 	virtual/pkgconfig
 "
+#	app-text/yelp-tools
 
 src_prepare() {
 	gnome2_src_prepare
@@ -53,7 +52,7 @@ src_prepare() {
 }
 
 src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
+	python_foreach_impl run_in_build_dir gnome2_src_configure ITSTOOL="$(type -P true)"
 }
 
 src_compile() {
@@ -70,4 +69,4 @@ src_install() {
 		python_doscript src/orca/orca
 	}
 	python_foreach_impl run_in_build_dir installing
-}
\ No newline at end of file
+}
diff --git a/app-accessibility/orca/orca-3.6.3-r1.ebuild b/app-accessibility/orca/orca-3.6.3-r1.ebuild
deleted file mode 100644
index fdd9e9679bc4..000000000000
--- a/app-accessibility/orca/orca-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 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.10 2013/06/08 23:03:14 zmedico 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+ 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.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,${PYTHON_USEDEP}]
-	dev-libs/atk[introspection]
-	dev-python/pyatspi[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	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
-}
\ No newline at end of file