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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

5 files changed, 21 insertions, 155 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/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