fix flac switching

4 files changed, 63 insertions, 12 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index b56582ad3c23..e6284d177cd5 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.32 2004/03/06 16:06:37 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.33 2004/03/06 17:30:29 foser Exp $
+
+  06 Mar 2004; foser <foser@gentoo.org> rhythmbox-0.6.8.ebuild :
+  Fixed flac switch, so it now actually works the way it should
+  Had to fix deps & configure switch usage accordingly
 
 *rhythmbox-0.6.8 (06 Mar 2004)
 
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 5204e72b8d45..de8c4852e4fc 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,11 +1,12 @@
-MD5 f97f431c8034fba2c38a42ad16763ced ChangeLog 3390
-MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
-MD5 5843451693629f7002a374d366c9ca98 rhythmbox-0.6.1-r1.ebuild 1834
+MD5 12cfb8853bf1605805ace9e879f151ef rhythmbox-0.6.8.ebuild 2264
 MD5 a642c988723d83c96adc928805dc2321 rhythmbox-0.6.5.ebuild 1994
-MD5 425b44898f10310c9964138233623384 rhythmbox-0.6.8.ebuild 1992
-MD5 5680d5f2fa4f98cf505fe60818d91e66 files/digest-rhythmbox-0.6.1-r1 69
+MD5 5843451693629f7002a374d366c9ca98 rhythmbox-0.6.1-r1.ebuild 1834
+MD5 8affa1eeab9594d648dd94ecab588e17 ChangeLog 3573
+MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
+MD5 98928ba8bd7737a9a219c2ee50464b40 files/rhythmbox-0.6.8-amd64.patch 998
 MD5 9984afbb27959f877a164db744172cfd files/digest-rhythmbox-0.6.5 69
 MD5 54be0f7e8c504930e7a42cc08fabe6a0 files/digest-rhythmbox-0.6.8 69
 MD5 f056f5e64663168cb7c702613c9a8322 files/rhythmbox-0.6.5-amd64.patch 2301
+MD5 7eba43d939d371b937ef3bf3428338e8 files/rhythmbox-0.6-fix_flac_test.patch 1393
+MD5 5680d5f2fa4f98cf505fe60818d91e66 files/digest-rhythmbox-0.6.1-r1 69
 MD5 6c5001723b759bda9528d5ebc03b470e files/rhythmbox-0.6.5-gcc2_fix.patch 637
-MD5 98928ba8bd7737a9a219c2ee50464b40 files/rhythmbox-0.6.8-amd64.patch 998
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.6-fix_flac_test.patch b/media-sound/rhythmbox/files/rhythmbox-0.6-fix_flac_test.patch
new file mode 100644
index 000000000000..8a044cfccd78
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.6-fix_flac_test.patch
@@ -0,0 +1,35 @@
+diff -uNr rhythmbox-0.6.8/configure.ac rhythmbox-0.6.8.patched/configure.ac
+--- rhythmbox-0.6.8/configure.ac	2004-03-05 20:06:16.000000000 +0100
++++ rhythmbox-0.6.8.patched/configure.ac	2004-03-06 18:03:59.314696456 +0100
+@@ -272,7 +272,7 @@
+   VORBISKEYS=
+ fi
+ AC_SUBST(VORBISKEYS)
+-if test "x$enable_vorbis" = "xyes"; then
++if test x"$enable_vorbis" = "xyes"; then
+    AC_DEFINE(HAVE_VORBIS,,[Define if we have Ogg Vorbis support])
+ fi
+ AM_CONDITIONAL(HAVE_VORBIS,test "x$enable_vorbis" = "xyes")
+@@ -284,18 +284,18 @@
+ if test x"$enable_flac" = xyes && test x"$enable_mp3" != xyes; then
+   AC_MSG_ERROR([libid3tag is required for FLAC support])  
+ fi
+-if test "$xenable_flac" != "xno" && test x"$enable_mp3" = xyes; then
++if test x"$enable_flac" != "xno" && test x"$enable_mp3" = xyes; then
+   AC_CHECK_HEADER(FLAC/all.h,[enable_flac=yes],)
+ fi
+-if test "x$enable_flac" = "xyes"; then
++if test x"$enable_flac" = "xyes"; then
+   LIBS="$LIBS -lFLAC"
+   FLACKEYS=",application/x-flac,audio/x-flac"
+ fi  
+ AC_SUBST(FLACKEYS)
+-if test "x$enable_flac" = "xyes"; then
++if test x"$enable_flac" = "xyes"; then
+    AC_DEFINE(HAVE_FLAC,,[Define if we have FLAC support])
+ fi
+-AM_CONDITIONAL(HAVE_FLAC,test "x$enable_flac" = "xyes")
++AM_CONDITIONAL(HAVE_FLAC,test x"$enable_flac" = "xyes")
+ 
+ CFLAGS="$CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS"
+ LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS $VORBISFILE_LIBS $FLAC_LIBS"
diff --git a/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild b/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild
index b4adcdc67976..6beafcc04f25 100644
--- a/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild,v 1.2 2004/03/06 16:06:37 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild,v 1.3 2004/03/06 17:30:29 foser Exp $
 
 inherit gnome2
 
@@ -19,7 +19,8 @@ RDEPEND=">=x11-libs/gtk+-2.2.2
 	>=gnome-base/libbonobo-2
 	>=media-libs/musicbrainz-2
 	faad? ( >=media-libs/faad2-2.0_rc3 )
-	flac? ( >=media-libs/flac-1 )
+	flac? ( >=media-libs/flac-1
+		>=media-libs/libid3tag-0.15.0b )
 	oggvorbis? ( >=media-libs/libvorbis-1 )
 	mad? ( >=media-libs/libid3tag-0.15.0b )
 	!xine? ( >=media-libs/gstreamer-0.6.3
@@ -43,13 +44,16 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 
 use xine && G2CONF="${G2CONF} --enable-xine"
-use flac && G2CONF="${G2CONF} --enable-flac"
+
+# flac support needs both flac & mp3 support enabled
+use flac || use mad \
+	&& G2CONF="${G2CONF} --enable-mp3" \
+	|| G2CONF="${G2CONF} --disable-mp3"
 
 G2CONF="${G2CONF} \
-	$(use_enable flac) \
 	$(use_enable oggvorbis vorbis) \
-	$(use_enable mad mp3) \
 	$(use_enable faad mp4 ) \
+	$(use_enable flac) \
 	--enable-mmkeys \
 	--enable-audiocd \
 	--disable-schemas-install"
@@ -64,6 +68,13 @@ src_unpack( ) {
 
 	epatch ${FILESDIR}/${PN}-0.6.5-gcc2_fix.patch
 	epatch ${FILESDIR}/${PN}-0.6.8-amd64.patch
+
+	# fix configure.ac to make flac switch work correctly
+	epatch ${FILESDIR}/${PN}-0.6-fix_flac_test.patch
+
+	# rerun autoconf for the flac fix
+	autoconf || die
+
 }
 
 DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \