Update gst-plugins dependencies to require input-selector per bug #275643. Clean up old revisions.

(Portage version: 2.2_rc39/cvs/Linux x86_64)

5 files changed, 11 insertions, 463 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 8d103f2253ca..d36df0b83827 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.154 2009/08/09 21:52:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.155 2009/08/23 21:25:26 eva Exp $
+
+  23 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -rhythmbox-0.12.2-r1.ebuild, -files/rhythmbox-0.12.2-link-fixes.patch,
+  -rhythmbox-0.12.3.ebuild, rhythmbox-0.12.3-r1.ebuild:
+  Update gst-plugins dependencies to require input-selector per bug #275643.
+  Clean up old revisions.
 
 *rhythmbox-0.12.3-r1 (09 Aug 2009)
 
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.12.2-link-fixes.patch b/media-sound/rhythmbox/files/rhythmbox-0.12.2-link-fixes.patch
deleted file mode 100644
index 9cf9673f64fe..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-0.12.2-link-fixes.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 02159da160b33f0e411ec502f59213b12d445c73 Mon Sep 17 00:00:00 2001
-From: Jonathan Matthew <jonathan@d14n.org>
-Date: Mon, 1 Jun 2009 10:21:11 +1000
-Subject: [PATCH] fix a variety of plugin linking problems
-
-All C plugins need to be linked against librhythmbox-core as well as any
-other libraries they need.
----
- plugins/daap/Makefile.am           |    1 +
- plugins/generic-player/Makefile.am |    3 ++-
- plugins/iradio/Makefile.am         |    4 +++-
- plugins/lirc/Makefile.am           |    2 ++
- plugins/mtpdevice/Makefile.am      |    4 ++--
- plugins/power-manager/Makefile.am  |    2 ++
- plugins/sample/Makefile.am         |    2 ++
- plugins/status-icon/Makefile.am    |    5 ++++-
- plugins/visualizer/Makefile.am     |    1 +
- 9 files changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am
-index a446f99..4c8fe7d 100644
---- a/plugins/daap/Makefile.am
-+++ b/plugins/daap/Makefile.am
-@@ -33,6 +33,7 @@ libdaap_la_SOURCES = \
- libdaap_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
- libdaap_la_LIBTOOLFLAGS = --tag=disable-static
- libdaap_la_LIBADD = 					\
-+	$(top_builddir)/corelib/librhythmbox-core.la	\
- 	$(DBUS_LIBS)					\
- 	$(MDNS_LIBS)
- 
-diff --git a/plugins/generic-player/Makefile.am b/plugins/generic-player/Makefile.am
-index 113240d..f7e7f45 100644
---- a/plugins/generic-player/Makefile.am
-+++ b/plugins/generic-player/Makefile.am
-@@ -18,8 +18,9 @@ endif
- 
- libgeneric_player_la_LIBTOOLFLAGS = --tag=disable-static
- libgeneric_player_la_LDFLAGS = 				\
-+	$(top_builddir)/corelib/librhythmbox-core.la	\
- 	$(TOTEM_PLPARSER_LIBS)				\
--	$(HAL_LIBS)				        \	
-+	$(HAL_LIBS)				        \
- 	$(PLUGIN_LIBTOOL_FLAGS)
- 
- INCLUDES = 						\
-diff --git a/plugins/iradio/Makefile.am b/plugins/iradio/Makefile.am
-index 2fc6399..3cce0a1 100644
---- a/plugins/iradio/Makefile.am
-+++ b/plugins/iradio/Makefile.am
-@@ -15,7 +15,9 @@ libiradio_la_SOURCES = 					\
- libiradio_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
- libiradio_la_LIBTOOLFLAGS = --tag=disable-static
- libiradio_la_LIBADD = 					\
--	$(top_builddir)/corelib/librhythmbox-core.la
-+	$(top_builddir)/corelib/librhythmbox-core.la	\
-+	$(TOTEM_PLPARSER_LIBS)				\
-+	$(NULL)
- 
- INCLUDES = 						\
-         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-diff --git a/plugins/lirc/Makefile.am b/plugins/lirc/Makefile.am
-index 2c85a4a..daea54a 100644
---- a/plugins/lirc/Makefile.am
-+++ b/plugins/lirc/Makefile.am
-@@ -7,6 +7,8 @@ librblirc_la_SOURCES = \
- librblirc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) -llirc_client
- librblirc_la_LIBTOOLFLAGS = --tag=disable-static
- 
-+librblirc_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la
-+
- configdir = $(PLUGINDIR)/rblirc
- config_DATA = rhythmbox_lirc_default
- 
-diff --git a/plugins/mtpdevice/Makefile.am b/plugins/mtpdevice/Makefile.am
-index 57188a0..6e6e4de 100644
---- a/plugins/mtpdevice/Makefile.am
-+++ b/plugins/mtpdevice/Makefile.am
-@@ -10,8 +10,8 @@ libmtpdevice_la_SOURCES = \
- 	
- libmtpdevice_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
- libmtpdevice_la_LIBTOOLFLAGS = --tag=disable-static
--libmtpdevice_la_LIBADD = 					\
--	$(top_builddir)/lib/librb.la			\
-+libmtpdevice_la_LIBADD = 				\
-+	$(top_builddir)/corelib/librhythmbox-core.la	\
- 	$(HAL_LIBS)					\
- 	$(MTP_LIBS)
- 
-diff --git a/plugins/power-manager/Makefile.am b/plugins/power-manager/Makefile.am
-index 8dbba4f..11c090a 100644
---- a/plugins/power-manager/Makefile.am
-+++ b/plugins/power-manager/Makefile.am
-@@ -7,6 +7,8 @@ libpower_manager_la_SOURCES = \
- libpower_manager_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
- libpower_manager_la_LIBTOOLFLAGS = --tag=disable-static
- 
-+libpower_manager_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la
-+
- INCLUDES = 						\
-         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
- 	-DG_LOG_DOMAIN=\"Rhythmbox\"		 	\
-diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
-index c90cc4f..9ee5d58 100644
---- a/plugins/sample/Makefile.am
-+++ b/plugins/sample/Makefile.am
-@@ -7,6 +7,8 @@ libsample_la_SOURCES = \
- 	
- libsample_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
- 
-+libsample_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la
-+
- INCLUDES = 						\
-         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
- 	-DG_LOG_DOMAIN=\"Rhythmbox\"		 	\
-diff --git a/plugins/status-icon/Makefile.am b/plugins/status-icon/Makefile.am
-index a52c3ce..d52dffd 100644
---- a/plugins/status-icon/Makefile.am
-+++ b/plugins/status-icon/Makefile.am
-@@ -25,7 +25,10 @@ libstatus_icon_la_SOURCES = \
- libstatus_icon_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
- libstatus_icon_la_LIBTOOLFLAGS = --tag=disable-static
- 
--libstatus_icon_la_LIBADD = $(RHYTHMBOX_LIBS)
-+libstatus_icon_la_LIBADD = 				\
-+	$(top_builddir)/corelib/librhythmbox-core.la	\
-+	$(NOTIFY_LIBS)					\
-+	$(NULL)
- 
- INCLUDES = 						\
-         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-diff --git a/plugins/visualizer/Makefile.am b/plugins/visualizer/Makefile.am
-index ffd3d33..979ac0c 100644
---- a/plugins/visualizer/Makefile.am
-+++ b/plugins/visualizer/Makefile.am
-@@ -12,6 +12,7 @@ libvisualizer_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
- libvisualizer_la_LIBTOOLFLAGS = --tag=disable-static
- 
- libvisualizer_la_LIBADD = 				\
-+	$(top_builddir)/corelib/librhythmbox-core.la	\
- 	-lgstinterfaces-0.10				\
- 	$(DBUS_LIBS)					\
- 	$(RHYTHMBOX_LIBS)
--- 
-1.6.3.1.257.gbd13
-
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.2-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.2-r1.ebuild
deleted file mode 100644
index 85367643ef11..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.12.2-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.2-r1.ebuild,v 1.2 2009/06/29 15:42:24 nirbheek Exp $
-
-EAPI="2"
-
-inherit eutils gnome2 python multilib virtualx autotools
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+brasero cdr daap doc hal ipod gnome-keyring libnotify lirc musicbrainz mtp nsplugin python test"
-
-# FIXME: double check what to do with fm-radio plugin
-
-SLOT="0"
-
-COMMON_DEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.16
-	>=dev-libs/dbus-glib-0.71
-	>=dev-libs/totem-pl-parser-2.26.0
-	>=gnome-base/gconf-2
-	>=gnome-extra/gnome-media-2.14.0
-	>=net-libs/libsoup-2.4:2.4
-
-	>=media-libs/gst-plugins-base-0.10.20
-
-	cdr? (
-		brasero? ( >=app-cdr/brasero-0.9.1 )
-		!brasero? ( >=gnome-extra/nautilus-cd-burner-2.21.6 ) )
-	daap? ( >=net-dns/avahi-0.6 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
-	hal? (
-		ipod? ( >=media-libs/libgpod-0.6 )
-		mtp? ( >=media-libs/libmtp-0.3.0 )
-		>=sys-apps/hal-0.5 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	lirc? ( app-misc/lirc )
-	musicbrainz? ( media-libs/musicbrainz:3 )
-	python? (
-		>=dev-lang/python-2.4.2
-		|| (
-			>=dev-lang/python-2.5
-			dev-python/celementtree )
-		>=dev-python/pygtk-2.8
-		>=dev-python/gnome-vfs-python-2.22.0
-		>=dev-python/gconf-python-2.22.0
-		>=dev-python/libgnome-python-2.22.0
-		>=dev-python/gst-python-0.10.8 )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-plugins/gst-plugins-soup-0.10
-	>=media-plugins/gst-plugins-libmms-0.10
-	|| (
-		>=media-plugins/gst-plugins-cdparanoia-0.10
-		>=media-plugins/gst-plugins-cdio-0.10 )
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-taglib-0.10.6
-	nsplugin? ( || (
-		net-libs/xulrunner
-		www-client/seamonkey
-		www-client/mozilla-firefox ) )"
-
-# gtk-doc-am needed for eautoreconf
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	test? ( dev-libs/check )"
-
-DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
-	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
-
-pkg_setup() {
-	if ! use hal && use ipod; then
-		ewarn "ipod support requires hal support.  Please"
-		ewarn "re-emerge with USE=hal to enable ipod support"
-	fi
-
-	if ! use hal && use mtp; then
-		ewarn "MTP support requires hal support.  Please"
-		ewarn "re-emerge with USE=hal to enable MTP support"
-	fi
-
-	if ! use cdr ; then
-		ewarn "You have cdr USE flag disabled."
-		ewarn "You will not be able to play audio CDs."
-	fi
-
-	if use brasero; then
-		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
-	else
-		G2CONF="${G2CONF} $(use_with cdr libnautilus-burn) --without-libbrasero-media"
-	fi
-
-	G2CONF="${G2CONF}
-		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
-		$(use_with gnome-keyring)
-		$(use_with ipod)
-		$(use_enable libnotify)
-		$(use_enable lirc)
-		$(use_enable musicbrainz)
-		$(use_with mtp)
-		$(use_enable nsplugin browser-plugin)
-		$(use_enable python)
-		$(use_enable daap)
-		$(use_with daap mdns avahi)
-		--enable-mmkeys
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-static
-		--disable-vala"
-
-	export GST_INSPECT=/bin/true
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	# Fix intltoolize broken file, see upstream #577133
-	#sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# Fix plugin linking.  Bug #272203
-	epatch "${FILESDIR}"/${P}-link-fixes.patch
-	eautoreconf
-}
-
-src_compile() {
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	gnome2_src_compile
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "test failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
-
-	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-0.12.3-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild
index 787a109e645f..1f7fbd5d905b 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild,v 1.1 2009/08/09 21:52:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild,v 1.2 2009/08/23 21:25:26 eva Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="1.10"
@@ -26,6 +26,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.16.0
 	>=net-libs/libsoup-2.26:2.4[gnome]
 
 	>=media-libs/gst-plugins-base-0.10.20
+	|| (
+		>=media-libs/gst-plugins-base-0.10.24
+		>=media-libs/gst-plugins-bad-0.10.6 )
 
 	cdr? (
 		brasero? ( >=app-cdr/brasero-0.9.1 )
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.3.ebuild
deleted file mode 100644
index 82179a60a897..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.12.3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.3.ebuild,v 1.1 2009/07/06 21:55:50 eva Exp $
-
-EAPI="2"
-
-inherit eutils gnome2 python multilib virtualx
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+brasero cdr daap doc hal ipod gnome-keyring libnotify lirc musicbrainz mtp nsplugin python test"
-
-# FIXME: double check what to do with fm-radio plugin
-
-SLOT="0"
-
-COMMON_DEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.16
-	>=dev-libs/dbus-glib-0.71
-	>=dev-libs/totem-pl-parser-2.26.0
-	>=gnome-base/gconf-2
-	>=gnome-extra/gnome-media-2.14.0
-	>=net-libs/libsoup-2.26:2.4[gnome]
-
-	>=media-libs/gst-plugins-base-0.10.20
-
-	cdr? (
-		brasero? ( >=app-cdr/brasero-0.9.1 )
-		!brasero? ( >=gnome-extra/nautilus-cd-burner-2.21.6 ) )
-	daap? ( >=net-dns/avahi-0.6 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
-	hal? (
-		ipod? ( >=media-libs/libgpod-0.6 )
-		mtp? ( >=media-libs/libmtp-0.3.0 )
-		>=sys-apps/hal-0.5 )
-	libnotify? ( >=x11-libs/libnotify-0.4.1 )
-	lirc? ( app-misc/lirc )
-	musicbrainz? ( media-libs/musicbrainz:3 )
-	python? (
-		>=dev-lang/python-2.4.2
-		|| (
-			>=dev-lang/python-2.5
-			dev-python/celementtree )
-		>=dev-python/pygtk-2.8
-		>=dev-python/gnome-vfs-python-2.22.0
-		>=dev-python/gconf-python-2.22.0
-		>=dev-python/libgnome-python-2.22.0
-		>=dev-python/gst-python-0.10.8 )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-plugins/gst-plugins-soup-0.10
-	>=media-plugins/gst-plugins-libmms-0.10
-	|| (
-		>=media-plugins/gst-plugins-cdparanoia-0.10
-		>=media-plugins/gst-plugins-cdio-0.10 )
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-taglib-0.10.6
-	nsplugin? ( || (
-		net-libs/xulrunner
-		www-client/seamonkey
-		www-client/mozilla-firefox ) )"
-
-# gtk-doc-am needed for eautoreconf
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	test? ( dev-libs/check )"
-
-DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
-	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
-
-pkg_setup() {
-	if ! use hal && use ipod; then
-		ewarn "ipod support requires hal support.  Please"
-		ewarn "re-emerge with USE=hal to enable ipod support"
-	fi
-
-	if ! use hal && use mtp; then
-		ewarn "MTP support requires hal support.  Please"
-		ewarn "re-emerge with USE=hal to enable MTP support"
-	fi
-
-	if ! use cdr ; then
-		ewarn "You have cdr USE flag disabled."
-		ewarn "You will not be able to play audio CDs."
-	fi
-
-	if use brasero; then
-		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
-	else
-		G2CONF="${G2CONF} $(use_with cdr libnautilus-burn) --without-libbrasero-media"
-	fi
-
-	G2CONF="${G2CONF}
-		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
-		$(use_with gnome-keyring)
-		$(use_with ipod)
-		$(use_enable libnotify)
-		$(use_enable lirc)
-		$(use_enable musicbrainz)
-		$(use_with mtp)
-		$(use_enable nsplugin browser-plugin)
-		$(use_enable python)
-		$(use_enable daap)
-		$(use_with daap mdns avahi)
-		--enable-mmkeys
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-static
-		--disable-vala"
-
-	export GST_INSPECT=/bin/true
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_compile() {
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	gnome2_src_compile
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "test failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
-
-	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
-}