Version bump wrt #329747 by Zsolt Branyiczky.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 43 insertions, 90 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/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
+}