Patch by Joshua Rich to respect LDFLAGS, closes bug #264134. Remove old ebuild.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

3 files changed, 30 insertions, 14 deletions

diff --git a/media-sound/mp3gain/ChangeLog b/media-sound/mp3gain/ChangeLog
index 34e7c19d51cd..cd3ebd283134 100644
--- a/media-sound/mp3gain/ChangeLog
+++ b/media-sound/mp3gain/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mp3gain
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/ChangeLog,v 1.33 2009/03/18 07:54:41 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/ChangeLog,v 1.34 2009/04/16 16:39:07 chainsaw Exp $
+
+*mp3gain-1.4.6-r3 (16 Apr 2009)
+
+  16 Apr 2009; <chainsaw@gentoo.org> -mp3gain-1.4.6-r1.ebuild,
+  +mp3gain-1.4.6-r3.ebuild:
+  Patch by Joshua Rich to respect LDFLAGS, closes bug #264134. Remove old
+  ebuild.
 
   18 Mar 2009; Joseph Jezak <josejx@gentoo.org> mp3gain-1.4.6-r2.ebuild:
   Marked ppc stable for bug #255516.
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index f9383f3ae301..379044259069 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.4.6-option-parser.patch 12346 RMD160 a5c73d857a1b5100cce8beeb5f9c5fed9b4f4bd6 SHA1 673145a4ddf4dd6b16a3bcee695374844829d6cf SHA256 ec572a32847901aae3804b32ae46fe5d0dc25505a9294a3945b96960ff56af97
 DIST mp3gain-1_4_6-src.zip 111408 RMD160 e9e340afee84706f434b24be2299c11e641666e3 SHA1 733ec64172087181c749c7434d774b804ce2e448 SHA256 e1ad9aeb18403cf9ea54af830e1371523d6d5373bfef01a8964e3735deaf7d4f
-EBUILD mp3gain-1.4.6-r1.ebuild 929 RMD160 da372b2107344032335d93e8801956520e95bdf7 SHA1 40d010fc439ac523bf1bacce7aca3e2b3fa20752 SHA256 77e6f5e709dc4e19e01ede784d584c5fde4af675fdc96644a734ed543c6324c2
 EBUILD mp3gain-1.4.6-r2.ebuild 1062 RMD160 46f5cdd05d62ad64ed4aec72b34213a9e6dce819 SHA1 897a2ed2f051db56b2f3d07489e3211fdc3ebb4e SHA256 96a4979cac56038f48348d1d232ed8915787653c1c3f6e9ea08b064a797e5990
-MISC ChangeLog 4219 RMD160 466c684cea99ebfac665f9854a5297545e08a5a7 SHA1 fcd732be49f4b0f6987d51b28df027bd181f35f3 SHA256 957f748b7da5cd6ddb8b441899cd4be60bfef4d36e862b576a173d146d85b1f4
+EBUILD mp3gain-1.4.6-r3.ebuild 987 RMD160 94dc8ce018ac5645666898f7d98f27f58725b2a0 SHA1 19ab62687a672c9680ecde15d70103209af0d428 SHA256 a91ff879577a97a9a5772d13aad34e80db2183de7bf04743638f4a45234a14aa
+MISC ChangeLog 4430 RMD160 4b2224f0443a73a6c02205817426be9e8ee7fdad SHA1 3adaf8bc573aa84553bb197d2b8e6d8c04cf0864 SHA256 8fa14019f45505e40f8dcf2991298d2a98759f08d999724e8dd268c86987c460
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknnXxoACgkQp5vW4rUFj5rhDwCgsRvvS1mz/zovRoK3UY/Tn9Af
+L1YAoJQHuq/+pnLePV0jj+6C1e/Bk3Hv
+=1CBj
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mp3gain/mp3gain-1.4.6-r1.ebuild b/media-sound/mp3gain/mp3gain-1.4.6-r3.ebuild
index c27bff61ba9f..a988fdf9225b 100644
--- a/media-sound/mp3gain/mp3gain-1.4.6-r1.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.4.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/mp3gain-1.4.6-r1.ebuild,v 1.8 2008/09/10 14:48:42 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/mp3gain-1.4.6-r3.ebuild,v 1.1 2009/04/16 16:39:07 chainsaw Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -15,25 +15,24 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="app-arch/unzip"
+RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
 	filter-flags -O*
-	sed -i -e "s:-Wall -O3 -DHAVE_MEMCPY:-Wall ${CFLAGS} -DHAVE_MEMCPY:" "${S}"/Makefile
+	sed -i -e "s:CC=.*:CC=$(tc-getCC):" \
+		-e "s:CFLAGS= -Wall -O3 -DHAVE_MEMCPY:CFLAGS+= -Wall -DHAVE_MEMCPY:" \
+		-e "s:LIBS=.*:LIBS= ${LDFLAGS} -lm:" \
+		"${S}"/Makefile \
+		|| die "Unable to adjust build system compiler/flags."
 	epatch "${FILESDIR}"/${PV}-option-parser.patch
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compile failed"
-}
-
 src_install () {
 	dobin mp3gain
 }