Fix building with GCC 4.1 and respect compiler, CFLAGS and LDFLAGS. Thanks to Patrick Lauer in bug #153097.

Package-Manager: portage-2.1.2_pre3-r9

5 files changed, 60 insertions, 10 deletions

diff --git a/media-sound/kaconnect/ChangeLog b/media-sound/kaconnect/ChangeLog
index 4fb49632ff40..af20caec8ccf 100644
--- a/media-sound/kaconnect/ChangeLog
+++ b/media-sound/kaconnect/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/kaconnect
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/ChangeLog,v 1.9 2005/07/25 15:55:24 caleb Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/ChangeLog,v 1.10 2006/10/28 01:55:17 flameeyes Exp $
+
+  28 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kaconnect-1.1.1-gcc41.patch, kaconnect-1.1.1.ebuild:
+  Fix building with GCC 4.1 and respect compiler, CFLAGS and LDFLAGS. Thanks
+  to Patrick Lauer in bug #153097.
 
   25 Jul 2005; Caleb Tennis <caleb@gentoo.org> kaconnect-1.1.1.ebuild:
   Change dep per bug #100235
diff --git a/media-sound/kaconnect/Manifest b/media-sound/kaconnect/Manifest
index ed61ed646624..b11a42005268 100644
--- a/media-sound/kaconnect/Manifest
+++ b/media-sound/kaconnect/Manifest
@@ -1,4 +1,30 @@
-MD5 c2618643c96f5bc072163d76a5edc345 kaconnect-1.1.1.ebuild 839
-MD5 9710b0909aff16282b1fad5d81cd2c57 ChangeLog 1120
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kaconnect-1.1.1-gcc41.patch 575 RMD160 7826f2efa9206dab125e2cb424154b1e50aa0724 SHA1 985006c2273a45721a43f0ee26861eb493be053d SHA256 381aa8273851d2fc778e77c537e38a55f2172275d872b32d2d50dc6a4e1bbbd1
+MD5 751c4092519cd735b19a61d2f1eff3c8 files/kaconnect-1.1.1-gcc41.patch 575
+RMD160 7826f2efa9206dab125e2cb424154b1e50aa0724 files/kaconnect-1.1.1-gcc41.patch 575
+SHA256 381aa8273851d2fc778e77c537e38a55f2172275d872b32d2d50dc6a4e1bbbd1 files/kaconnect-1.1.1-gcc41.patch 575
+DIST kaconnect-1.1.1.tar.bz2 14178 RMD160 4a38c843c2de9ac4611c496a18addcff6657f80b SHA1 525dc68d7ecc6e1d14477e105b897db9eb60fa6d SHA256 4b6254aaa2dd2457053cf4d6790bb1aca72f778474defd2d07f430d9396b9e8b
+EBUILD kaconnect-1.1.1.ebuild 974 RMD160 c81b9859d9a8abb3637f866de445e46931a3da3a SHA1 dd4caa9ed3fb940701991305053fd24c6795a3ec SHA256 30dbe14e586a1b97afd93fecbff375c8c768abf015985e13b7b518f67c4ca5fb
+MD5 97941da744e3b019bbb88646fd0a7898 kaconnect-1.1.1.ebuild 974
+RMD160 c81b9859d9a8abb3637f866de445e46931a3da3a kaconnect-1.1.1.ebuild 974
+SHA256 30dbe14e586a1b97afd93fecbff375c8c768abf015985e13b7b518f67c4ca5fb kaconnect-1.1.1.ebuild 974
+MISC ChangeLog 1353 RMD160 f2ac4e1994036c32b8381e8fcff5730503df3271 SHA1 197f825af185c10bf3aeb897cfaa155e2dbb285d SHA256 f9385e7321e70c5b1717f2bd6442cc410ed7175f2436f818cd49a52bb036525a
+MD5 fdbc328e1aef5d332537352ecf40a57e ChangeLog 1353
+RMD160 f2ac4e1994036c32b8381e8fcff5730503df3271 ChangeLog 1353
+SHA256 f9385e7321e70c5b1717f2bd6442cc410ed7175f2436f818cd49a52bb036525a ChangeLog 1353
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 98997067af96998c349ab336b8b097f9 files/digest-kaconnect-1.1.1 67
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 8498ac226c733be44390102dccaeacbe files/digest-kaconnect-1.1.1 247
+RMD160 03e3305d9a85b8b08dfa93a5c7cd43d33c1a9a6c files/digest-kaconnect-1.1.1 247
+SHA256 7d82cd87c4bec4d051631c49226e69d1eb0d8e5b2e148fbf5a6b21671fdd0d84 files/digest-kaconnect-1.1.1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFQriLAiZjviIA2XgRAit2AJ92yzd+BbrssGxY0pB5arpbbcSzdACg7zlr
+DrhfkcZ7HDbzw7g0RG34w+I=
+=KxFj
+-----END PGP SIGNATURE-----
diff --git a/media-sound/kaconnect/files/digest-kaconnect-1.1.1 b/media-sound/kaconnect/files/digest-kaconnect-1.1.1
index e7ace5a3bf02..33788ee5b047 100644
--- a/media-sound/kaconnect/files/digest-kaconnect-1.1.1
+++ b/media-sound/kaconnect/files/digest-kaconnect-1.1.1
@@ -1 +1,3 @@
 MD5 df012e2d7062f9055a031e74fb10f217 kaconnect-1.1.1.tar.bz2 14178
+RMD160 4a38c843c2de9ac4611c496a18addcff6657f80b kaconnect-1.1.1.tar.bz2 14178
+SHA256 4b6254aaa2dd2457053cf4d6790bb1aca72f778474defd2d07f430d9396b9e8b kaconnect-1.1.1.tar.bz2 14178
diff --git a/media-sound/kaconnect/files/kaconnect-1.1.1-gcc41.patch b/media-sound/kaconnect/files/kaconnect-1.1.1-gcc41.patch
new file mode 100644
index 000000000000..bbf0d8088a8c
--- /dev/null
+++ b/media-sound/kaconnect/files/kaconnect-1.1.1-gcc41.patch
@@ -0,0 +1,13 @@
+Index: kaconnect-1.1.1/connector.h
+===================================================================
+--- kaconnect-1.1.1.orig/connector.h
++++ kaconnect-1.1.1/connector.h
+@@ -24,7 +24,7 @@ class ConnectorWidget : public QWidget {
+         void arrow(int x1, int y1, int x2, int y2); 
+    
+     public:
+-        ConnectorWidget::ConnectorWidget(QWidget *parent, snd_seq_t *pseq); 
++        ConnectorWidget(QWidget *parent, snd_seq_t *pseq); 
+         void set_r_listBox(PortListBox *p_r_portlist);
+         void set_w_listBox(PortListBox *p_w_portlist);
+                    
diff --git a/media-sound/kaconnect/kaconnect-1.1.1.ebuild b/media-sound/kaconnect/kaconnect-1.1.1.ebuild
index 8176bce1047f..33fc797ce1ee 100644
--- a/media-sound/kaconnect/kaconnect-1.1.1.ebuild
+++ b/media-sound/kaconnect/kaconnect-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/kaconnect-1.1.1.ebuild,v 1.10 2005/07/25 15:55:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/kaconnect-1.1.1.ebuild,v 1.11 2006/10/28 01:55:17 flameeyes Exp $
 
-inherit qt3
+inherit qt3 toolchain-funcs eutils
 
 IUSE=""
 
@@ -23,11 +23,15 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A} || die
 
-	sed -i 's:/usr/lib/qt3:/usr/qt/3:g' ${S}/make_kaconnect
+	sed -i -e 's:/usr/lib/qt3:/usr/qt/3:g' \
+		's:gcc:${CC} ${CFLAGS} ${LDFLAGS}:g' \
+		"${S}/make_kaconnect"
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
 }
 
 src_compile() {
-	make -f make_kaconnect || die "Make failed."
+	emake CC="$(tc-getCC)" -f make_kaconnect || die "Make failed."
 }
 
 src_install () {