Revbump to fix xmms bug. Closes bug #82622.

(Portage version: 2.0.51.21)

7 files changed, 42 insertions, 85 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 15d75551372c..c016aabbedd8 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.56 2005/04/30 18:01:24 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.57 2005/05/03 20:24:01 eradicator Exp $
+
+*flac-1.1.2-r1 (03 May 2005)
+
+  03 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/flac-1.1.2-xmms-config.patch, -flac-1.1.0-r1.ebuild,
+  -flac-1.1.2.ebuild, +flac-1.1.2-r1.ebuild:
+  Revbump to fix xmms bug.  Closes bug #82622.
 
   30 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> flac-1.1.1.ebuild:
   Stable on ppc.
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 299ec91650ec..74bc0dfdf2c7 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,21 +1,20 @@
-MD5 6ab3635d825a48fba589f342fb7e72b1 flac-1.1.0-r1.ebuild 1564
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c98c1a13aa7d29907da0dbdde82c1009 ChangeLog 7439
+MD5 11a4150b0b0e5afd83bdc21d32e25e72 flac-1.1.0-r2.ebuild 1368
 MD5 8a5f0b8e9adfd2c0b322c917dae6b379 flac-1.1.0.ebuild 1550
-MD5 b194cc54071f7c7c32d2047488c9de1d ChangeLog 7197
-MD5 ecadca74bd32481381959e6e633cf0c9 flac-1.1.2.ebuild 1882
+MD5 c34058c948f95ee4af85314e738b3196 flac-1.1.2-r1.ebuild 1998
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 0b0d3adee8366b72e36272ea752dce76 flac-1.1.1.ebuild 1643
-MD5 11a4150b0b0e5afd83bdc21d32e25e72 flac-1.1.0-r2.ebuild 1368
-MD5 bb05dd6b2e2856a686d9d5a0441f60cd files/flac-1.1.0-m4.patch 2424
+MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
+MD5 6c841c2c7db322a6c7f74f2a59e2cdf9 files/digest-flac-1.1.2-r1 63
 MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r2 63
-MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r1 63
-MD5 d251cedb35cba423848e2e708f0f0773 files/flac-1.1.1-altivec.patch.gz 5705
-MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.2-libtool.patch 4041
-MD5 86b29504f63f0ebfe0ddd971fc6b2470 files/flac-1.1.2-makefile.patch 511
-MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.1-m4.patch 1175
-MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.1-libtool.patch 4041
 MD5 291cb72013c342e434ae5be0300ef63e files/digest-flac-1.1.1 63
 MD5 efbd988ef5877a8f1f4018cfaa97b378 files/flac-1.1.0-libtool.patch 3831
+MD5 bb05dd6b2e2856a686d9d5a0441f60cd files/flac-1.1.0-m4.patch 2424
+MD5 d251cedb35cba423848e2e708f0f0773 files/flac-1.1.1-altivec.patch.gz 5705
+MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.1-libtool.patch 4041
+MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.1-m4.patch 1175
 MD5 1faa1c73bc3f7236f9677ed41e22ef33 files/flac-1.1.2-gas.patch 735
-MD5 6c841c2c7db322a6c7f74f2a59e2cdf9 files/digest-flac-1.1.2 63
-MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
+MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.2-libtool.patch 4041
 MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.2-m4.patch 1175
+MD5 86b29504f63f0ebfe0ddd971fc6b2470 files/flac-1.1.2-makefile.patch 511
+MD5 96fbd16daecafb18ff0c203d9d041ee2 files/flac-1.1.2-xmms-config.patch 373
diff --git a/media-libs/flac/files/digest-flac-1.1.0-r1 b/media-libs/flac/files/digest-flac-1.1.0-r1
deleted file mode 100644
index 614cadc8c556..000000000000
--- a/media-libs/flac/files/digest-flac-1.1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19b456a27b5fcf502c76cc33f33e1490 flac-1.1.0.tar.gz 1201861
diff --git a/media-libs/flac/files/digest-flac-1.1.2 b/media-libs/flac/files/digest-flac-1.1.2-r1
index ff97332b0a84..ff97332b0a84 100644
--- a/media-libs/flac/files/digest-flac-1.1.2
+++ b/media-libs/flac/files/digest-flac-1.1.2-r1
diff --git a/media-libs/flac/files/flac-1.1.2-xmms-config.patch b/media-libs/flac/files/flac-1.1.2-xmms-config.patch
new file mode 100644
index 000000000000..9ac6d6931472
--- /dev/null
+++ b/media-libs/flac/files/flac-1.1.2-xmms-config.patch
@@ -0,0 +1,11 @@
+--- flac-1.1.2.orig/src/plugin_xmms/configure.c 2005-01-25 07:26:29 +0300
++++ flac-1.1.2/src/plugin_xmms/configure.c      2005-02-24 12:40:37 +0300
+@@ -61,7 +61,7 @@
+		"", /* proxy_user */
+		"", /* proxy_pass */
+		FALSE, /* save_http_stream */
+-		"", /* save_http_path */
++		FALSE, /* save_http_path */
+		FALSE, /* cast_title_streaming */
+		FALSE /* use_udp_channel */
+	},
diff --git a/media-libs/flac/flac-1.1.0-r1.ebuild b/media-libs/flac/flac-1.1.0-r1.ebuild
deleted file mode 100644
index 32a0941093a2..000000000000
--- a/media-libs/flac/flac-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0-r1.ebuild,v 1.14 2005/02/05 12:49:35 luckyduck Exp $
-
-inherit libtool
-
-DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
-HOMEPAGE="http://flac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64 ~mips"
-IUSE="sse xmms X"
-
-RDEPEND=">=media-libs/libogg-1.0_rc2
-	X? ( xmms? ( media-sound/xmms ) )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	sys-apps/gawk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#if X not in use, then don't build in xmms support
-	#if xmms not in use, then don't do it either.
-	#if both X and xmms in use, then do it.
-	if ! use xmms || ! use X
-	then
-		cp src/Makefile.in src/Makefile.in.orig
-		sed -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in.orig > src/Makefile.in || die
-	fi
-
-	elibtoolize --reverse-deps
-}
-
-src_compile() {
-	# non-x86 need -fPIC for to compile when X and xmss are in USE
-	# the --with-pic is not enough to fix this ... Makefiles probably
-	# need to get patched :p
-	if use xmms && use X; then
-		export CFLAGS="${CFLAGS} -fPIC"
-	fi
-
-	econf \
-		--with-pic \
-		`use_enable sse` \
-		|| die
-
-	#the man page ebuild requires docbook2man... yick!
-	sed -i -e 's:include man:include:g' Makefile
-	#emake seems to mess up the building of the xmms input plugin
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
-
-# see #59482
-src_test() { :; }
diff --git a/media-libs/flac/flac-1.1.2.ebuild b/media-libs/flac/flac-1.1.2-r1.ebuild
index c70681e22601..db543ebc5e48 100644
--- a/media-libs/flac/flac-1.1.2.ebuild
+++ b/media-libs/flac/flac-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2.ebuild,v 1.9 2005/04/25 17:58:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r1.ebuild,v 1.1 2005/05/03 20:24:01 eradicator Exp $
 
 inherit libtool eutils flag-o-matic gcc
 
@@ -23,7 +23,9 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	if ! use xmms ; then
+	if use xmms ; then
+		epatch "${FILESDIR}"/${P}-xmms-config.patch
+	else
 		sed -i -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in || die
 	fi
 
@@ -55,15 +57,15 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS README
-
-	# Keep around old lib
-	preserve_old_lib /usr/$(get_libdir)/libFLAC.so.4
-	preserve_old_lib /usr/$(get_libdir)/libFLAC++.so.2
 }
 
 pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libFLAC.so.4
-	preserve_old_lib_notify /usr/$(get_libdir)/libFLAC++.so.2
+	ewarn "If you've upgraded from a previous version of flac, you may need to run"
+	ewarn "one or more of the following:"
+	ewarn "revdep-rebuild --soname libFLAC.so.4"
+	ewarn "revdep-rebuild --soname libFLAC++.so.2"
+	ewarn "revdep-rebuild --soname libFLAC.so.6"
+	ewarn "revdep-rebuild --soname libFLAC++.so.4"
 }
 
 # see #59482