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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 15 insertions, 182 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/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
index 9a61a4001c00..d69555614610 100644
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ b/gnome-extra/gnome-tweak-tool/Manifest
@@ -1,20 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gnome-tweak-tool-3.0.4-gentoo-cursor-themes.patch 1030 SHA256 d6a9c50a41f5bb8ac6dcb97f646f9ce7be3f09ec6537cfbceef8bc91b0ac2fc5 SHA512 9c7438443e1d24329e3a74a65d4e1bf69412327887ffdf0b5455306a703426d012dee6ec24c8c5cdaa122932bed8420d8af6113b4768a948252015746b280529 WHIRLPOOL 198c7c946c828062ed915c1d1d2461b4e4c823d6b26905a8e8e118c8daac816185fe9a462c7e711fdde2af3dad4d2e3a148b558c8f3e5afe8dbdbdd4c6a390df
 AUX gnome-tweak-tool-3.7.4-gentoo-cursor-themes.patch 1005 SHA256 1291e7bf318e0153626fcbaa9197ac3300b443ea72fa6e23c81d7f1df059e54b SHA512 e7e6a37d8b66376e83c59aa75eb18833e83bb3065f8b83c2af45caede001c7b561cf5cd7b96d34143c3e6d5d0048b733fa6cb58b80345646a6063607ec5cdbed WHIRLPOOL 4bc004b4a9ea5c55cffd004f88acb0c748a0a23edd83a04a470f86ec345d70ea0135b77cced74e77eb82dea1b2c2c460d9262b0d1e116c4bdebb0bab8bd92567
-DIST gnome-tweak-tool-3.6.1.tar.xz 224152 SHA256 8ce5fe961f14bd886f3d23b49797bdabf3577507576e0bd004dfb962a2f1afa8 SHA512 0eaf2e152aab4ef4eb3f4231e61bb70df7ff1ce1258ebdf2a70d58c4e114cc39d972ef2fa3afe1a445b7e93aac55eb06c30f3908895f44ddfc9aa4e987def403 WHIRLPOOL e5a6b1bff8a4b685d742d306a4798d694e899e6107779b9d84c440a00bdf3291ddf209ab310f4a965ff033a153cfa6553e2a1fc0a6ab625cd36145bdda8dd0e9
-DIST gnome-tweak-tool-3.8.0.tar.xz 230948 SHA256 630135433d6e079967ed515d9082f4a8a35a7e7a9233f4fe89c6588345939c35 SHA512 ac4da49fa04d8dddc00189d451299641cb60938ec7bbb4d617924f06d67cdb67b0a54ffae751afe30d4d4fbe5dc65cfb1771ea3d765ec3ecb3bfd190e846a5d9 WHIRLPOOL 4de2563f4446497a9034d8336ce1b1e2e45cabf34053197d1a0b6bcbfa8323086723c50fdf052d256a456d8495b9a7fcdf2e120f4afb7945c344a48d214104c3
 DIST gnome-tweak-tool-3.8.1.tar.xz 230128 SHA256 283e3174ce85aeb9187de31a09b59866e84debd31dcdddedc1615a5097ea54c1 SHA512 d70e69dbdb0c05353a56cbdc9f495a7c27afe2f7af6533326cd3c28e9b729e25d0c77a4bb10cf091fd1920048a678b210b5e9d0f424a51189b1e58d75d210ee3 WHIRLPOOL fd0233b09f8996956f808a518d5d071a5fb3263053903132c3bc0bfeefbcbce7c0c77b1eac484c205080787805d61103bcde50db85b6ca221e85ad7e0f406641
-EBUILD gnome-tweak-tool-3.6.1-r1.ebuild 1776 SHA256 21c6acb96297039146dac37b8b128bb7ac7bb553e9a7db47b9913311415c4823 SHA512 aae16326b9511c3e298bdc4a829f2844ea359a419b64003b3cb4eeda9aea0c535b58427d5549ab0bd99f6b85c6d038bd3dd2f0ffe70dc2a07c34b20fa6b03807 WHIRLPOOL 844d5a675e2d6852bdda6f5cd3047d6846a35225f309d4ff86e77245f43ec242ecad29ba60a8ee56bd98673f8008ccdba12ff4c02842d8d01427cdf5ae545f04
-EBUILD gnome-tweak-tool-3.8.0.ebuild 1722 SHA256 e15bb82457d4ceaafb2f8d03338ea093765fdc001777426bb572c5e7d9b206fe SHA512 5c8b58ce4a6f9d053fecf0a21859fd4e465e4d3f32021fd33762852435cb6fe05bc0edaa072b63b85ef2465ace861f93282a2f17a81566081a1e4122cd030d47 WHIRLPOOL 32e141e7830b4301a140c75c46894414f5f4db937d9a8422e74c199a9cdc59175e0eee9c27255a669d178a07b8ae47980121ba9a0381910c6b358512c42806dd
-EBUILD gnome-tweak-tool-3.8.1.ebuild 1726 SHA256 9a98dfcdd0039584f332f876da98710dcf017813ef592984f75e478fd752ca0e SHA512 22132d1be95128c26992a9641510404f30bbd8078e47a68d625a4a2031d03689b95568655edf9af5ed775f2112636cf9a192287c15f7f9748f3eee530ae2369d WHIRLPOOL 71ba1ac94ec28d885ed7172613c04bf298d431d59f95e5c5934d0929450e37c9246915f805e63e15b0a89de76cf4784a085e3df54b7d1e451abafe3f54ac20a3
-MISC ChangeLog 4783 SHA256 90fb036a0736144889bf4ac25c1c16c516baab49c051acf6d3990c17850a92cb SHA512 0036631f011c17615748c01c0f57927b41a7572beb847f237a2c7fdd6c7e60a47122ace2072cf62e34beb0119e1d0a989cd5c393eaa29bb76003e204bc127979 WHIRLPOOL e3d3ba6aaaecf983d192f9697dd86f4ad72b002c4f2ba1bfb12f09016dec323f4d4edf0bf402a72379e80acd518325f69efdec74671e0d05f40d1968ef877548
+EBUILD gnome-tweak-tool-3.8.1.ebuild 1742 SHA256 f77078234ee31311dc22d919f0ee529be85520b914a332f9c8594b960fad9595 SHA512 23d656aaf3c2e92c1b20872fee1882d0625eafe7dc0acb6e22c35a9a8bd2a6005549c5f617c851f15f29da95671a0d38b7a4a66939f892196db9320e64a0feb5 WHIRLPOOL e59dd165ec37eb872d09e674ad1ee928e46699151bf55a375227e4a187fec213877a3f5f5985a6afd9d4cb09db161e95be3b821880d21d7f2bcd602a6762f6a9
+MISC ChangeLog 5073 SHA256 dfffaacd060618ebcf0ee4c3bc429e1ec52544df8a09056748a5d33142a53369 SHA512 5939f751e0a1880af8af51ac0ed599c2af29174711535753eebdc1c098754fa9736ad88c62274c6b0211e60fb62233b8809c4f727467f23e5a7fd6e99084e83a WHIRLPOOL ca33c397a619f2f6c751b659162a015b00d8728e772e9114e962207904521d8e8c453f22df92f30aa776418bc5dc52e4c9d15c8a92928281f5a1761bc5db7687
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHm/FsACgkQCaWpQKGI+9RSHACdGakBKnAUjIep7oJ/J12UyYGq
-xgQAnR0NLcCcyJ3Rtqy7GXQJk05VQGSg
-=588t
+iEYEAREIAAYFAlJsEFEACgkQCaWpQKGI+9QCDACfSpnlKD87dlE4N50L3/GEuoca
+e9cAoIeQbB0DKpVctVpWZaugHoDdE1TB
+=SSlU
 -----END PGP SIGNATURE-----
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