new release 'n cleanup

7 files changed, 18 insertions, 78 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 0eb14e5e6134..1d8c9468e3a6 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.23 2003/11/25 14:25:51 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.24 2003/12/20 14:09:27 foser Exp $
+
+*rhythmbox-0.6.2 (20 Dec 2003)
+
+  20 Dec 2003; foser <foser@gentoo.org> rhythmbox-0.6.2.ebuild :
+  New release
+  up xine-lib dep to rc3 (http://mail.gnome.org/archives/rhythmbox-devel/2003-December/msg00132.html)
 
 *rhythmbox-0.6.1-r1 (25 Nov 2003)
 
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 4c8126087cd4..fea07d4a1182 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,10 +1,6 @@
-MD5 17d373e66b3aa2c40dbdbbd7b2721918 rhythmbox-0.6.2.ebuild 1831
-MD5 acafd13dac1c6a0dc44c4deb40992ee1 rhythmbox-0.6.0.ebuild 1760
+MD5 c77d4a2e78869b8e9ffb99fc5d30b8d5 rhythmbox-0.6.2.ebuild 1870
 MD5 17d373e66b3aa2c40dbdbbd7b2721918 rhythmbox-0.6.1-r1.ebuild 1831
-MD5 50aea99552dac04490947548f52f13d1 ChangeLog 2088
+MD5 b277717b618be0684b5bde76c7521ac5 ChangeLog 2302
 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
-MD5 1dd7a53cd2bd7f9d56b85d64c769fcbd rhythmbox-0.5.4.ebuild 1751
-MD5 2d57c79e2ef895008e502c9e7a5efc16 files/digest-rhythmbox-0.5.4 69
-MD5 9959ed28e6efb2e41686016fe83352af files/digest-rhythmbox-0.6.0 69
 MD5 3ef99d6dbe5d7d547436249ef5358f5b files/digest-rhythmbox-0.6.2 69
 MD5 5680d5f2fa4f98cf505fe60818d91e66 files/digest-rhythmbox-0.6.1-r1 69
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.5.4 b/media-sound/rhythmbox/files/digest-rhythmbox-0.5.4
deleted file mode 100644
index 34ea1db4ca98..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e68e2690fd7ba08492c210689e6a0d1c rhythmbox-0.5.4.tar.bz2 1563299
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.0 b/media-sound/rhythmbox/files/digest-rhythmbox-0.6.0
deleted file mode 100644
index 3c7e305e557c..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b2f613f3a9f0e66facdc571867093c1 rhythmbox-0.6.0.tar.bz2 1511262
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.2 b/media-sound/rhythmbox/files/digest-rhythmbox-0.6.2
new file mode 100644
index 000000000000..e4028246626c
--- /dev/null
+++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.6.2
@@ -0,0 +1 @@
+MD5 a6d05830abf45cda229270b0e5ab5ca4 rhythmbox-0.6.2.tar.bz2 1572047
diff --git a/media-sound/rhythmbox/rhythmbox-0.5.4.ebuild b/media-sound/rhythmbox/rhythmbox-0.5.4.ebuild
deleted file mode 100644
index 39b0e0544ee6..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.5.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.5.4.ebuild,v 1.1 2003/10/30 14:19:19 foser Exp $
-
-inherit gnome2
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://web.rhythmbox.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="oggvorbis mad xine flac"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	>=media-libs/musicbrainz-2
-	flac? ( >=media-libs/flac-1 )
-	oggvorbis? ( >=media-libs/libvorbis-1 )
-	mad? ( >=media-libs/libid3tag-0.15 )
-	!xine? ( >=media-libs/gstreamer-0.6.3
-		>=media-libs/gst-plugins-0.6.3
-		>=media-plugins/gst-plugins-gnomevfs-0.6.3
-		flac? ( >=media-plugins/gst-plugins-flac-0.6.3 )
-		mad? ( >=media-plugins/gst-plugins-mad-0.6.3 )
-		oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.6.3 )
-		)
-	xine? ( >=media-libs/xine-lib-1_rc0 )"
-
-# REMIND : should we really force flac ?
-# I want to drop flac deps when rb get proper gst only/non monkey-media
-# flac support. Made it a local USE flag for now
-# <foser@gentoo.org> 06 Oct 2003
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-use xine && G2CONF="${G2CONF} --enable-xine"
-use flac && G2CONF="${G2CONF} --enable-flac"
-
-G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
-	$(use_enable mad mp3) \
-	--disable-schemas-install"
-
-src_unpack( ) {
-
-	unpack ${A}
-
-	cd ${S}
-	# sandbox errors work around
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-
-}
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README THANKS TODO"
-
-export GST_INSPECT=/bin/true
diff --git a/media-sound/rhythmbox/rhythmbox-0.6.0.ebuild b/media-sound/rhythmbox/rhythmbox-0.6.2.ebuild
index 240735e20a5f..00c05a90c38e 100644
--- a/media-sound/rhythmbox/rhythmbox-0.6.0.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.6.0.ebuild,v 1.2 2003/11/20 07:00:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.6.2.ebuild,v 1.1 2003/12/20 14:09:27 foser Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-IUSE="oggvorbis mad xine flac"
+IUSE="oggvorbis mad xine flac faad"
 
 RDEPEND=">=x11-libs/gtk+-2.2.2
 	>=gnome-base/libgnomeui-2
@@ -18,9 +18,10 @@ RDEPEND=">=x11-libs/gtk+-2.2.2
 	>=gnome-base/gnome-vfs-2
 	>=gnome-base/libbonobo-2
 	>=media-libs/musicbrainz-2
+	faad? ( >=media-libs/faad2-2.0_rc3 )
 	flac? ( >=media-libs/flac-1 )
 	oggvorbis? ( >=media-libs/libvorbis-1 )
-	mad? ( >=media-libs/libid3tag-0.15 )
+	mad? ( >=media-libs/libid3tag-0.15.0b )
 	!xine? ( >=media-libs/gstreamer-0.6.3
 		>=media-libs/gst-plugins-0.6.3
 		>=media-plugins/gst-plugins-gnomevfs-0.6.3
@@ -28,7 +29,7 @@ RDEPEND=">=x11-libs/gtk+-2.2.2
 		mad? ( >=media-plugins/gst-plugins-mad-0.6.3 )
 		oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.6.3 )
 		)
-	xine? ( >=media-libs/xine-lib-1_rc0 )"
+	xine? ( >=media-libs/xine-lib-1_rc3 )"
 
 # REMIND : should we really force flac ?
 # I want to drop flac deps when rb get proper gst only/non monkey-media
@@ -47,6 +48,9 @@ use flac && G2CONF="${G2CONF} --enable-flac"
 G2CONF="${G2CONF} \
 	$(use_enable oggvorbis vorbis) \
 	$(use_enable mad mp3) \
+	$(use_enable faad mp4 ) \
+	--enable-mmkeys \
+	--enable-audiocd \
 	--disable-schemas-install"
 
 src_unpack( ) {