Stable on PPC(32) & PPC64 because only this version has functional PSM playback. PPC64 also being stabled because no other version will work properly on 64UL. PPC32 ack'ed by rangerpb, nixnut. PPC64 ack'ed by rangerpb, tgall.

(Portage version: 2.1.2_rc4-r3)
 (Signed Manifest commit)

3 files changed, 18 insertions, 64 deletions

diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 4ddfd9e767c4..b60171facb00 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libmodplug-0.7-amd64.patch 1580 RMD160 75793a88b2d4113e8872c79da028ba2f7d98f569 SHA1 661f62ed0c1ff5848cab9cb3a663c0d285741163 SHA256 931534f2420722e51ddf136f8f84d3a7ef0d6b065fddd9cc8c244a06e0373e5e
 MD5 a8b506be2f9429c8b4ac508b04213432 files/libmodplug-0.7-amd64.patch 1580
 RMD160 75793a88b2d4113e8872c79da028ba2f7d98f569 files/libmodplug-0.7-amd64.patch 1580
@@ -33,14 +36,10 @@ EBUILD libmodplug-0.8-r1.ebuild 981 RMD160 d2e96914d5367c1298c2f1e7b8d022a98245d
 MD5 b00efc09ae9c61bb286e2b3f2a886193 libmodplug-0.8-r1.ebuild 981
 RMD160 d2e96914d5367c1298c2f1e7b8d022a98245de55 libmodplug-0.8-r1.ebuild 981
 SHA256 a3cd4dd2c157ad1704f0066ee64c7961c0da600946946953254624121b94e0f6 libmodplug-0.8-r1.ebuild 981
-EBUILD libmodplug-0.8.4-r1.ebuild 1350 RMD160 e296b27a7863b121f5f5f567cc35822154a40c7c SHA1 f2f2c303df8eebd759b7de998921fb2f7bdf5cd7 SHA256 ea113afeac957d31d861f3f316e46e928f1eedc95facc56ea5c23b3f60063844
-MD5 f2a6d672feb0b24940816fa834ed08d0 libmodplug-0.8.4-r1.ebuild 1350
-RMD160 e296b27a7863b121f5f5f567cc35822154a40c7c libmodplug-0.8.4-r1.ebuild 1350
-SHA256 ea113afeac957d31d861f3f316e46e928f1eedc95facc56ea5c23b3f60063844 libmodplug-0.8.4-r1.ebuild 1350
-EBUILD libmodplug-0.8.4-r2.ebuild 1395 RMD160 844f558fbff6845962550a62231de77b1bd48b46 SHA1 3dac5dda31ea26efd90446bedfa36702f652d50a SHA256 5576083981a51e2bad0b28640c2ac09faa589f5f1ebfb0af9ab97ecdcc132ca8
-MD5 4b5f19580c87e5353ef0ff00ef630dd7 libmodplug-0.8.4-r2.ebuild 1395
-RMD160 844f558fbff6845962550a62231de77b1bd48b46 libmodplug-0.8.4-r2.ebuild 1395
-SHA256 5576083981a51e2bad0b28640c2ac09faa589f5f1ebfb0af9ab97ecdcc132ca8 libmodplug-0.8.4-r2.ebuild 1395
+EBUILD libmodplug-0.8.4-r2.ebuild 1395 RMD160 e781908597f3d9a95646dacbcc30aa6d4401f8bf SHA1 eb7a2f75108428b17b92d607bb89ec9da8cd36cd SHA256 f860f8bdc61a31a981d6d2ed1823cd609f416b5a054d1d362423cd8198eb9a32
+MD5 0dbfeaf593efce800d82fa1a6496751c libmodplug-0.8.4-r2.ebuild 1395
+RMD160 e781908597f3d9a95646dacbcc30aa6d4401f8bf libmodplug-0.8.4-r2.ebuild 1395
+SHA256 f860f8bdc61a31a981d6d2ed1823cd609f416b5a054d1d362423cd8198eb9a32 libmodplug-0.8.4-r2.ebuild 1395
 EBUILD libmodplug-0.8.4.ebuild 1297 RMD160 ddc1416b024e91cc16fedce242fcdd383c675b4b SHA1 15857b960f73d7a06893283b93e7e91635db5a12 SHA256 40e289bbc114ce41c1dcf87d6e712a1394e563c361fc9d9440ccaa3f67904eea
 MD5 84a8271d92312d1cde047f72cdc44ceb libmodplug-0.8.4.ebuild 1297
 RMD160 ddc1416b024e91cc16fedce242fcdd383c675b4b libmodplug-0.8.4.ebuild 1297
@@ -49,10 +48,10 @@ EBUILD libmodplug-0.8.ebuild 943 RMD160 2207ba72e5d134f834ef34314aa5248a9a52c0d5
 MD5 289acc8c999cd9e7bc48d863955c2c33 libmodplug-0.8.ebuild 943
 RMD160 2207ba72e5d134f834ef34314aa5248a9a52c0d5 libmodplug-0.8.ebuild 943
 SHA256 120536049558699bb253181769e580ca094cde2febc84eb19cad0dcb003e32e4 libmodplug-0.8.ebuild 943
-MISC ChangeLog 3812 RMD160 9283ea0a82a1fbc3f25aae3fcd892d48c99fe9aa SHA1 e4278b766194a8a55e34b1b0289748a4615ac8de SHA256 132e0edd6488e10636efec9367ae3444ca8cb9a6546e88a68a20206182da9de9
-MD5 d0292a5cecf2a51d5f29b8559966370c ChangeLog 3812
-RMD160 9283ea0a82a1fbc3f25aae3fcd892d48c99fe9aa ChangeLog 3812
-SHA256 132e0edd6488e10636efec9367ae3444ca8cb9a6546e88a68a20206182da9de9 ChangeLog 3812
+MISC ChangeLog 4156 RMD160 c3bd1dc88cdf628e00cf03b6fc3f29e7ff8e95f2 SHA1 130138f4eb919ab3a8f483db6745b1e6585b6d22 SHA256 ea754ab9b928d4035d26d6cf12b5ae3fbc4921bca1ddb2cf82805a2dac112680
+MD5 e67a806f96cf86b5972c87bbf7f58780 ChangeLog 4156
+RMD160 c3bd1dc88cdf628e00cf03b6fc3f29e7ff8e95f2 ChangeLog 4156
+SHA256 ea754ab9b928d4035d26d6cf12b5ae3fbc4921bca1ddb2cf82805a2dac112680 ChangeLog 4156
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -69,9 +68,13 @@ SHA256 6aab7593739988a695fcbdba006f50c78d520cabe81cfaac7de84f5934363bf0 files/di
 MD5 1be334fdc8d38eea67d6928c162ac041 files/digest-libmodplug-0.8.4 250
 RMD160 a2ef5b2e60e99cc7c597d0a5850d706bde0ca871 files/digest-libmodplug-0.8.4 250
 SHA256 d27c62e06c98df68316b1e39b248ab990913d3f4779676ca9818b1c24bba5d81 files/digest-libmodplug-0.8.4 250
-MD5 1be334fdc8d38eea67d6928c162ac041 files/digest-libmodplug-0.8.4-r1 250
-RMD160 a2ef5b2e60e99cc7c597d0a5850d706bde0ca871 files/digest-libmodplug-0.8.4-r1 250
-SHA256 d27c62e06c98df68316b1e39b248ab990913d3f4779676ca9818b1c24bba5d81 files/digest-libmodplug-0.8.4-r1 250
 MD5 1be334fdc8d38eea67d6928c162ac041 files/digest-libmodplug-0.8.4-r2 250
 RMD160 a2ef5b2e60e99cc7c597d0a5850d706bde0ca871 files/digest-libmodplug-0.8.4-r2 250
 SHA256 d27c62e06c98df68316b1e39b248ab990913d3f4779676ca9818b1c24bba5d81 files/digest-libmodplug-0.8.4-r2 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+
+iD8DBQFFlo5Ap5vW4rUFj5oRAo/pAJwIKJqfjRk4547V9oYQhv7w1SkukwCfWe5W
+OmIZ9JZc29LJw1qGN/k+qos=
+=GKSQ
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libmodplug/files/digest-libmodplug-0.8.4-r1 b/media-libs/libmodplug/files/digest-libmodplug-0.8.4-r1
deleted file mode 100644
index 590a3cc7437e..000000000000
--- a/media-libs/libmodplug/files/digest-libmodplug-0.8.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 091bd1168a524a4f36fc61f95209e7e4 libmodplug-0.8.4.tar.gz 510758
-RMD160 0c4c179ebc32bf88cecb162c391e91a5d36ad834 libmodplug-0.8.4.tar.gz 510758
-SHA256 84890249b3ecf12ef040b9121b6238248fc8da0fee948661d70375049e5131ee libmodplug-0.8.4.tar.gz 510758
diff --git a/media-libs/libmodplug/libmodplug-0.8.4-r1.ebuild b/media-libs/libmodplug/libmodplug-0.8.4-r1.ebuild
deleted file mode 100644
index f5df77ebe1e4..000000000000
--- a/media-libs/libmodplug/libmodplug-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.4-r1.ebuild,v 1.1 2006/12/23 00:56:34 chainsaw Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-DESCRIPTION="Library for playing MOD-like music files"
-SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
-HOMEPAGE="http://modplug-xmms.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-sparc: 1.0 - Bus Error on play
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh -sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.7-amd64.patch"
-	epatch "${FILESDIR}/${PN}-0.8.4-timidity-patches.patch"
-	epatch "${FILESDIR}/${PN}-0.8.4-ppc64-64ul.patch"
-
-	sed -i -e 's:-ffast-math::' "${S}/configure.in"
-
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README TODO
-}
-
-pkg_postinst() {
-	elog "Since version 0.8.4 onward, libmodplug supports MIDI playback."
-	elog "unfortunately to work correctly, this needs timidity patches,"
-	elog "but the code does not support the needed 'source' directive to"
-	elog "work with the patches currently in portage. For this reason it"
-	elog "will not work as intended yet."
-}