Adding _p1 version to suport gstreamer-0.10 since it is still hardmasked and I don't want to upset repoman or anybody else

(Portage version: 2.1_pre3-r1)

5 files changed, 139 insertions, 31 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 01ffacb70234..1f53cfc15065 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.64 2006/02/06 07:21:19 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.65 2006/02/06 08:23:56 joem Exp $
+
+*rhythmbox-0.9.3.1_p1 (06 Feb 2006)
+
+  06 Feb 2006; Joe McCann <joem@gentoo.org> rhythmbox-0.9.3.1.ebuild,
+  +rhythmbox-0.9.3.1_p1.ebuild:
+  Adding _p1 version to suport gstreamer-0.10 since it is still hardmasked and
+  I don't want to upset repoman or anybody else
 
 *rhythmbox-0.9.3.1 (06 Feb 2006)
 
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 1cf1e8daf2ff..2cadbdc67ea0 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -2,6 +2,7 @@ MD5 e327ffa1ecf16bb89928772c9ff9d14a ChangeLog 7777
 MD5 44a42f72ca8c0f3136fded12f1aa7172 files/digest-rhythmbox-0.8.8-r1 69
 MD5 518953859231ab23eec13b7d8a004fdc files/digest-rhythmbox-0.9.2 69
 MD5 f1335da386c60b0cf4f0c5c67fa9743c files/digest-rhythmbox-0.9.3.1 71
+MD5 f1335da386c60b0cf4f0c5c67fa9743c files/digest-rhythmbox-0.9.3.1_p1 71
 MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
 MD5 a3ff016aec5eec7277e2598ad013b80a files/rhythmbox-0.8.8-empty-xlib.patch 496
 MD5 9f5bc9bf255b78cc67342f9fc9423ef6 files/rhythmbox-0.8.8-ipod.patch 809
@@ -9,4 +10,5 @@ MD5 ff8e0703a12aeaa2724bd8b9299556d2 files/rhythmbox-0.9.2-dbus-0.60.patch 342
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
 MD5 afaf09dad8a37b524662268bea3b9fb7 rhythmbox-0.8.8-r1.ebuild 2625
 MD5 8e689da700e4bcafd4ab70182d9f3ade rhythmbox-0.9.2.ebuild 2492
-MD5 c71b7b5f60bfd13ffd1c3179f3f963ad rhythmbox-0.9.3.1.ebuild 3305
+MD5 cb32dad4c307e90df9a7b94f5f71c288 rhythmbox-0.9.3.1.ebuild 2505
+MD5 f649e9c83b19acc0deb33b8704bedb78 rhythmbox-0.9.3.1_p1.ebuild 3401
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.3.1_p1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.3.1_p1
new file mode 100644
index 000000000000..76152f7491a9
--- /dev/null
+++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.3.1_p1
@@ -0,0 +1 @@
+MD5 0b63402c35c10de5581d79f5157a0739 rhythmbox-0.9.3.1.tar.bz2 2579756
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.3.1.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.3.1.ebuild
index 18e335831dd7..43e3c3c590df 100644
--- a/media-sound/rhythmbox/rhythmbox-0.9.3.1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.9.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.3.1.ebuild,v 1.1 2006/02/06 07:21:19 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.3.1.ebuild,v 1.2 2006/02/06 08:23:56 joem Exp $
 
 inherit gnome2 eutils
 
@@ -8,9 +8,8 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 
-KEYWORDS="~x86"
-IUSE="vorbis flac aac mad ipod avahi howl daap dbus musicbrainz tagwriting
-gstreamer010"
+KEYWORDS="~sparc ~x86"
+IUSE="vorbis flac aac mad ipod avahi howl daap dbus musicbrainz tagwriting"
 #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
@@ -31,20 +30,13 @@ RDEPEND=">=x11-libs/gtk+-2.5.4
 	avahi? ( >=net-dns/avahi-0.6 )
 	!avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
 	dbus? ( >=sys-apps/dbus-0.35 )
-	!gstreamer010 ( =media-libs/gst-plugins-0.8*
+	=media-libs/gst-plugins-0.8*
 	=media-plugins/gst-plugins-gnomevfs-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* )
-	aac? ( =media-plugins/gst-plugins-faad-0.8* ) )
-	gstreamer010? ( >=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 )
-	aac? ( >=media-plugins/gst-plugins-faad-0.10 ) )"
+	aac? ( =media-plugins/gst-plugins-faad-0.8* )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -74,17 +66,12 @@ pkg_setup() {
 		G2CONF="${G2CONF} --with-mdns=avahi"
 	fi
 
-	if use gstreamer010 ; then
-		G2CONF="${G2CONF} --with-playback=gstreamer-0-10"
-	else
-		G2CONF="${G2CONF} --with-playback=gstreamer-0-8 \
-						$(use_enable tagwriting tag-writing)"
-	fi
-
 	G2CONF="${G2CONF} \
 	$(use_enable ipod) \
 	$(use_enable musicbrainz) \
 	$(use_with dbus) \
+	$(use_enable tagwriting tag-writing)
+	--with-playback=gstreamer-0-8
 	--enable-mmkeys \
 	--enable-audioscrobbler \
 	--disable-libnotify
@@ -96,6 +83,7 @@ DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
 export GST_INSPECT=/bin/true
 USE_DESTDIR=1
 }
+
 src_unpack()
 {
 
@@ -105,12 +93,3 @@ src_unpack()
 	gnome2_omf_fix ${S}/help/ja/Makefile.in
 }
 
-pkg_postinst() {
-	gnome2_pkg_postinst()
-	if use gstreamer010 ; then
-		einfo "Gstreamer-0.10 support is still incomplete!"
-		einfo "Certain features such as tag editing do not yet work"
-		einfo "And are disabled. There are also some known issues with"
-		einfo "Dapp playback. Please use gstreamer-0.8 for full support"
-	fi
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.3.1_p1.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.3.1_p1.ebuild
new file mode 100644
index 000000000000..d0bdd4e2793f
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-0.9.3.1_p1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.3.1_p1.ebuild,v 1.1 2006/02/06 08:23:56 joem Exp $
+
+inherit gnome2 eutils
+
+MY_P="${P%%_*}"
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="http://www.rhythmbox.org/"
+SRC_URI="http://ftp.gnome.org/pub/gnome/sources/rhythmbox/0.9/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86"
+IUSE="vorbis flac aac mad ipod avahi howl daap dbus musicbrainz tagwriting
+gstreamer010"
+#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
+
+SLOT="0"
+
+RDEPEND=">=x11-libs/gtk+-2.5.4
+	>=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.9.0
+	>=media-video/totem-1.1.5
+	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
+	>=net-libs/libsoup-2.2
+	ipod? ( >=media-libs/libgpod-0.2.0
+			>=sys-apps/hal-0.5 )
+	avahi? ( >=net-dns/avahi-0.6 )
+	!avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
+	dbus? ( >=sys-apps/dbus-0.35 )
+	!gstreamer010 ( =media-libs/gst-plugins-0.8*
+	=media-plugins/gst-plugins-gnomevfs-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* )
+	aac? ( =media-plugins/gst-plugins-faad-0.8* ) )
+	gstreamer010? ( >=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 )
+	aac? ( >=media-plugins/gst-plugins-faad-0.10 ) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	app-text/scrollkeeper"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+
+	if ! use avahi && ! use howl; then
+		if use daap ; then
+		ewarn "Daap support requires either howl or avahi"
+		ewarn "to be installed. Please remerge with either"
+		ewarn "USE=avahi or USE=howl"
+		fi
+	fi
+	if use howl || use avahi ; then
+		G2CONF="${G2CONF} $(use_enable daap)"
+	fi
+
+	if use howl ; then
+		G2CONF="${G2CONF} --with-mdns=howl"
+	fi
+
+	if use avahi ; then
+		G2CONF="${G2CONF} --with-mdns=avahi"
+	fi
+
+	if use gstreamer010 ; then
+		G2CONF="${G2CONF} --with-playback=gstreamer-0-10"
+	else
+		G2CONF="${G2CONF} --with-playback=gstreamer-0-8 \
+						$(use_enable tagwriting tag-writing)"
+	fi
+
+	G2CONF="${G2CONF} \
+	$(use_enable ipod) \
+	$(use_enable musicbrainz) \
+	$(use_with dbus) \
+	--enable-mmkeys \
+	--enable-audioscrobbler \
+	--disable-libnotify
+	--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_unpack()
+{
+
+	unpack ${A}
+	cd ${S}
+	gnome2_omf_fix ${S}/help/C/Makefile.in
+	gnome2_omf_fix ${S}/help/ja/Makefile.in
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst()
+	if use gstreamer010 ; then
+		einfo "Gstreamer-0.10 support is still incomplete!"
+		einfo "Certain features such as tag editing do not yet work"
+		einfo "And are disabled. There are also some known issues with"
+		einfo "Dapp playback. Please use gstreamer-0.8 for full support"
+	fi
+}