Rename upnp USE flag to upnp-av (bug #435774, thanks to Michał Górny). Drop old.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

7 files changed, 28 insertions, 199 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 1c16c406641e..2ae8d0f79741 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.223 2012/12/03 02:33:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.224 2012/12/15 18:43:51 tetromino Exp $
+
+  15 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  rhythmbox-0.12.8-r1.ebuild, rhythmbox-0.13.3.ebuild, -rhythmbox-2.96.ebuild,
+  rhythmbox-2.97.ebuild, rhythmbox-2.98.ebuild, metadata.xml:
+  Rename upnp USE flag to upnp-av (bug #435774, thanks to Michał Górny). Drop
+  old.
 
   03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   rhythmbox-0.12.8-r1.ebuild, rhythmbox-0.13.3.ebuild, rhythmbox-2.96.ebuild,
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index 733bb273cfe4..ad65fd6c49f1 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -15,9 +15,6 @@
 		displaying HTML podcast episode descriptions.</flag>
 	<flag name="udev">Enable hardware detection via <pkg>sys-fs/udev</pkg>
 		replacing the deprecated <pkg>sys-apps/hal</pkg> code</flag>
-    <flag name="upnp">Build a plugin for local network music sharing which uses
-		UPnP protocols using <pkg>media-video/coherence</pkg>,
-		<pkg>dev-python/louie</pkg>, and <pkg>dev-python/twisted</pkg></flag>
 	<flag name="webkit">Enable context panel plugin</flag>
 	<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
   </use>
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
index 99ce19bcc16d..5a228a8eaa76 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.23 2012/12/03 02:33:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.24 2012/12/15 18:43:51 tetromino Exp $
 
 EAPI="4"
 GNOME_TARBALL_SUFFIX="bz2"
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE="cdr daap doc gnome-keyring ipod libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit"
+IUSE="cdr daap doc gnome-keyring ipod libnotify lirc musicbrainz mtp nsplugin python test udev upnp-av webkit"
 
 # FIXME: double check what to do with fm-radio plugin
 # TODO: watchout for udev use flag changes
@@ -59,7 +59,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.18:2
 		webkit? (
 			dev-python/mako
 			dev-python/pywebkitgtk )
-		upnp? ( media-video/coherence )
+		upnp-av? ( media-video/coherence )
 	)"
 
 RDEPEND="${COMMON_DEPEND}
@@ -114,8 +114,8 @@ pkg_setup() {
 			ewarn "the context panel plugin."
 		fi
 
-		if use upnp; then
-			ewarn "You need python support in addition to upnp"
+		if use upnp-av; then
+			ewarn "You need python support in addition to upnp-av"
 		fi
 	fi
 
@@ -150,8 +150,7 @@ src_prepare() {
 
 	gnome2_src_prepare
 
-	# disable pyc compiling
-	echo > py-compile
+	python_clean_py-compile_files
 
 	# Fix python initialization problems, bug #318333
 	epatch "${FILESDIR}/${PN}-0.12-python-initialization.patch"
diff --git a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
index 8253feec13ae..28781e528240 100644
--- a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.11 2012/12/03 02:33:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.12 2012/12/15 18:43:51 tetromino Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdr daap doc gnome-keyring ipod +lastfm libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit"
+IUSE="cdr daap doc gnome-keyring ipod +lastfm libnotify lirc musicbrainz mtp nsplugin python test udev upnp-av webkit"
 
 # FIXME: double check what to do with fm-radio plugin
 # TODO: watchout for udev use flag changes
@@ -63,7 +63,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26:2
 		webkit? (
 			dev-python/mako
 			dev-python/pywebkitgtk )
-		upnp? ( media-video/coherence )
+		upnp-av? ( media-video/coherence )
 	)
 	webkit? ( >=net-libs/webkit-gtk-1.1.7:2 )
 "
@@ -120,8 +120,8 @@ pkg_setup() {
 	fi
 
 	if ! use python; then
-		if use upnp; then
-			ewarn "You need python support in addition to upnp"
+		if use upnp-av; then
+			ewarn "You need python support in addition to upnp-av"
 		fi
 	fi
 
diff --git a/media-sound/rhythmbox/rhythmbox-2.96.ebuild b/media-sound/rhythmbox/rhythmbox-2.96.ebuild
deleted file mode 100644
index 2d35d38f7e9b..000000000000
--- a/media-sound/rhythmbox/rhythmbox-2.96.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.96.ebuild,v 1.7 2012/12/03 02:33:36 ssuominen Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
-PYTHON_USE_WITH="xml"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils gnome2 python multilib virtualx
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cdr clutter daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc
-musicbrainz mtp nsplugin +python test +udev upnp webkit zeitgeist"
-# vala
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="
-	ipod? ( udev )
-	mtp? ( udev )
-	dbus? ( python )
-	gnome-keyring? ( python )
-	webkit? ( python )"
-
-# FIXME: double check what to do with fm-radio plugin
-# NOTE: gst-python is still needed because gstreamer introspection is incomplete
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	dev-libs/libxml2:2
-	>=x11-libs/gtk+-3.2:3[introspection]
-	>=x11-libs/gdk-pixbuf-2.18.0:2
-	>=dev-libs/gobject-introspection-0.10.0
-	>=dev-libs/libpeas-0.7.3[gtk,python?]
-	>=dev-libs/totem-pl-parser-2.32.1
-	>=net-libs/libsoup-2.26:2.4
-	>=net-libs/libsoup-gnome-2.26:2.4
-	>=media-libs/gst-plugins-base-0.10.32:0.10[introspection]
-	>=media-libs/gstreamer-0.10.32:0.10[introspection]
-	>=sys-libs/tdb-1.2.6
-
-	clutter? (
-		>=media-libs/clutter-1.2:1.0
-		>=media-libs/clutter-gst-1.0:1.0
-		>=media-libs/clutter-gtk-1.0:1.0
-		>=x11-libs/mx-1.0.1:1.0 )
-	cdr? ( >=app-cdr/brasero-2.91.90 )
-	daap? (
-		>=net-libs/libdmapsharing-2.9.11:3.0
-		>=net-dns/avahi-0.6 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
-	html? ( >=net-libs/webkit-gtk-1.3.9:3 )
-	lastfm? ( dev-libs/json-glib )
-	libnotify? ( >=x11-libs/libnotify-0.7.0 )
-	lirc? ( app-misc/lirc )
-	musicbrainz? (
-		media-libs/musicbrainz:3
-		gnome-base/gconf:2 )
-	python? ( dev-python/pygobject:3 )
-	udev? (
-		virtual/udev[gudev]
-		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
-		mtp? ( >=media-libs/libmtp-0.3 ) )
-	zeitgeist? ( gnome-extra/zeitgeist )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-plugins/gst-plugins-soup-0.10:0.10
-	>=media-plugins/gst-plugins-libmms-0.10:0.10
-	|| (
-		>=media-plugins/gst-plugins-cdparanoia-0.10:0.10
-		>=media-plugins/gst-plugins-cdio-0.10:0.10 )
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-taglib-0.10.6:0.10
-	x11-themes/gnome-icon-theme-symbolic
-	upnp? (
-		>=media-libs/grilo-0.1.17:0.1
-		>=media-plugins/grilo-plugins-0.1.17:0.1[upnp] )
-	python? (
-		>=dev-python/gst-python-0.10.8:0.10
-
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-
-		dbus? ( sys-apps/dbus )
-		gnome-keyring? ( dev-python/gnome-keyring-python )
-		webkit? (
-			dev-python/mako
-			>=net-libs/webkit-gtk-1.3.9:3[introspection] ) )
-"
-# gtk-doc-am needed for eautoreconf
-#	dev-util/gtk-doc-am
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9.1
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	test? ( dev-libs/check )"
-#	vala? ( >=dev-lang/vala-0.9.4:0.12 )
-DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
-	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-		G2CONF="${G2CONF} PYTHON=$(PYTHON -2)"
-	fi
-
-	# --enable-vala just installs the sample vala plugin, and the configure
-	# checks are broken, so don't enable it
-	G2CONF="${G2CONF}
-		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
-		VALAC=$(type -P valac-0.14)
-		--enable-mmkeys
-		--disable-more-warnings
-		--disable-scrollkeeper
-		--disable-schemas-compile
-		--disable-static
-		--disable-vala
-		--without-hal
-		$(use_enable clutter visualizer)
-		$(use_enable daap)
-		$(use_enable lastfm)
-		$(use_enable libnotify)
-		$(use_enable lirc)
-		$(use_enable musicbrainz)
-		$(use_enable nsplugin browser-plugin)
-		$(use_enable python)
-		$(use_enable upnp grilo)
-		$(use_with cdr brasero)
-		$(use_with daap mdns avahi)
-		$(use_with gnome-keyring)
-		$(use_with html webkit)
-		$(use_with ipod)
-		$(use_with mtp)
-		$(use_with udev gudev)"
-
-	export GST_INSPECT=/bin/true
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	echo > py-compile
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "test failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
-	fi
-
-	ewarn
-	ewarn "If ${PN} doesn't play some music format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
-}
diff --git a/media-sound/rhythmbox/rhythmbox-2.97.ebuild b/media-sound/rhythmbox/rhythmbox-2.97.ebuild
index 6cb9c427141e..f28cfab5794f 100644
--- a/media-sound/rhythmbox/rhythmbox-2.97.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.97.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.4 2012/12/03 02:33:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.5 2012/12/15 18:43:51 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="cdr clutter daap dbus doc gnome-keyring html ipod libnotify lirc
-musicbrainz mtp nsplugin +python test +udev upnp webkit zeitgeist"
+musicbrainz mtp nsplugin +python test +udev upnp-av webkit zeitgeist"
 # vala
 KEYWORDS="~amd64 ~x86"
 
@@ -76,9 +76,9 @@ RDEPEND="${COMMON_DEPEND}
 	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
 	>=media-plugins/gst-plugins-taglib-0.10.6:0.10
 	x11-themes/gnome-icon-theme-symbolic
-	upnp? (
+	upnp-av? (
 		>=media-libs/grilo-0.1.17:0.1
-		>=media-plugins/grilo-plugins-0.1.17:0.1[upnp] )
+		>=media-plugins/grilo-plugins-0.1.17:0.1[upnp-av] )
 	python? (
 		>=dev-python/gst-python-0.10.8:0.10
 
@@ -131,7 +131,7 @@ pkg_setup() {
 		$(use_enable musicbrainz)
 		$(use_enable nsplugin browser-plugin)
 		$(use_enable python)
-		$(use_enable upnp grilo)
+		$(use_enable upnp-av grilo)
 		$(use_with cdr brasero)
 		$(use_with daap mdns avahi)
 		$(use_with gnome-keyring)
diff --git a/media-sound/rhythmbox/rhythmbox-2.98.ebuild b/media-sound/rhythmbox/rhythmbox-2.98.ebuild
index 9cc0eee77d73..02b4a6c6b351 100644
--- a/media-sound/rhythmbox/rhythmbox-2.98.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.98.ebuild,v 1.2 2012/12/03 02:33:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.98.ebuild,v 1.3 2012/12/15 18:43:51 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.rhythmbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cdr clutter daap dbus gnome-keyring html ipod libnotify lirc mtp nsplugin +python test +udev upnp webkit zeitgeist"
+IUSE="cdr clutter daap dbus gnome-keyring html ipod libnotify lirc mtp nsplugin +python test +udev upnp-av webkit zeitgeist"
 # vala
 KEYWORDS="~amd64 ~x86"
 
@@ -72,9 +72,9 @@ RDEPEND="${COMMON_DEPEND}
 	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
 	>=media-plugins/gst-plugins-taglib-0.10.6:0.10
 	x11-themes/gnome-icon-theme-symbolic
-	upnp? (
+	upnp-av? (
 		>=media-libs/grilo-0.2:0.2
-		>=media-plugins/grilo-plugins-0.2:0.2[upnp] )
+		>=media-plugins/grilo-plugins-0.2:0.2[upnp-av] )
 	python? (
 		>=dev-python/gst-python-0.10.8:0.10
 
@@ -131,7 +131,7 @@ src_configure() {
 		$(use_enable lirc)
 		$(use_enable nsplugin browser-plugin)
 		$(use_enable python)
-		$(use_enable upnp grilo)
+		$(use_enable upnp-av grilo)
 		$(use_with cdr brasero)
 		$(use_with daap mdns avahi)
 		$(use_with gnome-keyring)