now uses gst-plugins-meta, removed codec related use flags and imported python fixes from portage

3 files changed, 59 insertions, 41 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 3d4fa143..3231f5a1 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> rhythmbox-0.11.4:
+  now uses gst-plugins-meta, removed codec related use flags and imported
+  python fixes from portage
+
   29 Jan 2008; Daniel Gryniewicz <dang@gentoo.org> rhythmbox-0.11.4:
   Bump to 0.11.4
   * Support automatic GStreamer plugin installation
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 9541a981..de2058eb 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-0.11.4.tar.bz2 4443283 RMD160 c7a00b83ab75e06b2dc40026266e87ce8f9fd878 SHA1 a66f05cd2d581dc0eeb6a109ee3a6b30e4d4fe30 SHA256 8a04e32a3e19c324ac075e33d86906398491cddcd8d22b15d0527e7b2de436af
-EBUILD rhythmbox-0.11.4.ebuild 3265 RMD160 be795d29fdd47e6ddab8bb9732556ec58583585c SHA1 8ce2880a275a9af36fae4ed497bdf2b3b5735aa4 SHA256 3eb2ccce39419eb23987396ca897e8cdc0b42bfab5407243fc2b10676df09f70
-MISC ChangeLog 1333 RMD160 9250a8d99935d6c5aac5ee8dd13bc3307b218b05 SHA1 d3eb4ef5972796bc7f681132211e3eb31f1e98f3 SHA256 59612233dd443a734e72854161cd8c83a2c0d9c2d605bc34516d00f7bf38812a
+EBUILD rhythmbox-0.11.4.ebuild 3445 RMD160 c7a6b78b836e0bd604f07bf481f97f54db999372 SHA1 dab96f035406bac072b94078cf72eb0b01fdd684 SHA256 66e444789d01ea8003c6d87fb82b08ef34a3f64132ec31d1a51979171d578e59
+MISC ChangeLog 1508 RMD160 3afccbd26497562a06be38217a287109aabc9518 SHA1 bb1db88a26955e463558ce5d601190b07b376143 SHA256 643a0c2965a18681f93df2d7d67d78d58945d5b5991f6b2aa193310e9155e8dc
diff --git a/media-sound/rhythmbox/rhythmbox-0.11.4.ebuild b/media-sound/rhythmbox/rhythmbox-0.11.4.ebuild
index a3585df4..d7cea6fb 100644
--- a/media-sound/rhythmbox/rhythmbox-0.11.4.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.11.4.ebuild
@@ -1,22 +1,19 @@
 # Copyright 1999-2008 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-r1.ebuild,v 1.4 2008/01/29 18:22:35 dang Exp $
-EAPI="1"
-
-inherit gnome2 eutils
 
 EAPI="1"
 
+inherit gnome2 eutils python
+
 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.
-
-# We will probably want to activate crossfade backend at some point via USE flag
+IUSE="daap dbus doc hal ipod keyring libnotify lirc 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 due to gstreamer limitation.
 
 SLOT="0"
 
@@ -28,7 +25,6 @@ RDEPEND=">=x11-libs/gtk+-2.8
 	>=gnome-extra/nautilus-cd-burner-2.13
 	>=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:1 )
 	>=net-libs/libsoup-2.2.99:2.2
@@ -39,21 +35,24 @@ RDEPEND=">=x11-libs/gtk+-2.8
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	>=media-libs/gst-plugins-base-0.10.11
 	>=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 )
+	>=media-plugins/gst-plugins-cdparanoia-0.10
+	>=media-plugins/gst-plugins-meta-0.10-r1: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
-				>=dev-python/gst-python-0.10.8 )"
+	python? (
+		>=dev-lang/python-2.4.2
+		>=dev-python/pygtk-2.8
+		>=dev-python/gnome-python-2.12
+		>=dev-python/gst-python-0.10.8
+	)"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.35
 	app-text/scrollkeeper"
 
+DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
+	  MAINTAINERS NEWS README README.iPod THANKS TODO"
+
 pkg_setup() {
 
 	if ! use hal && use ipod; then
@@ -67,29 +66,33 @@ pkg_setup() {
 		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"
+	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
+}
 
-export GST_INSPECT=/bin/true
-USE_DESTDIR=1
+src_unpack() {
+	gnome2_src_unpack
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
 }
 
 src_compile() {
@@ -100,8 +103,19 @@ src_compile() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
+	use python && python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
+
+	ewarn
+	ewarn "If rhythmbox doesn't play some music format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+
 	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"
 }
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use python && python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
+}