From aa8c08e5eb2fee2413453a440bcd8e798d355408 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gentoo.org>
Date: Tue, 18 May 2010 18:50:50 +0000
Subject: [PATCH] Respect CPPFLAGS/LDFLAGS and fix linking of tests with
 --as-needed. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

---
 dev-libs/libhash/ChangeLog            |  8 ++++++--
 dev-libs/libhash/Manifest             | 12 ++++++------
 dev-libs/libhash/libhash-1.0.3.ebuild | 10 +++++-----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/dev-libs/libhash/ChangeLog b/dev-libs/libhash/ChangeLog
index cdaad7fc771e..ab2ee2716da9 100644
--- a/dev-libs/libhash/ChangeLog
+++ b/dev-libs/libhash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libhash
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhash/ChangeLog,v 1.5 2007/02/09 02:30:32 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhash/ChangeLog,v 1.6 2010/05/18 18:50:50 flameeyes Exp $
+
+  18 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  libhash-1.0.3.ebuild:
+  Respect CPPFLAGS/LDFLAGS and fix linking of tests with --as-needed.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-libs/libhash/Manifest b/dev-libs/libhash/Manifest
index 44de330a52ca..29029a07a621 100644
--- a/dev-libs/libhash/Manifest
+++ b/dev-libs/libhash/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST libhash-1.0.2.tar.gz 8763 RMD160 34f5dc63d5dd5cf00ebb235bdfe4de66d57c9280 SHA1 e37dc7d55c11e19f660e731d337e8714bb833f18 SHA256 f478eba0c72e45508f84ddb9bba0fb40fa82212d8b8c3b458bcb9bd9c7e29667
 DIST libhash-1.0.3.tar.gz 8918 RMD160 d3a470424da8380e2e360ce92c7fcd78d60fcb90 SHA1 51c5d9e08132b91ffabcb9755ba2f3dfc0ee72d7 SHA256 13d57b35537d98aaf39115d0bb253fe54009f773d239b235267c34769bd1ef9d
 EBUILD libhash-1.0.2.ebuild 886 RMD160 fbdc36b2f8409c85938ee812544d6ba7bb892288 SHA1 c766c702ec612482ad7974bd20ee9b41ea73d3f9 SHA256 54506266a0723fe9635068fd169a7d64b6f0cd62de523c380939e5bf19519077
-EBUILD libhash-1.0.3.ebuild 1094 RMD160 bfaf2fff4c66f99affb5a96b9e43d4c3a656e3ea SHA1 e2422293556cbcc12b34e3e1b26aa4c6f97adec8 SHA256 32432d6a5d91a6d5f24a282a3907f429cc0faa5844844bebd8c13830b2607f44
-MISC ChangeLog 665 RMD160 654fe52bc717372f534af23167175fcf4509acaa SHA1 6648e25d0818c5fa19295ccc80a83bb26a7313cf SHA256 35ba86cb6308782e88dbf58f63a93a8071ecfa00242ce57448148b196f6d5815
+EBUILD libhash-1.0.3.ebuild 1165 RMD160 cf2d1bb32dd16826ab13f2dd8c6978a503e5869a SHA1 1883021c287d1f5ed9995cdfd434d849e9ecfef8 SHA256 7f6826cebe4375a8e5ccf590575508cb1bd45d2927368636deb8cca8853f34c0
+MISC ChangeLog 816 RMD160 0430c3af3406dab1bafcbf3a723bdd7346c7e9c4 SHA1 8337c28548d6b6867676c6a09be6f30794e70eb3 SHA256 5aae2112d893daabbe6d70f6e1d739445137f0edadc9049762616de2523ad8a1
 MISC metadata.xml 232 RMD160 9175a294469e617e696f19e3b6468f8747de37b0 SHA1 cc789056a277a74bd76eaf8139cee7bbbd350785 SHA256 433f35a36976e29c3c0e3f51bf5184d26578cf99de91cff0b50796b57c6b6ca1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iD8DBQFIQNevj9hvisErhMIRAj6JAJwIUfkiVQ5ZkGHhCXjh2kZHKrmsMgCeKb3K
-dE8S3QwEjUpx3K0fjM+Gesc=
-=dCOw
+iEYEARECAAYFAkvy4YMACgkQAiZjviIA2Xi5lQCg6zTVqrwoj5pwPpdlFZ1u651L
+h0MAni188J3sRRB1yinOQoY89wilJCgb
+=bWa2
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libhash/libhash-1.0.3.ebuild b/dev-libs/libhash/libhash-1.0.3.ebuild
index d060e44fa980..13b33a13a563 100644
--- a/dev-libs/libhash/libhash-1.0.3.ebuild
+++ b/dev-libs/libhash/libhash-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhash/libhash-1.0.3.ebuild,v 1.1 2005/06/14 22:50:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhash/libhash-1.0.3.ebuild,v 1.2 2010/05/18 18:50:50 flameeyes Exp $
 
 inherit toolchain-funcs
 
@@ -19,15 +19,15 @@ S=${WORKDIR}/${PN}
 
 src_compile() {
 	rm -f Makefile
-	$(tc-getCC) ${CFLAGS} -fPIC -shared -o libhash.so hash.c || die ".so failed"
-	$(tc-getCC) ${CFLAGS} -c -o libhash.a hash.c || die ".a failed"
+	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -fPIC -shared -o libhash.so hash.c || die ".so failed"
+	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c -o libhash.a hash.c || die ".a failed"
 }
 
 src_test() {
 	cd tests
 	sed -i '/wrappers.h/d' *.c
 	for n in 2 3 ; do
-		$(tc-getCC) -I.. -L.. -lhash ${n}.c -o ${n} || die "compile ${n} failed"
+		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -I.. -L.. ${n}.c -o ${n} -lhash || die "compile ${n} failed"
 		LD_LIBRARY_PATH=.. ./${n} || die "test ${n} failed"
 	done
 }
-- 
2.26.2