Dont make use of the deprecated oggvorbis useflag any longer, see #94254.

(Portage version: 2.0.51.22-r1)

4 files changed, 12 insertions, 90 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 3762195461d6..9ad1b948bd7a 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.53 2005/04/08 17:34:09 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.54 2005/05/28 15:34:18 luckyduck Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -rhythmbox-0.8.5.ebuild,
+  rhythmbox-0.8.8-r1.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
 
   08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   rhythmbox-0.8.8-r1.ebuild:
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.5 b/media-sound/rhythmbox/files/digest-rhythmbox-0.8.5
deleted file mode 100644
index bb3f22970632..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50d2ebb835f89e01c6fb0531d65c1341 rhythmbox-0.8.5.tar.bz2 1787019
diff --git a/media-sound/rhythmbox/rhythmbox-0.8.5.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.5.ebuild
deleted file mode 100644
index a5ec3fcc7222..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.8.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.5.ebuild,v 1.7 2005/01/30 10:21:54 lanius Exp $
-
-inherit gnome2
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-
-#-sparc: 0.8.5: Fails with "Illegal Instruction" when you try playing a file.
-KEYWORDS="x86 ppc amd64 -sparc"
-#IUSE="oggvorbis xine flac aac mad pda"
-IUSE="oggvorbis flac aac mad pda"
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.2.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	>=media-libs/gst-plugins-0.8.2
-	>=media-plugins/gst-plugins-gnomevfs-0.8.2
-	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.2
-	             >=media-plugins/gst-plugins-ogg-0.8.2 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.8.2 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.8.2 )
-	aac? ( >=media-plugins/gst-plugins-faad-0.8.2 )"
-
-#	!xine? ( =media-libs/gst-plugins-0.8*
-#		=media-plugins/gst-plugins-gnomevfs-0.8*
-#		oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.8*
-#		             =media-plugins/gst-plugins-ogg-0.8* )
-#		mad? ( =media-plugins/gst-plugins-mad-0.8* )
-#		flac? ( =media-plugins/gst-plugins-flac-0.8* ) 
-#		aac? ( =media-plugins/gst-plugins-faad-0.8* ) )
-#	xine? ( aac? ( >=media-libs/faad2-2.0_rc3 )
-#		flac? ( >=media-libs/flac-1
-#			>=media-libs/libid3tag-0.15.0b )
-#		oggvorbis? ( >=media-libs/libvorbis-1 )
-#		mad? ( >=media-libs/libid3tag-0.15.0b )
-#		>=media-libs/xine-lib-1_rc3 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-#use xine &&\
-#	G2CONF="${G2CONF} --with-player=xine --with-metadata=monkeymedia" ||\
-#	G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
-
-G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
-
-G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
-	$(use_enable flac) \
-	$(use_enable mad mp3) \
-	$(use_enable aac mp4) \
-	$(use_enable pda ipod) \
-	--enable-mmkeys \
-	--enable-audiocd \
-	--disable-dashboard \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# sandbox errors work around
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
index 34765c0ee4c9..bd74ebc29c6b 100644
--- a/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild,v 1.5 2005/04/08 17:34:09 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild,v 1.6 2005/05/28 15:34:18 luckyduck Exp $
 
 inherit gnome2 eutils
 
@@ -10,8 +10,8 @@ LICENSE="GPL-2"
 
 #-sparc: 0.8.5: Fails with "Illegal Instruction" when you try playing a file.
 KEYWORDS="x86 ppc amd64 -sparc"
-#IUSE="oggvorbis xine flac aac mad pda"
-IUSE="oggvorbis flac aac mad pda"
+#IUSE="vorbis xine flac aac mad pda"
+IUSE="vorbis flac aac mad pda"
 SLOT="0"
 
 RDEPEND=">=x11-libs/gtk+-2.2.2
@@ -21,7 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.2.2
 	>=gnome-base/libbonobo-2
 	>=media-libs/gst-plugins-0.8.2
 	>=media-plugins/gst-plugins-gnomevfs-0.8.2
-	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.2
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.2
 	             >=media-plugins/gst-plugins-ogg-0.8.2 )
 	mad? ( >=media-plugins/gst-plugins-mad-0.8.2 )
 	flac? ( >=media-plugins/gst-plugins-flac-0.8.2 )
@@ -29,7 +29,7 @@ RDEPEND=">=x11-libs/gtk+-2.2.2
 
 #	!xine? ( =media-libs/gst-plugins-0.8*
 #		=media-plugins/gst-plugins-gnomevfs-0.8*
-#		oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.8*
+#		vorbis? ( =media-plugins/gst-plugins-vorbis-0.8*
 #		             =media-plugins/gst-plugins-ogg-0.8* )
 #		mad? ( =media-plugins/gst-plugins-mad-0.8* )
 #		flac? ( =media-plugins/gst-plugins-flac-0.8* ) 
@@ -37,7 +37,7 @@ RDEPEND=">=x11-libs/gtk+-2.2.2
 #	xine? ( aac? ( >=media-libs/faad2-2.0_rc3 )
 #		flac? ( >=media-libs/flac-1
 #			>=media-libs/libid3tag-0.15.0b )
-#		oggvorbis? ( >=media-libs/libvorbis-1 )
+#		vorbis? ( >=media-libs/libvorbis-1 )
 #		mad? ( >=media-libs/libid3tag-0.15.0b )
 #		>=media-libs/xine-lib-1_rc3 )"
 
@@ -55,7 +55,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
 
 G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
+	$(use_enable vorbis) \
 	$(use_enable flac) \
 	$(use_enable mad mp3) \
 	$(use_enable aac mp4) \