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

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

5 files changed, 11 insertions, 382 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index d79ef5161c24..a68b76a354b0 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.345 2012/09/21 04:33:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.346 2012/12/15 18:17:35 tetromino Exp $
+
+  15 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  totem-2.32.0-r2.ebuild, -totem-3.2.2.ebuild, -totem-3.4.2.ebuild,
+  metadata.xml:
+  Rename upnp USE flag to upnp-av (bug #435776, thanks to Michał Górny). Drop
+  old.
 
   21 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> totem-3.4.3.ebuild:
   We don't really need vala for building from the source tarball
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index b33af20d95b5..93928e147594 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -23,8 +23,6 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen
 		<flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag>
 		<flag name="tracker">Enable support for searching media files using the
 		indexer <pkg>app-misc/tracker</pkg></flag>
-		<flag name="upnp">Enable DLNA support through
-		<pkg>media-video/coherence</pkg></flag>
 		<flag name="youtube">Enable youtube plugin</flag>
 		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 		<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
diff --git a/media-video/totem/totem-2.32.0-r2.ebuild b/media-video/totem/totem-2.32.0-r2.ebuild
index e3db6dda06bc..735c9d56e2c2 100644
--- a/media-video/totem/totem-2.32.0-r2.ebuild
+++ b/media-video/totem/totem-2.32.0-r2.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-video/totem/totem-2.32.0-r2.ebuild,v 1.12 2012/05/05 08:58:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r2.ebuild,v 1.13 2012/12/15 18:17:35 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
-IUSE="bluetooth debug doc iplayer lirc nautilus nsplugin python tracker upnp +youtube" #zeroconf
+IUSE="bluetooth debug doc iplayer lirc nautilus nsplugin python tracker upnp-av +youtube" #zeroconf
 
 # TODO:
 # Cone (VLC) plugin needs someone with the right setup (remi ?)
@@ -69,7 +69,7 @@ RDEPEND=">=dev-libs/glib-2.25.11:2
 	nsplugin? ( media-plugins/gst-plugins-soup:0.10 )
 	python? ( ${PYTHON_DEPS} )
 	tracker? ( >=app-misc/tracker-0.8.1 )
-	upnp? ( media-video/coherence )
+	upnp-av? ( media-video/coherence )
 	youtube? (
 		<dev-libs/libgdata-0.9
 		>=dev-libs/libgdata-0.4
@@ -121,7 +121,7 @@ pkg_setup() {
 	use lirc && plugins="${plugins},lirc"
 	use python && plugins="${plugins},opensubtitles,jamendo,pythonconsole,dbus-service"
 	use tracker && plugins="${plugins},tracker"
-	use upnp && plugins="${plugins},coherence_upnp"
+	use upnp-av && plugins="${plugins},coherence_upnp"
 	use youtube && plugins="${plugins},youtube"
 	#use vala && plugins="${plugins},sample-vala"
 	#use zeroconf && plugins="${plugins},publish"
diff --git a/media-video/totem/totem-3.2.2.ebuild b/media-video/totem/totem-3.2.2.ebuild
deleted file mode 100644
index 8a3440f420f8..000000000000
--- a/media-video/totem/totem-3.2.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.2.ebuild,v 1.6 2012/09/16 02:55:45 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-WANT_AUTOMAKE="1.11"
-PYTHON_DEPEND="python? 2:2.5"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit gnome2 multilib python
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="bluetooth doc grilo +introspection iplayer lirc nautilus nsplugin +python +youtube vala zeitgeist" # test zeroconf
-
-# TODO:
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# coherence plugin broken upstream
-#
-# FIXME: Automagic tracker-0.9.0
-# Runtime dependency on gnome-session-2.91
-RDEPEND=">=dev-libs/glib-2.27.92:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-2.99.3:3[introspection?]
-	>=dev-libs/totem-pl-parser-2.32.4[introspection?]
-	>=dev-libs/libpeas-1.1.0[gtk]
-	>=x11-themes/gnome-icon-theme-2.16
-	x11-libs/cairo
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/clutter-1.6.8:1.0
-	>=media-libs/clutter-gst-1.3.9:1.0
-	>=media-libs/clutter-gtk-1.0.2:1.0
-	>=media-libs/gstreamer-0.10.30:0.10
-	>=media-libs/gst-plugins-base-0.10.30:0.10
-	x11-libs/mx:1.0
-
-	media-libs/gst-plugins-good:0.10
-	media-plugins/gst-plugins-taglib:0.10
-	media-plugins/gst-plugins-gio:0.10
-	media-plugins/gst-plugins-pango:0.10
-	media-plugins/gst-plugins-x:0.10
-	media-plugins/gst-plugins-meta:0.10
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXtst
-	>=x11-libs/libXxf86vm-1.0.1
-
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/gnome-icon-theme-symbolic
-
-	bluetooth? ( net-wireless/bluez )
-	grilo? ( >=media-libs/grilo-0.1.16:0.1 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	nsplugin? (
-		>=dev-libs/dbus-glib-0.82
-		>=x11-misc/shared-mime-info-0.22 )
-	python? (
-		>=dev-libs/gobject-introspection-0.6.7
-		>=dev-python/pygobject-2.90.3:3
-		>=x11-libs/gtk+-2.91.7:3[introspection]
-		dev-python/pyxdg
-		dev-python/gst-python:0.10
-		dev-python/dbus-python
-		iplayer? (
-			dev-python/httplib2
-			dev-python/feedparser
-			dev-python/beautifulsoup ) )
-	vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
-	youtube? (
-		>=dev-libs/libgdata-0.7.0
-		net-libs/libsoup:2.4
-		media-plugins/gst-plugins-soup:0.10
-		>=dev-libs/totem-pl-parser-2.32.4[quvi] )
-	zeitgeist? ( dev-libs/libzeitgeist )"
-#	zeroconf? ( >=net-libs/libepc-0.5.0 )
-# XXX: zeroconf requires unreleased version of libepc
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	x11-proto/xproto
-	x11-proto/xextproto
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.20.3
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.5
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.14 )"
-#	test? ( python? ( dev-python/pylint ) )
-# docbook-xml-dtd is needed for user doc
-
-# see bug #359379
-REQUIRED_USE="python? ( introspection )
-	zeitgeist? ( vala )"
-
-# XXX: pylint checks fail, need to investigate why
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-run-in-source-tree
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-smclient=auto
-		--enable-easy-codec-installation
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable nsplugin browser-plugins)
-		$(use_enable python)
-		$(use_enable python introspection)
-		$(use_enable vala)
-		VALAC=$(type -P valac-0.14)
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-	#--with-smclient=auto needed to correctly link to libICE and libSM
-
-	# Disabled: sample-python, sample-vala, zeitgeist-dp
-	local plugins="brasero-disc-recorder,chapters,im-status,gromit"
-	plugins="${plugins},media-player-keys,ontop,properties,screensaver"
-	plugins="${plugins},screenshot,sidebar-test,skipto"
-	use bluetooth && plugins="${plugins},bemused"
-	use grilo && plugins="${plugins},grilo"
-	use iplayer && plugins="${plugins},iplayer"
-	use lirc && plugins="${plugins},lirc"
-	use nautilus && plugins="${plugins},save-file"
-	use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
-	use vala && plugins="${plugins},rotation"
-	use youtube && plugins="${plugins},youtube"
-	use zeitgeist && plugins="${plugins},zeitgeist-dp"
-	# XXX: zeroconf requires unreleased version of libepc
-	# use zeroconf && plugins="${plugins},publish"
-
-	G2CONF="${G2CONF} --with-plugins=${plugins}"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
-	mkdir -p m4
-
-	#if [[ ${PV} != 9999 ]]; then
-	#	intltoolize --force --copy --automake || die "intltoolize failed"
-	#	eautoreconf
-	#fi
-
-	use python && python_clean_py-compile_files
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Work around sandbox violations when FEATURES=-userpriv caused by
-	# gst-inspect-0.10 (bug #358755, #419187)
-	unset DISPLAY
-	gnome2_src_configure
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize /usr/$(get_libdir)/totem/plugins
-	fi
-
-	ewarn
-	ewarn "If totem doesn't play some video format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
-}
diff --git a/media-video/totem/totem-3.4.2.ebuild b/media-video/totem/totem-3.4.2.ebuild
deleted file mode 100644
index 320a1e2d0c79..000000000000
--- a/media-video/totem/totem-3.4.2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.4.2.ebuild,v 1.4 2012/09/16 02:55:45 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-WANT_AUTOMAKE="1.11"
-PYTHON_DEPEND="python? 2:2.5"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit gnome2 multilib python
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-
-# TODO:
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# coherence plugin broken upstream
-#
-# FIXME: Automagic tracker-0.9.0
-# Runtime dependency on gnome-session-2.91
-RDEPEND=">=dev-libs/glib-2.27.92:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
-	>=dev-libs/totem-pl-parser-2.32.4[introspection?]
-	>=dev-libs/libpeas-1.1.0[gtk]
-	>=x11-themes/gnome-icon-theme-2.16
-	x11-libs/cairo
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/clutter-1.6.8:1.0
-	>=media-libs/clutter-gst-1.3.9:1.0
-	>=media-libs/clutter-gtk-1.0.2:1.0
-	>=media-libs/gstreamer-0.10.30:0.10
-	>=media-libs/gst-plugins-base-0.10.30:0.10
-	x11-libs/mx:1.0
-
-	media-libs/gst-plugins-good:0.10
-	media-plugins/gst-plugins-taglib:0.10
-	media-plugins/gst-plugins-gio:0.10
-	media-plugins/gst-plugins-pango:0.10
-	media-plugins/gst-plugins-x:0.10
-	media-plugins/gst-plugins-meta:0.10
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXtst
-	>=x11-libs/libXxf86vm-1.0.1
-
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/gnome-icon-theme-symbolic
-
-	flash? ( dev-libs/totem-pl-parser[quvi] )
-	grilo? ( >=media-libs/grilo-0.1.16:0.1 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	nsplugin? (
-		>=dev-libs/dbus-glib-0.82
-		>=x11-misc/shared-mime-info-0.22 )
-	python? (
-		>=dev-libs/gobject-introspection-0.6.7
-		>=dev-python/pygobject-2.90.3:3
-		>=x11-libs/gtk+-2.91.7:3[introspection]
-		dev-python/pyxdg
-		dev-python/gst-python:0.10
-		dev-python/dbus-python
-		iplayer? (
-			dev-python/httplib2
-			dev-python/feedparser
-			dev-python/beautifulsoup ) )
-	vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
-	zeitgeist? ( dev-libs/libzeitgeist )
-	zeroconf? ( >net-libs/libepc-0.4.0 )"
-# XXX: zeroconf requires unreleased version of libepc
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/gnome-doc-utils-0.20.3
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	x11-proto/xextproto
-	x11-proto/xproto
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.14 )
-	test? ( python? ( dev-python/pylint ) )"
-# docbook-xml-dtd is needed for user doc
-
-# see bug #359379
-REQUIRED_USE="flash? ( nsplugin )
-	python? ( introspection )
-	zeitgeist? ( introspection vala )"
-
-# XXX: pylint checks fail because of bad code
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
-	G2CONF="${G2CONF}
-		--disable-run-in-source-tree
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-smclient=auto
-		--enable-easy-codec-installation
-		$(use_enable flash vegas-plugin)
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable nsplugin browser-plugins)
-		$(use_enable python)
-		$(use_enable vala)
-		VALAC=$(type -P valac-0.14)
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
-	if ! use test; then
-		# pylint is checked unconditionally, but is only used for make check
-		G2CONF="${G2CONF} PYLINT=$(type -P true)"
-	fi
-	#--with-smclient=auto needed to correctly link to libICE and libSM
-
-	# Disabled: sample-python, sample-vala, zeitgeist-dp
-	local plugins="brasero-disc-recorder,chapters,im-status,gromit"
-	plugins="${plugins},media-player-keys,ontop,properties,screensaver"
-	plugins="${plugins},screenshot,sidebar-test,skipto"
-	use grilo && plugins="${plugins},grilo"
-	use iplayer && plugins="${plugins},iplayer"
-	use lirc && plugins="${plugins},lirc"
-	use nautilus && plugins="${plugins},save-file"
-	use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
-	use vala && plugins="${plugins},rotation"
-	use zeitgeist && plugins="${plugins},zeitgeist-dp"
-	use zeroconf && plugins="${plugins},publish"
-
-	G2CONF="${G2CONF} --with-plugins=${plugins}"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
-	mkdir -p m4
-
-	#if [[ ${PV} != 9999 ]]; then
-	#	intltoolize --force --copy --automake || die "intltoolize failed"
-	#	eautoreconf
-	#fi
-
-	use python && python_clean_py-compile_files
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Work around sandbox violations when FEATURES=-userpriv caused by
-	# gst-inspect-0.10 (bug #358755)
-	unset DISPLAY
-	gnome2_src_configure
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize /usr/$(get_libdir)/totem/plugins
-	fi
-
-	ewarn
-	ewarn "If totem doesn't play some video format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
-}