Rework the way we force glib and goi to be in sync (#518424 by Alexander Tsoy)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 10 insertions, 18 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 582d3b550aa1..f8d58298a35b 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.616 2014/07/28 13:42:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.617 2014/08/02 09:16:10 pacho Exp $
+
+  02 Aug 2014; Pacho Ramos <pacho@gentoo.org> glib-2.40.0-r1.ebuild:
+  Rework the way we force glib and goi to be in sync (#518424 by Alexander Tsoy)
 
   28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> glib-2.40.0-r1.ebuild:
   Stable for ppc, wrt bug #512012
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 545ae84a7087..7f8f88ac323b 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -20,23 +20,13 @@ DIST glib-2.40.0.tar.xz 7016228 SHA256 0d27f195966ecb1995dcce0754129fd66ebe820c7
 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.38.2-r1.ebuild 10136 SHA256 e276186ee74001eb75dd8b300a04395446034279ea30f81d4a9c3c60a3938b1d SHA512 30edcf3a44987b941451b0f0e24bb3d08aa2a233315a4bb02135c109aa334c9db8420a0739bc92aeecbe8d90478caff24deea3d30ceb661189dad6f20406afbc WHIRLPOOL 44f83bb6b1581a64c4037528c3c26e86661efbd07843ca887174c70de76c3a0ffc9ad5091a5604a30df86000da09808ce80bfbfa8c420c17cfe5fdd2e41f413a
-EBUILD glib-2.40.0-r1.ebuild 10121 SHA256 bcaeb1527972804d474c4cd16391c87408c5b8fa29975ff3830a2603259b669c SHA512 6ea685e96f64f8dffdd40a4afe0b2dee2bfe8c5107fee7cd45da1ebfc7acf06b39760fd73cb9de1f36d8017c475b873867f4a78443c821eb415d02b297fe468f WHIRLPOOL 2c64e4722a8895f3db302e4afba353ae284f377daf7f490ad9c2acfcb011bad8c6f40195186af94fb81878c8e96f88be257b1fc628dc5e0ef2c036a61af1b4f8
-MISC ChangeLog 86890 SHA256 0db9bb36a56dccba26153f244accdc9dee49ba2134ad05805f69e072961f42a3 SHA512 cece68403b36520425c45278de5783cd3d80cd3ab08757838531bcd354e267756419c8e8a7209969d294d8b172bfc6090be82fe93099d8dba035e061a528de49 WHIRLPOOL af1dd218f215eb7dc6ed0ecc01fe91da320df2d556ee6de71f8a87653feb95f69b962d7f49bd26394e29d2ebc2f21eb36da4f16f099d845ffb17edf15fe6da9a
+EBUILD glib-2.40.0-r1.ebuild 10054 SHA256 da8b6a6301c33aae8dc71e53d084981d478d2e79fa8485f8b188744c158a97a9 SHA512 5b69201c85d7b4151c08f8cc23808d7a4de9455494ccbe15814ffc300d532448a99a6236af0f90a144fd1ca65ecca1c00f4426757ec7219ff5cf1f2921a46910 WHIRLPOOL 2cdc24d88a631a3883b57f872ef877ebd75c0ab301e57e5b4e855a7418826881ac7b444a683002f4dc8b842f2b4833b7c3d2bc4d565c7c5abefada0de426892f
+MISC ChangeLog 87043 SHA256 d3f716b970417e3299540ecc62a64339a80480bb5050bd88a3c10f76e389fe63 SHA512 dcb44cfb275e6d8692b69538bc55721dc01cd1a32926251253eb66e70f8606eebfaf187c2a48553a578b51a23866bd85a6ccd8c9341d1029826d45c74faad706 WHIRLPOOL 9a3b193c5a2af3c724c34ea503d3aa48f36ec7fb033d41a25e4050e0905bbc24ec7c8af81da98a40c18b4256bb0dcf60abb1c3c88550e4c4bde268452d833189
 MISC metadata.xml 692 SHA256 d46beb748667144ea36ba0b32f8f7c27ca0e10faec80809852cb81fb3b798e5f SHA512 db21e2d66d280757c98065433ebb66720db113ee70807c1e69c21b782dc8c9832981098ffedd962839089f174c8b0545de717d5cd2969b8e7ae4640a382a3de1 WHIRLPOOL 7fc05ab8e50cfe9904f3f97123a16fa7e6f051d45e7c6c2616b0254529864cb7b029a329bda8102bf01bfeef287215f6536caca9090e22e7b0c7c59af8994951
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT1lNWAAoJELp701BxlEWf6S8P/0xfo6a2fRGd3FRWCwuBfXD9
-CQAqMXGUmChuLJpIyckl+s95TwaQ/h2Ya0szWI/NxHsy8NOpW1C5PzGHMyWKjnxX
-XC1rUQCvyL4KCYvElp5BLqfzddtVQypKfCGagVgvUCPO86oirD1e1HAtni0cEbPF
-8HVYVvnSAUDC5lo517dxSoVZhnwB9cvAo1xMA//aft4cTUK6IfWW9qJ9PMy+/BB+
-TsMOdSAsSToZpMTeo6lDDsVLyfNllPjs20RXxf5HzzJFWHjUNtZeINxmWA51LdiU
-3Z/3EGK2pGn+uqzdIuWwaIQ3IwBb4+WapJRZ7wbCZLiltpWs0fuarXelbY+voesi
-6tD2S6YZZ7RZccudajBSgM7BGL88woCs+h0rcF+B4OA7rZqNqrW+p6/WdbSFlJqt
-PphvNBYoTXp33svAqSTgDG3W5AaPQC7zUmELSPaDoSc2ja+Nmq+W1FbZPfZwDz44
-aPoCGRFw231s0st0A2V0pC6dAAjSEAqkwrWuurHRXNZ4mTmAAAOdANRJa5Nv40BW
-Xijrnu05EHDN8ftDT+o1Es17RV6JPRaWFwuPzUjO9KR2tYI1ACTLXagHbHzn7hJ4
-HJkQqjhTi0NKAY7kNzbz5fKXUFtS/s3fuESjpnD8ou9Jxix3usuFwQCBjkPnowp5
-XJoejYwXise/lCS94Us2
-=70O7
+iEYEAREIAAYFAlPcrFsACgkQCaWpQKGI+9TZjACdGhLUQEKxx6t+ez8cQLZ3XxiJ
+21MAn0ZHWP+3JTWFlo49y9KaCMHU8gZR
+=e6jq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.40.0-r1.ebuild b/dev-libs/glib/glib-2.40.0-r1.ebuild
index 63b98cd525c1..0e594e01a57e 100644
--- a/dev-libs/glib/glib-2.40.0-r1.ebuild
+++ b/dev-libs/glib/glib-2.40.0-r1.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-libs/glib/glib-2.40.0-r1.ebuild,v 1.6 2014/07/28 13:42:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0-r1.ebuild,v 1.7 2014/08/02 09:16:10 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -51,7 +51,6 @@ DEPEND="${RDEPEND}
 		${PYTHON_DEPS}
 		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
 		>=sys-apps/dbus-1.2.14 )
-	!<dev-libs/gobject-introspection-1.$(get_version_component_range 2)
 	!<dev-util/gtk-doc-1.15-r2
 "
 # gobject-introspection blocker to ensure people don't mix