dont warning about mp3 stuff when USE=mp3

Package-Manager: portage-2.1

3 files changed, 57 insertions, 52 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 0cae840a2bb7..4276ed0411e8 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -9,18 +9,18 @@ EBUILD audacious-0.2.3.ebuild 2552 RMD160 93e522f8402adce72bb4dab97851eb25d3365b
 MD5 ef2ce7cecb8f2bf6363734f9c2b9795e audacious-0.2.3.ebuild 2552
 RMD160 93e522f8402adce72bb4dab97851eb25d3365bcf audacious-0.2.3.ebuild 2552
 SHA256 b51202585e526af70395bd50fcde4ea314feafb7e449fbc3f1d32865603a6600 audacious-0.2.3.ebuild 2552
-EBUILD audacious-1.0.0-r1.ebuild 2645 RMD160 1f207b13a155f075570db6974e18efbf1af7b036 SHA1 34f5ac774ae08d82cbce30790139a5cf637bbf9d SHA256 f85cbed0bb9270cb8a3474a0117ece499af1cc6865a83f0b41b84841d004336b
-MD5 7d86251aeeb47e847c6ce6068a4e86b6 audacious-1.0.0-r1.ebuild 2645
-RMD160 1f207b13a155f075570db6974e18efbf1af7b036 audacious-1.0.0-r1.ebuild 2645
-SHA256 f85cbed0bb9270cb8a3474a0117ece499af1cc6865a83f0b41b84841d004336b audacious-1.0.0-r1.ebuild 2645
+EBUILD audacious-1.0.0-r1.ebuild 2643 RMD160 3bbffba786670af7bb5b26f8146857aa72ced229 SHA1 c070782707d5533ac4cabab75f6246e136d24cfc SHA256 6b00455d06de4c77a8a16025a6ac00cede4c92a2bb71b7eb889860cc773db51f
+MD5 107923dd47ec97fec07422443f2e7f2a audacious-1.0.0-r1.ebuild 2643
+RMD160 3bbffba786670af7bb5b26f8146857aa72ced229 audacious-1.0.0-r1.ebuild 2643
+SHA256 6b00455d06de4c77a8a16025a6ac00cede4c92a2bb71b7eb889860cc773db51f audacious-1.0.0-r1.ebuild 2643
 EBUILD audacious-1.0.0.ebuild 2611 RMD160 1a3718ccdbd406937f7a7a22dd80382ff0544006 SHA1 efa138a0ce947f2bfb6b52e52fc6c111d6312bbc SHA256 82da5580623f3da52468195d07680b41a6c22b0a78d175b04e666d66ede9e466
 MD5 c81132c30362be6170e33b0948af5f15 audacious-1.0.0.ebuild 2611
 RMD160 1a3718ccdbd406937f7a7a22dd80382ff0544006 audacious-1.0.0.ebuild 2611
 SHA256 82da5580623f3da52468195d07680b41a6c22b0a78d175b04e666d66ede9e466 audacious-1.0.0.ebuild 2611
-EBUILD audacious-1.1.0_beta1.ebuild 2712 RMD160 eac3bf4a1bac8add5e3dece38eb3a26c66ea3a74 SHA1 4f42fa7cdd8fe04870ae049f8d4a63f784e00d9f SHA256 750f8ddcf7909db2a72e1f17eed659eacbf67e1a02b3aadd95e01078091b031d
-MD5 9eec1650c5681a0f6ade191b2d11dc1b audacious-1.1.0_beta1.ebuild 2712
-RMD160 eac3bf4a1bac8add5e3dece38eb3a26c66ea3a74 audacious-1.1.0_beta1.ebuild 2712
-SHA256 750f8ddcf7909db2a72e1f17eed659eacbf67e1a02b3aadd95e01078091b031d audacious-1.1.0_beta1.ebuild 2712
+EBUILD audacious-1.1.0_beta1.ebuild 2693 RMD160 cf007e5816b3511de37e9a587184e8147b92c86d SHA1 15eaa3c15287b2efbfb3476687bed75083fc59bd SHA256 bd256f4d791df65ee6d2729b04506e1e12596aeb40dc701dc7768d664433ad07
+MD5 52543e695bb143d0a822295f0dcb4c13 audacious-1.1.0_beta1.ebuild 2693
+RMD160 cf007e5816b3511de37e9a587184e8147b92c86d audacious-1.1.0_beta1.ebuild 2693
+SHA256 bd256f4d791df65ee6d2729b04506e1e12596aeb40dc701dc7768d664433ad07 audacious-1.1.0_beta1.ebuild 2693
 MISC ChangeLog 7748 RMD160 cd1586a1f11c06630fb413d6fc1d9f80705f4a5f SHA1 b2ecf4b3ffa3e62a0064cbd422676c6442adc1f9 SHA256 0ab0b2e35296839b64f883c72208b606652c2c9458142abcacd45d2c73a79d53
 MD5 f26dd5fd38d32adc8b58addef474f600 ChangeLog 7748
 RMD160 cd1586a1f11c06630fb413d6fc1d9f80705f4a5f ChangeLog 7748
@@ -44,7 +44,7 @@ SHA256 ab8d6a6c85723afd9464667f5977a5d4678b877607e2067e97afd5c66875db2a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEh/rp2+ySkm8kpY0RAqjpAJ9Q5PBeaiNNCApHW3nQclXHvR9oGwCfQ+2q
-RNP8ikfDR4IdzcDJSYw77xw=
-=1d+E
+iD8DBQFEit2K2+ySkm8kpY0RAhSSAJ9Dc8JBxgJ2kKCA4RYOZaaEs5+e1wCgwL1m
+klIIsxpLWPG0CywVtSMT0oE=
+=Zf9d
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-1.0.0-r1.ebuild b/media-sound/audacious/audacious-1.0.0-r1.ebuild
index 9eab3b704ffc..f95285525a1e 100644
--- a/media-sound/audacious/audacious-1.0.0-r1.ebuild
+++ b/media-sound/audacious/audacious-1.0.0-r1.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.0.0-r1.ebuild,v 1.3 2006/06/06 15:13:37 chainsaw Exp $
-
-IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.0.0-r1.ebuild,v 1.4 2006/06/10 14:51:55 vapier Exp $
 
 inherit flag-o-matic
 
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions."
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
 HOMEPAGE="http://audacious-media-player.org/"
 SRC_URI="http://audacious-media-player.org/release/${P}.tgz
 	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~ppc64 ~sparc ~x86"
+IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma"
 
 RDEPEND="app-arch/unzip
 	net-misc/curl
@@ -41,15 +39,20 @@ RDEPEND="app-arch/unzip
 	timidity? ( media-sound/timidity++ )
 	vorbis? ( >=media-libs/libvorbis-1.0
 		  >=media-libs/libogg-1.0 )"
-
 DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool )
 	>=dev-util/pkgconfig-0.9.0"
 
-src_compile() {
-	if ! useq mp3; then
-		ewarn "MP3 support is now optional and you have not enabled it."
+mp3_warning() {
+	if ! useq mp3 ; then
+		echo
+		ewarn "MP3 support is now optional, you may want to enable the mp3 USE-flag"
+		echo
 	fi
+}
+
+src_compile() {
+	mp3_warning
 
 	# Bug #42893
 	replace-flags "-Os" "-O2"
@@ -59,25 +62,25 @@ src_compile() {
 	econf \
 		--with-dev-dsp=/dev/sound/dsp \
 		--with-dev-mixer=/dev/sound/mixer \
-		`use_enable mmx simd` \
-		`use_enable gnome gconf` \
-		`use_enable vorbis` \
-		`use_enable esd` \
-		`use_enable mp3` \
-		`use_enable nls` \
-		`use_enable oss` \
-		`use_enable alsa` \
-		`use_enable arts` \
-		`use_enable flac` \
-		`use_enable aac` \
-		`use_enable modplug` \
-		`use_enable lirc` \
-		`use_enable sndfile` \
-		`use_enable wma` \
-		`use_enable sid` \
-		`use_enable musepack` \
-		`use_enable jack` \
-		`use_enable timidity` \
+		$(use_enable mmx simd) \
+		$(use_enable gnome gconf) \
+		$(use_enable vorbis) \
+		$(use_enable esd) \
+		$(use_enable mp3) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable flac) \
+		$(use_enable aac) \
+		$(use_enable modplug) \
+		$(use_enable lirc) \
+		$(use_enable sndfile) \
+		$(use_enable wma) \
+		$(use_enable sid) \
+		$(use_enable musepack) \
+		$(use_enable jack) \
+		$(use_enable timidity) \
 		|| die
 
 	emake || die "make failed"
@@ -89,13 +92,11 @@ src_install() {
 
 	# Gentoo_ice skin installation; bug #109772
 	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins ${WORKDIR}/gentoo_ice/*
+	doins "${WORKDIR}"/gentoo_ice/*
 	docinto gentoo_ice
-	dodoc ${WORKDIR}/README
+	dodoc "${WORKDIR}"/README
 }
 
 pkg_postinst() {
-	echo
-	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
-	echo
+	mp3_warning
 }
diff --git a/media-sound/audacious/audacious-1.1.0_beta1.ebuild b/media-sound/audacious/audacious-1.1.0_beta1.ebuild
index f9f668e2a683..07802c65da36 100644
--- a/media-sound/audacious/audacious-1.1.0_beta1.ebuild
+++ b/media-sound/audacious/audacious-1.1.0_beta1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.1.0_beta1.ebuild,v 1.2 2006/06/08 10:20:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.1.0_beta1.ebuild,v 1.3 2006/06/10 14:51:55 vapier Exp $
 
 inherit flag-o-matic
 
 MY_P="${P/_beta/-dr}"
 S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions."
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
 HOMEPAGE="http://audacious-media-player.org/"
 SRC_URI="http://audacious-media-player.org/beta/${MY_P}.tgz
 	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
@@ -45,10 +45,16 @@ DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool )
 	>=dev-util/pkgconfig-0.9.0"
 
-src_compile() {
-	if ! useq mp3; then
-		ewarn "MP3 support is now optional and you have not enabled it."
+mp3_warning() {
+	if ! useq mp3 ; then
+		echo
+		ewarn "MP3 support is now optional, you may want to enable the mp3 USE-flag"
+		echo
 	fi
+}
+
+src_compile() {
+	mp3_warning
 
 	# Bug #42893
 	replace-flags "-Os" "-O2"
@@ -94,7 +100,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
-	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag"
-	echo
+	mp3_warning
 }