Prevent user from having older dev-util/gdbus-codegen than dev-libs/glib wrt #517316

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

4 files changed, 21 insertions, 22 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index f60167aafd85..830a903bc651 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.612 2014/06/18 19:11:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.613 2014/07/17 15:12:26 ssuominen Exp $
+
+  17 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> glib-2.38.2-r1.ebuild,
+  glib-2.40.0-r1.ebuild:
+  Prevent user from having older dev-util/gdbus-codegen than dev-libs/glib wrt
+  #517316
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> glib-2.38.2-r1.ebuild,
   glib-2.40.0-r1.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index b937272e775f..d17f4d739815 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -19,26 +19,18 @@ DIST glib-2.38.2.tar.xz 6718296 SHA256 056a9854c0966a0945e16146b3345b7a82562a5ba
 DIST glib-2.40.0.tar.xz 7016228 SHA256 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5 SHA512 346a32f2d1447d3398ac2400047f0556517b914788cf9c8c9f28de5f395ef3993231f9a58fc103e08013fa2e7136a097de46aabdf4c035a46f883ca3971408a4 WHIRLPOOL d3e7ccfa3ac4270ccc5f950771238addabcbf025ebaf85a1586c7757493c6cdc3dc447f6ab92af1ed87f1c68c79d7b1bb6417b1894f8c0304fd87e04b1eb9b3b
 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 10101 SHA256 9e882a98466f00dba4ffce2571748e9c663eff87a3c5d91a70044839c021d6cb SHA512 de82ac6c9a5e18bf24cbaad3bff27f3a9ee0d1895f6db5f0ba7479d91a38dcb31e71b32dacd38ceefca78a7d4755a2dd3ce87fc5d2975cc9538ab71a2b06c178 WHIRLPOOL eac3e0af5bacfccc85b9a0fcb0f675019d71d8006b5f736816f410d7d44e35ee5b23ff0ce1f8c4c310707bb91e6c2f5d9843a56955de6bc3252c8b91a9d9003e
-EBUILD glib-2.40.0-r1.ebuild 10095 SHA256 8c312e8197654ecc5af1b84bb9ddd1de27c9e3b33ce3812760320d8d40e854f9 SHA512 5d66333d96a9cc01d38deb49e66772e24728f7ef2e1f7383db914b2bcbd522dbfbb5eca16d3ec60633a534d089f8af101706433f76bbac92c0afacf95a558c6c WHIRLPOOL 857afc6176ceae43adba62028bcd068b1d2e30aac27127ed9bccef53e0449abbd553c3a75631d633ab0d01bdd4a4df466df7b0290fd1951d0c7ba9436805a1ad
-MISC ChangeLog 86378 SHA256 519a429176a6ac592be6b2c3aa062f4f5890ba2702039514c8288e59e8bf4b6f SHA512 f0e968c07643ffa7e114dee73cfd3c21105dad89c32becefe8a3701afb02e1c01105dda2fe2adc724f86aad0a734aefaa426cd4ce2d599b9357408d7250c2058 WHIRLPOOL 2de40e2d94bed797e91f1f908eaeb90cf258c6db9b247b651adeb9592adbe4e626e6b7b2bc9141ccc941b81a135f506d3c6f95c85bfb627a2da458d7b6f4bf7a
+EBUILD glib-2.38.2-r1.ebuild 10136 SHA256 e276186ee74001eb75dd8b300a04395446034279ea30f81d4a9c3c60a3938b1d SHA512 30edcf3a44987b941451b0f0e24bb3d08aa2a233315a4bb02135c109aa334c9db8420a0739bc92aeecbe8d90478caff24deea3d30ceb661189dad6f20406afbc WHIRLPOOL 44f83bb6b1581a64c4037528c3c26e86661efbd07843ca887174c70de76c3a0ffc9ad5091a5604a30df86000da09808ce80bfbfa8c420c17cfe5fdd2e41f413a
+EBUILD glib-2.40.0-r1.ebuild 10130 SHA256 1e2af324e4312d30e6b028dbf9dbd1441dc220b4ee94714fac2ec679f7a424be SHA512 19414bdacf05005cf0cf02418181f6567dc3ca56d84d7a593d44354babb37e535adaba531a430dbbdbe19246779f4cfcc9fd701f713b7081a77d409538546385 WHIRLPOOL ebfca327f63962b9bde34d4e4b4d21d322ba72f39b16a1e8617971fc5b6b37fe46daa890af2966aafa37269b2c6cde8be868703b79cc3a6819978f3d5dd0c807
+MISC ChangeLog 86573 SHA256 f7475d4c098e044bee1881f129fe27711f32a05d147ecb64652adde868f1b565 SHA512 9a8f62511f7608296c62d8c95ed1068bb1485c6587a98dba1825084b3046a46b2b292467c09f6155d48ab0ebaf950ab0de54d90ea43598169dbc4c06f43267a5 WHIRLPOOL f24b9cc31b3054409a75c7b590083f98e277f7a5305ce8deba9a9fadfccffe9f5d7b69bd9d3b64ff0c79c3784336499bd2569039923fc206adc058ef9a71b6ae
 MISC metadata.xml 692 SHA256 d46beb748667144ea36ba0b32f8f7c27ca0e10faec80809852cb81fb3b798e5f SHA512 db21e2d66d280757c98065433ebb66720db113ee70807c1e69c21b782dc8c9832981098ffedd962839089f174c8b0545de717d5cd2969b8e7ae4640a382a3de1 WHIRLPOOL 7fc05ab8e50cfe9904f3f97123a16fa7e6f051d45e7c6c2616b0254529864cb7b029a329bda8102bf01bfeef287215f6536caca9090e22e7b0c7c59af8994951
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJToeRbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOeTQP/1Oj8zUk2qJ4y1pNBNtdX4tb
-+9sBNy7/NbJvXFUe1hszA2RhoyiDt2e+EJvEOvBK9vIXMWnJp2e/xWg1c0Y5umau
-hU613aP0czReRB6JXIGpYbdMbLe9YmirZh9mCxTVNAC4h10Z+mr82N4stF0+jfrA
-WiFHLuJPHA01KM3K3mYzJplsZILnVL/oVdrLIZWsf7CgRglUJx3VK4DP8g5VEQiz
-pVVqPnvOW8NzHgDWcL/4X0LPpC2CLnuzgHFDWypwt/gfUYMyEYaZKmxjaNY2+SkB
-0mt5QfpGPm7MQnNb4bc6X7aGIVUVn7ybSihfTVBfRzi9jrjXkh9WUlcPvYNWWvtF
-TuPbbp6mYfu6wnzxeKdO7Ou6BDRdoSb4bRpXieCif/2iqjpVV5B5VqrZB4LM9C+g
-poe8rOK+mLAREL0FApYqsGnfJAJNkRx5xQ+wUHERstzDYl+7hoCxb+PliLm/kxzO
-IavpQ+s9eerkOZ62bGcqavo4Bv3lDvQFbB2OlB+paA8XwS/IBgQfQeRq/Nv2IZaR
-uMojyed2yrI0loJdhoTKxifhMfse9lkyxC/LDRENInH1rWYsvJxliJNvMDIuFzqv
-UkRroQ1ZGR+JrpqXGxMcwYLYh9f2EmvW45z4Z0ITLn63q1ahnlCHoUXszLwCOfIp
-U+Nb+p6OwnWRfaRvwr7q
-=NPKs
+iQEcBAEBCAAGBQJTx+fXAAoJEEdUh39IaPFN/rgH/0xRTe0fFFdPXl+d4oaziJ1Y
+CsThHQbwkTyU20tA3vbzxPszgQVQ068Ij1a6gljyaRgHFB04Or9SGaA/hbRXI/bA
+ptyFxgllD718iFS1+JkF46dAFMO2lGjr7oZSB2snX2g9REkqwHrKFiVwebgmS/zQ
+KyXPR1MUVgbFlFkB8YN+mkFEJIS4sriOkGpeNQDcXGVsaAdsCDYXVAuFRz8qg9mr
+IP9VeI4i4zEwQREHiIWFcZN5hbNukTrixByyp/au0dpEFWrav/l0JKS3dL9pLZZS
+ZxNwnlxv+0TiJyukMdNB8UpaqE84lHCOtcirNjsYMA/tNf/G9hXkNhmw+BgzUEk=
+=Kklh
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.38.2-r1.ebuild b/dev-libs/glib/glib-2.38.2-r1.ebuild
index 9c4bdd6e6157..49cb2378c702 100644
--- a/dev-libs/glib/glib-2.38.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.38.2-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.38.2-r1.ebuild,v 1.14 2014/06/18 19:11:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.15 2014/07/17 15:12:26 ssuominen Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -20,6 +20,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 
 # FIXME: want >=libselinux-2.2.2-r4[${MULTILIB_USEDEP}] - bug #480960
 RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/glib/glib-2.40.0-r1.ebuild b/dev-libs/glib/glib-2.40.0-r1.ebuild
index 4e1cdf8329ff..dd80d3406f7c 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.2 2014/06/18 19:11:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0-r1.ebuild,v 1.3 2014/07/17 15:12:26 ssuominen Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -20,6 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 
 # FIXME: want >=libselinux-2.2.2-r4[${MULTILIB_USEDEP}] - bug #480960
 RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]