Make dietlibc optional by Rolf Eike Beer (bug #97185). Respect CC.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 23 insertions, 12 deletions

diff --git a/dev-libs/libowfat/ChangeLog b/dev-libs/libowfat/ChangeLog
index acd1f7c8a95f..a12a7aa85b1e 100644
--- a/dev-libs/libowfat/ChangeLog
+++ b/dev-libs/libowfat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libowfat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/ChangeLog,v 1.30 2012/01/31 17:10:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/ChangeLog,v 1.31 2012/01/31 22:06:08 jer Exp $
+
+  31 Jan 2012; Jeroen Roovers <jer@gentoo.org> libowfat-0.28-r1.ebuild,
+  metadata.xml:
+  Make dietlibc optional by Rolf Eike Beer (bug #97185). Respect CC.
 
   31 Jan 2012; Jeroen Roovers <jer@gentoo.org> libowfat-0.28-r1.ebuild:
   Drop HPPA keywording now that this requires an unsupported version of
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index e36820b8e951..21e6b6616071 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 DIST libowfat-0.24.tar.bz2 112302 RMD160 86d8f7f696715a55439558e9d57ac11d9ced8dac SHA1 5d738c95b4749d88971532e370d53472e4ec1fe5 SHA256 64c6b42af4c9df60f2c672ef89f056cfb8f0c6f437359dfca6618b5d1b9805af
 DIST libowfat-0.28.tar.bz2 129622 RMD160 3e8826e10a3f46520bdfa9602edb2741728aa370 SHA1 6bbe997ae1bbe94b784ab50a3d44b63a2e08d857 SHA256 392348c2bbde78cde001ba0ef62c8c2ae27105218fc3ba3833d13d26ecdaa541
 EBUILD libowfat-0.24.ebuild 1041 RMD160 3fc91842eaaebd55fd3936e750cd866380e5b864 SHA1 46646f436110958797b97993a1e0baed21711c4f SHA256 4db7759a6ba0678799d4d0bbb9715e4f1ea8cb417882080f1fd402d051f3f60b
-EBUILD libowfat-0.28-r1.ebuild 1136 RMD160 85f0a469d1317b99330f05b07bf5ef140bf3813e SHA1 69a7781670121260f062cad0ec3c8b483f812874 SHA256 8461fb48620643dfc24e1724c871bf346978f4c586f6aff39e0910c213250761
+EBUILD libowfat-0.28-r1.ebuild 1246 RMD160 b86f74846caf2194de662769b9466fe67cf7fb97 SHA1 82381cfb7d8f95b62f934a65df579f4781d0db56 SHA256 b86b71112de79fce602ded2f0f418eee5d5cc7c13d86a940b01d1a4064660e52
 EBUILD libowfat-0.28.ebuild 1046 RMD160 e627ab9f965ba7b7a81983f1292712567d55f99e SHA1 c0b18a36819ad228c14aba89dfce63bd19c1498e SHA256 89d72bbddeecbb0e4bd4c8d42760ae5b36389e2e87abba55ba841f0fb0a1d55a
-MISC ChangeLog 3889 RMD160 a8506c608b05ad2c1293f9fdb7c5b55c86b0bbe6 SHA1 b9a42a528fd0598a0ecc4d841f397e7824f51d6f SHA256 9e63702337d0367001802e81d88862588b2736dae00a0989f225a79ccc1524fb
-MISC metadata.xml 326 RMD160 a5f62934edccdd7de5de6ebaeefc6441bc4a4344 SHA1 259b2a26735b6e55a6257be1e06d887cc2008712 SHA256 00a4474828fd91edd8707c471584dfe651addbb89f879d8e2b41d0aa232e21af
+MISC ChangeLog 4047 RMD160 1b982e1afcb7ac3012d67a0eb1cedf109156d4cb SHA1 e5c213a9b85a9fa4487def87fae8ac991074e9e9 SHA256 88f7592657e9acf24dc6938622d2749f1b78f4a7b6a938e9b59353e9fc05a618
+MISC metadata.xml 407 RMD160 672894cf619ffd35885efc6d238fb679b128920c SHA1 203b64a56a76a2f09f0ef2a4e85856ddccce3f9e SHA256 b83d06e8e5ce635e3e5fad6561d73a6560ffeb5888d13a06b5b8e629501fde51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8oITUACgkQVWmRsqeSphOosgCfSP9a09IX6LjgUj+IUI1eqYCr
-zvEAn1ptHIngepz+gGqsCydh+jBn3413
-=PszM
+iEYEARECAAYFAk8oZdUACgkQVWmRsqeSphOxYACeMcxwLlA5VEwRn1c7+e2UWY9P
+ZBUAn05cRknE6EcPqt7yIQDxWNcHIf6y
+=rPeD
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libowfat/libowfat-0.28-r1.ebuild b/dev-libs/libowfat/libowfat-0.28-r1.ebuild
index b5c3142356d3..3c337111abb8 100644
--- a/dev-libs/libowfat/libowfat-0.28-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.28-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild,v 1.5 2012/01/31 17:10:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild,v 1.6 2012/01/31 22:06:08 jer Exp $
 
 EAPI=2
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein."
 SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
@@ -12,9 +12,9 @@ HOMEPAGE="http://www.fefe.de/libowfat/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
+IUSE="diet"
 
-RDEPEND=">=dev-libs/dietlibc-0.33_pre20090721"
+RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
@@ -25,12 +25,18 @@ pkg_setup() {
 
 src_prepare() {
 	sed -e "s:^CFLAGS.*:CFLAGS=-I. ${CFLAGS}:" \
-		-e "s:^DIET.*:DIET=/usr/bin/diet -Os:" \
+		-e "s:^DIET.*:DIET?=/usr/bin/diet -Os:" \
 		-e "s:^prefix.*:prefix=/usr:" \
 		-e "s:^INCLUDEDIR.*:INCLUDEDIR=\${prefix}/include/libowfat:" \
 		-i GNUmakefile || die "sed failed"
 }
 
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		$( use diet || echo 'DIET=' )
+}
+
 src_install () {
 	emake \
 		LIBDIR="${D}/usr/lib" \
diff --git a/dev-libs/libowfat/metadata.xml b/dev-libs/libowfat/metadata.xml
index 8d992ee4960c..d6487d17b847 100644
--- a/dev-libs/libowfat/metadata.xml
+++ b/dev-libs/libowfat/metadata.xml
@@ -6,4 +6,5 @@
   <name>Patrick Lauer</name>
 </maintainer>
 <longdescription>reimplement libdjb - excellent libraries from Dan Bernstein</longdescription>
+<use><flag name="diet">Compile against <pkg>dev-libs/dietlibc</pkg></flag></use>
 </pkgmetadata>