Introduce minimal USE flag to permit avoidind file collisions with kde-frameworks/kpeople wrt bug #548976.

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

4 files changed, 28 insertions, 58 deletions

diff --git a/net-libs/libkpeople/ChangeLog b/net-libs/libkpeople/ChangeLog
index f0e3434e1aac..df7915f8b4b5 100644
--- a/net-libs/libkpeople/ChangeLog
+++ b/net-libs/libkpeople/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libkpeople
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkpeople/ChangeLog,v 1.9 2015/02/12 22:06:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkpeople/ChangeLog,v 1.10 2015/05/12 14:03:48 kensington Exp $
+
+  12 May 2015; Michael Palimaka <kensington@gentoo.org>
+  -libkpeople-0.2.2.ebuild, libkpeople-0.3.0.ebuild:
+  Introduce minimal USE flag to permit avoidind file collisions with kde-
+  frameworks/kpeople wrt bug #548976.
 
   12 Feb 2015; Johannes Huber <johu@gentoo.org> libkpeople-0.2.2.ebuild,
   libkpeople-0.3.0.ebuild:
diff --git a/net-libs/libkpeople/Manifest b/net-libs/libkpeople/Manifest
index 35a2b602764e..e2e1e314b896 100644
--- a/net-libs/libkpeople/Manifest
+++ b/net-libs/libkpeople/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libkpeople-0.2.2.tar.bz2 51337 SHA256 4586807a170720c7fdf2a94761ab2ac9fc38d15d8c5bd64a1f9b71bcc5d37305 SHA512 85efe3902f5712261d2f611b33cfd6e24d466129b6716d56d67d011ef15d0746b3dbc1e61d6fb9ca085e633608427ceb423fd7ec2034b787313ac10061d9c81b WHIRLPOOL c37e6b61ee34386d90abbfb349c1df5eeca393b9da3a6c64a3a4188c07f8093badcbe85545c11a1f1385011ce5b099db896bdc91430951f40d43980cccc3a52e
 DIST libkpeople-0.3.0.tar.bz2 54677 SHA256 8097426149d68f9c8981b623879fa6509d59f99a3cf6dd58b4d652faba88c1fc SHA512 7e0cb8f397c0c18f51ad5d6516ae0d4dbbe16e2d3b1fab9f163253762d62178989eddfeaa3a61f58fc20f2bea3b962b6f39c120da6956390b94ff945d6aa5c52 WHIRLPOOL b0fdb0c3da20938c1003f119774829dbc5a21a26e36cc423f714b87bee3a4d6a532dbc1a387216403fa71dd5b3baa7b8e02b6b6d7b44c746ddb7d3ab0a83099c
-EBUILD libkpeople-0.2.2.ebuild 864 SHA256 203b7dd44e5b038dd8d3263ac9dd24cbcb920819280716bea10f7b9fb7064e75 SHA512 5da5c202d15785953bc23f761d3a96f86064085f9731fc9a042392c61164dbc777b86315002a8e167423e95c9f3da13e9cd8849482119c7ba2f49cb6d2a788dd WHIRLPOOL 912a9391f91a0c665f8ee0062549bb7db8bf9f9d86bfcd4eabe6aa80d8ae7f0594813f7941bec7ffbd74275eb63170c54f0d05f4ad074c6025b673dd9b083d99
-EBUILD libkpeople-0.3.0.ebuild 997 SHA256 07f495d939741f3af03c98903ac315ad5595178c570d948381301bfd8cd0d491 SHA512 db7b92182617fc2797359dee437a526bedbf3b9f404e8496dff1af6939a386517747b7586d12cc001d2b8402547a9dcd25db7b8168e20380c0205ac5dfd9e006 WHIRLPOOL 1f26036ab30a6875a6fa11a368f2023ad375c3b829690a8ae04d2df40f66a099d3ff0ce9c430995e786196dba03506089d8b57d03db3631e0ea903866448ec37
-MISC ChangeLog 1365 SHA256 23f54765b198b0eb261361c6c58f0133a641655e1fb72146c02e89ea1bdebc50 SHA512 884aa53cf43f220cf97a9dacf26faff14a72283e21ef4c29716fdc796947e84eaf48c15f1355b98f4987bb046def10c407ab73322d8853feb318b15dfd65efcb WHIRLPOOL 428285dcc273ba4beaec7fe2b6730d7984cfe11c8636444e79fbb4ed91e0ab7d2207bed9b33227a8228aa08b53ff4c2f8b25727c04425ed53889fc7cd7e407b6
+EBUILD libkpeople-0.3.0.ebuild 1097 SHA256 3d70132f555d4cbb4327d3be4d8edec1194a42ae4f594262ae139e7147c25540 SHA512 4bf045c7d828c2399ec4ff583902b57b1b5c9c8153bb0c93f696e0aa79889ad56d5424ce23c40ca7ea97b6a34c83e81a82e5a2ce7cf81874ab26a4ddc60a0bcb WHIRLPOOL e0578a9e9a158fada124e1cb04abe83a3eb0bd449a24e014e147591701deac92c72f8a54b94b46844c071dee84e79e9d3b10d3ffa1cfbbf7ab0c400262af2879
+MISC ChangeLog 1594 SHA256 a8c315a5484670eaa280fbfe2594363194422544aece79f1199072cd526c554e SHA512 c78a881d1ab199037667e250e4cc9c9c55e56d81709584383b5612b5087c9981e42473df86dabda5b04fd888487b89f2cebd36f4385845c16247cb10d155874f WHIRLPOOL 28af93c10c7c3bf11ff643ce2178e38ce6ef4b6fe1ce84f0c0bcaf1b65ac06871dfbb236658d97b60f734f303bfb0ddc7db08e17b92ce3c377ae5d181d3f4e48
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVUgVgRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJVUghGRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7JISD/4wPS9FVfc/gA/SbKDm6215qdDrl0JBZ9Nhc+JmemZQa97jXpJgqhayGrHt
-KQi0TDo2eLqAqqTcZx/RM2YalYDlxcUrTvh85ZRVDWzsdTba7LQJEb2QQTaUvYfL
-UGI+wMNHXev8CsWp6cpbrbFbfh4wgVxjfkO8QT32awjKjpNPFUho8nuitAPHrKRH
-TWRt4ljS/UD9NH/N0PnjCZp5vVhVAGIM4ELYIsFtWtFWHTWeebJyDf0Yc5lfqCtD
-gTrxikL3S35qyW+X+sVhWzT0FdBdjY+wjDQkECjRF209Xm2Omw5X1q/dRKBcCRyD
-ldkVh4BZdyruV7ymBMVZa8mLdArutaqSQC5x2kf7/yhulVv1ZExPqGyRMHqCLg75
-3mCC/gyJ2pP+NcY5iNBfPoZRfiwX5asDacuswrux4AYW+FfMagZlJmcdwacTZTuR
-mxx8bEPXTpVvB+BtDKK3f5FvvgcdD8gqqwe3ZkvYbxjQWaEP3U5YHW0rsUDtNYrZ
-rk3HWZl9t6X89B2NkX5v1XeH/2u4PUi+qVJ/Gdfn+10oisJ8xzquDcQRH+v4jB9S
-QU1t7noV6q/fKjPpe/ZzaupQ/W+H8tnHYe59zitJji4nPrU86gsduXG2uoFZt/o7
-mgtQxp9CJLb6RJjkkOY61A7lUu5RiQJcMXEYyekblfsL31bT1w==
-=MV4k
+7KTCEADFsyDap8zaXGI1ozb6idJ/gP7odgdmKpy7rMxybqUv4snRsMN0sdUTa4f+
+dde+dYlH8qQNIT9rS8/2UGjCCkqhE4HQwudZQH1bPck8+Y4fQ5Y/j7hgCN6H8z/O
+jtoOw+NKWz8YfxX8p268bAbVVrJ2YjDwAA+V1mQkBkdt+p9AxItACCIXoCKY3lDt
+dfGacrdzkZuf71OMAQuqFCp0Sq4IKBF/cW258B4uP1uxCPQ0M/vSF3W1VJBVOR1d
+4bqIW3xeav+CrPz74ahKdo/xyGYL2uGwrsxdwZZzdVuC2pg68MSOhE3ATXGQFhw8
+OalahQ1bga9p8rGeeLRlD9hFdVuW/FDyNN77iuZE7kZdDa3DHdm3ezeZwD0PrHcb
+sy4FYrXPy7gFStfaYa16dsMflBTameYGvUjkZrEg38EpeCaHLCYtoSuqpabpN8eC
+aOl+sS0zKPR4MRMcyzeQFa6A2VY6B27SRCxBkfV6dl7IXSjENeCfpf4RCFpewMzJ
+fHhJHgr4ul3JJQIN8cVjLyp3S5iCk5S6okcSC/RbYjLFm6UXCWdppSON077Req5u
+EaLZW9xobVXe2LkOLnj0tZPHxtJix7ie/sbr+58ZJwCuVSfAEQAEzqUFNPauZXwL
+CDgXCetvbu5/v6Z9ecM7RP9VkMDBH0T5Lzaf4CwLXn4g45pXpQ==
+=DQfk
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libkpeople/libkpeople-0.2.2.ebuild b/net-libs/libkpeople/libkpeople-0.2.2.ebuild
deleted file mode 100644
index 59bdb8b5049c..000000000000
--- a/net-libs/libkpeople/libkpeople-0.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkpeople/libkpeople-0.2.2.ebuild,v 1.2 2015/02/12 22:06:09 johu Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-KDE_LINGUAS="bs cs da de fi fr hu lt nl pt pt_BR ro ru sk sl sv uk"
-inherit kde4-base
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-else
-	KEYWORDS=""
-fi
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://projects.kde.org/projects/playground/network/kpeople"
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-IUSE="debug examples test"
-
-RDEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with examples)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/net-libs/libkpeople/libkpeople-0.3.0.ebuild b/net-libs/libkpeople/libkpeople-0.3.0.ebuild
index de09f3ba1059..eedfcdc67d92 100644
--- a/net-libs/libkpeople/libkpeople-0.3.0.ebuild
+++ b/net-libs/libkpeople/libkpeople-0.3.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/net-libs/libkpeople/libkpeople-0.3.0.ebuild,v 1.2 2015/02/12 22:06:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkpeople/libkpeople-0.3.0.ebuild,v 1.3 2015/05/12 14:03:48 kensington Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ HOMEPAGE="https://projects.kde.org/projects/playground/network/kpeople"
 
 LICENSE="LGPL-2.1"
 SLOT="4/4"
-IUSE="debug examples semantic-desktop test"
+IUSE="debug examples minimal semantic-desktop test"
 
 RDEPEND="
 	$(add_kdebase_dep kdepimlibs)
@@ -30,6 +30,11 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
 
+src_prepare() {
+	use minimal && comment_add_subdirectory po
+	kde4-base_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with examples)