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.

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

5 files changed, 37 insertions, 62 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/Manifest b/media-libs/libmodplug/Manifest
index a9c2a680f6a3..abbf47845451 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA1
 
 AUX libmodplug-0.8.4-timidity-patches.patch 592 RMD160 28433fbef068eccc69f2f013c81ebfbd8f47f219 SHA1 0950e4b480d5e2420240335696bfb95d1f3f24e7 SHA256 e486f9343d69d5849b42f6971162335e7c0805174dd5fba61697da9d948515ab
-DIST libmodplug-0.8.8.1.tar.gz 513612 RMD160 47444bc6306bf2ff35cb92ac70c2d496ac5c63c2 SHA1 49639b29b302aafe3fa6e5c5cdb994bfc72fd573 SHA256 9f3b8232b106b56d82e14300187ff0d3b72181d40d1be69ddc9a8b992f4f65f0
+AUX libmodplug-0.8.8.4-no-fast-math.patch 563 RMD160 e736d91ab8aa7c60832341312b597c14626ae5da SHA1 b1df8e510700f48e7ce4f671b5a303c90e61ac30 SHA256 3b683a6890a20d9f4e2c04b80d5908013e78e9a93877d491c140e9a6685d7da7
 DIST libmodplug-0.8.8.2.tar.gz 517938 RMD160 5e6c1cb6195d0adbd6b27004f6abff400133af48 SHA1 425bb013194242ac45d36f547574d3883ee52770 SHA256 6dedf79713f7ab75258c097a8749dab9127c81692858dab5295eef504ea61705
-DIST libmodplug-0.8.8.3.tar.gz 518546 RMD160 f7c233885c384e45d242f1450efdba4ca4577c04 SHA1 7b8caa4178de158f89464c741a539d3d3d3ff952 SHA256 0d52a259e85c4f50491d66128d7c476bc67a44d3930b965014954289c0c3f4a5
-EBUILD libmodplug-0.8.8.1.ebuild 1065 RMD160 2cd1f76878138536401e6833e427ce76894e74b9 SHA1 a9eae9143c6a1b31190cdf7084776b63cdf60de1 SHA256 f0b037548ed0ce731c2f2abe74c1721f13f8be8e79c1b6b8f6a6876a98a6d175
+DIST libmodplug-0.8.8.4.tar.gz 546319 RMD160 ca27dbcc918efb3a56de42d90618ebc1ea8478ab SHA1 df4deffe542b501070ccb0aee37d875ebb0c9e22 SHA256 5c5ee13dddbed144be26276e5f102da17ff5b1c992f3100389983082da2264f7
 EBUILD libmodplug-0.8.8.2.ebuild 1065 RMD160 eb142c85cdbc89468212adb80e21b71d6fb5e955 SHA1 a780f9d57c01c1744d0a0ded10697efd859093f4 SHA256 b5a1ea88d7a7786e12a6e98c7e368e5363ad7f7e7ed217742a696a028d0bfb6b
-EBUILD libmodplug-0.8.8.3.ebuild 1076 RMD160 e904398b83ac61c882ee2e0fb7fce3b59434603e SHA1 dbf1fedf9518af5b12b5e9b97d90ff8249ad0470 SHA256 54edd378df10493a2aed6e15b24d5c3f06f18706c49201f87f8764ce0cf48b09
-MISC ChangeLog 8142 RMD160 79d72f01aeda03d0b41e99dced5ef8017e78afa1 SHA1 ea1fc8772924e6eddc5ea2b248af8ecd72f47819 SHA256 42c6ed0e8cd879f42ee796c224963b78cffe0ee8c44112cfe7f54b6e4d3873a0
+EBUILD libmodplug-0.8.8.4.ebuild 1036 RMD160 ce7ca148468fb920b83ac16358c4319d9a5584a8 SHA1 f02eff9a94f73d3b470635fc80befed6bd822416 SHA256 523273d9417aad26f32d151642037ca34e4114e78c5c98def956859b1f1c53a0
+MISC ChangeLog 8537 RMD160 c27b75436bfe0e9c694c27ad03e3648f67e6e8f6 SHA1 aff58b9ca4fcf16c1ee1cecec20a2379ca113d5f SHA256 11effce039ac8c4269caa0f18e7dba54da9a9876647922209f7dcc256869dfde
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3JZNgACgkQvFcC4BYPU0qAnQCgmHkHsgDpve1avwtAzaF++P5u
-w3UAniC46X9ZsLZOdZmpbTvgNUtkMlaj
-=SK8S
+iEYEARECAAYFAk5Lo6IACgkQp5vW4rUFj5oukACeO1AlTUjKUNnd2VzOzvvpJNbZ
+jBIAoI8FKFGfGOHiPmt8ZAzNbItWPpC3
+=OriV
 -----END PGP SIGNATURE-----
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
 }