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

6 files changed, 25 insertions, 38 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
diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index 3e868318bb68..febd5508e0f0 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gobject-introspection
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.121 2014/07/28 13:42:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.122 2014/08/02 09:17:09 pacho Exp $
+
+  02 Aug 2014; Pacho Ramos <pacho@gentoo.org>
+  gobject-introspection-1.40.0.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>
   gobject-introspection-1.40.0.ebuild:
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index db03f164dd40..82905949a23a 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -4,23 +4,13 @@ Hash: SHA256
 DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
 DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
 EBUILD gobject-introspection-1.38.0.ebuild 2216 SHA256 60ae171734654b20bb2c00101483f659241da5f9366ca8b78a8dbe1e5a2e8242 SHA512 777e3ad39c4a43c701f44b29f47b33e8bd83852e28ae69bf74de0dc1cfa49870a873efebf7dd780d8672a8e59feb0a845c6f98c3af41084bd47eb7dce66d172f WHIRLPOOL fc4ddc0e9a8721b4acbd4f66b66736b2c223e5a041aba2d9d505e71e7f2f4ed8653cd9568156672104e3a40c70fc8497e04fde48f808f81c5d2ce50b7063499e
-EBUILD gobject-introspection-1.40.0.ebuild 2214 SHA256 0760e05c929d6b4f962db07891baed789618a9bd327bf04caf15687548a4a6d1 SHA512 451cf0a745a5c306d0c2dd7bea92ee145bb9e976bf95249b15b84f5b8cc9507772b6b6170698462693cea6d980b1cb3d828745757acbc9bc32a75ea92f3e5c10 WHIRLPOOL 8392f9261504c3c595bbb997b1b6e1c7407bd1f2ad2e913125cbf1fb91427aaa891bfc0f7a816e874b83fafd6139d08fcb92ee9e2ffeb8aa6675999b700e5e5e
-MISC ChangeLog 21180 SHA256 3aace86ac569d2f5543fd35eefbed35c44a3b765563df927fbb8ee2ba8a2d2a3 SHA512 9254938b6a61e099d0a42c4f96462c93e995d7b22e0697a8a61b267eb1519a90423bae2c159c15a340dc346732c6b9a5730445c239ce3af21e2d3712d2ea93bc WHIRLPOOL 87b94b45973769374f467190b280ab5c64e45842420f5a898519867ea26a346baf257f4eceb492d10075e125f5a9ac49b6e5ce53a5ad91ebae00354b97c34549
+EBUILD gobject-introspection-1.40.0.ebuild 2345 SHA256 0688124966ddd82dc6f9364f2b3b5d45300772378d8314540f566032b020f5e0 SHA512 44903360acbd7b604f42b511cd89e22ba2854d501911deed71a0e822c0cba96032e498697ab6a1651649f8248730179fc944d366d6835448152cb8a3a54d1a04 WHIRLPOOL dbb2a9ac7e89c6b79e35951bc77b7616feb0526a2e3c6f632547c302b0385ddf890650b585ddccc3a4c6fa3d62107eb26cd2aea1515c0ea732eb1fe67e9d6ab8
+MISC ChangeLog 21349 SHA256 7ecdff789e61b45b7c803f8710e9d0b8696d55072a129fb051ba826297e526f2 SHA512 442bd5f3fe3bfb335556a5277776a175e7657d68411689c7968e3919c490c5598a3e32649cbdeb78b68171920ae2761de202c8cb57f0af0b141b441eaea5bab1 WHIRLPOOL e478af60bcdcfe7d61996c20223577fadd6aed7b4f986993363985924cb74fbaae37e868d470e1405526e8c2bdf2642ef4f7345f6f7d80c450ded5cdc7f9f8fb
 MISC metadata.xml 276 SHA256 64896ff5d165a9a750f5e13dfb6ae8ab203c9c5ecf1fe95f5828dca418652cb3 SHA512 69c30c46828ec7f02fde73973d64e48042242a42f7c354fe37297df0653552eed04fac21cabbe385efa9e0d348f70e718afdf328ebdcd203a109761b4b89f99e WHIRLPOOL c527df37fc6657961892dd27b52b8597a54f11f9da01e3acbe7cad6ebaaa6d41364e49bb1635ab5c5e354a8a56e11eae49eff1f394be934cda9322204de4e282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT1lNYAAoJELp701BxlEWfepYP/R5nKtGXjR0FU/qJW2ASNdLC
-o/f8oS0gAvJSwALKmbcsHkaPfyu4CJScOUqTrE6Ahk69Q2t/VHCl+JP1lxxwwsRM
-wsmF8Kp/ZsapNe5JYz3aR1lrJMBEaZXyvIQz9U1cau3KF3mW+Kl8rxEiMuZG9QTv
-Tk7UA8z5YmxH6u4BTQpZcbqcURcaNGflng0BghpwdArTnOltKoH0/UiieP3BR/K3
-zD2PynUppwtI9z+ddY/VuOaFkDOA9b3bNKZUcppkPNK5oM4Zrt7vgjuclrmlIAUp
-CCcTOYvoUClv8spLLvJ0ZbN/RUz6DN/fPJht+GI5czXKHE6P2pANB4eOp0RYaLmz
-TmhTLWkzzgpj2mlZxQquSrkTaEStuCtHk6ogrq7RgvBhUDsa/CtZIgpeTG7yL1MI
-7kXK8pqvsYDscihdpDcFa6M4gJl8Yr89Upv4klz4MfSLVJ3pcCvV9SX43s5zCRh/
-1XrCfDe09zJtOomLKhyve91uciUezTmRY6FdKHMeL7ijhXi2mEskUzfnyb++TFJj
-imeOZHM65w8L0mecvCQ6y/CTdSlsyVPBZlCJXBm8NBQCA9kKdH4tZGYfVO3ICySW
-bKzX9bXqkCVUvQ5gbHYhqnaAODH4LPAMWrJ6lJNmKAakJjA2DCwseg6PKXOYoUgu
-4rHrusZwWxEoYqHh05mk
-=etcL
+iEYEAREIAAYFAlPcrJYACgkQCaWpQKGI+9SxkwCcC3eZUeAAxWW7Pl+x6Tk4Mq1C
+3MAAmgP4j9gv5cE9Y5SJYefYVj/3UPiM
+=G6im
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
index fd1768880d47..0cd328e8c7e2 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild,v 1.4 2014/07/28 13:42:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild,v 1.5 2014/08/02 09:17:09 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
-inherit gnome2 python-single-r1 toolchain-funcs
+inherit gnome2 python-single-r1 toolchain-funcs versionator
 
 DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
-HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
@@ -22,9 +22,10 @@ REQUIRED_USE="
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
+# We force glib and goi to be in sync by this way as explained in bug #518424
 RDEPEND="
 	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.36:2
+	>=dev-libs/glib-2.$(get_version_component_range 2):2
 	doctool? ( dev-python/mako )
 	virtual/libffi:=
 	virtual/pkgconfig