Version bump wrt #329747 by Zsolt Branyiczky.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 46 insertions, 105 deletions

diff --git a/media-sound/mp3gain/ChangeLog b/media-sound/mp3gain/ChangeLog
index ee170a621fec..0afe37e3fc9c 100644
--- a/media-sound/mp3gain/ChangeLog
+++ b/media-sound/mp3gain/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mp3gain
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/ChangeLog,v 1.42 2010/05/02 14:47:58 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/ChangeLog,v 1.43 2010/07/25 09:09:02 ssuominen Exp $
+
+*mp3gain-1.5.2 (25 Jul 2010)
+
+  25 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> +mp3gain-1.5.2.ebuild:
+  Version bump wrt #329747 by Zsolt Branyiczky.
 
 *mp3gain-1.5.1 (02 May 2010)
 
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index 2da9e6d7b79e..831745d04f76 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4.6-option-parser.patch 12346 RMD160 a5c73d857a1b5100cce8beeb5f9c5fed9b4f4bd6 SHA1 673145a4ddf4dd6b16a3bcee695374844829d6cf SHA256 ec572a32847901aae3804b32ae46fe5d0dc25505a9294a3945b96960ff56af97
-AUX 1.5.1-format-string.patch 367 RMD160 a7d95eb7f203a89557249ef664a195d798410bc3 SHA1 dd8bd033d677274b2380f29894bf796829cad30b SHA256 04349dafeb19e99f5ea063c39274186302412ddd168ab59e1f1a5c07751cc485
 DIST mp3gain-1_4_6-src.zip 111408 RMD160 e9e340afee84706f434b24be2299c11e641666e3 SHA1 733ec64172087181c749c7434d774b804ce2e448 SHA256 e1ad9aeb18403cf9ea54af830e1371523d6d5373bfef01a8964e3735deaf7d4f
-DIST mp3gain-1_5_1-src.zip 121613 RMD160 8a075f40b69b028b51ef8d38f84e3d3920ba8ed5 SHA1 ac51ab7167511e09c964a311382b14b012ee1c51 SHA256 4d756b2aebb8dffed36a43a81379a5512743fbb1217a27e70a6f96640dd414b5
-EBUILD mp3gain-1.4.6-r2.ebuild 1062 RMD160 46f5cdd05d62ad64ed4aec72b34213a9e6dce819 SHA1 897a2ed2f051db56b2f3d07489e3211fdc3ebb4e SHA256 96a4979cac56038f48348d1d232ed8915787653c1c3f6e9ea08b064a797e5990
+DIST mp3gain-1_5_2-src.zip 129435 RMD160 60fcff364ab3a71a40f9ff89001afe02e2bdb5de SHA1 b4593dc0873728b8b6745c8dec0560f338368aab SHA256 dbadc7a41a8a3b87d3a21a1989701cfe72d2090c3ead02b0b396a19a8acf6fca
 EBUILD mp3gain-1.4.6-r3.ebuild 1023 RMD160 a8d1808ebbb038d6d4d1a3c8551c17fbba9f49ba SHA1 6e49d5461266a50009a4b9f8ab81729afc691e50 SHA256 05e76037863f5fd16b49dbc31d15711eb1a3d2750c0453f98721c14a3b768f37
-EBUILD mp3gain-1.5.1.ebuild 1030 RMD160 032f3ad0139ca25a342096be269fe1e2c5529638 SHA1 6abe63456ba343ae2efb73d7cf45f2f6f6d3f66d SHA256 ddfd8dab7ff13e3ff5f66b1649f71a6492443eb93813ee5e2f67f767c8954ea5
-MISC ChangeLog 5469 RMD160 7c5b0fd58cc03720125fbc890c629cb4642d1bee SHA1 dc69634a3a47fc03c78792229aa8f28478b1a6c5 SHA256 595198ca0f686ff95968e0c5b29b8166287dcd4bbab35c8333a88a9faedcc328
+EBUILD mp3gain-1.5.2.ebuild 853 RMD160 d34d690c6f18ee4e5eedb8cb26443d17e777ff3a SHA1 3dcc775e09e43a17c79feecb6ecf224a0946699f SHA256 5cfbb95b10dde73a4f9d7d256e4ce244b57f33cabaf5cca50e1b1bede246f577
+MISC ChangeLog 5626 RMD160 6b2c49dedfe299acd99035a817c0c15141d08fd8 SHA1 684ef5092296e1db5263a9a36cab165aba9e76be SHA256 534fccd5c9ba965fbf1e8113524deb628f770cf7667e887c6819d2ee5245c0f9
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvdkO8ACgkQp5vW4rUFj5qWcACeLrxKGeK1bHgsNQZeCAqhlw8x
-Jk0An0P8b19qbb1LVkieYrka02iVsr4g
-=1QPZ
------END PGP SIGNATURE-----
diff --git a/media-sound/mp3gain/files/1.5.1-format-string.patch b/media-sound/mp3gain/files/1.5.1-format-string.patch
deleted file mode 100644
index a91d82f404f5..000000000000
--- a/media-sound/mp3gain/files/1.5.1-format-string.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr work.ORIG//rg_error.c work/rg_error.c
---- work.ORIG//rg_error.c	2010-05-02 15:42:47.056116105 +0100
-+++ work/rg_error.c	2010-05-02 15:43:26.851999890 +0100
-@@ -40,7 +40,7 @@
- {
- #ifndef asWIN32DLL
-     gSuccess = 0;
--	fprintf(stdout, localerrstr);
-+	fprintf(stdout, "%s", localerrstr);
- #else
- 	//send message to DLL's parent
-     mp3gainerr = localerrnum;
diff --git a/media-sound/mp3gain/mp3gain-1.4.6-r2.ebuild b/media-sound/mp3gain/mp3gain-1.4.6-r2.ebuild
deleted file mode 100644
index d103ba523608..000000000000
--- a/media-sound/mp3gain/mp3gain-1.4.6-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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-r2.ebuild,v 1.7 2009/03/18 07:54:41 josejx Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-IUSE=""
-
-MY_P=${P//./_}
-S=${WORKDIR}
-
-DESCRIPTION="MP3Gain automatically adjusts mp3s so that they all have the same volume"
-HOMEPAGE="http://mp3gain.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-
-DEPEND="app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	filter-flags -O*
-	sed -i -e "s:CC=.*:CC=$(tc-getCC):" "${S}"/Makefile || die "Unable to override compiler selection"
-	sed -i -e "s:CFLAGS= -Wall -O3 -DHAVE_MEMCPY:CFLAGS+= -Wall -DHAVE_MEMCPY:" "${S}"/Makefile ||
-						die "Unable to convince build system to respect CFLAGS"
-	epatch "${FILESDIR}"/${PV}-option-parser.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compile failed"
-}
-
-src_install () {
-	dobin mp3gain
-}
diff --git a/media-sound/mp3gain/mp3gain-1.5.1.ebuild b/media-sound/mp3gain/mp3gain-1.5.1.ebuild
deleted file mode 100644
index ef0c68da4a18..000000000000
--- a/media-sound/mp3gain/mp3gain-1.5.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/mp3gain-1.5.1.ebuild,v 1.1 2010/05/02 14:47:58 chainsaw Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-IUSE=""
-
-MY_P=${P//./_}
-S=${WORKDIR}
-
-DESCRIPTION="MP3Gain automatically adjusts mp3s so that they all have the same volume"
-HOMEPAGE="http://mp3gain.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	filter-flags -O*
-	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}-format-string.patch
-}
-
-src_install () {
-	dobin mp3gain
-}
diff --git a/media-sound/mp3gain/mp3gain-1.5.2.ebuild b/media-sound/mp3gain/mp3gain-1.5.2.ebuild
new file mode 100644
index 000000000000..d0c57b4fa41b
--- /dev/null
+++ b/media-sound/mp3gain/mp3gain-1.5.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/mp3gain-1.5.2.ebuild,v 1.1 2010/07/25 09:09:02 ssuominen Exp $
+
+EAPI=2
+inherit toolchain-funcs
+
+MY_P=${P//./_}
+
+DESCRIPTION="A program to analyze and adjust MP3 files to same volume"
+HOMEPAGE="http://mp3gain.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	sed -i \
+		-e 's:CFLAGS= -Wall -O2:CFLAGS+= -Wall:' \
+		-e 's:$(CC) -o:$(CC) $(LDFLAGS) -o:' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin mp3gain || die
+}