Version Bump from upstream. I added libnotify support for both packages. Closes bug #128417 and #130210.

(Portage version: 2.1_pre7-r5)

6 files changed, 241 insertions, 1 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index fa8b275d2a81..7938df98a20f 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,14 @@
 # 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.69 2006/04/08 14:16:04 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.70 2006/04/18 00:16:43 metalgod Exp $
+
+*rhythmbox-0.9.4_p1 (18 Apr 2006)
+*rhythmbox-0.9.4 (18 Apr 2006)
+
+  18 Apr 2006; Luis Medinas <metalgod@gentoo.org> +rhythmbox-0.9.4.ebuild,
+  +rhythmbox-0.9.4_p1.ebuild:
+  Version Bump from upstream. I added libnotify support for both packages.
+  Closes bug #128417 and #130210.
 
   08 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   rhythmbox-0.9.3.1_p1.ebuild:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index fa6bb0037907..f26fd963c94b 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -13,6 +13,12 @@ SHA256 8dc25fd528fe6f957533779502e6da111ef4d3f2a4b1f7b42319f17452f8273b files/di
 MD5 f1335da386c60b0cf4f0c5c67fa9743c files/digest-rhythmbox-0.9.3.1_p1 71
 RMD160 0809c53b4b0db677c96f425e775a977c00093d96 files/digest-rhythmbox-0.9.3.1_p1 71
 SHA256 8dc25fd528fe6f957533779502e6da111ef4d3f2a4b1f7b42319f17452f8273b files/digest-rhythmbox-0.9.3.1_p1 71
+MD5 954c4f44bcf7a699ba6bc40c654b0ff2 files/digest-rhythmbox-0.9.4 253
+RMD160 1b3df0f615af3547ca0ae641550d98c1109ecacc files/digest-rhythmbox-0.9.4 253
+SHA256 d346f8d31393b3b5aa412e65e08d3e89a0ff64483141b2c40dea74cf5224a5fb files/digest-rhythmbox-0.9.4 253
+MD5 954c4f44bcf7a699ba6bc40c654b0ff2 files/digest-rhythmbox-0.9.4_p1 253
+RMD160 1b3df0f615af3547ca0ae641550d98c1109ecacc files/digest-rhythmbox-0.9.4_p1 253
+SHA256 d346f8d31393b3b5aa412e65e08d3e89a0ff64483141b2c40dea74cf5224a5fb files/digest-rhythmbox-0.9.4_p1 253
 MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
 RMD160 8f8eec7bf19405ea70b7ab5984c5d5a96e834822 files/rhythmbox-0.8.7-gst_shn_support.patch 665
 SHA256 1c4fbabdff94741c88fb92f37c84ae70e05be9054481241efcab49f8c2c19018 files/rhythmbox-0.8.7-gst_shn_support.patch 665
@@ -40,3 +46,9 @@ SHA256 4cfc913b2847ea4d7b1e17f909f74e96273af17674e70ec22bd6d4cb2f962b69 rhythmbo
 MD5 5e66f44207349857fa04c9756a0ecade rhythmbox-0.9.3.1_p1.ebuild 3452
 RMD160 77544b73ad190d348c2b4db4eb1af66110872745 rhythmbox-0.9.3.1_p1.ebuild 3452
 SHA256 94c758926aa960853536a35ac316482f8c006a2b1bb0cadb6f82ead784b4ba6f rhythmbox-0.9.3.1_p1.ebuild 3452
+MD5 a2e66053ecfdb1dda2d6edeb467322e1 rhythmbox-0.9.4.ebuild 2650
+RMD160 cdb18915ee9be217fc06f6e8f4e9af4e2dadce3b rhythmbox-0.9.4.ebuild 2650
+SHA256 89f4b0b26a7540bb562cc8c5b07c258b201d486174e98ccc49bfce96c2703d84 rhythmbox-0.9.4.ebuild 2650
+MD5 f34b0c14bde3dd7d6b27291a3db3f2b6 rhythmbox-0.9.4_p1.ebuild 3457
+RMD160 751198c8aaffd88e09c3f9e203f3aa226685b606 rhythmbox-0.9.4_p1.ebuild 3457
+SHA256 9ee4c6be680b9697a8dbe33fc9ce7ed7005a09577a3d0adcd95d1ec7120e14cb rhythmbox-0.9.4_p1.ebuild 3457
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.4 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.4
new file mode 100644
index 000000000000..34eee5329886
--- /dev/null
+++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.4
@@ -0,0 +1,3 @@
+MD5 0d335864738d6de0d0e6acc2964f8bc4 rhythmbox-0.9.4.tar.bz2 2005808
+RMD160 0698d38c0584039d2fa977970a5331607fb106e1 rhythmbox-0.9.4.tar.bz2 2005808
+SHA256 1318d7bb28a8b60a5342eb12995c6b802d88e3d0db62a90a72af59f21e13947b rhythmbox-0.9.4.tar.bz2 2005808
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.4_p1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.4_p1
new file mode 100644
index 000000000000..34eee5329886
--- /dev/null
+++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.4_p1
@@ -0,0 +1,3 @@
+MD5 0d335864738d6de0d0e6acc2964f8bc4 rhythmbox-0.9.4.tar.bz2 2005808
+RMD160 0698d38c0584039d2fa977970a5331607fb106e1 rhythmbox-0.9.4.tar.bz2 2005808
+SHA256 1318d7bb28a8b60a5342eb12995c6b802d88e3d0db62a90a72af59f21e13947b rhythmbox-0.9.4.tar.bz2 2005808
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.4.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.4.ebuild
new file mode 100644
index 000000000000..7d8cabc21ddb
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-0.9.4.ebuild
@@ -0,0 +1,98 @@
+# 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.4.ebuild,v 1.1 2006/04/18 00:16:43 metalgod Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="http://www.rhythmbox.org/"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="vorbis flac aac mad ipod avahi howl daap dbus libnotify musicbrainz python 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
+
+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 )
+	=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* )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	python? ( >=dev-lang/python-2.4.2 )"
+
+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
+
+	G2CONF="${G2CONF} \
+	$(use_enable ipod) \
+	$(use_enable musicbrainz) \
+	$(use_with dbus) \
+	$(use_enable tagwriting tag-writing) \
+	$(use_enable python) \
+	$(use_enable libnotify) \
+	--with-playback=gstreamer-0-8
+	--enable-mmkeys \
+	--enable-audioscrobbler \
+	--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
+}
+
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.4_p1.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.4_p1.ebuild
new file mode 100644
index 000000000000..3ca7245c0f98
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-0.9.4_p1.ebuild
@@ -0,0 +1,116 @@
+# 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.4_p1.ebuild,v 1.1 2006/04/18 00:16:43 metalgod 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="~amd64 ~ppc ~x86"
+IUSE="vorbis flac aac mad ipod avahi howl daap dbus libnotify musicbrainz
+tagwriting python 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 ) )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	python? ( >=dev-lang/python-2.4.2 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	app-text/scrollkeeper"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+S=${WORKDIR}/${MY_P}
+
+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) \
+	$(use_enable python) \
+	$(use_enable libnotify) \
+	--enable-mmkeys \
+	--enable-audioscrobbler \
+	--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
+}
+
+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
+}