Restore forgotten cross-compile fix from 2.30.x (bug #414761, thanks to Samuli Suominen).

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

4 files changed, 28 insertions, 19 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index ec1d32258a7c..c6f9fc98d59e 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.522 2012/05/05 14:11:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.523 2012/05/05 16:35:21 tetromino Exp $
+
+  05 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> glib-2.32.1.ebuild,
+  glib-2.32.2.ebuild:
+  Restore forgotten cross-compile fix from 2.30.x (bug #414761, thanks to
+  Samuli Suominen).
 
   05 May 2012; Samuli Suominen <ssuominen@gentoo.org> glib-2.30.2.ebuild,
   glib-2.30.3.ebuild, glib-2.32.1.ebuild, glib-2.32.2.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 210b3636bbfa..a310f9efed72 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -33,18 +33,18 @@ 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.30.2.ebuild 8732 RMD160 a846978168149534ac99b725c595bf4e509cc941 SHA1 5edfb6162bd3fb287a3f4168d2680452207640c4 SHA256 b7837f8c76e479f24c351465ea5d28068235862fff0511d5ff3c15b79dce1a60
 EBUILD glib-2.30.3.ebuild 8954 RMD160 76a8cb569db281cdd6a210eb33461e6682d31a45 SHA1 aa327e8fc70c1abb7e060e79b1c4659f68332477 SHA256 b4097937c7963cca3d968c50c14e207383b872359b3362984c9c2a57efa70a18
-EBUILD glib-2.32.1.ebuild 8685 RMD160 06bd3e08a6926a69a3254e8b11687adef7a154b3 SHA1 8a4c67ecfd593ff772909005765f1ea981e5226d SHA256 574f90a8245051aa5d5a893ec1298f6fefd3a14da9053d6f1a3fbb0ec4356130
-EBUILD glib-2.32.2.ebuild 8336 RMD160 189bed639f4b465c17ba50a1408f64fbbc0e638c SHA1 f3e0655228592b092e3a4a10d67530b7952b3804 SHA256 a086146386b030aee44d58956da3bee79b78709aa4d37b5c02f555a50aa9e4bc
-MISC ChangeLog 70708 RMD160 ce73439aff32348a1989080acbfab89ba91ed168 SHA1 f310957b713fa6f33eb26c2a47c6577dae903325 SHA256 cb34c00b9f9a7a3fef8ee1fb09c7e2711113caeea6fadefec8a639e24902034e
+EBUILD glib-2.32.1.ebuild 8822 RMD160 aff477bca9cc0495c7f09c91efc7b75bb6883bd0 SHA1 3b82519d764c832b89beebefbfd1cad5e3e3fc12 SHA256 f22d3c46675fd7ad9f8dba12aa7f92a6e13863087305cdd63dfcf6830145d41a
+EBUILD glib-2.32.2.ebuild 8473 RMD160 baf17e568a18875232cd65fdf8a9b34827bcde8c SHA1 e7d249d7c7edb75f04a1e2a5a1111f27f4e30aea SHA256 867496af9be5e4a572edd2a4aef66418c7d444a7dd288c558dcf6ae5ef44fab4
+MISC ChangeLog 70904 RMD160 75b2257e1ec9855c645ef54540d230118c06d104 SHA1 6f2fa83a9c2ea1c55de391843b0d96408456c2ca SHA256 9a5d992a6298ea978ab89dcd60cd6c95a81d7f65df5d67149afc615ec6534950
 MISC metadata.xml 396 RMD160 8f82fa2bbf203e04f92cb62f8d8b451a608cee0c SHA1 4c81e5cc8cfabca39381e3757853350a8aac31d9 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPpTRqAAoJEEdUh39IaPFN0OEH/jhtuC9bx4goyFiFmIDBHZa0
-IKp2YhjvKrhod9jOac2tmbeOuABp6wmTtEH0IhHrMeuGOyTcrzeSlJZHmNJZx3v4
-tG9yYAXCzH5mSkFNYAC6cYjUL3AKeOgRyoOAcNqrEkVcyMX0hSmS3Izku5nFPRDt
-MHMk2oZiuw1ltXRQ7Poc7tM6Pzjq8bfvXBSdDf4I6KFgGPjCXLlJEEoZjxYTocVo
-2XBgtaNKO+AeMeXB6OHP/5JfGtBa9c+r398XW/isFXfPnsh3IabQxPCkEgFapn0z
-Ykvzn8TIz4Qu1OIEMX8qeugk8QhYFFvMFkjFfBTCm2ZEYy0mrEFzVkdLMUulHxg=
-=gbOV
+iQEcBAEBAgAGBQJPpVbPAAoJEJ0WA1zPCt1hPbIH/0spRhYs+qEQZlfSQR1CPeL7
+m1RJm7IaLZIRUOgMMZfYmuhNwbt48lQKL36Olez/Y1eouAO/ZsvbDxbHGnnVcwk4
++iDCZJzhIbAmNSFub3KfpI3i5VgGv45RyLOACIVh5wjwlk1GA9+lv03u6yWv1+7U
+6ZSdVaLCWoEJJH8Jgs8UpjVoD//AkVWfejABXwuY+dgwQtxKwleqCO4HS+3bk01J
+RBNFmDK2GDjTL27qlcz+rJgGblutqOn09tdwd9hhrtbxPx05/aQIjURKXiDR608G
+1O5FpSOqitjTn4xi5NByI35AqcJqcajvlDRhSUvnlW1XBl5avaAFY4I0IkTG7Oc=
+=CVmy
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.32.1.ebuild b/dev-libs/glib/glib-2.32.1.ebuild
index bd888d1842e4..8355e635ac59 100644
--- a/dev-libs/glib/glib-2.32.1.ebuild
+++ b/dev-libs/glib/glib-2.32.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild,v 1.8 2012/05/05 14:11:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild,v 1.9 2012/05/05 16:35:21 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python virtualx linux-info
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -137,8 +137,10 @@ src_prepare() {
 }
 
 src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig
-	if ! has_version virtual/pkgconfig; then
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! has_version virtual/pkgconfig; then
 		if has_version sys-apps/dbus; then
 			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
 			export DBUS1_LIBS="-ldbus-1"
diff --git a/dev-libs/glib/glib-2.32.2.ebuild b/dev-libs/glib/glib-2.32.2.ebuild
index 1f07f21cb0f3..f044c8184143 100644
--- a/dev-libs/glib/glib-2.32.2.ebuild
+++ b/dev-libs/glib/glib-2.32.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.2.ebuild,v 1.2 2012/05/05 14:11:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.2.ebuild,v 1.3 2012/05/05 16:35:21 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python virtualx linux-info
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -130,8 +130,10 @@ src_prepare() {
 }
 
 src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig
-	if ! has_version virtual/pkgconfig; then
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! has_version virtual/pkgconfig; then
 		if has_version sys-apps/dbus; then
 			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
 			export DBUS1_LIBS="-ldbus-1"