export LIBFFI_CFLAGS and LIBFFI_LIBS if dev-util/pkgconfig is not installed wrt ...

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

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 59d4f3c6a8901bbd7b0690dc863ec82cde97e05a..b75368e9d7f35a6bb8a9f69a3ef11cef9773f6bc 100644 (file)
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.485 2011/10/05 16:51:48 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.486 2011/10/06 08:52:18 ssuominen Exp $
+
+  06 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> glib-2.30.0.ebuild:
+  export LIBFFI_CFLAGS and LIBFFI_LIBS if dev-util/pkgconfig is not installed
+  wrt #385561 by Bartosz Szreder
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> glib-2.28.8.ebuild:
   ppc/ppc64 stable wrt #369909

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index d6a2a17067539d66d0663a4339ab49273a078e9c..a6907a4dff6e9ba595d41709f548e93df18e7655 100644 (file)
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -23,15 +23,17 @@ DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52
 EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36
 EBUILD glib-2.28.6.ebuild 5649 RMD160 1a57e73c13cae0a708808053ed6bd3e92c1ce29c SHA1 3c607a96e34dad256b32d9b006f2f5a8a333f454 SHA256 4a9d0a6f835a2aced9de540091acf8eaccf74cb054ce6d55576ea2ef34bdb78e
 EBUILD glib-2.28.8.ebuild 7412 RMD160 435c6ad000b6aa13fe161b21a0575ead944a2805 SHA1 8ffbfc1ab5f71d783e3697d1e580b57b1ea3a5cc SHA256 c8b600b3d8417878ba8b49ed3217f1a5ef38a64573fc8bc5b5990b5bc523da20
-EBUILD glib-2.30.0.ebuild 6684 RMD160 d1f37631f1f62a5c45ff0e0051939cb665c1c3ac SHA1 59934a4dd1fa86d8b067f0f64dc259dc5534a53f SHA256 d2dee63162636ea4011ef469a83cc44d0694b6fdfa1449a276aaf0e7e459fa20
-MISC ChangeLog 63743 RMD160 40eb557df505a5c43223340f74ef1026e26e1e9c SHA1 cca299d76b19652b92adccee7c21f19332d0269b SHA256 ae8bc28dda90c9c2c361371f79036b2c69b3f8ff6f231ca8eb726ea84c813817
+EBUILD glib-2.30.0.ebuild 6784 RMD160 5f5107c9c6edfca27da651367ea9b2b80d400859 SHA1 c24ccc3504a798d613969ad09ac677c0429acbd2 SHA256 6f10287a368a61d99dfd9af9945bd152cad51124ce6f5a8cc94957114bb387de
+MISC ChangeLog 63928 RMD160 b37485f9e8e61abe31a9cd38bd645df395a97c7a SHA1 60ac5d7dee82b623ba2fd235b796846eed4ed05f SHA256 563859d1d2d9b1b0022d4816c0239b54d3d4ca8bfd901cbbcba3da2248a94ebb
 MISC metadata.xml 395 RMD160 12e6f6ec98b635283d1f254e93da3c4f47f50a13 SHA1 db51ce81497f12112e03bb5812ea734e1e15b44e SHA256 7ff3e0519e10476616dbcc11540641d9cf8b2ae0c97b5715b8db1f72135c95d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6MiyoACgkQIiMqcbOVdxTV1QP/Y+D5NrGFJXk9TDTrTm8OhLPc
-ARm0srH3JGUECQWRUGcvnokhuQdyT6V1/zxNowuk2+NybLHMXyJUt+Ra5I60ANDl
-MFlQHcFaRAViNJ88Qq9PlhNx4+AZEHSQH+IIYTnPNyTcR2zxFVtaespNPmGTE1XI
-OIte9wtgopS5XKzlolo=
-=vV1g
+iQEcBAEBAgAGBQJOjWxmAAoJEEdUh39IaPFNYcUH/2VuZemIan/C3nrPBbw/zz1c
+wIFQfNRVI+eep+yvNWM944YoKZBa7PDIPsBfyYNtcYgWoD4EBFZ0qbcw27u3u7aL
+C3MUsf77nJIjtPLTByy5UjAbJQ3gciyNFxnJ2a766bjvV2PmLCH7MlttVrbwkKNI
+HTil1fkh9e0OLVzR4Li2hyIv8KSgCflL2TohZexHFg+I2P57We2WYmMw0m7yNUpE
+iHFd2iLAWe/SSFWOUaoT2PKiGLdaORs9e6WRyNM4F5I1hMHwaxbkBoBuHsJh2uH3
+2J/6IBqRSMCR1m7PzmdaDTPRElbufrb/6nYXM26dBd1K4qHjXOm9mtoC5BUzweY=
+=HHp0
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/glib/glib-2.30.0.ebuild b/dev-libs/glib/glib-2.30.0.ebuild
index b0798b1b872e9b3166cc817cc1131e88480c7ef8..f7f9927113db6c5639f0f0c443c34f49c9dde4fc 100644 (file)
--- a/dev-libs/glib/glib-2.30.0.ebuild
+++ b/dev-libs/glib/glib-2.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.0.ebuild,v 1.2 2011/09/28 11:19:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.0.ebuild,v 1.3 2011/10/06 08:52:18 ssuominen Exp $
 
 EAPI="4"
 
@@ -100,6 +100,8 @@ src_configure() {
        if ! has_version dev-util/pkgconfig; then
                export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
                export DBUS1_LIBS="-ldbus-1"
+               export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+               export LIBFFI_LIBS="-lffi"
        fi
 
        local myconf