Introduce blocker on net-libs/libkpeople to avoid file collisions wrt bug #548976.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

5 files changed, 37 insertions, 8 deletions

diff --git a/kde-frameworks/kpeople/ChangeLog b/kde-frameworks/kpeople/ChangeLog
index fc8f7c9f2109..5b019702047f 100644
--- a/kde-frameworks/kpeople/ChangeLog
+++ b/kde-frameworks/kpeople/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-frameworks/kpeople
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/ChangeLog,v 1.3 2015/05/09 10:36:05 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/ChangeLog,v 1.4 2015/05/12 14:10:51 kensington Exp $
+
+  12 May 2015; Michael Palimaka <kensington@gentoo.org> kpeople-5.10.0.ebuild,
+  kpeople-5.8.0.ebuild, kpeople-5.9.0.ebuild:
+  Introduce blocker on net-libs/libkpeople to avoid file collisions wrt bug
+  #548976.
 
 *kpeople-5.10.0 (09 May 2015)
 
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 498e6be49637..e0bb724f7c22 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,8 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST kpeople-5.10.0.tar.xz 56308 SHA256 6a327e888cf603d5ad7bbbccc78981bd6e5b26691ba88860fa2f0705ef60a62c SHA512 616b736f9a44455ebd3526e6a8fb6d2557d9340d22834dcb0b322fc72abe9ffbe8066fdaf09d8153aa41a2c2b2d6bf820672f6a1dc0cc301328a4bd2a2ff59de WHIRLPOOL 185f200ac74b7c064e5b28ea0b78320e2c377837da4bb72ba1243f610922954eaa9d79166e56eda393b9cf72ca63ea3d4b19f05132e99ad89276dc5bbcfc1bd0
 DIST kpeople-5.8.0.tar.xz 53448 SHA256 0516f8df4992bdae2ff57425bfce84e14d45635cc6697b11a9111ed8b5e2a2c5 SHA512 a5d40273e1cb3c04ceb0458dbe9e1a5a1ec1aea22ba850dc8a847a6e41534d82da21a0344bcaca73fd97fef9faa1f66c76012ce303ed58dcadb88768335687fc WHIRLPOOL 197798e96cd139d727bac2a71a443686761b585874bff494c14f4ed80b7a8385b0da72059fe85e0b5fd49d3d33a805f89ea85be8e7529ae96b6f5b8f3e5ff5b2
 DIST kpeople-5.9.0.tar.xz 55356 SHA256 649ae7c4dd5f5703b07dd7ccd284e0953cbcb21d7897929ac8aefa09d02cd9e1 SHA512 ae3bc2795e51120934230b709dc0c389b56c3ab9053c69d9a10f19e25e3828332d9a1406d59e1d144037b59d09ebed5a7250310dff6c8fc334c67576e29bb5c2 WHIRLPOOL e1cad7d8fb8382254db214faea33dc08e595c6f01166b30fef28bc4afe45fe2ee2e9fdd0552f93a19277aa759194933c680006130eb725b618a21b6c77825bd6
-EBUILD kpeople-5.10.0.ebuild 757 SHA256 4b565a01f30ac35eb10233d2e225e576f1c3bd9475a5495ee9f0507b3c389d95 SHA512 347cded4c7ff2359b5fdae2ae4e7d63b04f191f9741b3acd2c0ea952699e5a00a1d346ff15f0f9ba6f2a1d6bef713a80231f0dbfbe24ab74d8d0861ade7c8924 WHIRLPOOL 15444ef2301699373077bc1a67502f5e4f8be7131f7deac15ca7a9b650124fb479db96d8298db1ae4a5c29c1e3960c1641b1fc2193e04c6bec3ef29cc929c66e
-EBUILD kpeople-5.8.0.ebuild 761 SHA256 4d7f91bbfdb4b5fe52c0fd2cf9cfc2045f2a5a813528372036b5c720dcb3500e SHA512 412af76334b5b2ae735bcaba9a71ed5380135ef985aa590f805ffe1f4599f046fe6c74fa4ea148dd99fa22fff495f694aaefcb78bcc5460866579115c004b31e WHIRLPOOL b8e6bc3a1d950d4b5561f0bd107762f4fb25d76476d70ca5a9f20614f87eec814cbbe07267e291849c882ed9f9f7125bbd2bf797065c2ab26177d0421bef31ab
-EBUILD kpeople-5.9.0.ebuild 761 SHA256 0ee54b0896b2350348338bac1b9fc158e0f3143a06f0f0c804571b6016bfa4c5 SHA512 8f75ddc9bba43b61e0cf80cb5488f90ea5cbb40df36d2d46e20238125a8f51cf42a5dde3f21ba45560dfa9fc9f800bd4c58d24dee22c485d03cdbb57288a1315 WHIRLPOOL 45df2ffa977b4aeb797d48298a50afb68b522ae684dba5dd5da8c09407c0fe444941e2f2fede775a1137e092bfab8ed345f198b11b2d4b0a7d4a0c393c2f26e7
-MISC ChangeLog 615 SHA256 a2552005f14c9914be194d4de4c16dd2c243399496e8d33b03c1751d471d700a SHA512 0b87994d1f9737112b604bc1166e008da47d7270cfb102c94b7634e1e77d135d35974a00e45b6a9cc36a8b03e7adbf4e8e1e9ff7ae03b8f4737e41c8e33d7fa4 WHIRLPOOL 2ef68f0832b7f5b8599ef1d5245c40b76eb1296eae34ba0c566c6d1a5e6680e9f6ae86c06adad562c26b52dd265019208fb3199ffa81349ff875f77ed48ae795
+EBUILD kpeople-5.10.0.ebuild 797 SHA256 2832e436146c839dc81f9fbb120515d925586d7eab111c04b6e3869cbb7ebf91 SHA512 87184e4f1ce4b9a4866cdd0ad2d2503b3db87786abbfe01bc5c48029055cff6546d5f0aca710044f81b31a24ed11482198430cf534452aec85e720ebbebe0921 WHIRLPOOL c43620b5844a54af03dc0f530d8e9257c883e24927b1db407403cd473876113452f739557b9f9ce3d941e8e262cf6db615d560a5e5891fc8cec42cd9c41d552c
+EBUILD kpeople-5.8.0.ebuild 796 SHA256 5653cc8515dc9990c14ac33a07d2db6abb1abc2d374881f9df9372e953a4bd30 SHA512 39319a03722157b087e1c4791f7e10c325253bd6355900f10d4851e389ff4cc51be62458e6052adfd484d610304c197b8394e660176c79bc43ac11fe6ab40d8d WHIRLPOOL b9f9e442f67df2d6b594041e11c2e030700993e48814d1648322fde4717a2d64ac2243ea5cbdc3b24d32acddd85b8b0140c765c1b5fbdc6e4bc48df851e2c8e1
+EBUILD kpeople-5.9.0.ebuild 796 SHA256 cb53aed4fedc62e64a918e1e9b930610682fb8223904433a43ab4175e6bfe9f8 SHA512 0757472e0507866c080b8b284f60a20afbb527dac26f283e1455d30ca954596debda5dbd3428f0d5e2b1735cfbc98c067adb901d85ff1ecf7e6fcbcb7c95df01 WHIRLPOOL 5ab7736bbf61a318b7bebfcd6b655dd253a96c025d054ea84869d9ddc5c05d2917ba96ec7801df2b2ded81c35e7f8f8df33193e4ed62c28171946915fcee2a04
+MISC ChangeLog 833 SHA256 171168bc8bc71bda069c1ce999edc83f9e8dee8ca63ba1dbedec9f1932ebdb4d SHA512 58d54ad3f93fc4dc3b0351fb90f25e7d5c76d327d957ec05c0eb49fb6ca71190ed4a3667c60f38a0b7ce772cd2620de6438c5826ef3eecdec35bac7d4c21e4d4 WHIRLPOOL 176a2ded178a6cf23190d433021222c2429343455e26ed77e9b08bf6ae95e3efea71dd6e1d7dc0f7251a11daacbd5794bc5a17562759376eec5e038435f92ff6
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJiBAEBCABMBQJVUgntRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7ECzEAC7jg4AS3CR0aIE409i87FvvBmU+I/tadWkARZd71ckZGMU+wDxncUJZxPJ
+f70ZG/uaqG+G42+v6wqdb0DbgfSsegcT3r6wAL0g+xFHei66KA6gyOccTPPZ9bst
+3LzAXyEseUf+QdxlFFtZHysmUigQUHRqT8kaONkoZqIguyfs53PMADkltMr6IiYK
+L/GQcpCQvRmWN2EyI/0O4/yslf3C30HozcOYqQUABKHguXeadRtNmf5ouWb1JqMt
+REu95OFyUF//03c1tYw23uNUVmCGWxpa8XGSEPdBBgOUwBxnT++qZHUCMygF0Vvx
+xbeibTXl4PQcCsgzvHehnY5TkiaCmMKgyNbYB7vg6sWdMwwGQj/xo1xkqFGW5whm
+11JSmihx1XcR44ow8HmBbNtR1/oAZ99ETTInfAalteO7CYPQ5jsXJ6dw3Zi8rdi4
+BF5sh1sf2LQS1QHvfPnTVWBvhv5wB873juAy/7EEbnZhzB1TfEjjutem2TmKdlji
+OkFONtOPCeh4qtqCG1DSND5abeJu8QEvqk9BhVLqdW2nZ19o0J1XvLAPkTDVy09g
+os/rdh/RMU0XzGp1+5MsEMYUHHXYwX9VNDwJJErXmS1x96eX1fi3jlWZ4KJtvdHw
+RFZmfmUAqNE7QidC+ABn7C46/lOFX3x33fedF6FIh/2j87zaoA==
+=K8sy
+-----END PGP SIGNATURE-----
diff --git a/kde-frameworks/kpeople/kpeople-5.10.0.ebuild b/kde-frameworks/kpeople/kpeople-5.10.0.ebuild
index 1ec825f13ecc..f2898087a63e 100644
--- a/kde-frameworks/kpeople/kpeople-5.10.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/kpeople-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/kpeople-5.10.0.ebuild,v 1.2 2015/05/12 14:10:51 kensington Exp $
 
 EAPI=5
 
@@ -28,4 +28,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!net-libs/kpeople:5
+	!net-libs/libkpeople[-minimal(-)]
 "
diff --git a/kde-frameworks/kpeople/kpeople-5.8.0.ebuild b/kde-frameworks/kpeople/kpeople-5.8.0.ebuild
index 0c381014fab4..125823a05de6 100644
--- a/kde-frameworks/kpeople/kpeople-5.8.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/kpeople-5.8.0.ebuild,v 1.1 2015/03/21 17:29:08 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/kpeople-5.8.0.ebuild,v 1.2 2015/05/12 14:10:51 kensington Exp $
 
 EAPI=5
 
@@ -28,4 +28,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!net-libs/kpeople:5
+	!net-libs/libkpeople[-minimal(-)]
 "
diff --git a/kde-frameworks/kpeople/kpeople-5.9.0.ebuild b/kde-frameworks/kpeople/kpeople-5.9.0.ebuild
index e231a0435f1b..9dbcba1850a3 100644
--- a/kde-frameworks/kpeople/kpeople-5.9.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/kpeople-5.9.0.ebuild,v 1.1 2015/04/11 17:09:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/kpeople-5.9.0.ebuild,v 1.2 2015/05/12 14:10:51 kensington Exp $
 
 EAPI=5
 
@@ -28,4 +28,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!net-libs/kpeople:5
+	!net-libs/libkpeople[-minimal(-)]
 "