Samuli is not an happy developer when broken patches are introduced. Fix MP3 playing, again.

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

3 files changed, 11 insertions, 15 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 3e1d096f0950..5be794ab106e 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.637 2009/05/31 16:20:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.638 2009/05/31 16:28:28 ssuominen Exp $
+
+  31 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  mplayer-1.0_rc2_p20090530.ebuild:
+  Samuli is not an happy developer when broken patches are introduced. Fix
+  MP3 playing, again.
 
   31 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   mplayer-1.0_rc2_p20090530.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 5b52e44ef609..fb91c0d18bd5 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mplayer-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch 984 RMD160 8cd43ba4841036f6f8b19605144a8ed5f60065c1 SHA1 faa72c210ccff43b164d69f1e5996600c64a52d2 SHA256 cc87fe132e4494ab1131411a8f342d5589fedd017e227df2fe723686829011c8
 AUX mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch 689 RMD160 a2a26ad4129bcfb4330ed6f1ee35e6ee1b73fb0d SHA1 918dee2cdff42297376d1afcb9eb9cff6f6f4094 SHA256 54b129ae19a1728981fef5530ba12828f163079201bb479afba7a74d4425e847
 AUX mplayer-1.0_rc2_p27725-libx264.patch 785 RMD160 ecbe6e80be98458af0723df6190c52f1e94b862d SHA1 b23ffc9c9563ad026f66ae57a402161be3e8031d SHA256 df837dd739a197e4ab1b7b5121e8e77e6dabc0cc1f53801b9fe6492f28974b47
@@ -20,17 +17,10 @@ DIST mplayer-1.0_rc2_p28450.tar.bz2 8159720 RMD160 3c287a1cc63cc82c686abbe985fa4
 DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5
 EBUILD mplayer-1.0_rc2_p20090226.ebuild 19093 RMD160 d87618dd3bfe530439bdfea7692120b4e7c2958c SHA1 9ec3a32dcb4e283bd4969fba6a14124565a4c1e1 SHA256 622f1316f0bf9a228ef0d369aaa17ee67a1184dc58b24cacc322064f20f60647
 EBUILD mplayer-1.0_rc2_p20090322.ebuild 19451 RMD160 16a792dbae6e505204a794a37a54fd8ad336559f SHA1 50fbe16646eea316b2d65a24f0626db8e8533254 SHA256 1745d78e137bfc83c784b2e1459a148e5ec042b663e99d6be2c0e90d8129d33b
-EBUILD mplayer-1.0_rc2_p20090530.ebuild 19519 RMD160 3b2f436e10946ba995d493ad1619a74ad5956d01 SHA1 2fea08873fcdad65a244c1d64a7e30232c65ba64 SHA256 1096f6c356628f4037d8278eec01d9ee1802b15f07b5c24b05f47279367da415
+EBUILD mplayer-1.0_rc2_p20090530.ebuild 19574 RMD160 36d2b48c2983d31215d89d3b3bcaf009656be188 SHA1 1aff9698e865dc5822689f4ab9116f490d74a1b8 SHA256 ba28c3ffb7092db3763f20d7533c311260b3947e36746e3e9f415808b71c1358
 EBUILD mplayer-1.0_rc2_p28058-r1.ebuild 18011 RMD160 e8cd4e085a85f0fbeb2833aee9478986bb746749 SHA1 4e561379851a82aa7352c443a59f6f13f69aff94 SHA256 baad154691f02acc6a8b85cc305aa1a3ab08366c977296f6241ffcf5cf032697
 EBUILD mplayer-1.0_rc2_p28288.ebuild 17846 RMD160 71a9e036e8369b0dfbe5e83760df592d9f4d725b SHA1 43a283d3a266cb2ff560e774016516c89bb2a665 SHA256 3784754239cb211cfdf4a7ec1cefffd21bf5085d82ea1ef67d1269009f7a23d1
 EBUILD mplayer-1.0_rc2_p28450.ebuild 17830 RMD160 28d30350080d982f94428c5348bb173e0b0b73b9 SHA1 9495c8f55b0579e23c04035a85bd1987aa89dae3 SHA256 a8acca34776d3337ac406ad643905398fc8f947aa7d9f265a1c159aa5d9e9bae
 EBUILD mplayer-9999.ebuild 19691 RMD160 6e294cdc147fd8156015d4307d38633c60e680fe SHA1 ad78130b43ff95fc280d13ad601e67a238421203 SHA256 2fad2408f64ef738456a9699dd75fe03f2785716b09a430063c512472ad89ab2
-MISC ChangeLog 112474 RMD160 be5ee282faccd974f4090f06ee3c6e759d5a987e SHA1 87e7c41bb293583b84481f1ecee1648a086d6add SHA256 6b3d2741ed748b308c9ee8ead6cdb7d12b0cce925bfb712ca1e30092f86fa15b
+MISC ChangeLog 112662 RMD160 43995f2e02c4884cc8ef49d972b75cdf2a8be8de SHA1 c3c18f509757844aeda0b57112cd28bd1b462307 SHA256 099f71eda04d978a6b80557dd6792070e9f458f4802af37ab7e4c0eabeb71d74
 MISC metadata.xml 3684 RMD160 4f44b7003c5e28bbc42263a103d8aa280c7ba14a SHA1 51d846e40fb6e1ec93372a102d127cf5760a401a SHA256 558422f6a79736a0888ad2500e534b1b5c18fc5af1879543ebb007be7d1050c7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoirkYACgkQAiZjviIA2XjgLgCg1Bk5e+RVC3h61/msVmrkDXDg
-mPAAoJIeOb01QTjzONsW02GnxktmP0tT
-=GZFt
------END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
index b8df2bd5315c..01f4ba519630 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild,v 1.3 2009/05/31 16:20:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild,v 1.4 2009/05/31 16:28:28 ssuominen Exp $
 
 EAPI="2"
 
@@ -239,7 +239,8 @@ src_unpack() {
 		mv "${WORKDIR}/svgalib_helper" "${S}/libdha"
 	fi
 
-	epatch "${FILESDIR}"/${PN}-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch
+# This patch breaks MP3 playing entirely, wrt #271815
+#	epatch "${FILESDIR}"/${PN}-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch
 }
 
 src_configure() {