Fix python dependencies, bug #489230 by Mark R. Pariente and mgorny. Drop old.

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

5 files changed, 9 insertions, 171 deletions

diff --git a/gnome-extra/gnome-tweak-tool/ChangeLog b/gnome-extra/gnome-tweak-tool/ChangeLog
index 216a87c2602c..099075037f3a 100644
--- a/gnome-extra/gnome-tweak-tool/ChangeLog
+++ b/gnome-extra/gnome-tweak-tool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-tweak-tool
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.22 2013/07/17 20:19:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.23 2013/10/26 18:56:15 pacho Exp $
+
+  26 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-tweak-tool-3.0.4-gentoo-cursor-themes.patch,
+  -gnome-tweak-tool-3.6.1-r1.ebuild, -gnome-tweak-tool-3.8.0.ebuild,
+  gnome-tweak-tool-3.8.1.ebuild:
+  Fix python dependencies, bug #489230 by Mark R. Pariente and mgorny. Drop old.
 
 *gnome-tweak-tool-3.8.1 (17 Jul 2013)
 
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.0.4-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.0.4-gentoo-cursor-themes.patch
deleted file mode 100644
index dfd4a9ee5cd2..000000000000
--- a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.0.4-gentoo-cursor-themes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4dc16c9c7b409cc39f51031be8202093d22563c9 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Mon, 23 May 2011 06:50:28 -0400
-Subject: [PATCH] Support Gentoo's /usr/share/cursors/xorg-x11 cursor theme directory
-
----
- gtweak/tweaks/tweak_interface.py |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/gtweak/tweaks/tweak_interface.py b/gtweak/tweaks/tweak_interface.py
-index 33ee362..31f6e1d 100644
---- a/gtweak/tweaks/tweak_interface.py
-+++ b/gtweak/tweaks/tweak_interface.py
-@@ -66,7 +66,8 @@ class CursorThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_cursor_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
-+        dirs = ( os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11"),
-+                 os.path.join(gtweak.DATA_DIR, "icons"),
-                  os.path.join(os.path.expanduser("~"), ".icons"))
-         valid = walk_directories(dirs, lambda d:
-                     os.path.isdir(d) and \
--- 
-1.7.5.rc3
-
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1-r1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1-r1.ebuild
deleted file mode 100644
index 9ba383dca6cd..000000000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1-r1.ebuild,v 1.8 2013/02/02 22:39:31 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit eutils gnome2 python-r1
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="http://live.gnome.org/GnomeTweakTool"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=gnome-base/gsettings-desktop-schemas-3.4
-	>=dev-python/pygobject-3.2.1:3[${PYTHON_USEDEP}]
-	gnome-base/gconf:2
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gconf:2[introspection]
-	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
-	x11-libs/gtk+:3[introspection]
-
-	>=gnome-base/gnome-settings-daemon-3
-	gnome-base/gnome-shell
-	>=gnome-base/nautilus-3
-	x11-wm/metacity
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	epatch "${FILESDIR}/${PN}-3.0.4-gentoo-cursor-themes.patch"
-
-	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_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		gnome2_src_install
-		python_doscript gnome-tweak-tool || die
-	}
-	python_foreach_impl run_in_build_dir install_python
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.0.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.0.ebuild
deleted file mode 100644
index 3a648ee4e684..000000000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.0.ebuild,v 1.2 2013/07/01 18:33:52 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit eutils gnome2 python-r1
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="http://live.gnome.org/GnomeTweakTool"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=gnome-base/gsettings-desktop-schemas-3.4
-	>=dev-python/pygobject-3.2.1:3[${PYTHON_USEDEP}]
-	gnome-base/gconf:2
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gconf:2[introspection]
-	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
-	x11-libs/gtk+:3[introspection]
-
-	>=gnome-base/gnome-settings-daemon-3
-	gnome-base/gnome-shell
-	>=gnome-base/nautilus-3
-	x11-wm/metacity
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	epatch "${FILESDIR}/${PN}-3.7.4-gentoo-cursor-themes.patch"
-
-	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_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		gnome2_src_install
-		python_doscript gnome-tweak-tool || die
-	}
-	python_foreach_impl run_in_build_dir install_python
-}
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.1.ebuild
index 011bd82a6c67..7a8671187cc5 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.1.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.1.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/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.1.ebuild,v 1.1 2013/07/17 20:19:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.8.1.ebuild,v 1.2 2013/10/26 18:56:15 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -20,6 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
+	${PYTHON_DEPS}
 	>=gnome-base/gsettings-desktop-schemas-3.4
 	>=dev-python/pygobject-3.2.1:3[${PYTHON_USEDEP}]
 	gnome-base/gconf:2