Force the XMMS plugin disabled, now that XMMS is removed, see bug #156187.

(Portage version: 2.1.2_rc2-r1)

4 files changed, 19 insertions, 6 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 5575463c837b..006487743765 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.95 2006/11/07 16:15:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.96 2006/11/25 11:07:23 flameeyes Exp $
+
+  25 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> flac-1.1.2-r3.ebuild,
+  flac-1.1.2-r8.ebuild, flac-1.1.3_beta2.ebuild:
+  Force the XMMS plugin disabled, now that XMMS is removed, see bug #156187.
 
   07 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> flac-1.1.2-r3.ebuild,
   flac-1.1.2-r8.ebuild, flac-1.1.3_beta2.ebuild:
diff --git a/media-libs/flac/flac-1.1.2-r3.ebuild b/media-libs/flac/flac-1.1.2-r3.ebuild
index ad46d8e1fde8..2b21f303f865 100644
--- a/media-libs/flac/flac-1.1.2-r3.ebuild
+++ b/media-libs/flac/flac-1.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r3.ebuild,v 1.13 2006/11/07 16:15:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r3.ebuild,v 1.14 2006/11/25 11:07:23 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -29,6 +29,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# Hard-disable the XMMS plugin now that XMMS is removed.
+	sed -i -e '/AM_PATH_XMMS/d' "${S}/configure.in"
+
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches
 
 	AT_M4DIR="${WORKDIR}/m4" eautoreconf
diff --git a/media-libs/flac/flac-1.1.2-r8.ebuild b/media-libs/flac/flac-1.1.2-r8.ebuild
index 2830ac4057f1..caf8f1db21cf 100644
--- a/media-libs/flac/flac-1.1.2-r8.ebuild
+++ b/media-libs/flac/flac-1.1.2-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r8.ebuild,v 1.2 2006/11/07 16:15:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r8.ebuild,v 1.3 2006/11/25 11:07:23 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -35,6 +35,9 @@ src_unpack() {
 	[[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] || \
 		export EPATCH_EXCLUDE="130_all_visibility.patch 140_all_visibility-xmms.patch 160_all_protected.patch"
 
+	# Hard-disable the XMMS plugin now that XMMS is removed.
+	sed -i -e '/AM_PATH_XMMS/d' "${S}/configure.in"
+
 	EPATCH_SUFFIX="patch" \
 	epatch "${WORKDIR}/patches"
 	AT_M4DIR="m4" eautoreconf
diff --git a/media-libs/flac/flac-1.1.3_beta2.ebuild b/media-libs/flac/flac-1.1.3_beta2.ebuild
index 5f6e1d224162..81740abed258 100644
--- a/media-libs/flac/flac-1.1.3_beta2.ebuild
+++ b/media-libs/flac/flac-1.1.3_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.3_beta2.ebuild,v 1.2 2006/11/07 16:15:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.3_beta2.ebuild,v 1.3 2006/11/25 11:07:23 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -39,6 +39,9 @@ src_unpack() {
 	[[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] || \
 		export EPATCH_EXCLUDE="130_all_visibility.patch 160_all_protected.patch"
 
+	# Hard-disable the XMMS plugin now that XMMS is removed.
+	sed -i -e '/AM_PATH_XMMS/d' "${S}/configure.in"
+
 	EPATCH_SUFFIX="patch" \
 	epatch "${WORKDIR}/patches"
 	AT_M4DIR="m4" eautoreconf
@@ -71,6 +74,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "If you've upgraded from a previous version of flac, you may need to re-emerge"
-	elog "packages that linked against flac by running revdep-rebuild"
+	ewarn "If you've upgraded from a previous version of flac, you may need to re-emerge"
+	ewarn "packages that linked against flac by running revdep-rebuild"
 }