revbumps to drop howl support (bug #183776)

Package-Manager: portage-2.1.3.12

6 files changed, 139 insertions, 33 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/Manifest b/media-sound/rhythmbox/Manifest
index 9066fccdfdcc..9cb605c1948d 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,17 +1,21 @@
 DIST rhythmbox-0.10.1.tar.bz2 3408309 RMD160 b2fdfc48aba957623ca141d45e8e1291a556bbf7 SHA1 ed20d528c24c1447a2f4597f334cd74466139d2e SHA256 a303076477a9a7b6a226613a6f3b43f4641ce977357c9aa9652932dc0b9bbd16
 DIST rhythmbox-0.11.2.tar.bz2 3536270 RMD160 8fb9c756b7b36c947cde32e3a38c85cecea73a96 SHA1 139bd8dcc046533670d1c8d167d921f9c06ae7a3 SHA256 f3dbc104831688ea6dfbf3ac807200a5c4f094d13a861f932e488992a8c89ae5
+EBUILD rhythmbox-0.10.1-r1.ebuild 3146 RMD160 d00c4125fd1a1df7c01c212b885a779a0de6b1df SHA1 57c7ce1013f7fa442c17e66e68e4eaa1171cdf68 SHA256 8d8597607a8c9282ee7b2f70e3aa7dfe2e7c8af0afe306a994eb298906815203
+MD5 fc8afd3d6a11e555f9d167f9c8fb3a17 rhythmbox-0.10.1-r1.ebuild 3146
+RMD160 d00c4125fd1a1df7c01c212b885a779a0de6b1df rhythmbox-0.10.1-r1.ebuild 3146
+SHA256 8d8597607a8c9282ee7b2f70e3aa7dfe2e7c8af0afe306a994eb298906815203 rhythmbox-0.10.1-r1.ebuild 3146
 EBUILD rhythmbox-0.10.1.ebuild 3482 RMD160 93f2d5ddf25b8a5be6850e07215e12838d0a807d SHA1 52b1377a53fcd48a968c164f20045d1466774070 SHA256 1c43087d1aa939c76abf1619e5c82a8116b33fe82b0e963722bac5348a9632ae
 MD5 bf5ebc14123f06c1591c8f5752b6fe33 rhythmbox-0.10.1.ebuild 3482
 RMD160 93f2d5ddf25b8a5be6850e07215e12838d0a807d rhythmbox-0.10.1.ebuild 3482
 SHA256 1c43087d1aa939c76abf1619e5c82a8116b33fe82b0e963722bac5348a9632ae rhythmbox-0.10.1.ebuild 3482
-EBUILD rhythmbox-0.11.2.ebuild 3567 RMD160 b48e009f3961a76e1e7e7b812d2aa72afd99a502 SHA1 6e37ee82e3da606dcb9ec360d410a341c5d0ecc7 SHA256 582f6fa070da35369d1fcef3c22b55dd7459629cc18cd6bf24784ad955f05811
-MD5 7a502c7e237e4701378d6a2cd6bcc0a2 rhythmbox-0.11.2.ebuild 3567
-RMD160 b48e009f3961a76e1e7e7b812d2aa72afd99a502 rhythmbox-0.11.2.ebuild 3567
-SHA256 582f6fa070da35369d1fcef3c22b55dd7459629cc18cd6bf24784ad955f05811 rhythmbox-0.11.2.ebuild 3567
-MISC ChangeLog 15237 RMD160 251e34585d3657433fbbc42f328ca588393f4c07 SHA1 089b96622eb18f787ab14ce978caff8c2c7869fc SHA256 37a1a391906396c7c6b61669dd08258d538cea4d2db1b92941ab2e0e62a105f3
-MD5 89bfdf6a445aaa8a2daf078cb0ff5d3a ChangeLog 15237
-RMD160 251e34585d3657433fbbc42f328ca588393f4c07 ChangeLog 15237
-SHA256 37a1a391906396c7c6b61669dd08258d538cea4d2db1b92941ab2e0e62a105f3 ChangeLog 15237
+EBUILD rhythmbox-0.11.2-r1.ebuild 3227 RMD160 176386bdf8205f730da3d75a8fb1cb5a117f2c93 SHA1 46379732aeddff241cf9759e526ce1bebd95aee9 SHA256 5d4d66d54143c0bb0bb156929929a50d910b5ebef7465fa714388fad350a884d
+MD5 fddc822adab035f438f5d9feb5394c3e rhythmbox-0.11.2-r1.ebuild 3227
+RMD160 176386bdf8205f730da3d75a8fb1cb5a117f2c93 rhythmbox-0.11.2-r1.ebuild 3227
+SHA256 5d4d66d54143c0bb0bb156929929a50d910b5ebef7465fa714388fad350a884d rhythmbox-0.11.2-r1.ebuild 3227
+MISC ChangeLog 15499 RMD160 2ac9eddd7aab9bc70c36192aa034fb75105c5916 SHA1 2f5e5dcae5815c78e276e9db9026703be93bb981 SHA256 0e0949f1fcd7cc3c0a4d244c8a60ace7b0b99e0749af2f5d11b8388ff88eeb70
+MD5 5ab5eec64c9498355d1c9d0af6b14d29 ChangeLog 15499
+RMD160 2ac9eddd7aab9bc70c36192aa034fb75105c5916 ChangeLog 15499
+SHA256 0e0949f1fcd7cc3c0a4d244c8a60ace7b0b99e0749af2f5d11b8388ff88eeb70 ChangeLog 15499
 MISC metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 SHA1 9d3b582b967a1030b95428758f25fe33cb5a25fd SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 metadata.xml 200
@@ -19,6 +23,9 @@ SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b metadata
 MD5 ee15e14b7c558b356b48602a9e14bf0e files/digest-rhythmbox-0.10.1 256
 RMD160 fe95d4dd2bbc7454e597007d2483efd5114da05b files/digest-rhythmbox-0.10.1 256
 SHA256 4a2394168cb797f3c034debe85785e888f4fe4c4fe46d42b75bd584d43a04b7e files/digest-rhythmbox-0.10.1 256
-MD5 ef256f2145c2893cdebb9df28cbf5eb7 files/digest-rhythmbox-0.11.2 256
-RMD160 f8587954410ab8bcdd7cec6a6d6e726354112177 files/digest-rhythmbox-0.11.2 256
-SHA256 a11400ce75e2409888edfa0f065b58f0cf2654dd224cbcc7638a8dfee0e1d839 files/digest-rhythmbox-0.11.2 256
+MD5 ee15e14b7c558b356b48602a9e14bf0e files/digest-rhythmbox-0.10.1-r1 256
+RMD160 fe95d4dd2bbc7454e597007d2483efd5114da05b files/digest-rhythmbox-0.10.1-r1 256
+SHA256 4a2394168cb797f3c034debe85785e888f4fe4c4fe46d42b75bd584d43a04b7e files/digest-rhythmbox-0.10.1-r1 256
+MD5 dd911ac0265ffee036d47a2ea394ec7d files/digest-rhythmbox-0.11.2-r1 186
+RMD160 149c0a41214a6521d7df545ba66b6a40fc8ef03f files/digest-rhythmbox-0.11.2-r1 186
+SHA256 43fc30c0e6534d4787578c2314419a0a61daa10dae1c3e732c7af5e7eadbdeac files/digest-rhythmbox-0.11.2-r1 186
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} \