Force a decent behaviour with respect to C(XX)FLAGS.

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 123 insertions, 16 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 52235c6a7d97..26383b0b5148 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsaplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.47 2006/07/09 17:14:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.48 2006/07/09 17:33:43 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsaplayer-0.99.76-cxxflags.patch, alsaplayer-0.99.76-r3.ebuild:
+  Force a decent behaviour with respect to C(XX)FLAGS.
 
   09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   -alsaplayer-0.99.76.ebuild, -alsaplayer-0.99.76-r1.ebuild:
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index ec03575a48fb..08eb8aa3f060 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX alsaplayer-0.99.76-cxxflags.patch 3510 RMD160 18bdfb435ce1015a0d3ca47e411921c1988ce4fb SHA1 b1344de788aedee3a7ccb5dea7420927341f6c9f SHA256 bf1fc6280e2736776cb1af65ebde0057b84c99c29876c7492905fe60d8ca2ac2
+MD5 b499a2ef3a20f7596fb8745a3a93a528 files/alsaplayer-0.99.76-cxxflags.patch 3510
+RMD160 18bdfb435ce1015a0d3ca47e411921c1988ce4fb files/alsaplayer-0.99.76-cxxflags.patch 3510
+SHA256 bf1fc6280e2736776cb1af65ebde0057b84c99c29876c7492905fe60d8ca2ac2 files/alsaplayer-0.99.76-cxxflags.patch 3510
 AUX alsaplayer-0.99.76-join-null-thread.patch 403 RMD160 3c52425ce11b59a380ebef93dd930ed6ba6c4aa3 SHA1 71db6d68d058ed80418e88dc0373c34b9ae55808 SHA256 2a2aa08401ce9670e339d375e25b62eebc337c4a4c3996b83c0a48fe90e4ce25
 MD5 91839b065ffbc9ecf2b5e01ce8b05223 files/alsaplayer-0.99.76-join-null-thread.patch 403
 RMD160 3c52425ce11b59a380ebef93dd930ed6ba6c4aa3 files/alsaplayer-0.99.76-join-null-thread.patch 403
@@ -14,14 +18,14 @@ EBUILD alsaplayer-0.99.76-r2.ebuild 1984 RMD160 c88607133e1eabd9c178250f688c32c6
 MD5 ed53143ce5c2ee9a838121fe5f3dba40 alsaplayer-0.99.76-r2.ebuild 1984
 RMD160 c88607133e1eabd9c178250f688c32c6980baf5a alsaplayer-0.99.76-r2.ebuild 1984
 SHA256 e59f3319f1e70d8575bab8783470f95c7fb82eadeab109c9fd5f0cbe6aaec1fc alsaplayer-0.99.76-r2.ebuild 1984
-EBUILD alsaplayer-0.99.76-r3.ebuild 2031 RMD160 c045ba96b31f9d2c517356981a02a4d40484963d SHA1 197ebabca7990634c7d72d6d7871902e61bf7f4a SHA256 786e21c1d7b19d6e034a181b4650a6687d05ea1b0adcc7c904472343d7061f04
-MD5 16eb5ca24007ec33f6bcb86deef6e73d alsaplayer-0.99.76-r3.ebuild 2031
-RMD160 c045ba96b31f9d2c517356981a02a4d40484963d alsaplayer-0.99.76-r3.ebuild 2031
-SHA256 786e21c1d7b19d6e034a181b4650a6687d05ea1b0adcc7c904472343d7061f04 alsaplayer-0.99.76-r3.ebuild 2031
-MISC ChangeLog 7813 RMD160 610f85249d693edd5c13717fecccc20fbad404a6 SHA1 a2c3d02f31b9cd6e8b9319467233a8aa9147b079 SHA256 6a776317f9c63719f411b9c828886e620df3820912b50c408bd99e165c868005
-MD5 5ce75485a2ce4aeaa6633791c3380fe2 ChangeLog 7813
-RMD160 610f85249d693edd5c13717fecccc20fbad404a6 ChangeLog 7813
-SHA256 6a776317f9c63719f411b9c828886e620df3820912b50c408bd99e165c868005 ChangeLog 7813
+EBUILD alsaplayer-0.99.76-r3.ebuild 2131 RMD160 9926a21b5b4224691ee78b29be4d17d564425026 SHA1 160fccc3d8c8fac60a0284e86ba3bc3f2cdd3d13 SHA256 2a59406531823b231db64d2038730a4bf9746d33a176ef595c4bdb967ccb8818
+MD5 609e0ca79dde2ae0366362d5d15ee289 alsaplayer-0.99.76-r3.ebuild 2131
+RMD160 9926a21b5b4224691ee78b29be4d17d564425026 alsaplayer-0.99.76-r3.ebuild 2131
+SHA256 2a59406531823b231db64d2038730a4bf9746d33a176ef595c4bdb967ccb8818 alsaplayer-0.99.76-r3.ebuild 2131
+MISC ChangeLog 7996 RMD160 775ff580a8cc35325b9b8ff09fe645928385022e SHA1 f179a0f7439fe5f91a8b0f36d32978ff32b5ddfe SHA256 402c11978eb7099d6041c836c6770f54ba63122f13a73f454d94bceadad7638f
+MD5 9d15e79b8298dce7769f2308a1bce296 ChangeLog 7996
+RMD160 775ff580a8cc35325b9b8ff09fe645928385022e ChangeLog 7996
+SHA256 402c11978eb7099d6041c836c6770f54ba63122f13a73f454d94bceadad7638f ChangeLog 7996
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -35,7 +39,7 @@ SHA256 27c3e62bf65642d84df1ac006aafe8784874e1f126aa7c4ec5489ae4dd7f0862 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEsTloAiZjviIA2XgRAkkcAJwNPAMwF6AltmR+xS58QFKHqegzywCeNEpx
-91fHQikpLdYYnks2jndrU5I=
-=Oskb
+iD8DBQFEsT3+AiZjviIA2XgRAuZMAJ4+ct25pSBOMnXyvYNEyooO1BCanQCg5nsa
+rMfuyImzz4pCR0yRfNjS8+U=
+=aSz3
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.76-r3.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.76-r3.ebuild
index 852dd945c531..d4e4bd27061f 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.76-r3.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.76-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76-r3.ebuild,v 1.4 2006/04/28 19:22:00 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76-r3.ebuild,v 1.5 2006/07/09 17:33:43 flameeyes Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Media player primarily utilising ALSA"
 HOMEPAGE="http://www.alsaplayer.org/"
@@ -40,6 +40,9 @@ src_unpack() {
 	fi
 
 	epatch "${FILESDIR}/${P}-join-null-thread.patch"
+	epatch "${FILESDIR}/${P}-cxxflags.patch"
+
+	eautoreconf
 }
 
 src_compile() {
@@ -69,13 +72,14 @@ src_compile() {
 		$(use_enable vorbis oggvorbis) \
 		${myconf} \
 		--disable-gtk \
-		--disable-sgi --disable-dependency-tracking
+		--disable-sgi --disable-dependency-tracking \
+		|| die "econf failed"
 
 	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} docdir=${D}/usr/share/doc/${PF} install \
+	emake DESTDIR="${D}" docdir="${D}/usr/share/doc/${PF}" install \
 		|| die "make install failed"
 
 	dodoc AUTHORS ChangeLog README TODO
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.76-cxxflags.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.76-cxxflags.patch
new file mode 100644
index 000000000000..875b940e825f
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.76-cxxflags.patch
@@ -0,0 +1,95 @@
+Index: alsaplayer-0.99.76/configure.ac
+===================================================================
+--- alsaplayer-0.99.76.orig/configure.ac
++++ alsaplayer-0.99.76/configure.ac
+@@ -585,17 +585,6 @@ AM_CONDITIONAL(ARCH_686,test "$ARCH_TYPE
+ AM_CONDITIONAL(ARCH_PPC,test "$ARCH_TYPE" = "ppc")
+ AM_CONDITIONAL(ARCH_ULTRA,test "$ARCH_TYPE" = "sun4u")
+ 
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -O2 -fexpensive-optimizations -funroll-loops -finline-functions -ffast-math -Wall"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-O2 -fexpensive-optimizations -funroll-loops -finline-functions -ffast-math -Wall"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+-ARCH_CFLAGS="$EXTRA_OPT_CFLAGS $CFLAGS"
+-
+ if test "$ARCH_TYPE" = "i486" || test "$ARCH_TYPE" = "i586" || test "$ARCH_TYPE" = "i686"
+ then
+ 	AC_DEFINE(ARCH_X86, 1, [Define if on x86 platform])
+Index: alsaplayer-0.99.76/app/Makefile.am
+===================================================================
+--- alsaplayer-0.99.76.orig/app/Makefile.am
++++ alsaplayer-0.99.76/app/Makefile.am
+@@ -27,7 +27,6 @@ INCLUDES = -I$(top_srcdir)/alsaplayer -I
+ 
+ AM_CXXFLAGS = $(COMMON_FLAGS)
+ 
+-AM_CFLAGS = $(CXXFLAGS)
+ 
+ bin_PROGRAMS = alsaplayer
+ 
+Index: alsaplayer-0.99.76/input/mad/Makefile.am
+===================================================================
+--- alsaplayer-0.99.76.orig/input/mad/Makefile.am
++++ alsaplayer-0.99.76/input/mad/Makefile.am
+@@ -28,8 +28,6 @@ COMMON_CFLAGS = -I$(top_builddir) -I$(to
+ 
+ AM_CFLAGS = $(COMMON_CFLAGS)
+ 
+-AM_CXXFLAGS = $(CFLAGS)
+-
+ INCLUDES = -I$(ROOT_DIR)/app $(GLIB_CFLAGS)
+ 
+ libmad_in_la_SOURCES = $(mad_insources)
+Index: alsaplayer-0.99.76/interface/daemon/Makefile.am
+===================================================================
+--- alsaplayer-0.99.76.orig/interface/daemon/Makefile.am
++++ alsaplayer-0.99.76/interface/daemon/Makefile.am
+@@ -10,7 +10,6 @@ AM_CXXFLAGS = @DFLAGS@ $(COMMON_FLAGS) \
+ 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
+ 		-DADDON_DIR=\"$(ADDON_DIR)\"
+ 
+-AM_CFLAGS = $(CXXFLAGS)
+ 
+ libdir = $(ADDON_DIR)/interface
+ 
+Index: alsaplayer-0.99.76/interface/gtk/Makefile.am
+===================================================================
+--- alsaplayer-0.99.76.orig/interface/gtk/Makefile.am
++++ alsaplayer-0.99.76/interface/gtk/Makefile.am
+@@ -25,7 +25,6 @@ AM_CXXFLAGS = -I$(top_builddir) -I$(top_
+ 		@GLIB_CFLAGS@ @GTK_CFLAGS@ $(COMMON_FLAGS) \
+ 		-D_REENTRANT -DADDON_DIR=\"$(ADDON_DIR)\"
+ 
+-AM_CFLAGS = $(CXXFLAGS)
+ 
+ libdir = $(ADDON_DIR)/interface
+ 
+Index: alsaplayer-0.99.76/interface/text/Makefile.am
+===================================================================
+--- alsaplayer-0.99.76.orig/interface/text/Makefile.am
++++ alsaplayer-0.99.76/interface/text/Makefile.am
+@@ -10,7 +10,6 @@ AM_CXXFLAGS = @DFLAGS@ $(COMMON_FLAGS) \
+ 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
+ 		-DADDON_DIR=\"$(ADDON_DIR)\"
+ 
+-AM_CFLAGS = $(CXXFLAGS)
+ 
+ libdir = $(ADDON_DIR)/interface
+ 
+Index: alsaplayer-0.99.76/interface/xosd/Makefile.am
+===================================================================
+--- alsaplayer-0.99.76.orig/interface/xosd/Makefile.am
++++ alsaplayer-0.99.76/interface/xosd/Makefile.am
+@@ -22,7 +22,6 @@ AM_CXXFLAGS = @DFLAGS@ $(COMMON_FLAGS) \
+ 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
+ 		-DADDON_DIR=\"$(ADDON_DIR)\"
+ 
+-AM_CFLAGS = $(CXXFLAGS)
+ 
+ libdir = $(ADDON_DIR)/interface
+