Honour ldflags/cflags/cxxflags/cc/cxx, bug #240830, fix gcc 4.3 build, bug #251258

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 99 insertions, 3 deletions

diff --git a/media-sound/streamixer/ChangeLog b/media-sound/streamixer/ChangeLog
index b21fd1282e91..92cf0b202794 100644
--- a/media-sound/streamixer/ChangeLog
+++ b/media-sound/streamixer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/streamixer
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/streamixer/ChangeLog,v 1.8 2007/02/03 20:29:29 flameeyes Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamixer/ChangeLog,v 1.9 2008/12/19 17:50:23 aballier Exp $
+
+*streamixer-1.19.0-r1 (19 Dec 2008)
+
+  19 Dec 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/streamixer-1.19.0-gcc43.patch, +streamixer-1.19.0-r1.ebuild:
+  Honour ldflags/cflags/cxxflags/cc/cxx, bug #240830, fix gcc 4.3 build, bug
+  #251258
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-sound/streamixer/Manifest b/media-sound/streamixer/Manifest
index 3d1ee0b1e697..39faebff457c 100644
--- a/media-sound/streamixer/Manifest
+++ b/media-sound/streamixer/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX streamixer-1.19.0-gcc43.patch 632 RMD160 6a3b22b8f9f6ad57d3a3de8161e6b1d05a8afc6a SHA1 4fd52cce619031965b61ef77dd4ad56cf237bcc8 SHA256 93caed9d5519b69ea3cc9bd26a5294b2eb91432b80ed9c5410c8591b6f03ce73
 DIST streamixer-1.19.0.tar.bz2 40560 RMD160 c9b778b06b1c2a0484388cfc98e8297e8e4e58e7 SHA1 967f8db2764208229fc0ad334d61bfb72f70a098 SHA256 df47ce0f9617f592d81f1426cd97817495aa8a71e90169989a65f0cab9b5a2d8
+EBUILD streamixer-1.19.0-r1.ebuild 1487 RMD160 413ca924d8a8df03e79d5576d6b806e9b42a770f SHA1 ea5fcf493662bf7cd08b81dc7e7a38cef4bc62de SHA256 5014a8d9512e63dd8aa5abcb738ad9987488ad80539c5be3fe6f70182fb7e655
 EBUILD streamixer-1.19.0.ebuild 1232 RMD160 d36a02b43655ae82d1597ddcb029ee04ef293f2a SHA1 7a4d35252f50aab7abc271a8ac556f42e1ad3c8e SHA256 8cd2f0d7bf8c36ae7ea8acc7ca9db09bc609f8a39e274c6c1ce1ee74ce34490c
-MISC ChangeLog 1063 RMD160 8d11290ae1c9ddbbf5490e95e85d1d3b28a66b18 SHA1 46126b37b74111815e2697ff2dca6e52271d48fa SHA256 788a26c8510fc157d746d8b672cd8b722b8cd6fb9ab4eb1f26add106af5df5cb
+MISC ChangeLog 1309 RMD160 3e704c2c4c5033354e0218ef8ef42768a0d9d9d9 SHA1 2a01aabbb04261875bd78df981034aa4187f34c9 SHA256 07ce00e7374d64c72bf1568b160ca183e66fe910fa6e80f01a256ff2bf6ce4cf
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklL3uUACgkQvFcC4BYPU0oDowCghYONGa/m0kZGWh4sZ3/jcBdE
+ubkAoL4tpNiyPlf6oOUanqGDLjRfvXeE
+=xgMJ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/streamixer/files/streamixer-1.19.0-gcc43.patch b/media-sound/streamixer/files/streamixer-1.19.0-gcc43.patch
new file mode 100644
index 000000000000..036a3b7d4937
--- /dev/null
+++ b/media-sound/streamixer/files/streamixer-1.19.0-gcc43.patch
@@ -0,0 +1,24 @@
+Index: streamixer-1.19.0/argh/argh.cc
+===================================================================
+--- streamixer-1.19.0.orig/argh/argh.cc
++++ streamixer-1.19.0/argh/argh.cc
+@@ -1,6 +1,7 @@
+ #include <map>
+ #include <cstdio>
+ #include <cstring>
++#include <cstdlib>
+ 
+ using std::strchr;
+ using std::sprintf;
+Index: streamixer-1.19.0/mixer.cc
+===================================================================
+--- streamixer-1.19.0.orig/mixer.cc
++++ streamixer-1.19.0/mixer.cc
+@@ -6,6 +6,7 @@
+ #include <signal.h>
+ #include <unistd.h>
+ #include <vector>
++#include <cstring>
+ 
+ #include "soundtypes.h"
+ #include "serverfun.h"
diff --git a/media-sound/streamixer/streamixer-1.19.0-r1.ebuild b/media-sound/streamixer/streamixer-1.19.0-r1.ebuild
new file mode 100644
index 000000000000..5e136818a098
--- /dev/null
+++ b/media-sound/streamixer/streamixer-1.19.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamixer/streamixer-1.19.0-r1.ebuild,v 1.1 2008/12/19 17:50:23 aballier Exp $
+
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Various audio stream handling tools (non-interactive)"
+HOMEPAGE="http://bisqwit.iki.fi/source/streamixer.html"
+SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+#-sparc: 1.19.0: bad assembly
+KEYWORDS="~amd64 -sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="sys-apps/sed"
+IUSE=""
+
+INSTALLPROGS="resample mixer mixwrite mixeridle ecat hum mixerscript"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s:BINDIR=/usr/local/bin:BINDIR=${D}usr/bin:" \
+		-e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \
+		-e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \
+		-e "s:\$(CXX):\$(CXX) \$(CXXFLAGS) -I${S}/argh:g" \
+		Makefile
+
+	sed -i \
+		-e 's:CPPFLAGS=:CPPFLAGS=-I/var/tmp/portage/erec-2.2.0.1/work/erec-2.2.0.1/argh :' \
+		Makefile.sets
+
+	echo "" > .depend
+	echo "" > argh/.depend
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -C argh libargh.a || die
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${INSTALLPROGS} || die
+}
+
+src_install() {
+	dobin ${INSTALLPROGS}
+	dohard /usr/bin/mixwrite /usr/bin/mixmon
+	dodoc README
+	dohtml README.html
+}