Version bump for security bug #379557 by Agostino "ago" Sarubbo. Port to EAPI=4 and use a patch instead of relying on sed. Remove all ebuilds but this and current stable.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 29 insertions, 53 deletions

diff --git a/media-libs/libmodplug/ChangeLog b/media-libs/libmodplug/ChangeLog
index dcb7938e2507..ac6a0683597c 100644
--- a/media-libs/libmodplug/ChangeLog
+++ b/media-libs/libmodplug/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libmodplug
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/ChangeLog,v 1.65 2011/05/10 16:16:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/ChangeLog,v 1.66 2011/08/17 11:18:51 chainsaw Exp $
+
+*libmodplug-0.8.8.4 (17 Aug 2011)
+
+  17 Aug 2011; Tony Vroon <chainsaw@gentoo.org> -libmodplug-0.8.8.1.ebuild,
+  -libmodplug-0.8.8.3.ebuild, +libmodplug-0.8.8.4.ebuild,
+  +files/libmodplug-0.8.8.4-no-fast-math.patch:
+  Version bump for security bug #379557 by Agostino "ago" Sarubbo. Port to
+  EAPI=4 and use a patch instead of relying on sed. Remove all ebuilds but this
+  and current stable.
 
 *libmodplug-0.8.8.3 (10 May 2011)
 
diff --git a/media-libs/libmodplug/files/libmodplug-0.8.8.4-no-fast-math.patch b/media-libs/libmodplug/files/libmodplug-0.8.8.4-no-fast-math.patch
new file mode 100644
index 000000000000..3ca9ad1a6fd5
--- /dev/null
+++ b/media-libs/libmodplug/files/libmodplug-0.8.8.4-no-fast-math.patch
@@ -0,0 +1,12 @@
+diff -uNr libmodplug-0.8.8.4.ORIG//configure.in libmodplug-0.8.8.4/configure.in
+--- libmodplug-0.8.8.4.ORIG//configure.in	2011-08-17 12:09:24.843546749 +0100
++++ libmodplug-0.8.8.4/configure.in	2011-08-17 12:10:23.582544651 +0100
+@@ -27,7 +27,7 @@
+ AC_CHECK_HEADERS([inttypes.h stdint.h malloc.h])
+ AC_CHECK_FUNCS(setenv sinf)
+ 
+-CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -ffast-math -D_REENTRANT"
++CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -D_REENTRANT"
+ # CXXFLAGS="-fno-exceptions -g -Wall -ffast-math -D_REENTRANT `glib-config --cflags`"
+ 
+ AC_CANONICAL_HOST
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.1.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.1.ebuild
deleted file mode 100644
index d8d4214b739a..000000000000
--- a/media-libs/libmodplug/libmodplug-0.8.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.8.1.ebuild,v 1.8 2010/10/03 14:16:24 armin76 Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="Library for playing MOD-like music files"
-SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
-HOMEPAGE="http://modplug-xmms.sourceforge.net/"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="dev-util/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e '/CXXFLAGS/s:-ffast-math::' \
-		configure.in || die
-
-	epatch "${FILESDIR}"/${PN}-0.8.4-timidity-patches.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.3.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild
index b48c13ae0751..64bb350f5219 100644
--- a/media-libs/libmodplug/libmodplug-0.8.8.3.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.8.3.ebuild,v 1.1 2011/05/10 16:16:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild,v 1.1 2011/08/17 11:18:51 chainsaw Exp $
 
-EAPI=2
-inherit autotools eutils
+EAPI=4
+inherit autotools base
 
 DESCRIPTION="Library for playing MOD-like music files"
 SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
@@ -17,25 +17,21 @@ IUSE="static-libs"
 RDEPEND=""
 DEPEND="dev-util/pkgconfig"
 
-src_prepare() {
-	sed -i \
-		-e '/CXXFLAGS/s:-ffast-math::' \
-		configure.in || die
-
-	epatch "${FILESDIR}"/${PN}-0.8.4-timidity-patches.patch
+PATCHES=(  "${FILESDIR}/${PN}-0.8.4-timidity-patches.patch"
+	   "${FILESDIR}/${P}-no-fast-math.patch" )
 
+src_prepare() {
+	base_src_prepare
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README TODO
-
 	find "${D}" -name '*.la' -delete
 }