revbumps to drop howl support (bug #183776)

(Portage version: 2.1.3.12)

5 files changed, 121 insertions, 22 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index ff2b54eaa37d..b2440ad53d46 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.107 2007/10/28 20:52:07 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.108 2007/10/28 21:15:49 compnerd Exp $
+
+*rhythmbox-0.11.2-r1 (28 Oct 2007)
+*rhythmbox-0.10.1-r1 (28 Oct 2007)
+
+  28 Oct 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +rhythmbox-0.10.1-r1.ebuild, -rhythmbox-0.11.2.ebuild,
+  +rhythmbox-0.11.2-r1.ebuild:
+  revbumps to drop howl support (bug #183776)
 
   28 Oct 2007; Saleem Abdulrasool <compnerd@gentoo.org>
   -files/rhythmbox-0.9.7-daap_fix.patch,
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.10.1-r1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.10.1-r1
new file mode 100644
index 000000000000..30d599efbb0d
--- /dev/null
+++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.10.1-r1
@@ -0,0 +1,3 @@
+MD5 6ab510d54654d2973f91b5d0de54f854 rhythmbox-0.10.1.tar.bz2 3408309
+RMD160 b2fdfc48aba957623ca141d45e8e1291a556bbf7 rhythmbox-0.10.1.tar.bz2 3408309
+SHA256 a303076477a9a7b6a226613a6f3b43f4641ce977357c9aa9652932dc0b9bbd16 rhythmbox-0.10.1.tar.bz2 3408309
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.11.2 b/media-sound/rhythmbox/files/digest-rhythmbox-0.11.2-r1
index fa67ee4ef66d..bc941cb06d8d 100644
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.11.2
+++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.11.2-r1
@@ -1,3 +1,2 @@
-MD5 125440f92e5c64b530894c5f3ca9038b rhythmbox-0.11.2.tar.bz2 3536270
 RMD160 8fb9c756b7b36c947cde32e3a38c85cecea73a96 rhythmbox-0.11.2.tar.bz2 3536270
 SHA256 f3dbc104831688ea6dfbf3ac807200a5c4f094d13a861f932e488992a8c89ae5 rhythmbox-0.11.2.tar.bz2 3536270
diff --git a/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..e7248f9c1901
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild,v 1.1 2007/10/28 21:15:49 compnerd Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="http://www.rhythmbox.org/"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc vorbis flac mad ipod hal daap dbus libnotify lirc musicbrainz tagwriting python keyring"
+#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 due to gstreamer limitation.
+
+SLOT="0"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=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.11.3
+	>=media-video/totem-1.1.5
+	>=x11-libs/libsexy-0.1.5
+	>=gnome-extra/gnome-media-2.14.0
+	>=media-plugins/gst-plugins-cdparanoia-0.10
+	keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
+	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
+	>=net-libs/libsoup-2.2.99
+	lirc? ( app-misc/lirc )
+	hal? ( ipod? ( >=media-libs/libgpod-0.4 )
+			>=sys-apps/hal-0.5 )
+	daap? ( >=net-dns/avahi-0.6 )
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	>=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 )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	python? ( >=dev-lang/python-2.4.2
+				>=dev-python/pygtk-2.8
+				>=dev-python/gnome-python-2.12 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35
+	app-text/scrollkeeper"
+
+pkg_setup() {
+
+	if ! use hal && use ipod; then
+		ewarn "ipod support requires hal support.  Please"
+		ewarn "re-emerge with USE=hal to enable ipod support"
+	fi
+
+	if use daap ; then
+		G2CONF="${G2CONF} --enable-daap --with-mdns=avahi"
+	else
+		G2CONF="${G2CONF} --disable-daap"
+	fi
+
+	G2CONF="${G2CONF} \
+	$(use_enable tagwriting tag-writing) \
+	$(use_with ipod) \
+	$(use_enable ipod ipod-writing) \
+	$(use_enable musicbrainz) \
+	$(use_with dbus) \
+	$(use_enable python) \
+	$(use_enable libnotify) \
+	$(use_enable lirc) \
+	$(use_with keyring gnome-keyring)
+	--with-playback=gstreamer-0-10 \
+	--with-cd-burning
+	--enable-mmkeys \
+	--enable-audioscrobbler \
+	--enable-track-transfer \
+	--with-metadata-helper \
+	--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_compile() {
+	addpredict "$(unset HOME; echo ~)/.gconf"
+	addpredict "$(unset HOME; echo ~)/.gconfd"
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	elog "The aac flag has been removed from rhythmbox."
+	elog "This is due to stabilization issues with any gst-bad plugins."
+	elog "Please emerge gst-plugins-bad and gst-plugins-faad to be able to play m4a files"
+	elog "See bug #159538 for more information"
+}
diff --git a/media-sound/rhythmbox/rhythmbox-0.11.2.ebuild b/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild
index 1018801737cd..363af78681a3 100644
--- a/media-sound/rhythmbox/rhythmbox-0.11.2.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.2.ebuild,v 1.1 2007/10/13 09:24:50 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild,v 1.1 2007/10/28 21:15:49 compnerd Exp $
 
 inherit gnome2 eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc vorbis flac mad ipod avahi hal howl daap dbus libnotify lirc musicbrainz tagwriting python keyring"
+IUSE="doc vorbis flac mad ipod hal daap dbus libnotify lirc musicbrainz tagwriting python keyring"
 #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 due to gstreamer limitation.
@@ -33,8 +33,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
 	lirc? ( app-misc/lirc )
 	hal? ( ipod? ( >=media-libs/libgpod-0.4 )
 			>=sys-apps/hal-0.5 )
-	avahi? ( >=net-dns/avahi-0.6 )
-	!avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
+	daap? ( >=net-dns/avahi-0.6 )
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	>=media-libs/gst-plugins-base-0.10.11
 	>=media-plugins/gst-plugins-gnomevfs-0.10
@@ -54,27 +53,15 @@ DEPEND="${RDEPEND}
 
 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 hal && use ipod; then
 		ewarn "ipod support requires hal support.  Please"
 		ewarn "re-emerge with USE=hal to enable ipod support"
 	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"
+	if use daap ; then
+		G2CONF="${G2CONF} --enable-daap --with-mdns=avahi"
+	else
+		G2CONF="${G2CONF} --disable-daap"
 	fi
 
 	G2CONF="${G2CONF} \