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.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 13 insertions, 113 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/Manifest b/media-sound/rhythmbox/Manifest
index 67d99b566560..9a4a0c94406b 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,13 +1,11 @@
 AUX rhythmbox-0.11.5-libmtp-0.3.0-API.patch 426 RMD160 f48440d266ba4209e5025c2e1525c606516db49e SHA1 9d4822b237d0434376e3f3c072ee8fb52ee11386 SHA256 3de9f0ecfbfac969a93a199da576cff4fd3d9f411ae5d2d71dfb6112f63a36b8
 AUX rhythmbox-0.12.1-visualization.patch 1208 RMD160 d7e91b5363f248aef0517ca11b52b1ec4209be3a SHA1 0c4d11f51daadba61a387497ade9628c7de85832 SHA256 733e1a582b38ae905e58fbc4939c0cc7a33c213a42c5e11d9c3e2ec1a789c92a
-DIST rhythmbox-0.10.1.tar.bz2 3408309 RMD160 b2fdfc48aba957623ca141d45e8e1291a556bbf7 SHA1 ed20d528c24c1447a2f4597f334cd74466139d2e SHA256 a303076477a9a7b6a226613a6f3b43f4641ce977357c9aa9652932dc0b9bbd16
 DIST rhythmbox-0.11.6.tar.bz2 4683400 RMD160 3fd6b8595705a91c779c458a26333575ba5e2233 SHA1 4364447bd4f6fb0e969039213cea37d6d3e4fb58 SHA256 687f566817a0c1c6a2c0e9cc462bb10cded39b8d22b224fa55be00ae1cbdc151
 DIST rhythmbox-0.12.0.tar.bz2 4925468 RMD160 d7bbf03b44d6b2ac22e4fb466122471e6368762e SHA1 b9c478099d9a1dc3a201d5d217d0b08b111f81b9 SHA256 797d0e0d542d4c4ddc436f1ea395f272ebcdaa46fff112226ec9ab244af5b7eb
 DIST rhythmbox-0.12.1.tar.bz2 4859015 RMD160 72964294d2bd8353c86a0f57bde7d7f37db88f41 SHA1 e4360e67aad41adb2dbad0a13c508638de4dfa6c SHA256 1f444b9cd74615831dab7ec8cd3c58c95d7436372df9a768bd701ab4321a8721
-EBUILD rhythmbox-0.10.1-r1.ebuild 3150 RMD160 feb84a680bc82a9d36e254e1f4cba68bfd281307 SHA1 8ba1b11a4b80704cb19ca126c3d61805fec14f66 SHA256 47af87c8aaf7b5aa2a7a6570b603b0ade9846f8c4f544162650177a8b77dda49
-EBUILD rhythmbox-0.11.6-r1.ebuild 4625 RMD160 95063ca298b71f082950435316ab19a295c1df83 SHA1 fa391368f13ac75f02ef9b8db5541156ebc09b4b SHA256 f8fc30a5f468dace585651cf9edb5562d9b73a8bd877966d1a40ff5f356092e0
+EBUILD rhythmbox-0.11.6-r1.ebuild 4619 RMD160 12fbccb18e350ec7b6ee63d83330f7aa56ec5d2c SHA1 aceb08bb2864b4c9e13e3d0a24ae80e26d8c93f1 SHA256 809b87170e1415a15502124434c8e1f0fd973b823ee5045c423521994202da18
 EBUILD rhythmbox-0.12.0.ebuild 3965 RMD160 88b79c16d07f536fd44edd7776058d23009fbe58 SHA1 a26fbabedc9017b2b9c40a384eb728d1d2d1f0fe SHA256 b15db5214c0b9f81664eb917a2e6c91ed309513c0e403a9c7d09efa5b7a280bd
 EBUILD rhythmbox-0.12.1-r1.ebuild 4259 RMD160 65be287f7cd3e3b32d55298923497babe60335de SHA1 0ecbc7869e15913a32a03cdee0ae711892e239ad SHA256 ea999bb16d06a0ab274c425403ff1a804d3bd539f0eae979d6e0452e1ff68dd0
 EBUILD rhythmbox-0.12.1.ebuild 4076 RMD160 898d0f66b27faecfe6869e23d823f108c4f8f8c3 SHA1 ede071a6c1ca661514ab6efe6fe81607e0d7148e SHA256 edb2df0fd8e6a036b982b468a03c9ab5368c22c73c0f2674de1e73f84927d61d
-MISC ChangeLog 21468 RMD160 20e8249d7d58db203a73b720d1ec4cf552b175ca SHA1 cced39a60aa189211665c2d3d63f6bfdb52e55e6 SHA256 70f3fcd1f2ca43c6406342563e5b911925280195f4f889ad0ddcb598b71e7a1d
-MISC metadata.xml 581 RMD160 26e759da4542e72558bfbbb60c857abe85e76235 SHA1 e374907c6f72800c69c40da74b5d5ca21a00a97b SHA256 d0b1d71b83f788af0f80bf50b9bcc5aa3ba5c345b2ae2d6fc629fc7012861074
+MISC ChangeLog 21737 RMD160 3e7bd7351aebad7925d80cf8573c650668a7490d SHA1 efb667daaed3fbec5530bea8a0d656f951268500 SHA256 91828cf2fb8a40b18054817f8718825c9c295de29082523b8052043b8cbdba41
+MISC metadata.xml 499 RMD160 2913fd35997d79f3fea648d4b3f4f12ce47a769d SHA1 a9636fc5898527825d7ec4cc6a9ebe3210a03b3a SHA256 f55d6d569982566d3cacd0f635be5aa757d19c54704a94124487eed37e29627c
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