Fixed problem with Makefile not working on some systems - bug #130577.

Package-Manager: portage-2.1_rc4-r3

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index be92cd32941e62ca993365bf8ef1dc49bf858d9c..944a4ad0c7a30869c22a9501a62a0913903c6618 100644 (file)
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.95 2006/06/06 16:39:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.96 2006/06/07 07:17:22 eradicator Exp $
+
+  07 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg123-0.59s-r11.ebuild:
+  Fixed problem with Makefile not working on some systems - bug #130577.
 
 *mpg123-0.59s-r11 (06 Jun 2006)
 

diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 1386afa903821411761eb4c6abe2489789d6e29d..b33fff3e472b6b53cf55f8f885b23784161d8dae 100644 (file)
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -20,18 +20,18 @@ SHA256 4d5fc7650687f3c7aeb3e82622bde477f24412d914e5ceb30000725d654185dd files/mp
 DIST mpg123-0.59s-gentoo-1.5.tar.bz2 7207 RMD160 75bc91d354e665c424afa1a3beab202f7a60441c SHA1 9631911b2a8c6331e494a1e26d03516b19634c62 SHA256 2c2495ce9bd029b01d94c4c4ca930653d174d4a3e6d11488e2e669692835b116
 DIST mpg123-0.59s-gentoo-1.6.tar.bz2 7311 RMD160 393f10020bb15a813cc53570926be279d0e9b798 SHA1 9c74d4fac54be92c74faddcc7a8c52c9a8818291 SHA256 5ecbe31774b6fc83c3a73c06da8e75d419486b57339f41ac8e7848c5ede268e5
 DIST mpg123-pre0.59s.tar.gz 244899 RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f SHA1 7e521785dc3a9015f4228f0a118bf36856884b67 SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a
-EBUILD mpg123-0.59s-r11.ebuild 3410 RMD160 fb6204b2804b06a19b90693e3a432760b5b5455a SHA1 4ebf81f20f8da30d498eb96cb67152231fd5fb02 SHA256 a823e0087ade250c61356669160458af6bea23f5cf13d77b85e535218ffd3538
-MD5 d4d664dd5680a4130a1f88f000255990 mpg123-0.59s-r11.ebuild 3410
-RMD160 fb6204b2804b06a19b90693e3a432760b5b5455a mpg123-0.59s-r11.ebuild 3410
-SHA256 a823e0087ade250c61356669160458af6bea23f5cf13d77b85e535218ffd3538 mpg123-0.59s-r11.ebuild 3410
+EBUILD mpg123-0.59s-r11.ebuild 3584 RMD160 b149c5e0c07ac8581b78f666661cc195ee2ea24b SHA1 d718a2cec89e31225134b2e112ea7bd6523a2988 SHA256 e2565a4942fc4a14ece3f2099ed578b7f16f66d46f7887ab3d47ae10f0403aff
+MD5 c03f5a5cee4cc0ae1f7687598ab6d231 mpg123-0.59s-r11.ebuild 3584
+RMD160 b149c5e0c07ac8581b78f666661cc195ee2ea24b mpg123-0.59s-r11.ebuild 3584
+SHA256 e2565a4942fc4a14ece3f2099ed578b7f16f66d46f7887ab3d47ae10f0403aff mpg123-0.59s-r11.ebuild 3584
 EBUILD mpg123-0.59s-r9.ebuild 3048 RMD160 47f49b6b4fb13f3a95dd3afd0ca7f082afdd8802 SHA1 3ff99127488fa3fbf4283d0d86d0651698d8c915 SHA256 d96b73bcd2a237e6bbd994add3a2aa180b30a6e6c0d36c6bdc4eb983cac7feb8
 MD5 15087675c7f8776c29b28cd3b42a9ed7 mpg123-0.59s-r9.ebuild 3048
 RMD160 47f49b6b4fb13f3a95dd3afd0ca7f082afdd8802 mpg123-0.59s-r9.ebuild 3048
 SHA256 d96b73bcd2a237e6bbd994add3a2aa180b30a6e6c0d36c6bdc4eb983cac7feb8 mpg123-0.59s-r9.ebuild 3048
-MISC ChangeLog 14881 RMD160 81612b24c99b0acc31c202855642d59f63e8ca35 SHA1 dac1b7a3931a1184ad408cc829b7f59064f8edeb SHA256 beadbe87e80900bd064bf01d76982f1d8f3a1148e7a5bbc0cc0e0495c0657acc
-MD5 8f1a1def9f814d07f5994e0aca42fff4 ChangeLog 14881
-RMD160 81612b24c99b0acc31c202855642d59f63e8ca35 ChangeLog 14881
-SHA256 beadbe87e80900bd064bf01d76982f1d8f3a1148e7a5bbc0cc0e0495c0657acc ChangeLog 14881
+MISC ChangeLog 15039 RMD160 8b7c1cea76f717b78d8a8e11782f6b8224f3065a SHA1 537150d12cecd07f96abe59898ff6a9d20524dab SHA256 309502c88531bc582a4a0706dfc0b1e16695a03858dcb472c8879043e04cefd3
+MD5 556074652531581403af1583acdb3a82 ChangeLog 15039
+RMD160 8b7c1cea76f717b78d8a8e11782f6b8224f3065a ChangeLog 15039
+SHA256 309502c88531bc582a4a0706dfc0b1e16695a03858dcb472c8879043e04cefd3 ChangeLog 15039
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -45,7 +45,7 @@ SHA256 1d2ba827a81e29b4a69c92e515b3e963829396119a8239da7e194204efb849ae files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEhfnTOpjtAl+gMRURArNBAJ4ul3IMXQhNU8De7XkT/iumSUFnXACfcbiR
-9CiAz1d4NXYWwtRLku8+o60=
-=egcv
+iD8DBQFEhn2SOpjtAl+gMRURAkQjAKDcc6BL7SmAXDxIDUQ+q6X+O4FwVgCgz583
+wF/sf/zrhfFlxntFDTL5szU=
+=RQuW
 -----END PGP SIGNATURE-----

diff --git a/media-sound/mpg123/mpg123-0.59s-r11.ebuild b/media-sound/mpg123/mpg123-0.59s-r11.ebuild
index 0ffd04a5ed507a0bfeeb8b687919e299bee44ae6..f270716802135d582aec22dd1230096477cf1c7f 100644 (file)
--- a/media-sound/mpg123/mpg123-0.59s-r11.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r11.ebuild,v 1.2 2006/06/06 21:55:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r11.ebuild,v 1.3 2006/06/07 07:17:22 eradicator Exp $
 
 inherit eutils toolchain-funcs
 
@@ -24,7 +24,8 @@ RDEPEND="esd? ( media-sound/esound )
 # alsa-1 b0rks and it's not a simple fix
 #       alsa? ( media-libs/alsa-lib )"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+       dev-lang/perl"
 
 PROVIDE="virtual/mpg123"
 
@@ -53,6 +54,10 @@ src_unpack() {
        sed -i "s:${PV}-mh4:${PVR}:" version.h
 
        epatch "${FILESDIR}/${P}-gmake-3.81.patch"
+
+       # Bug #130577
+       perl -e 'my @text = <STDIN>; my $str = join "",@text; $str =~ s/\\\n//gs; print $str' < Makefile > Makefile.fixed
+       mv Makefile.fixed Makefile
 }
 
 src_compile() {