Drop virtual/libc dependency. Respect CC, CFLAGS and LDFLAGS.

Package-Manager: portage-2.1_pre5-r4

5 files changed, 63 insertions, 15 deletions

diff --git a/media-sound/multimux/ChangeLog b/media-sound/multimux/ChangeLog
index 554591d5b03e..05ee485c2d17 100644
--- a/media-sound/multimux/ChangeLog
+++ b/media-sound/multimux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/multimux
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/multimux/ChangeLog,v 1.6 2005/10/31 22:29:34 matsuu Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/multimux/ChangeLog,v 1.7 2006/03/07 15:19:05 flameeyes Exp $
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/multimux-0.2.4-makefiles.patch, metadata.xml,
+  multimux-0.2.4.ebuild:
+  Drop virtual/libc dependency. Respect CC, CFLAGS and LDFLAGS.
 
 *multimux-0.2.4 (31 Oct 2005)
 
diff --git a/media-sound/multimux/Manifest b/media-sound/multimux/Manifest
index 9cf1a8771ef5..5aed0349cb61 100644
--- a/media-sound/multimux/Manifest
+++ b/media-sound/multimux/Manifest
@@ -1,8 +1,37 @@
-MD5 f29c09f8a2e23029f6c2a2e1bb651fbc multimux-0.2.3.ebuild 659
-MD5 038529ded9a3d6817e13b22d43055f2d multimux-0.1.ebuild 632
-MD5 21bd1cd3efe884c41178968613e3e222 ChangeLog 859
-MD5 6796af42a6e4fc8cb7d98b99b951ef94 multimux-0.2.4.ebuild 714
-MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 74ea170dfd2de244ae0aa962ff6e1fe2 ChangeLog 1060
+RMD160 d3a10792251d0706ec73c7a507ef0153fbf109f0 ChangeLog 1060
+SHA256 6b6ffdde0e2b8b77564b91c945b4d0bd8ab653bd7c032401ecb63b8622d4b521 ChangeLog 1060
+MD5 004e8cfcff5f02f9f588de131f43f552 files/digest-multimux-0.1 60
+RMD160 24431aa511e5903c9f59b924f69d0f00c56698a7 files/digest-multimux-0.1 60
+SHA256 6469c756666c80df62f81736a7ecdc098b6f08eaf3361002bed6a7397c5ce7ea files/digest-multimux-0.1 60
 MD5 f61218b80cb9228b63c2491d819df215 files/digest-multimux-0.2.3 62
+RMD160 956dee5ea1610506e77cdfc4f5fb27704fefc056 files/digest-multimux-0.2.3 62
+SHA256 49ecf70ea78a7a03205af2ab8329eaf224c4927a4eb118db4078d42b721dfeab files/digest-multimux-0.2.3 62
 MD5 7e75a5c44f4a653a8bf8683771812349 files/digest-multimux-0.2.4 62
-MD5 004e8cfcff5f02f9f588de131f43f552 files/digest-multimux-0.1 60
+RMD160 ba69bc12ff068bc5dad00e522e66ec26c2b44ba6 files/digest-multimux-0.2.4 62
+SHA256 e23233c759de5d08297b9c840bea45dd65ed5607adfba135e6cacb634b603e97 files/digest-multimux-0.2.4 62
+MD5 c871d29082e8140d59b314f07a991f8b files/multimux-0.2.4-makefiles.patch 379
+RMD160 58b14ac0830d68ca3464a11aac5a589c53e1c81d files/multimux-0.2.4-makefiles.patch 379
+SHA256 f279877d70f0e9a76da339aa622f618976bec037f1d0ab82c04b323c3db37a12 files/multimux-0.2.4-makefiles.patch 379
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 038529ded9a3d6817e13b22d43055f2d multimux-0.1.ebuild 632
+RMD160 6873600c06c6aa38142931f2ca671d1c87b20546 multimux-0.1.ebuild 632
+SHA256 183a0b5a3efadeb04433e6fc23485cde1defb7c406b9b34a309d868fde8d69bd multimux-0.1.ebuild 632
+MD5 f29c09f8a2e23029f6c2a2e1bb651fbc multimux-0.2.3.ebuild 659
+RMD160 7ae1eccfae69feb1e4bf832c18e40291aad8753d multimux-0.2.3.ebuild 659
+SHA256 b9abf58715daded185e9754a130c39036bcab5a5e7460845ea23f2bc72ee6669 multimux-0.2.3.ebuild 659
+MD5 6f46ce407f32754670735035695a3d5b multimux-0.2.4.ebuild 768
+RMD160 677f7ddd33ade3058e007db1883d65ef3715563d multimux-0.2.4.ebuild 768
+SHA256 7ab52e54c5db53cdc294eb729094a3e3b5d2f7724ea086338ee60bb29e1887e9 multimux-0.2.4.ebuild 768
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEDaR3AiZjviIA2XgRAiyfAKDAubJG0oobZx5OHr2aG/AJb15KPwCfdPmr
+2k1uxj0mGbe9jpTSQLcKKE8=
+=drb7
+-----END PGP SIGNATURE-----
diff --git a/media-sound/multimux/files/multimux-0.2.4-makefiles.patch b/media-sound/multimux/files/multimux-0.2.4-makefiles.patch
new file mode 100644
index 000000000000..61ab8b8b395c
--- /dev/null
+++ b/media-sound/multimux/files/multimux-0.2.4-makefiles.patch
@@ -0,0 +1,13 @@
+Index: multimux-0.2.4/Makefile
+===================================================================
+--- multimux-0.2.4.orig/Makefile
++++ multimux-0.2.4/Makefile
+@@ -17,7 +17,7 @@ multimux.o
+ all:
+ 	$(CC) $(CFLAGS) -c $(SRC1)
+ 
+-	$(CC) -o multimux   $(OBJECT1) $(LIBRARY)
++	$(CC) $(LDFLAGS) -o multimux   $(OBJECT1) $(LIBRARY)
+ 
+ # DEPENDENCIES
+ multimux.o : multimux.c multimux.h
diff --git a/media-sound/multimux/metadata.xml b/media-sound/multimux/metadata.xml
index 3bf6bcfeb512..e1774e3d9ad7 100644
--- a/media-sound/multimux/metadata.xml
+++ b/media-sound/multimux/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/multimux/multimux-0.2.4.ebuild b/media-sound/multimux/multimux-0.2.4.ebuild
index 99b55b620c8f..07da972d354d 100644
--- a/media-sound/multimux/multimux-0.2.4.ebuild
+++ b/media-sound/multimux/multimux-0.2.4.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/multimux/multimux-0.2.4.ebuild,v 1.1 2005/10/31 22:29:34 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/multimux/multimux-0.2.4.ebuild,v 1.2 2006/03/07 15:19:05 flameeyes Exp $
+
+inherit eutils toolchain-funcs
 
 IUSE=""
 
@@ -12,16 +14,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i -e "/^CFLAGS/s/-O2/${CFLAGS}/" Makefile || die
+	epatch "${FILESDIR}/${P}-makefiles.patch"
 }
 
 src_compile() {
-	emake || die "emake failed"
+	append-lfs-flags
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {