Remove old version and rename USE tagwriting to USE taglib (used to do this task) and is widely more compatible with rest of the tree.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 10 insertions, 108 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index c3fbd9d6fa30..c08e7bfdb0f0 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,11 @@
 # 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.147 2009/05/20 15:02:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.148 2009/05/20 15:24:23 ssuominen Exp $
+
+  20 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -rhythmbox-0.10.1-r1.ebuild, rhythmbox-0.11.6-r1.ebuild, metadata.xml:
+  Remove old version and rename USE tagwriting to USE taglib (used to do
+  this task) and is widely more compatible with rest of the tree.
 
   20 May 2009; Raúl Porcel <armin76@gentoo.org> rhythmbox-0.11.6-r1.ebuild:
   sparc stable wrt #234306
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index 03ea20174855..35c5ccbe31ad 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -7,7 +7,6 @@
   <use>
     <flag name="daap">Enable support for local network music sharing via daap</flag>
     <flag name="mtp">Enable support for MTP devices</flag>
-    <flag name="tagwriting">support for tag writing in certain audio files</flag>
 	<flag name="brasero">Enable CD burning via <pkg>app-cdr/brasero</pkg> rather than <pkg>gnome-extra/nautilus-cd-burner</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild
deleted file mode 100644
index ce77ec45c2a9..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild,v 1.10 2008/04/21 17:17:50 welp Exp $
-EAPI="1"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="doc vorbis flac mad ipod hal daap dbus libnotify lirc musicbrainz tagwriting python gnome-keyring"
-#I want tagwriting to be on by default in the future. It is just a local flag
-#now because it is still considered experimental by upstream and doesn't work
-#well with all formats due to gstreamer limitation.
-
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2.7.4
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/nautilus-cd-burner-2.11.3
-	>=media-video/totem-1.1.5
-	>=x11-libs/libsexy-0.1.5
-	>=gnome-extra/gnome-media-2.14.0
-	>=media-plugins/gst-plugins-cdparanoia-0.10
-	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
-	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
-	>=net-libs/libsoup-2.2.99:2.2
-	lirc? ( app-misc/lirc )
-	hal? ( ipod? ( >=media-libs/libgpod-0.4 )
-			>=sys-apps/hal-0.5 )
-	daap? ( >=net-dns/avahi-0.6 )
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	>=media-libs/gst-plugins-base-0.10
-	>=media-plugins/gst-plugins-gnomevfs-0.10
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10
-				>=media-plugins/gst-plugins-ogg-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	python? ( >=dev-lang/python-2.4.2
-				>=dev-python/pygtk-2.8
-				>=dev-python/gnome-python-2.12 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35
-	app-text/scrollkeeper"
-
-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 daap ; then
-		G2CONF="${G2CONF} --enable-daap --with-mdns=avahi"
-	else
-		G2CONF="${G2CONF} --disable-daap"
-	fi
-
-	G2CONF="${G2CONF} \
-	$(use_enable tagwriting tag-writing) \
-	$(use_with ipod) \
-	$(use_enable ipod ipod-writing) \
-	$(use_enable musicbrainz) \
-	$(use_with dbus) \
-	$(use_enable python) \
-	$(use_enable libnotify) \
-	$(use_enable lirc) \
-	$(use_with gnome-keyring)
-	--with-playback=gstreamer-0-10 \
-	--with-cd-burning
-	--enable-mmkeys \
-	--enable-audioscrobbler \
-	--enable-track-transfer \
-	--with-metadata-helper \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-USE_DESTDIR=1
-}
-
-src_compile() {
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "The aac flag has been removed from rhythmbox."
-	elog "This is due to stabilization issues with any gst-bad plugins."
-	elog "Please emerge gst-plugins-bad and gst-plugins-faad to be able to play m4a files"
-	elog "See bug #159538 for more information"
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.11.6-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.11.6-r1.ebuild
index 693ebabab969..73b3af6644f2 100644
--- a/media-sound/rhythmbox/rhythmbox-0.11.6-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.11.6-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.11.6-r1.ebuild,v 1.7 2009/05/20 15:02:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.6-r1.ebuild,v 1.8 2009/05/20 15:24:23 ssuominen Exp $
 
 EAPI="1"
 
@@ -10,7 +10,8 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="cdr daap dbus doc hal ipod gnome-keyring libnotify lirc musicbrainz mtp nsplugin python tagwriting test"
+IUSE="cdr daap dbus doc hal ipod gnome-keyring libnotify lirc musicbrainz mtp
+nsplugin python taglib test"
 
 # I want tagwriting to be on by default in the future. It is just a local flag
 # now because it is still considered experimental by upstream and doesn't work
@@ -108,7 +109,7 @@ pkg_setup() {
 		$(use_with mtp)
 		$(use_enable nsplugin browser-plugin)
 		$(use_enable python)
-		$(use_enable tagwriting tag-writing)
+		$(use_enable taglib tag-writing)
 		--with-playback=gstreamer-0-10
 		--enable-mmkeys
 		--enable-audioscrobbler