Use ${PN} in the gobject-introspection blocker to be future proof (since mixing might work only out of fluke)

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

3 files changed, 19 insertions, 16 deletions

diff --git a/dev-libs/gobject-introspection-common/ChangeLog b/dev-libs/gobject-introspection-common/ChangeLog
index de72c419060c..e56673a81173 100644
--- a/dev-libs/gobject-introspection-common/ChangeLog
+++ b/dev-libs/gobject-introspection-common/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gobject-introspection-common
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/ChangeLog,v 1.19 2013/10/20 20:11:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/ChangeLog,v 1.20 2013/10/23 00:33:01 ssuominen Exp $
+
+  23 Oct 2013; Samuli Suominen <ssuominen@gentoo.org>
+  gobject-introspection-common-1.36.0.ebuild:
+  Use ${PN} in the gobject-introspection blocker to be future proof (since
+  mixing might work only out of fluke)
 
   20 Oct 2013; Samuli Suominen <ssuominen@gentoo.org>
   gobject-introspection-common-1.36.0.ebuild:
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 0284ad18c22c..36024bc4d3bf 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -6,17 +6,17 @@ DIST gobject-introspection-1.34.2.tar.xz 1088768 SHA256 bc7948a35ce2218922dfb080
 DIST gobject-introspection-1.36.0.tar.xz 1201108 SHA256 e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383 SHA512 5c6d17851ac7d1372abdc6a9ced44d1c2313b098e6fdfbe7cba78bff66032923fccddb58913753f46e1d7fea09536bb057ea2ff7203d5f4f7540badd830eaa83 WHIRLPOOL 1f31a314a9056f2f452e59808ba143f5e387f1c7c82ddb0e3f20295592850995f602a2a82b36602b7089cddb192896d918db02190e411710d8806dbdebc77f4c
 EBUILD gobject-introspection-common-1.32.1.ebuild 1116 SHA256 77336de47ff95b09f3212ab3b8a4299b417b4456240d897d951e4e6f977b9fd9 SHA512 a7c3ea232dabb6041ab66fe889b8d5461eae579c1a8cfcf359e6d65104f2cbfe27707b60a5516cd97068e287abfc6e46a18f044f25e6767539632cf28454ce88 WHIRLPOOL bd76fcff70eed43ca28248c1b9e4ed507283f138fe5828db142321130383de7123adb09da9ffc2a9bfe79340311869aed7f391a639c4f0db7fb175a4ae5975cb
 EBUILD gobject-introspection-common-1.34.2.ebuild 1133 SHA256 68882fc6273723032e7f86f96fa97c20641f949e2483b6275470e8318b50b411 SHA512 c87ddbde96f1a7068d0a2175828fd2c42f1ff14d8db488b3e75ed38571facb7274f8a0cd61b4b3ed82be7c6edf6b672d3d1e583d3c3d214e21b895ff2f908d94 WHIRLPOOL 0475fe429801efb581e955c56260c4e413f78c54c92601971c64a4bcaaaceae3e6f686a2f8562ef6c43e027ecb7a3034ff79b788ad7c687decb4a42c58343d33
-EBUILD gobject-introspection-common-1.36.0.ebuild 1246 SHA256 0e3493c18375ce0ac031009f612a8b402841a37d458ca151e961a766d04674cc SHA512 8b090b76cc0f75c3512e4cc33ff075f835fb972d4d7c158b14dc838e4de532abcf6881b270f014b790a35bce507c6f160ce726c774ead40041ccf30b6b778a69 WHIRLPOOL 870e0e724ecdb0d880cba1a8748da9ac88908bc76633d9b4b7c1618a2e3b18bd924c2d6335778ca534e89baf030016da856c44b6f72fbe5fd49470753cb4a27a
-MISC ChangeLog 3499 SHA256 39429e3ebe6fff3ba4f61e6588510120fe44945417431686958860604f8b8b0e SHA512 56d3925d27a58a48d8330061d9c6e2f59560937588fde65e079c00bc291250952de858f29f4f001a02e5e449b0f62ff5529734c2e864181511754300addb92fd WHIRLPOOL 98bbe71342f84f5506e7c66a30a82fedda29a9a484746a8eb57553217722127f45f097542204b2f84216c8e5ee7b34c5e764f4e0d25c6204864ff959724d5d26
+EBUILD gobject-introspection-common-1.36.0.ebuild 1213 SHA256 fbd189b146f315914d194bbcd257c30a07b18cb487d006140c78c4330aaa1297 SHA512 ae5f2e2902b291086cdd90c8e56d7b1d6f633721c8434230cda8dc96c48ac3c6af1c17fa2b800e9373bbf5ca5ba961d4e0d1616dcfb8090165d25745bf7c7c44 WHIRLPOOL 262a109d099480ec8d15d6e57015bda94a1e6c475fd4bbebc115986473e2607bed6801bd4035807b1b464ecedc57f32169df14a825a373422430d5a0c96bf388
+MISC ChangeLog 3714 SHA256 7b55d9387680b3ad33904c5dd391f1fcca66c388de5416eaf494561a8f983136 SHA512 09748b9303cb908d127a3128909ef148c384caf958299f26498966ff81044ee0f2f0d55739fa80e94a5ad02867fefbe4fa4b21a34f0c910d82b3515d11bc49ae WHIRLPOOL 789e77049b649a46a3bad1747b18c027f18a825a4f5769953765fbe0e472deb17ec017a8b50de5eeb137358916dd6f1b2d8892ebf9f6850dc3d7b36f57175dcb
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSZDhcAAoJEEdUh39IaPFN9YwIAIgZeQY4bLRUTEnrYxXkrgzt
-kkPYLVd3WuOvfdI+aIBQCcWX3BAPSOGbIIz2Fy9ucN33ZBqhEdmlMLoRAt0IAN5d
-CUjY+B2Suq2T6UxRruf7gGdP0+XZ/TxCqvDQMKRW5xYRqSry6nts4a9AuSzFmVeR
-tkH9FMBkJy3UzGyVqQQoNSXjOxU75HCwGfOp62sqLcPCfXWMtKCdlYsKwOcV/UwO
-68XDHB8VjCa8oXsuxBleiBq9TwG8X6dhyBGv/jrdgAbDcg0eTPM0RySoK7ldSpBL
-1Fy/rKFb2GUsoVwt71DQjNLRLpNC+iUxriHlvZ3CwSBmKrYxEVnB8RzDA7Q/k9o=
-=FE43
+iQEcBAEBCAAGBQJSZxi4AAoJEEdUh39IaPFNb58H/R+JBZZiKciXvZqfu+dfLHl+
+pYs18zTmazQnQUWPpg0E2B2DxNV5Nv9IntYYy33qk/Thqu5ZECrWFGjlEGM8awMw
+L/L4T7j//KUg1FyFZLk4bAcPeIUknLqz9/aqi/WGXadDMHkA1m4jOvpoQWDuRrZh
+mHMK3Uknk2yT3dOFQZA+47J+3KT+C3iFY5vhRPRu9eYMDqQv4lbHNZpzjM3yhDsP
+Crc94d7nsaOP7ZWO6Ls7k1KVsJbMKCEYaidUKuoCleL+4Sn69CSN/LYilB/qihx1
+0lnUUMZxoIuXVGx8MdO+1T35daESOYWGEPgJ95qye3fCeQFh3XAZT9TUg1vI9Co=
+=jA5M
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.36.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.36.0.ebuild
index 025d534f7bf6..dde20e1f679b 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.36.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.36.0.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/gobject-introspection-common/gobject-introspection-common-1.36.0.ebuild,v 1.2 2013/10/20 20:11:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/gobject-introspection-common-1.36.0.ebuild,v 1.3 2013/10/23 00:33:01 ssuominen Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="gobject-introspection"
@@ -15,11 +15,9 @@ SLOT="0"
 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"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<dev-libs/gobject-introspection-1.36.0"
-# Before 1.32.0, ${PN} was part of gobject-introspection
-# Update: Changed blocker from 1.32.0 to 1.36.0 to prevent http://forums.gentoo.org/viewtopic-p-7421930.html
+RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
+# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
+# http://forums.gentoo.org/viewtopic-p-7421930.html
 
 src_configure() { :; }