Restore the pkg.m4 hack from 2.34.x to prevent stage3 build failure (bug #481056, thanks to Markos Chandras).

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

3 files changed, 22 insertions, 11 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index fc691862b7ac..1c63d6dc9e33 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.569 2013/08/14 04:19:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.570 2013/08/15 01:24:32 tetromino Exp $
+
+  15 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  glib-2.36.3-r2.ebuild:
+  Restore the pkg.m4 hack from 2.34.x to prevent stage3 build failure (bug
+  #481056, thanks to Markos Chandras).
 
   14 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   glib-2.32.4-r1.ebuild, glib-2.34.3.ebuild, glib-2.36.3.ebuild,
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index a5f759e50122..06746f9fb9b9 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -22,22 +22,23 @@ DIST glib-2.32.4.tar.xz 6178556 SHA256 a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8a
 DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 SHA512 2382e09159da2ef47384a3e52622f139577af69d6aba86ea1636f2b6b23b9f6bf89967f29394fd7f93d0528e2c58ae015864aa58a3e3e4f504c7a268b2ef4a75 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d
 DIST glib-2.36.3.tar.xz 6626972 SHA256 5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e SHA512 1ea45e7978bffb8ec23c8eddb74b0bab686126fd55d96956203bc1eef44e3047edcf2cbc39e018c83e56093f806c739bf320e6a359b45cd652e55c94a6f1ad19 WHIRLPOOL b6e997381fe451fe90f17478a6a3e3ddb75ca028a6f0adce1e970faef7dd64f2d88fa7a5557971bcba8e047a72801332f1804c815a9a45907dc0f468b888b404
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
+DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 EBUILD glib-1.2.10-r5.ebuild 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e62131e9858d26fb26d8f1699c2029 SHA512 d2c84ba968f81bc851f53fbf1bad01f62de58f16dc49565e341bf7e9396b5f8870501de2027d5b49c5dcd2a8416dca6f530a34491c63ccb26ab94aeafea442ba WHIRLPOOL 1fd9b784429c287fa5dbb4e20db42dd9e1f67cc03ac60c7d47fb751878ed827f2791a2bd6622d84773a4a4607c190a671cef6a6d9b7a61943bf12b7b0e1d6b45
 EBUILD glib-2.32.4-r1.ebuild 8355 SHA256 2c7bed6e3df8f29a6fc03d3c627ac6ddedb62d5624be324063ef3494186d45f4 SHA512 bee7e53b3ad42e5dcc36f75c9a30b7c7bb6e09803064a953982a07d88852ee414987964abfd1acab27dc8b08946c769dc12f8167cbcbf934cc9b66e009286793 WHIRLPOOL cd9bd78ae8d8ed4cb0fbeadc7d1a91937ed056d68b90e4a321412c812ba27edca6c753a87b3fbe8a4d75d4ddd88e66fa8312ca16d88843242ad0365287a6aed6
 EBUILD glib-2.34.3.ebuild 8631 SHA256 37970835f0f70e6318b3dc9c4de67c8365a106a60c25e9abe9ff53129b002ff8 SHA512 c197e526247e0b386bc440dc67d01dfed644bc5cf3c30931075d2dce8cf36a7cf78fe7903e083b83b6922906338e237ec32f8f2c8224b927069b09be9aa4ee74 WHIRLPOOL 5da1cb9a91189a58f701595a83dcdab589468287923998ba3418e09457e9d5d2f10f815ee6fa9977c55abbef0068ce353016055f573931b1d1bf415b18b6f887
 EBUILD glib-2.36.3-r1.ebuild 8535 SHA256 c8dca3602e2b9f6e45bea4fb695570824fd92c760aabd4f15f65375b95e014b9 SHA512 7bb9cab2f414993181fa45a6bfc3215e412a55dab230091e44551662fcac2899bdd0179966d9ff58c67c77212864dfa02fd181f83bbc23a4b1d728cd0d4a4dab WHIRLPOOL dccda73b292adc59fd643ae7e99f3531f392585d734772d4b95e0341e1a3d9825115d11560a74c84d6878b90bc6ef23d8a9164ff52356b6f67809c084adbeaaf
-EBUILD glib-2.36.3-r2.ebuild 9202 SHA256 22d9fc1bbf2152e6a391edc5689d86aed0aa30da38690102080ac45701955c26 SHA512 b7afa38c3e227ce5da752f77a93bd28d63f5c6cec2b7091ad1654f0c0789abf06e4c1526222b4398155c0ce3f8c12ad5873b6b4cb92d359897ff53e89fb6c906 WHIRLPOOL 7df6771fda186beb24cf231637c89222805475bb7d44717ad8857fc82048f03e0f611a78a5498475c84763b34dbd163710d2c4e8f079895dbe65f0d277eba6ce
+EBUILD glib-2.36.3-r2.ebuild 9460 SHA256 94943f021ce9ca89d128de65fe1736a89a3ac8d43403c107611468175977b299 SHA512 8418bb0514813eaf6dd2557e1874f08cc05d524f78d04cfa2c3b0db0698b6fc48ceb074a7d617e863731bba683af4086782878eff242576a2f219c6ae9aa2401 WHIRLPOOL 5ae2cbcbc3ca67064b37e30561344a7a9a755fc4ecc2e75344861c2db1083e6aeac30e0bc98a48bcc922090448bdedf4392fc5c47d3d9340a2b59495f7f97ddc
 EBUILD glib-2.36.3.ebuild 9274 SHA256 b16d8b916691777ac32f72eebe59f67138b0bebe5aae7ad7c40a8d74facddca6 SHA512 7a3e7fbbd7048732976e51642f72d02e6adb4f13b504a36cf32539f542895feeafa46a8474ac8914f37de78b02b63ccf11bbce178bcc4a98b2a9c80fef828fc5 WHIRLPOOL abfd6351be76e1b0f8c65218a754c8cdc91370a2c756eede804bc999f18faa1f14abb43553c618edb34f42f6466f8a38d93562cf166680cba38b9da2bb9304c3
-MISC ChangeLog 79503 SHA256 e19a3395bb78fdb6bd21dda04624c4cba3f3f3bf43c880f67e5967f7fa0d5c3b SHA512 6dbf19e88b7076ce74dad86dade499ef91393c57ddd7c3f791f1e8b54d74a6a79b36c8dd9be025b8107935ce5480840571ecefc2533aa25da624a3444fa4c27b WHIRLPOOL d673334741363bff697339bca9d6b0180776432c0e3782155da703312c8d48ab70423009841e4dfe63331bbc8f7aa89a670cbcb7dcb3ed53fe0b03f255601eb0
+MISC ChangeLog 79702 SHA256 16e141241408d1e8a253442083300808a73852869d19693b80fd7a91a2b0f77b SHA512 0c86c794d5438cc2236291e0e17e5a269bcfbba42e162932f64adaaca57c1c076dedbff73efb7ea307dfd4551e2bf6ce2f881f82d11e233f7966408c833227e7 WHIRLPOOL c1369dc6e399ab6f2b2cc1291eb55b1c18d563f4ff60a5422834c7c547fd2ece3056e5058eaf5d3c7aca31c00cbb381422616f6ba12daf4e34ceb56bc6e54675
 MISC metadata.xml 479 SHA256 1a41cb4f56511674a423efd444f7c6999b5d316f9058d2eb67a032a522738ffb SHA512 f30f9e937d43dd4fb148dc7ab1554b5c58ddf4211bc06cfc65e92ff9843a84f0b05fa130fcd130744ad6e3579fb5b82a7f31950dd8ccc317f58388023cb6fe50 WHIRLPOOL 92888cd8e3a839860cb20c60ad1ee2871ea9efdf54d5751d6b5f677faf10e721333c3d68b1b5c4af212854f9ecd9e31970832eaa05f30276987bcadacaf5f637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSCwVeAAoJEJ0WA1zPCt1hfYsH/0ZUHry9p2w0m/8DsViGObxK
-/x9Z0HQaEES325WQRQ0L3kF8ncHv/RJkSq07tEwFitJYJL6DjqE9AiNtYu5PPrrZ
-cXKJUJWf8mck4McMZN98QxNnOLHEDEA2Ksaisj+jE1aatGVBCJ9autjBcR28OGu9
-PIysRLQxHodfE7BAnqnocsGeU1mNdo4k6URjMlQj2VAlaVLw+cSIWJqMSrHN0zb8
-+4xAv99CEqF+nyCWqRvFubiVlRrmS5N/3pUp/3rS83WsROiOLBUUVARFsUYADrCd
-iqgzI/HqTG3MvFLaBbfyXZGhGfXEwbTrBx5woXK+Sv44ovuAreQoyUcQmPQ7jt4=
-=xkl3
+iQEcBAEBCAAGBQJSDC3eAAoJEJ0WA1zPCt1hhG4IAJobL913ijLoCvZB4WJt03W1
+d7eWwhxINusqbTmhdVbE8Qbwcs6xYYcgLHOHiRKIQElXrN7sQNlHnPbM3qB1HVL2
+3adfFGOTmdEVBI0WxnPb4RAZHKHNyVojcknfv1LGbWTJt0XXYmLBEIBxpczADVud
+TIm2u+u8XCcvW7IXy5E/aG2hraEecA8SiC5vGuZFYAkZEzAMS6kHQxn5k0M7Kk5O
+fRZPKwtSyLl2cF0b66sLwnyIT6hQCZmO662eJEEKPjiK78DGKamceHnj5UDHqcUd
+hS+Cq6K3i8/Dq7oBl2GlxzNWLzVzWg1tfMi6/h78w+WTXdn2e66qAqczcPZi1X0=
+=XbIv
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.36.3-r2.ebuild b/dev-libs/glib/glib-2.36.3-r2.ebuild
index 0b0ed4cfd51c..6ad7d7010610 100644
--- a/dev-libs/glib/glib-2.36.3-r2.ebuild
+++ b/dev-libs/glib/glib-2.36.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3-r2.ebuild,v 1.4 2013/08/14 04:19:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3-r2.ebuild,v 1.5 2013/08/15 01:24:32 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{5,6,7} )
@@ -10,6 +10,8 @@ inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
 
 LICENSE="LGPL-2+"
 SLOT="2"
@@ -74,6 +76,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
 	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch