Drop virtual/libc dependency. Respect CC and LDFLAGS, don't strip binaries unconditionally.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 51 insertions, 14 deletions

diff --git a/media-sound/cmix/ChangeLog b/media-sound/cmix/ChangeLog
index 8c08209a7864..7ebad2f8c625 100644
--- a/media-sound/cmix/ChangeLog
+++ b/media-sound/cmix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/cmix
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmix/ChangeLog,v 1.9 2005/09/04 10:35:00 flameeyes Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmix/ChangeLog,v 1.10 2006/03/07 14:03:52 flameeyes Exp $
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/cmix-1.6-ldflags.patch, cmix-1.6.ebuild:
+  Drop virtual/libc dependency. Respect CC and LDFLAGS, don't strip binaries
+  unconditionally.
 
   04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> cmix-1.6.ebuild:
   Don't install COPYING file.
diff --git a/media-sound/cmix/Manifest b/media-sound/cmix/Manifest
index 40e23094a26f..ddbfc04610af 100644
--- a/media-sound/cmix/Manifest
+++ b/media-sound/cmix/Manifest
@@ -1,14 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 804ed737b735d9722ef0617a88fb8d52 ChangeLog 813
-MD5 dcddef402b2a96b9712a41fccc45d848 cmix-1.6.ebuild 633
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 01f80751ad3bdf011fa0497a1b8863f9 ChangeLog 1014
+RMD160 4ae37838bbe5272e0559433a841fd66e0089548f ChangeLog 1014
+SHA256 9f7054f939ecf08ea9d5000fc2f4ec06fd7b108cb52425aadf367644d9894990 ChangeLog 1014
+MD5 3a4357f80d42134318e4b0c971be52ea cmix-1.6.ebuild 756
+RMD160 1d29fdeb009528118ae4127655c865a1293f18d0 cmix-1.6.ebuild 756
+SHA256 c4b479cf8c90bf357ab11ed69c6287aec31d8360d9eed6b316b24a3e333a7872 cmix-1.6.ebuild 756
+MD5 05f65a14e0059e4d7dce129bee3d7d8d files/cmix-1.6-ldflags.patch 296
+RMD160 28c6e2627522409d643e972f19964d50e60fc536 files/cmix-1.6-ldflags.patch 296
+SHA256 25fffb41722ae8f8a8d7cbbd7a9069bef1c3f3422a19d3b475bacb117945f2de files/cmix-1.6-ldflags.patch 296
 MD5 d5fd0bc80214a2081086243b86dfbb14 files/digest-cmix-1.6 57
+RMD160 72328d2bc448aad5b5ccfe73f2e7b064704d80ae files/digest-cmix-1.6 57
+SHA256 e06df1c15bc0f188f361d2e8118a86557cf192cb5067f2879472f44d9ecffc93 files/digest-cmix-1.6 57
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDGs3rj5H05b2HAEkRAhUtAJ9UwL5aUEwP6gLUfIR7+ZsoIklnjACfS6yQ
-nA4DPRIu11H174M2e66cYh8=
-=0D+d
+iD8DBQFEDZLVAiZjviIA2XgRAjnGAKCH1KNHcvMoqiEdheS0PEmc3kEmdgCgvzJ3
+te3ViYPamc7GWcb7f7x5an0=
+=q4/A
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cmix/cmix-1.6.ebuild b/media-sound/cmix/cmix-1.6.ebuild
index 5a1db03039a8..a46c8fb215bc 100644
--- a/media-sound/cmix/cmix-1.6.ebuild
+++ b/media-sound/cmix/cmix-1.6.ebuild
@@ -1,6 +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/cmix/cmix-1.6.ebuild,v 1.13 2005/09/04 10:35:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmix/cmix-1.6.ebuild,v 1.14 2006/03/07 14:03:52 flameeyes Exp $
+
+inherit eutils toolchain-funcs
 
 IUSE=""
 
@@ -10,13 +12,18 @@ SRC_URI="http://antipoder.dyndns.org/downloads/${P}.tbz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-#-amd64: 1.6: 'cmix list' gives: MIXER_READ(SOUND_MIXER_OUTSRC): Input/output error 
+#-amd64: 1.6: 'cmix list' gives: MIXER_READ(SOUND_MIXER_OUTSRC): Input/output error
 KEYWORDS="-amd64 ~ppc sparc x86"
 
-DEPEND="virtual/libc"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
 
 src_compile() {
-	make || die
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
diff --git a/media-sound/cmix/files/cmix-1.6-ldflags.patch b/media-sound/cmix/files/cmix-1.6-ldflags.patch
new file mode 100644
index 000000000000..ba8dacb2567b
--- /dev/null
+++ b/media-sound/cmix/files/cmix-1.6-ldflags.patch
@@ -0,0 +1,14 @@
+Index: cmix-1.6/Makefile
+===================================================================
+--- cmix-1.6.orig/Makefile
++++ cmix-1.6/Makefile
+@@ -3,8 +3,7 @@ CC=gcc
+ #CFLAGS=-Wall -O2
+ 
+ cmix: mix.c
+-	$(CC) $(CFLAGS) mix.c -o $@
+-	strip $@
++	$(CC) $(CFLAGS) $(LDFLAGS) mix.c -o $@
+ 
+ install: 
+