Respect CC, CFLAGS, LDFLAGS for tests. Don't automatically enable ccache. Hopefully fixes build issues for hppa, bug 512610.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 27 insertions, 4 deletions

diff --git a/dev-ruby/ffi/ChangeLog b/dev-ruby/ffi/ChangeLog
index 8736894d792a..cbd76f7cc08d 100644
--- a/dev-ruby/ffi/ChangeLog
+++ b/dev-ruby/ffi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ffi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ChangeLog,v 1.67 2014/05/26 05:37:33 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ChangeLog,v 1.68 2014/06/07 06:38:31 graaff Exp $
+
+  07 Jun 2014; Hans de Graaff <graaff@gentoo.org> ffi-1.9.3.ebuild:
+  Respect CC, CFLAGS, LDFLAGS for tests. Don't automatically enable ccache.
+  Hopefully fixes build issues for hppa, bug 512610.
 
   26 May 2014; Manuel Rüger <mrueg@gentoo.org> ffi-1.1.5.ebuild,
   ffi-1.4.0.ebuild:
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 68c44ed18f14..a04891a42125 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ffi-git-1.1.5.tgz 894189 SHA256 0782f58701509524a015455d34a195d7dc0a408fb516703595c6332beaee36b6 SHA512 9fc0dea9df9a455b68e0cf71e05bfd9b0f8ba1fbc08b4dc84a18e10c19485ab6e7912263a3af4e0f2c3123b2fe7b73197ed5273c4083abe4b5665e549898513e WHIRLPOOL 0d71b737ddbe311d52eb4677daa2505d45b135872bf58874f6fde04130452cde8ef7892469374c564bf202501fc3f6b2da4f9ee7d1e9819ec3db3eef7682b211
 DIST ffi-git-1.4.0.tgz 889839 SHA256 696d58704ed002c32b53fb83db5cd985058a2839f04e7228e00ca60f06855948 SHA512 f99d47a450b90a1c10a5db54b0421b8a6a01564144443429fb8071940ef7020130b5b8f71c0198e0b15a6cbc61742b2cd3ef60a92f5c3cc4077e9c2074ac771c WHIRLPOOL 64300f19741ed59b44424cb68eac42cb886826d3019f533c8548c14e626cb5fa3c998337227c83a0e90a7e0700526e12e4e3a84b29fa6f2fdb2d98ca93693488
 DIST ffi-git-1.9.3.tgz 881344 SHA256 f8cc0a05b682eac330fbd0c4f76c9fbf6338a7c32bd3cb5b1619506678ce5c7a SHA512 56c5d4ab13f8ce4038a614470a82a3c723d90e6cc9cb3423efdcd8b1a5f4f3f9f01a0fe335fe088e207818f541184256e20f81fea24c1fe449ed3382e45f9af3 WHIRLPOOL ba412d79cea3f0077048d388bcc94ae25552aada3b5261e44f1ff30245c4cc531be86272b1e3eaf59c215b429aeaab7ad72804de9d31016acec2c6099679096a
 EBUILD ffi-1.1.5.ebuild 1470 SHA256 1c3ec97d5f08c92a812c56e847289ffaa0f2450f86ed5b665af94088f875c8b9 SHA512 088c031820c72f37c7c70d2517c3284bb60ed52e4c8cd11708a67f52e83be015d0b71fff9002bfef6b0190d495e704fddb41a9997664274be88bbe37660e6561 WHIRLPOOL 70fd6e212d91e76bbad05d87b8aa420e66cecbde612f0cc83e57441e13047bd15191142eb9600f3a269cbcd1eba74af0e3b341da39f25997d571ebd39586586f
 EBUILD ffi-1.4.0.ebuild 1281 SHA256 f9116db21f1caaa1cccaee80f5eeb911d9cbf554f50d293c280b332cc906d0a6 SHA512 92509132c46493c496e0efeb6bc4e460738fc6869ad11d1f6b188f2394c59e0906316a6be52561fb4b3bdcc284b1e109762160225bd1fb496a5f35c4ae3440ed WHIRLPOOL 9e13a9e2e7427987da47ca85caed55a47fff8db8992cfef085f96f34e8b0f4f11a1a8cd6df1cc11110564173dc40efd300891be2c0f35df6a48f557aa0cb0397
-EBUILD ffi-1.9.3.ebuild 1372 SHA256 bcebcc3fd012ee3bd17a548f452befe4b0a2f97c8c38b86f1ffffbe2701e4a59 SHA512 6addc6a8b60a9e443f615d5220986934b010d2f9dc7d8abe876826835fde0717eb872e0ab064b7a9609dda9914ef51fe298620c0c783de020cd612e83085e8a0 WHIRLPOOL 3d461b970664e0b6e4f380d52cfa14b1121e49118bc00759f57e94303740802ef49db8bb31c23d3e7a62045608d31e41c6e64f55574b71517d66979bbd9fc0a1
-MISC ChangeLog 8729 SHA256 a8f00608e03bc26a7149c72743333818cda29c266760a3b7894aeed3b8104764 SHA512 6d3517bc5e08b9fd772ed80b0f5a567ecde5ef7f0a18f4c1851a596ec89146e5858a8244fd1ae495f8b083266e83c264776812c1dab6cbddbea9ddf47d4a2bb7 WHIRLPOOL f72d85ed744a097c3fe77a98cbd25f8229d142ca0b6ba436f915137e180132dcfe0d5de0daa530eb232ee1341aaa3e072736d93aff0c0f7ecc95f6c4530c86de
+EBUILD ffi-1.9.3.ebuild 1614 SHA256 da9607610830e2d375adf9212b19424cff72b30891e87e953d7b14db56e33e98 SHA512 0f75348a33b540888db22a1bea4ea3b507bf3182880e64e37b60e3cd6ae1e453ccf1c275601f3d9539913b387e4083db1a85c7d4edfe8bbfaf6f2f94b4e99659 WHIRLPOOL 7acaaf50b73af2c0c7314b060b7664886fc90e64ddab87479b4ab28c26422040d1975aeb4ef1969b1c55cb82fca50a42bb09ea107a12542645551a8d8d28d580
+MISC ChangeLog 8928 SHA256 c645889d11a6e9f98f6007b65fc70858bec8f70a92cd5bb14a0d5694c62001c3 SHA512 5931bb6c1ad81a3d4d179a6cbca31d553b8313849706795e8a3f3239abcde34a553042d6a83126dfaab2f1c6087a797691c27822d671eddcc5a534011228c28d WHIRLPOOL ec368689f57812f2e36f75d567e53dc70d020b10b6d50f5f5a4d15ace2e3d59f15f5ee8bcd61f31caca4b52e5aa7d4d375007afd0f01cfef07c6eecdbc2a4c94
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlOSs2oACgkQiIP6VqMIqNfC2wD/X6ueb2wYSDJui8oehUHdV5uq
+edbzWhtkpMzVX4GlxkMA/1iFYF2AD4kF8D8ULOF5GgxGGncNXP73nZ8+PFsJIFV2
+=p3VK
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/ffi/ffi-1.9.3.ebuild b/dev-ruby/ffi/ffi-1.9.3.ebuild
index 624afeb60986..9a71f8a757e1 100644
--- a/dev-ruby/ffi/ffi-1.9.3.ebuild
+++ b/dev-ruby/ffi/ffi-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-1.9.3.ebuild,v 1.6 2014/04/20 08:04:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-1.9.3.ebuild,v 1.7 2014/06/07 06:38:31 graaff Exp $
 
 EAPI=5
 
@@ -37,6 +37,11 @@ ruby_add_rdepend "virtual/ruby-threads"
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
 }
 
 each_ruby_compile() {
@@ -44,6 +49,10 @@ each_ruby_compile() {
 	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
 }
 
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rake specs || die
+}
+
 all_ruby_install() {
 	all_fakegem_install