summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-07 18:12:41 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-07 18:12:41 +0000
commit2924f69b1862689e1a015e19103935dc86adea82 (patch)
treed4292f405cbda0ffcf6f45efd4b4d81bc353fd34 /dev-libs/glib
parentInitial import. Ebuild written by Ian Delaney <johneed@hotmail.com>. Fixes bu... (diff)
downloadhistorical-2924f69b1862689e1a015e19103935dc86adea82.tar.gz
historical-2924f69b1862689e1a015e19103935dc86adea82.tar.bz2
historical-2924f69b1862689e1a015e19103935dc86adea82.zip
Check if pkg-config binary is working instead of checking if virtual/pkgconfig is installed.
Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/glib')
-rw-r--r--dev-libs/glib/ChangeLog6
-rw-r--r--dev-libs/glib/Manifest18
-rw-r--r--dev-libs/glib/glib-2.32.3.ebuild4
3 files changed, 16 insertions, 12 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 3cb0c2375779..8bd38cfb17c4 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
# 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.526 2012/05/24 13:36:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.527 2012/06/07 18:12:41 ssuominen Exp $
+
+ 07 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> glib-2.32.3.ebuild:
+ Check if pkg-config binary is working instead of checking if
+ virtual/pkgconfig is installed.
24 May 2012; Samuli Suominen <ssuominen@gentoo.org> glib-2.30.3.ebuild:
ppc stable wrt #410611
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index f238879507e7..200576cb47ff 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -33,17 +33,17 @@ EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb77
EBUILD glib-2.30.2.ebuild 8732 RMD160 a846978168149534ac99b725c595bf4e509cc941 SHA1 5edfb6162bd3fb287a3f4168d2680452207640c4 SHA256 b7837f8c76e479f24c351465ea5d28068235862fff0511d5ff3c15b79dce1a60
EBUILD glib-2.30.3.ebuild 8953 RMD160 a97b2af896d2fd54462e3c7840841951432c7cd4 SHA1 5187f6c2b07f516be3cbaba7531837e63f816c4e SHA256 a54f2fa3b5ce4b758d65b0af11625c0740a0442963232606b7a2289c638c7355
EBUILD glib-2.32.2.ebuild 8473 RMD160 baf17e568a18875232cd65fdf8a9b34827bcde8c SHA1 e7d249d7c7edb75f04a1e2a5a1111f27f4e30aea SHA256 867496af9be5e4a572edd2a4aef66418c7d444a7dd288c558dcf6ae5ef44fab4
-EBUILD glib-2.32.3.ebuild 8361 RMD160 7ca87ed9046d2f148228c6f7816470925ee8f9dd SHA1 2b7c511d63d8ccd669264977a945cebc618502bf SHA256 7a0bd1f7ddd5100c2f7d1542832f22ef60c5ad683c7b288ae825f5448a3d60fd
-MISC ChangeLog 71327 RMD160 f6d0b6f53045964635012cde40bfb87b156b8ae7 SHA1 af49e7bf56e07ed85ea69e9349cda90696acb47d SHA256 f4f55ad064b55b83a5d2d585d3f77ce39503c2d9ca17ee334eda787df61753aa
+EBUILD glib-2.32.3.ebuild 8374 RMD160 8cd0505eb3f65098db30da7c5a09d3de456d9cee SHA1 1420031743994ab06674e2a38435579396abff1e SHA256 b57aa52cd12399f2e222a237976f51171540f3ea85a81b6a253ad4223da61fd9
+MISC ChangeLog 71499 RMD160 f2533f5f205459fc476e3b98ffaffa463519cf9b SHA1 953aff70454551379e0ff7487fb90f2e88fb7d41 SHA256 6529514577eab8dc76d4747207b89e85691e0089e71418f7c51fff1950c2adbb
MISC metadata.xml 396 RMD160 8f82fa2bbf203e04f92cb62f8d8b451a608cee0c SHA1 4c81e5cc8cfabca39381e3757853350a8aac31d9 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPvjlSAAoJEEdUh39IaPFN2awH/2rnryBB9SfatUAoAJ6QGQyJ
-SH4NmIRJqipl7da1I0SEBF6ynk8w8UNZ3tZABFihoP0deGS+8raWU61wVl7PiMsH
-C+jjr9D+qWR2wdsBXWRA4u7qKZvcYLj8445HA+l541xlmlyAspwl46IrDnKB68we
-sUpO+X4Mt++Fi9sBV9bkvFueZCdk7B9qfmSwHne+ute96I2FQrFVYwpSfJtpraXZ
-xVq7G8ytan3tVp8qj61nxc8j5m+dV7BqB3LixTqqoGs7MJb3UPXI+Lt4TUGyF4hb
-l3lhkUfaPgwLNHsZrTAio22ueaddZKUVzcmmyMSilYyPYLhQ2KYOvAbkaZ82KPw=
-=fGRt
+iQEcBAEBAgAGBQJP0O41AAoJEEdUh39IaPFN0noH/ix4Nz7ULfNLZz83sKla2ZtI
+D8SiKS0MWMG3Y0FBcI07AsnMRLz7pgRmCTOjhTrckiTPuNdPZozaMsQ8R5kaT6WD
+JulA504WswP12Q/NQztn0w8NPcIsFlvbATsWK683lwz5djunWFTAas5bbqSwT5K+
+qlOMPTcew1mur4zifN19uvihb2FdjPxTq7F/5XGU76t/8uswDRvA4jRAX7mZPERQ
+LkdGKJDXw2FClntra1+oISrI72JEiWTPfjDE0wJcsvq7VXGlAM2qZbfjCj7n+zdE
+6O8iMi3yEUK0H+51W7zW1Swcpf4zJECSwrTIyU0zsXP8tYo6Ntac3bVp83bYneQ=
+=9K/Q
-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.32.3.ebuild b/dev-libs/glib/glib-2.32.3.ebuild
index a3cb5549d0dd..8c9dc236f586 100644
--- a/dev-libs/glib/glib-2.32.3.ebuild
+++ b/dev-libs/glib/glib-2.32.3.ebuild
@@ -1,6 +1,6 @@
# 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.3.ebuild,v 1.1 2012/05/15 06:22:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.3.ebuild,v 1.2 2012/06/07 18:12:41 ssuominen Exp $
EAPI="4"
PYTHON_DEPEND="utils? 2"
@@ -130,7 +130,7 @@ src_configure() {
# 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 ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; 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"