Add more missing PYTHON_USEDEPs (bug #546266). Drop old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

6 files changed, 40 insertions, 178 deletions

diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog
index ddd2f6ea6638..94863ad7bf57 100644
--- a/media-sound/quodlibet/ChangeLog
+++ b/media-sound/quodlibet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/quodlibet
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.109 2014/11/30 16:46:45 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.110 2015/04/19 07:09:22 yngwin Exp $
+
+  19 Apr 2015; Ben de Groot <yngwin@gentoo.org> -quodlibet-3.0.2.ebuild,
+  -quodlibet-3.1.1.ebuild, quodlibet-2.6.3.ebuild, quodlibet-3.1.2.ebuild:
+  Add more missing PYTHON_USEDEPs (bug #546266). Drop old.
 
   30 Nov 2014; Michał Górny <mgorny@gentoo.org> quodlibet-3.0.2.ebuild,
   quodlibet-3.1.1.ebuild, quodlibet-3.1.2.ebuild:
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index 7c8e538ca959..21431cbe0379 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -2,31 +2,27 @@
 Hash: SHA256
 
 DIST quodlibet-2.6.3.tar.gz 2507416 SHA256 dff4ebb90c676678f72cecbff8ab15d80154354f40a865b6c9c82bb048d48a46 SHA512 ffbf03a4e0f1e5740b0c87ce62aa0cda33d017d0ee95dc6ecb3aeb8cadcde0fb525289658ea8edee088a382af4b261e44acb53cd0dc170520ed4070c8bf488e6 WHIRLPOOL 1ea653b1620170367cf7fa67519166c783192c0ee442598393699bc248cc697d608bf88903685e4ff39ec17b411c2be91d3807980951c61196436d0d23b88ca1
-DIST quodlibet-3.0.2.tar.gz 4069435 SHA256 116e37a3ba82e07d6d40739205c32643e4f4b608c1ac7fdf89446a7eb7e8a032 SHA512 118bd21f763edb8aff5672be7118e62c349bdd973334f6a4d1c2abfa1e8121b0fe6a47bf9946f497085c9f67e88db83732fb6f415816548dcddb48fc15251f5c WHIRLPOOL e551335cd1d3a4c67bc9435c5722e6999066142a21e2424ed38d9d4e8607be10bfb7b5160a2354653f90a92f6925f638c034bccce04718c6cd5711e4c87136c7
-DIST quodlibet-3.1.1.tar.gz 2614018 SHA256 39dc11b64c7bcb543d7ad7bbb41c7a0c8548cded439d8f1e805ded0142f2b60c SHA512 547ff6105d3c1f94a91c938b7c48ed8ed8da36297ce5112ed139f4e488106764951937b37dee28ecb73260978d2342f56884682500cdbf8e7f98795fd2b83c90 WHIRLPOOL 590806ccad2fcabea139e8615a547fa49d727b238c5e8cd3af005e8ed72af6792de2ec68001a555164c3931dcad961f2013b9b3d4e99905d239dfe6fe008a2a0
 DIST quodlibet-3.1.2.tar.gz 2615449 SHA256 3ef6320f4c72e2e759c2190e87749aae7b59c6b154f48d1102a142fbc961edbf SHA512 f2429606098b74b6affabaafe392ad99b2f739de0c858e4ba45a0e6416963f941fc8276f33e6c68ce54f8412c772399f0341757fbade8b57047d743518c37fe1 WHIRLPOOL 513be2c0c0aa9b0881fae9621d76a730417a309b55492031d1f91a5183ab6f4366b9418fd02c785178daf042e2abf726ce9945315f0cac38fd775ec73d529bc7
-EBUILD quodlibet-2.6.3.ebuild 1707 SHA256 5fdf7d170ff0f8451674a429f62eab397a4f6ba207930da4d240fc63749f467e SHA512 c744c71090841b41d6074b859aa95e533b70f3f6a234f1fa6bad7925003058c6241670f5edba1f244c639fc8c9a56be533741767d938b1e1a9c17033849ebc71 WHIRLPOOL 8acbf370dc5a14fb5152aea94e4a2ef66c0b756b1da6f153e5908e4f117fdab90a5445662b2816fd31e2eca862dff897c9caa4eac8ff3cd44e84e9c1c3bda98d
-EBUILD quodlibet-3.0.2.ebuild 1669 SHA256 ed7dafc275d702f778a74dde740a5c4ddf8799bd74323b7e1a72075a1143dcba SHA512 11e36edac1060be84e771b89f0715051155f43b76b2d50ae6f4afcefd35290574e48a4bc5cd0ccfbf7c32515e7cb252ca7cf278e108debd17a7d70991e677dc8 WHIRLPOOL 0e276eba232a9c7a5fb62243ba55d4739035cdd8aa280120fc49c9fabf3059aeb18067797a999192e82260c50502f6fe7da67553fa6105bfba6cf7382f73c448
-EBUILD quodlibet-3.1.1.ebuild 1695 SHA256 8f26895f5666a792dee682b2ce4243fa2f5f76a4d34b9c1b81572f25d369b817 SHA512 8376c80f47241ecf7906ea0ed454988469e9673fed9d3cea6260669f23251747b294f093444ece47e1b87b873a6c4a15c3c24181cb3defd33efbaf4633fef54c WHIRLPOOL f1a9e3df4b83292b1ca417d7f1314e9fea35bfa96fe56dddd1a697fba3374b3d592cf5f331d4446bb7c2412d933782fd6c5824f82dea23242a591d14b59dd6ab
-EBUILD quodlibet-3.1.2.ebuild 1695 SHA256 89f2ec95709c225d99e9f637b0c2f04a2b9b77a363ac9c7014af23a090a586f5 SHA512 700120b0ba5c2a0adab18e6b5a237180a9ca28945c8ddd31f243a6b33acee7829ba7c202512fc45cbbfde36dd55dfde9027fe0682e10c13776f2b05c91542f72 WHIRLPOOL 1e0eab16e5143f7046b59df52b0144c93f382b28e90c19ef65be5ca859868d5033fe329d8cb56130a941b4886ef085f7e1b536090303b1f94bfe886c231427f7
-MISC ChangeLog 17625 SHA256 33c6a204197e17ff6a410e3b3f5b1d282cf3900620f45eefd785e973965524ad SHA512 a3a3b6f1f175ff4005f7867acd0eb379239f33c463a787833fb49a5b08ce0be8f7275b5ada14890d10bbc18c9dade2e18cae694541205a37c30a8ea2cd6cea37 WHIRLPOOL 648ee95ae56cff46939c231a611d83f7b3565622354d869289d1588ec1aa32a70c44be6b675e870932b0636390c39b797668978554b6063d19bdf3c42c50392e
+EBUILD quodlibet-2.6.3.ebuild 1821 SHA256 1482770d16b2546aee32a4ea51ddfea11492636b8f710f8a5f41a3b71c967406 SHA512 b20f9bd21d259b20893b9f804583102320fca48449d114a58b844b830450060d8f35b0a9aaae368cdd17b607b9afa37180d01ec05a43b45ce890aa149a0ce7a4 WHIRLPOOL 901c32b61ba5ab4f654b0cf2aeb701846cedd1bb7be05b34e8a2e11b6e1e2cf79c855217563f78b02559cd24cce4a53e3da0a81770a5b11cf4bf3c01c9e4bbdb
+EBUILD quodlibet-3.1.2.ebuild 1749 SHA256 0ee1faa3fd9dac21f461dc198164bc563975df4a495bf4f01ca7eeb44a4a5e3b SHA512 b2c68ef9db9ae2323996fa2bbf5b07045b34da6cabf531cb95175c56be636e70252afbbe606924b1f7d16f6b5781fee7e40a191a0cdf023c528c797647633bb6 WHIRLPOOL 43827b83441d321b03cdff800413e7cc6311a2c6f80a82dc388789258a7cfd9ecb880cde79b143a36c8c660b7a36ffd8a50bbe2ff0f5efbb11ac7c1554f5bd41
+MISC ChangeLog 17833 SHA256 2d145ba6cd5b98ddf632ceef16456167d775f63a2969a466cd8fdf0b45e60a66 SHA512 9999d10fb917e0f7b386ba36962bbf419d337c289796d94dc51228f8cbdecd042f55edfbcfa3bc5b0a6971fce7451b10fd40186c9416196ee400a97b282befe9 WHIRLPOOL efe4a39c933cf3a4b5162770f3ba4151b9a0651a23874a1e48dd4a4575a8b9ea8fa7891f68e4ded70eb0c533fd2c55f1b2426e5998a9c66f31c4284ab38701e1
 MISC metadata.xml 717 SHA256 5b3886ac2a706da49f89cf719e8c443c0df15f5c508fdadadd22856fd05e19df SHA512 1d6b91cbd523896ce7313ab78e5499d517ca2e04b76010acaa64830fbe155ee02dc55395893f48377d93b0ed9cc1389646e34336536ce14ff3b97d837e143e4f WHIRLPOOL 090a5475ecefc2fa3a5f58e86effdd82c93e9b12f3d8bbd73152ea23f9924e1e8ad0783c404d3c194e81cf125f7307c828cb19b07015e653a95e626219fc6afd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJUe0n3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOuBsP/iTOYOPaSOLeWD1aTAH6xmJK
-+9GfoC+67B2JbM5x9CnUwaEV7zHFObVczAXFa51Gm2w6RdtjsYF5YPbFX4R8j0bc
-Vvt4UtvwUEfFcVhepkWqIE+jKxeo7wiLAtgY0G9URy38mqBiI4Nt+XdMWSpWPcJ2
-MNLgrBoGjZaLLCLCWzKZ9tj7zsxcXXZm80pf2y6yAQdVC0K9ucJ9dB2r/eLZwAsA
-MgwrwOL5H0BKlq+txQAD0s43K8QyzZ+kv/LDRQydK1V5qNfRLZVF3TQq+M0CBfe+
-1HshhNZGHcHH47ji64altXb/KLR8g2SeVzSX1bbV+rOpZcG0eT1hlECJz7jz2jP9
-YGa4u/IzJmjtbY+Ea2h7Xsq6iQERoS1j7W2c0NwHu8VLM2aS2vPY/aiuhxblANuI
-hxgu8gcZ3FM7y5zPIiW9xdRttEHUJFIYiLbdQHPVAHnfdWi/rvxAuBEqqv4tDRZI
-4B8eA+BQdyQsfCI/94l7oNS6RErg+iLwzJfxX+8BuwW7wv26ef+rtEV3m7gnPu4Z
-nvRlUO9qd3ZkHC/17v121uwv45Nf0YrElv/IJfx349BFNieqWkR8E80ropmFeeKT
-6y3UxQlYd2AjQf4fysWReVYTuPe/I+kh9SoSOgJUwn9XEnn2OphZpsXgqTOhoUcB
-iUbVrhHyx5jUfzTkef/u
-=TDSm
+iQJ8BAEBCABmBQJVM1SlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOxRYP/jEiMRhDzLKXQFuGmnVhAwfI
+fXHW2Us/bqcwpKJGpaQ+Y7fzD/eKcWm+5/z0DruzNXbxWdApEuk0JKoD3s6C7V5T
+p+vVJY9fQANnikq/mSQnazL7eB8Ugr6rqcsGsPZ2QKG/thJVJwVW+B87WZXBI7Ok
+QbECHr3sUIWx7BrC9b8/qb2XX8tZjLaizxPL6ZhpIBaFLFGN/SOCSohi1Hv5WRiV
+DR0gN1ShHDfrOAzaj/StE9kIVqVUnvrdUmkEz3Rrp/bDhLv86lvD+DuhVP24K11Q
+hGMJlUuXmhfR7BT67TosOhsFycatjgUVyv1HC2ucvGcDxvO27NmwRvrEIZXWJQ4t
+nb7+2KI1S6utR78nqHtJHYjLRfCn2+So27nI6HfxYrX9NFWzPPFYmATtap6qujwI
+n1BGv/pLdvvVpjSIBghQ+fCd7RfL+OdZrYLF1o0XJaUa1wJM0iOK64YmA818H/Ph
+reZTf77AyW82Fxav7u51lgbJya2uA1QNZ4SKiFAKOTVWZWY66kjbXyLXzgTQHOkw
+KjK3e2Rswn/irIjG9HU0Up/wqjHiICPJaUqT6Cnq7rS9Y0szSWYiM6ewlyph2jsy
+11ULD6kyhdQN5hTeBubiuyaldpJpc4cbJvHhAaKnIOOV0L9MPSPR28PfHY5Yer2Q
+Sf0l4vvV4aRmxW01grHI
+=gMLb
 -----END PGP SIGNATURE-----
diff --git a/media-sound/quodlibet/quodlibet-2.6.3.ebuild b/media-sound/quodlibet/quodlibet-2.6.3.ebuild
index b6e90603b19c..46b337aa3af1 100644
--- a/media-sound/quodlibet/quodlibet-2.6.3.ebuild
+++ b/media-sound/quodlibet/quodlibet-2.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.6.3.ebuild,v 1.1 2014/02/17 19:52:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.6.3.ebuild,v 1.2 2015/04/19 07:09:22 yngwin Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,23 +15,23 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+dbus gstreamer ipod +udev"
 
-COMMON_DEPEND=">=dev-python/pygtk-2.24"
+COMMON_DEPEND=">=dev-python/pygtk-2.24[${PYTHON_USEDEP}]"
 RDEPEND="${COMMON_DEPEND}
-	dev-libs/keybinder:0[python]
-	dev-python/feedparser
-	dev-python/pygobject:2
-	>=media-libs/mutagen-1.20
+	dev-libs/keybinder:0
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.20[${PYTHON_USEDEP}]
 	gstreamer? (
-		>=dev-python/gst-python-0.10.2:0.10
+		>=dev-python/gst-python-0.10.2:0.10[${PYTHON_USEDEP}]
 		media-libs/gst-plugins-good:0.10
 		media-plugins/gst-plugins-meta:0.10
 		)
 	!gstreamer? ( media-libs/xine-lib )
 	dbus? (
 		app-misc/media-player-info
-		dev-python/dbus-python
+		dev-python/dbus-python[${PYTHON_USEDEP}]
 		)
-	ipod? ( media-libs/libgpod[python] )
+	ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
 	udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool"
diff --git a/media-sound/quodlibet/quodlibet-3.0.2.ebuild b/media-sound/quodlibet/quodlibet-3.0.2.ebuild
deleted file mode 100644
index def5c69434ff..000000000000
--- a/media-sound/quodlibet/quodlibet-3.0.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-3.0.2.ebuild,v 1.2 2014/11/30 16:46:45 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 gnome2-utils fdo-mime
-
-DESCRIPTION="audio library tagger, manager, and player for GTK+"
-HOMEPAGE="http://code.google.com/p/quodlibet/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+dbus gstreamer ipod +udev"
-
-RDEPEND="dev-libs/keybinder:3[introspection]
-	dev-python/feedparser
-	dev-python/pygobject:3
-	>=media-libs/mutagen-1.22
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-meta:1.0
-		)
-	!gstreamer? ( media-libs/xine-lib )
-	dbus? (
-		app-misc/media-player-info
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		)
-	ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
-	udev? ( virtual/udev )"
-DEPEND="dev-util/intltool"
-REQUIRED_USE="ipod? ( dbus )"
-
-src_prepare() {
-	sed -i -e '/usr.*bin.*env/s:python:python2:' {exfalso,quodlibet}.py || die
-
-	local qlconfig=${PN}/config.py
-
-	if ! use gstreamer; then
-		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
-	fi
-
-	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc NEWS README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/quodlibet/quodlibet-3.1.1.ebuild b/media-sound/quodlibet/quodlibet-3.1.1.ebuild
deleted file mode 100644
index f11b49ae4811..000000000000
--- a/media-sound/quodlibet/quodlibet-3.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-3.1.1.ebuild,v 1.2 2014/11/30 16:46:45 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 gnome2-utils fdo-mime
-
-DESCRIPTION="audio library tagger, manager, and player for GTK+"
-HOMEPAGE="http://code.google.com/p/quodlibet/"
-SRC_URI="http://bitbucket.org/lazka/${PN}-files/raw/default/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+dbus gstreamer ipod +udev"
-
-RDEPEND="dev-libs/keybinder:3[introspection]
-	dev-python/feedparser
-	dev-python/pygobject:3
-	>=media-libs/mutagen-1.22
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-meta:1.0
-		)
-	!gstreamer? ( media-libs/xine-lib )
-	dbus? (
-		app-misc/media-player-info
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		)
-	ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
-	udev? ( virtual/udev )"
-DEPEND="dev-util/intltool"
-REQUIRED_USE="ipod? ( dbus )"
-
-src_prepare() {
-	sed -i -e '/usr.*bin.*env/s:python:python2:' {exfalso,quodlibet}.py || die
-
-	local qlconfig=${PN}/config.py
-
-	if ! use gstreamer; then
-		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
-	fi
-
-	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc NEWS README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/quodlibet/quodlibet-3.1.2.ebuild b/media-sound/quodlibet/quodlibet-3.1.2.ebuild
index 511aa1a8bc2a..0f8535a3023d 100644
--- a/media-sound/quodlibet/quodlibet-3.1.2.ebuild
+++ b/media-sound/quodlibet/quodlibet-3.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-3.1.2.ebuild,v 1.2 2014/11/30 16:46:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-3.1.2.ebuild,v 1.3 2015/04/19 07:09:22 yngwin Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,9 +16,9 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+dbus gstreamer ipod +udev"
 
 RDEPEND="dev-libs/keybinder:3[introspection]
-	dev-python/feedparser
-	dev-python/pygobject:3
-	>=media-libs/mutagen-1.22
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.22[${PYTHON_USEDEP}]
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0