dep fix

8 files changed, 28 insertions, 114 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 0dc34d7a5c0c..dc5322a80eb6 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,9 +1,15 @@
 # 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.17 2003/09/21 16:53:04 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.18 2003/10/13 16:32:58 foser Exp $
 
 *rhythmbox-0.5.3 (09 Sep 2003)
 
+  13 Oct 2003; foser <foser@gentoo.org> rhythmbox-0.5.3.ebuild :
+  add scrollkeeper dep (#30911)
+
+  06 Oct 2003; foser <foser@gentoo.org> rhythmbox-0.5.3.ebuild :
+  Added local USE flag for flac support
+
   21 Sep 2003; foser <foser@gentoo.org> rhythmbox-0.5.3.ebuild :
   Added ORBit2 fix as suggested by TGL <degrenier@easyconnect.fr> in (#28739)
   Always regenerate orbit stubs
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 0713c5c8999e..70eb569c37a7 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,7 +1,4 @@
-MD5 3f91ab5fec8022d8221bcca3c17bd4e3 rhythmbox-0.5.1.ebuild 1470
-MD5 b9eb20176f9a54387245bbe8a63e37a9 rhythmbox-0.5.3.ebuild 1509
-MD5 d348c2782328bd866222526442ea9447 rhythmbox-0.5.0.ebuild 1482
-MD5 a5530f37cdd98e8a356ee86e2e0b0e81 ChangeLog 1251
-MD5 ab865b430e07f028d861503a1669dc97 files/digest-rhythmbox-0.5.0 68
-MD5 44fc4699d370d1b03eb5d60c273f755f files/digest-rhythmbox-0.5.1 68
+MD5 0d64925738fa3babda9c8d487fb67d76 rhythmbox-0.5.3.ebuild 1765
+MD5 1524623a2a0a0229e46e667d851636ef ChangeLog 1455
+MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 MD5 a5cac79c211eb4eebac4e1f056736e65 files/digest-rhythmbox-0.5.3 69
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.5.0 b/media-sound/rhythmbox/files/digest-rhythmbox-0.5.0
deleted file mode 100644
index 0863a5b8e93b..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c7e460199e36c020a67272b7cc6d095 rhythmbox-0.5.0.tar.gz 1261067
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.5.1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.5.1
deleted file mode 100644
index d23c782352f5..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 748838d17ede79e157517dd8d4a63146 rhythmbox-0.5.1.tar.gz 1261073
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
new file mode 100644
index 000000000000..b016c18b5446
--- /dev/null
+++ b/media-sound/rhythmbox/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/rhythmbox/rhythmbox-0.5.0.ebuild b/media-sound/rhythmbox/rhythmbox-0.5.0.ebuild
deleted file mode 100644
index 7b7ec5329c00..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.5.0.ebuild
+++ /dev/null
@@ -1,48 +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.0.ebuild,v 1.3 2003/08/20 16:39:27 tester Exp $
-
-# Comments wrt gstreamer are in the build.  Not all the gstreamer plugins
-# required for support are in portage yet.
-
-IUSE="mad oggvorbis" # gstreamer
-
-inherit gnome2
-
-DESCRIPTION="An integrated music management application originally inspired by iTunes for GNOME 2"
-HOMEPAGE="http://www.rhythmbox.org"
-SRC_URI="mirror://sourceforge/rhythmbox/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-
-DEPEND="virtual/glibc
-	media-libs/flac
-	media-libs/xine-lib
-	>=media-libs/musicbrainz-2.0.0
-	mad? ( media-sound/mad )
-	oggvorbis? ( media-libs/libogg
-		     media-libs/libvorbis )"
-
-#	gstreamer? ( >=media-libs/gstreamer-0.6.2
-#		     >=media-libs/gst-plugins-0.6.2
-#		     >=media-libs/gst-plugins-cdparanoia-0.6.2 )
-#	!gstreamer? ( media-libs/xine-lib )
-#	oggvorbis? ( gstreamer? ( >=media-libs/gst-plugins-vorbis-0.6.2 ) )
-#	mad? ( gstreamer? ( >=media-libs/gst-plugins-mad-0.6.2 ) )
-
-DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS MAINTAINERS NEWS \
-	README THANKS TODO"
-
-src_compile() {
-	local myconf="--with-gnu-ld --enable-xine"
-	#use gstreamer || myconf="${myconf} --enable-xine"
-
-	use mad || myconf="${myconf} --disable-mp3"
-
-	use oggvorbis || myconf="${myconf} --disable-vorbis"
-
-	gnome2_src_compile ${myconf}
-}
-
diff --git a/media-sound/rhythmbox/rhythmbox-0.5.1.ebuild b/media-sound/rhythmbox/rhythmbox-0.5.1.ebuild
deleted file mode 100644
index f6f5f3d3ebcd..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.5.1.ebuild
+++ /dev/null
@@ -1,51 +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.1.ebuild,v 1.1 2003/08/21 08:35:52 g2boojum Exp $
-
-IUSE="mad oggvorbis gstreamer"
-
-inherit gnome2
-
-DESCRIPTION="An integrated music management application originally inspired by iTunes for GNOME 2"
-HOMEPAGE="http://www.rhythmbox.org"
-SRC_URI="mirror://sourceforge/rhythmbox/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-
-DEPEND="virtual/glibc
-	media-libs/flac
-	>=media-libs/musicbrainz-2.0.0
-	mad? ( media-sound/mad )
-	oggvorbis? ( media-libs/libogg
-		     media-libs/libvorbis )
-	gstreamer? ( >=media-libs/gstreamer-0.6.2
-		     >=media-libs/gst-plugins-0.6.2 )
-	!gstreamer? ( media-libs/xine-lib )"
-
-DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS MAINTAINERS NEWS \
-	README THANKS TODO"
-
-src_compile() {
-
-	if [ ! `use gstreamer` ]; then
-		ewarn ""
-		ewarn "You are installing rhythmbox with xine as the backend"
-		ewarn "but gstreamer is the suggested backend for rhythmbox."
-		ewarn "If you would like to install the gstreamer backend,"
-		ewarn "hit ctrl-c and restart the emerge after adding gstreamer to USE"
-		ewarn ""
-		sleep 5
-	fi
-
-	local myconf="--with-gnu-ld"
-
-	use gstreamer || myconf="${myconf} --enable-xine"
-
-	use mad || myconf="${myconf} --disable-mp3"
-
-	use oggvorbis || myconf="${myconf} --disable-vorbis"
-
-	gnome2_src_compile ${myconf}
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.5.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.5.3.ebuild
index 344d4d85f323..d80dfa04cd35 100644
--- a/media-sound/rhythmbox/rhythmbox-0.5.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.5.3.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.5.3.ebuild,v 1.4 2003/09/21 16:53:04 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.5.3.ebuild,v 1.5 2003/10/13 16:32:58 foser Exp $
 
 inherit gnome2
 
@@ -10,30 +10,36 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="oggvorbis mad xine"
+IUSE="oggvorbis mad xine flac"
 
 RDEPEND=">=x11-libs/gtk+-2.2
 	>=gnome-base/libgnomeui-2.0
 	>=gnome-base/libbonoboui-2.0
 	>=gnome-base/gconf-2.0
-	>=media-libs/flac-1.0
 	>=media-libs/musicbrainz-2.0
+	flac? ( >=media-libs/flac-1.0 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
 	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 )"
-#		>=media-plugins/gst-plugins-flac-0.6.3
-# should we really force flac ?
+
+# 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"
+	dev-util/pkgconfig
+	app-text/scrollkeeper"
 
 use xine && G2CONF="${G2CONF} --enable-xine"
+use flac && G2CONF="${G2CONF} --enable-flac"
 
 G2CONF="${G2CONF} \
 	$(use_enable oggvorbis vorbis) \