GCC 4.2.2 really hates the -faltivec this build system wants to specify, remove it so USE=altivec can actually be used. Quote some vars in an older ebuild to make repoman happy.

Package-Manager: portage-2.1.3.15

5 files changed, 58 insertions, 21 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 83a6da58ecee..afe6059cf9f9 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.119 2007/09/18 14:37:36 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.120 2007/10/21 15:27:14 chainsaw Exp $
+
+  21 Oct 2007; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.67-no-faltivec.patch, mpg123-0.67.ebuild:
+  GCC 4.2.2 really hates the -faltivec this build system wants to specify,
+  remove it so USE=altivec can actually be used.
 
 *mpg123-0.67 (18 Sep 2007)
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 5c808dc4d5e9..e78c04d7db4c 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.59s-set-terminal-line-settings-once.patch 767 RMD160 7fe4d8c799ff633511b825d6cf624aba73900efa SHA1 c53183f5581e20cb267b77fe0e2f9da9db495051 SHA256 b4c350475b6392a6fdc1b54141665112c829e02111e3080eb0c49f4edaf7a412
 MD5 a147137fdcd756dd021b9807a2fae2b6 files/0.59s-set-terminal-line-settings-once.patch 767
 RMD160 7fe4d8c799ff633511b825d6cf624aba73900efa files/0.59s-set-terminal-line-settings-once.patch 767
 SHA256 b4c350475b6392a6fdc1b54141665112c829e02111e3080eb0c49f4edaf7a412 files/0.59s-set-terminal-line-settings-once.patch 767
+AUX 0.67-no-faltivec.patch 424 RMD160 347c74b29a83a20b950a1c0c6e7e00fa0f1492b0 SHA1 053a548788c69a1e1ee2d17ce4e1e62639134e48 SHA256 66afa6aa654f38abb114c67f69ae23842d8e41d5936dacc55d81034c38050d45
+MD5 ce969d9d187eaabd20c3c66e89f52743 files/0.67-no-faltivec.patch 424
+RMD160 347c74b29a83a20b950a1c0c6e7e00fa0f1492b0 files/0.67-no-faltivec.patch 424
+SHA256 66afa6aa654f38abb114c67f69ae23842d8e41d5936dacc55d81034c38050d45 files/0.67-no-faltivec.patch 424
 AUX mpg123-0.59s-gmake-3.81.patch 7489 RMD160 698ffe24b926ffb6de7afe50b0e2ba8d7928f4d8 SHA1 e3e6604a85202bf572d317332ad8c3f8071d064d SHA256 cadb1ad75b36efd853ad0e1637db3d88ec37b6bb4e1726e025e21676c7507438
 MD5 1afa21b956e382825339b141255014eb files/mpg123-0.59s-gmake-3.81.patch 7489
 RMD160 698ffe24b926ffb6de7afe50b0e2ba8d7928f4d8 files/mpg123-0.59s-gmake-3.81.patch 7489
@@ -18,22 +25,22 @@ DIST mpg123-0.59s-gentoo-1.6.tar.bz2 7311 RMD160 393f10020bb15a813cc53570926be27
 DIST mpg123-0.65.tar.bz2 529154 RMD160 f28f79425a41cd71d9cca7e817fd3c010f71ab30 SHA1 984a1ce7f0705a15ce3afb9538615cc82cd1ea7c SHA256 091f0b29e630530b42c4a06671d14a7a9acc0b0cadad90edcf1983e798691e0b
 DIST mpg123-0.67.tar.bz2 559725 RMD160 29a8343a08d01ed5ff5462b4a90e95f13db29b89 SHA1 caf70343893a83cf8d9233b50ee67e8bc35cbd96 SHA256 af19eeb8898639491e9d8ebfc14e79cf0dd7f3776d20b4baa03685626882fd54
 DIST mpg123-pre0.59s.tar.gz 244899 RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f SHA1 7e521785dc3a9015f4228f0a118bf36856884b67 SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a
-EBUILD mpg123-0.59s-r11.ebuild 3560 RMD160 5329eb38287bbec816f7ff24945a2adba926456e SHA1 65b3e8fff243a0d5e969cd9dfa333732693914cf SHA256 abb8074156f06ae5590b2f6ebc92c6b3dce7dc2ba78dd0677f5ffd9539db75b2
-MD5 b1beb57e4e478ab4ddf65a68c529e0c4 mpg123-0.59s-r11.ebuild 3560
-RMD160 5329eb38287bbec816f7ff24945a2adba926456e mpg123-0.59s-r11.ebuild 3560
-SHA256 abb8074156f06ae5590b2f6ebc92c6b3dce7dc2ba78dd0677f5ffd9539db75b2 mpg123-0.59s-r11.ebuild 3560
+EBUILD mpg123-0.59s-r11.ebuild 3571 RMD160 37c54519b30aeb05f6bf740d43393c3aede7c6f5 SHA1 b2db14bca004e9b391e30f2c843202430f209e30 SHA256 c0f264ca1b34ab9291f2a2f4e877cca6f9ed2b401cf9bcb179e8bc62c8871e9a
+MD5 a8c38ef49c81da268c4546f2cbc6fbe7 mpg123-0.59s-r11.ebuild 3571
+RMD160 37c54519b30aeb05f6bf740d43393c3aede7c6f5 mpg123-0.59s-r11.ebuild 3571
+SHA256 c0f264ca1b34ab9291f2a2f4e877cca6f9ed2b401cf9bcb179e8bc62c8871e9a mpg123-0.59s-r11.ebuild 3571
 EBUILD mpg123-0.65.ebuild 1895 RMD160 5de7c1067f544dd7331ac48a63d33b36f4d2eb59 SHA1 ed0090b3e0d78a0566d5629508f96c97389a7f7f SHA256 fcbbe10708a26aa2d870032530388cf7c48d397657db561b442d39337725ff78
 MD5 c829052abc4a15b408bba40d04087dcc mpg123-0.65.ebuild 1895
 RMD160 5de7c1067f544dd7331ac48a63d33b36f4d2eb59 mpg123-0.65.ebuild 1895
 SHA256 fcbbe10708a26aa2d870032530388cf7c48d397657db561b442d39337725ff78 mpg123-0.65.ebuild 1895
-EBUILD mpg123-0.67.ebuild 2054 RMD160 e7516f7562eac29afc131146a1c2ea5bbd6b0093 SHA1 a0d037d832a71eba47399fab2539e844a1c1a7ac SHA256 416a8f6727a60d621a64474623070258ca52a748671eb84bc68713efb409f52d
-MD5 7369d144ea8a8655a8bb7eaf19e4a98e mpg123-0.67.ebuild 2054
-RMD160 e7516f7562eac29afc131146a1c2ea5bbd6b0093 mpg123-0.67.ebuild 2054
-SHA256 416a8f6727a60d621a64474623070258ca52a748671eb84bc68713efb409f52d mpg123-0.67.ebuild 2054
-MISC ChangeLog 17934 RMD160 facf6810db3b95be562cfc70164aa3f8a5a46f8e SHA1 ccd318486979e0cac1aea9acf453752190561d30 SHA256 b6499d416b0e8065ba63a7e64678e80bc239e4681336f5517dba212c782a720d
-MD5 1f654b9fbdd7952c4aa6d90b01b15b92 ChangeLog 17934
-RMD160 facf6810db3b95be562cfc70164aa3f8a5a46f8e ChangeLog 17934
-SHA256 b6499d416b0e8065ba63a7e64678e80bc239e4681336f5517dba212c782a720d ChangeLog 17934
+EBUILD mpg123-0.67.ebuild 2171 RMD160 f0c69f0deaca9c7f37b68169a3073289bb73ad5e SHA1 ed509b0b79a651563182417c240fa78c0f6cc0fe SHA256 65abfdb44b7597a41b8dd8a364ccc72c6865ae6b76810fc39b773c11b6a6eb09
+MD5 a389ba0929b8f4738703c39a6b307d92 mpg123-0.67.ebuild 2171
+RMD160 f0c69f0deaca9c7f37b68169a3073289bb73ad5e mpg123-0.67.ebuild 2171
+SHA256 65abfdb44b7597a41b8dd8a364ccc72c6865ae6b76810fc39b773c11b6a6eb09 mpg123-0.67.ebuild 2171
+MISC ChangeLog 18164 RMD160 cd80e1118b8126d2b4574873a549dfa0c4872c75 SHA1 6c011c8929278bdd7d0b6d0f0d61332297a21f84 SHA256 99afabbaadc426d68eb4b45307cb25ab008d288af07094b46a8b627d34bbe30a
+MD5 e527e32bf5f3563a050584dbd499173e ChangeLog 18164
+RMD160 cd80e1118b8126d2b4574873a549dfa0c4872c75 ChangeLog 18164
+SHA256 99afabbaadc426d68eb4b45307cb25ab008d288af07094b46a8b627d34bbe30a ChangeLog 18164
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -47,3 +54,10 @@ SHA256 9810f4997d4a47b19fe8a162382e25388f4aeec9a460ef23083ce2c7e90634b6 files/di
 MD5 c2932338daf1a486e01dfedce680a62a files/digest-mpg123-0.67 238
 RMD160 02ee89ecb771bd817624756221b15ee00e402bb2 files/digest-mpg123-0.67 238
 SHA256 6d82d90f276538969333828b14e687fb41daedb27ab84fd3b7b0aa723aef2c37 files/digest-mpg123-0.67 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHG28+p5vW4rUFj5oRAskcAKCxRvUHWlrJShqEVNMWYKEZjbbbYQCeJ1cc
+EBNv1oDq82qpOZlkskAaAY4=
+=Fzgl
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpg123/files/0.67-no-faltivec.patch b/media-sound/mpg123/files/0.67-no-faltivec.patch
new file mode 100644
index 000000000000..23af449477f5
--- /dev/null
+++ b/media-sound/mpg123/files/0.67-no-faltivec.patch
@@ -0,0 +1,11 @@
+--- mpg123-0.67/configure.ac.orig	2007-10-21 16:07:05.000000000 +0100
++++ mpg123-0.67/configure.ac	2007-10-21 16:07:24.000000000 +0100
+@@ -445,7 +445,7 @@
+     CFLAGS="$CFLAGS -DOPT_GENERIC -DREAL_IS_FIXED"
+   ;;
+   altivec)
+-    CFLAGS="$CFLAGS -maltivec -faltivec -DREAL_IS_FLOAT -DOPT_ALTIVEC"
++    CFLAGS="$CFLAGS -maltivec -DREAL_IS_FLOAT -DOPT_ALTIVEC"
+   ;;
+   i386) 
+     CFLAGS="$CFLAGS -DOPT_I386 -DREAL_IS_FLOAT"
diff --git a/media-sound/mpg123/mpg123-0.59s-r11.ebuild b/media-sound/mpg123/mpg123-0.59s-r11.ebuild
index 6f0ab87ce78a..092e3616f9a8 100644
--- a/media-sound/mpg123/mpg123-0.59s-r11.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.12 2007/03/02 12:47:10 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r11.ebuild,v 1.13 2007/10/21 15:27:14 chainsaw Exp $
 
 inherit eutils toolchain-funcs
 
@@ -34,21 +34,21 @@ PATCHDIR="${WORKDIR}/patches"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 
 	EPATCH_SUFFIX="patch"
 	epatch ${PATCHDIR}
 
 	# Bug #70592; terminal line settings should only be set once; not everytime a new song starts
-	epatch ${FILESDIR}/${PV}-set-terminal-line-settings-once.patch
+	epatch "${FILESDIR}/${PV}-set-terminal-line-settings-once.patch"
 
 	# Bug #87539; user CFLAGS are not respected on amd64
-	epatch ${FILESDIR}/${PN}-respectusercflags.patch
+	epatch "${FILESDIR}/${PN}-respectusercflags.patch"
 
 	if use ppc-macos;
 	then
 		einfo "Patching for OSX build"
-		epatch ${FILESDIR}/${PN}-osx.diff
+		epatch "${FILESDIR}/${PN}-osx.diff"
 	fi
 
 	sed -i "s:${PV}-mh4:${PVR}:" version.h
@@ -139,7 +139,7 @@ src_compile() {
 
 src_install() {
 	dodir /usr
-	cp -R gentoo-bin ${D}/usr/bin
+	cp -R gentoo-bin "${D}/usr/bin"
 	doman mpg123.1
 	dodoc BENCHMARKING BUGS CHANGES JUKEBOX README* TODO
 }
diff --git a/media-sound/mpg123/mpg123-0.67.ebuild b/media-sound/mpg123/mpg123-0.67.ebuild
index d1b278cef321..e4262ab0f455 100644
--- a/media-sound/mpg123/mpg123-0.67.ebuild
+++ b/media-sound/mpg123/mpg123-0.67.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.67.ebuild,v 1.2 2007/09/18 14:41:20 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.67.ebuild,v 1.3 2007/10/21 15:27:14 chainsaw Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Real Time mp3 player"
 HOMEPAGE="http://www.mpg123.de"
@@ -23,6 +23,13 @@ DEPEND="${RDEPEND}"
 
 PROVIDE="virtual/mpg123"
 
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-no-faltivec.patch"
+	eautoreconf
+}
+
 src_compile() {
 	local audiodev
 	if use alsa; then