Introduce nepomuk USE flag, bug #508350.

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

5 files changed, 37 insertions, 32 deletions

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index 9b92b30fed81..8ba4c5bfd3ab 100644
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/kphotoalbum
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.62 2014/03/21 20:55:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.63 2014/05/13 18:04:46 johu Exp $
+
+  13 May 2014; Johannes Huber <johu@gentoo.org> kphotoalbum-4.4-r1.ebuild,
+  kphotoalbum-4.4.ebuild, metadata.xml:
+  Introduce nepomuk USE flag, bug #508350.
 
 *kphotoalbum-4.4-r1 (21 Mar 2014)
 
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index b9d0b9d17ae2..c2d5af53c026 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA256
 
 DIST kphotoalbum-4.4.tar.bz2 10544428 SHA256 0ad98048d674e59f2e636c538c62da5d18fb29840b94fabd0a016db622c89142 SHA512 d984dede876af64c51c4d845d2af61f71881c3caa8950af7dbeef34ddc40a082fe5b9b27c6fded78f947fc14b5f607c871a67bc8fdc0f96e1ac7dc0b3c1b7455 WHIRLPOOL 2d9736618a5462c1849363d2f21f93cb2e65db0925baccbead3eff8826413a9e77237582a6e21c7ab2acc96c45c4f1028b7c07f162bd29980ccf4b95b0a64ae2
-EBUILD kphotoalbum-4.4-r1.ebuild 1485 SHA256 c5075d031c683130fd6c431a6957e50fc02ff10be925ddf494b4bc3e9f31ea1e SHA512 0ef8ffd190a32b3b3acd091c76c94e9885d784da7bf0d62f4410715aa4e4510446ff21ee6cca71eab6290d3be1207a8ba7a3208e27be852b39ccb84478890b53 WHIRLPOOL 7185bcb5558d0fa2db8b40cedec790ba33965fba89122caaf2cb2cb362eaa0be4bbf2b632243e26eecfcd5b22839e3e06ea706ef6de57c53e22f2766c9366d17
-EBUILD kphotoalbum-4.4.ebuild 1487 SHA256 8655c9d393d4d2e4d027d20f663ef7fa558e4b94f0262504b15166a6c5fb09a4 SHA512 6c039a6539529d0d2cefb947d5aaea3f27e7667c8ef00f052f98444a99f6c19f990bf61d64c47957d17adba8688f0b73af86a2585565291eda9dba3fdbca9066 WHIRLPOOL d2add0b57e095645952c18a2b158fe9589cfd7088d5c79f2cdd141f7693c3c46c0a49808137449fe58a4ada9944420232556db82ed5fb47d4acedc8b27b63480
-MISC ChangeLog 10557 SHA256 204df5719aa26cf113d24df8f3d90e6a44fe92928cb2a68f32719c6a475f878f SHA512 227dde503762e6737c3caa8be071198d678d1b58d902190d8694f9bdb35f7162e73253367906979c656ac0094cd4c4d35ef4b0e64f35bd9c9fbf870a94c6339b WHIRLPOOL 7b927af42cdf90263406fd4d97c0affe9334407fdef8e8bdf1b87756e37bb115310894a103b327ef37aa54ef7c0767f1e449e83aa2d1d9ef31c56b4edb3a61ed
-MISC metadata.xml 314 SHA256 356aa0127738afc738c007b41abf84e5f93730741eb05176f7f525e04c36e73c SHA512 b97db24970fb787619385288917c07e97fa32b15c019225365f4d5980507d8af9802b65caaeb8b394b79d6144946398b020d1e42598fffd03d9495ebe8f37980 WHIRLPOOL a742bd08f24dbdbb39c69e9a07ab8ecf798510d7fa315d4cda56665116afb031a1fa96ae80472f1beb4390ccd32d0829233aa678039d0680759ba31f5ce866b4
+EBUILD kphotoalbum-4.4-r1.ebuild 1431 SHA256 fe8d11f26c54d997fd65b99f687f50ce905ec8f15fc9b9d6a0d838ce94b13eae SHA512 b3b785c3260a835ad3744f71e93d4814011075db3dfdb7b17e815d921e17fa9eb51bfa039f27123a6fa24bfa323a70ca0fe3beeec8487abd2092ac5a32d24cff WHIRLPOOL b86595bd692f89a963045d4cf240fbcdc442b94b7c303459254d470872aa801988b3f40e314590cf2aec30270818ef4e26aae916fc6980eb40313b3d10ca1434
+EBUILD kphotoalbum-4.4.ebuild 1483 SHA256 120609f3724726c9eec6053d80d0a1762e1d49945d21e530ef1a9ed4c17fa04b SHA512 146d382c8f45045e0eea98136facd7d512c9c15947dc838b6421bf344754fd89d00bfc67a29fcfbfe61ac34b764579556337810a39f05c9be15996e4a076b5f0 WHIRLPOOL 19863ee7beca1095833bdefa2c97360765327d18429ccd965cb0e33be2e69410aac09ff05ae3d71013559fe84450f48dd00c56caf2680ee68e7b697bcd54e667
+MISC ChangeLog 10716 SHA256 ed67142c9c7a911b3d4caca48870151f7f22f35a9f5ffa66f2db178471c8e3ee SHA512 7b61f1dd1196b643fe691d333032ffe5957f0d940b18a541a0dd5b630a9446aaf561b859a1697ec01d17d8a96427f3df90c0926a1e6945e33c5a5d2922f63a68 WHIRLPOOL b5e491fc0f471c026977662f38c0cf1ca7f6f0cb976ff866c27fa9dfdc15782926c9dae10d54a36d1ba0cc0c13016f8765f8ff4c8ac4fb755c4ad7e79d00109b
+MISC metadata.xml 408 SHA256 73b63710622923ae11e2fa2011de0db42f368a6fae54b9d480e5d0b1aa1639c5 SHA512 4b93a65edacf31496c51c85b166cddefda77104b1500d67829aede39928819a0c3ef1bcbbee9852d1dd6b29545fd1a0ebc7292b8751822f58000e80e3f245789 WHIRLPOOL 9cd41123183ad56537a1e2c55f40ddd731da1c65242762a01e4ce0370ea3feeb7def0258367b6950261b09a64310d093ca0f70a466daa88505481ccf28947f35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLKcsAAoJEGVpnaTzz9K9em0P/3HHkF4WBB6m1bcJL3hAwiQM
-f5wIiLJLQfGgDTh23hfzyedYOV/WJfITGF0vqLvNetw7uFwoTqDIN5iiMTF+ZOe+
-Mu4zfHovxltBn++tzlEShg8rUftUvlAcDFZBKSoLfkBeg1aZ8rdFmTrnOumJ7ETK
-oT+TCxA9Nj7ksI1pFJupS2pGVWCYqrA9CLIvwnrWbplp2i8ZffDrnicZQi2Xx7ZE
-C7T7WUytZQHsRKmYXU5uRzOa9OlabCQc1ydtg9hUmfFlxNJ3cp56FxWwQev6en9n
-cJ3YiSEE4KHUS1PlGyf6h3f69CwXugW24vb9TLfLYofrL4/cyKO/IKRq011YuD8Y
-YDpHmIwwQLPiaSdELIYYmHJiw+KSVdvGHWLnhms0aZQwAwxGnA/HgC8mvCMDfgAB
-yu0MFEHBxC7XyjLsrlFbMf32AiFMJpjYzrI+sbPxwGe019P89PHpLvmKDn++cXFO
-ty1EY4SAh841+Zpyc+kOKcQioW+dIepMKqnvLHBKnh+W6sPeuuIFYdGgidYndAyS
-UGQxuCDmg7tt8N92lBY+KXbju+8Anlw4nvLgRiwtbCq5yc3TJbBKggoyso5z7Y32
-msfxZPqEK2XPaMXyXyAFN748GHYv0zIvZIfH+QbwlGaq4nknLRTNuUWrzfh3X17y
-ckHzGsNXQ1MOdVhhGNpZ
-=7/hj
+iQIcBAEBCAAGBQJTcl6/AAoJEGVpnaTzz9K96iAP/32+IDPimo58uGc+d2y+qjeR
+/mffIVDmLmtz6bt8kVDFcgYCBgOpFvcJDj7ogmyASN1Uf93Mhx5s1rfYohK5UB5o
+r9ijKqVvzFQVpwCYqjC/2Mv2WeOkxjf4knPb830LKvXwamanvGWBkxoNdii89TaF
+afuQKrt3YUA8z+tls4GqDHF0/K5COt6YzXq0dgxC854co5t54nB2KjuoWyT+ut5N
+Oi5joXG7vnBKNOvW/IpGLn5hQbss47O9Ygg4JNr0/c2USfxgcBV2NnkD0yAwJDz6
+tPr0GDHnpEpEzjqRo81ojD1tT2gCo2kABFtcSuI05A/TiPdQuhpPvgZNj3j/Et9Y
+JfQmzHzU2S0RfNIVA2fMbstdlTBbjqZcLMy9x+jSqnmd5to/SlaUoUGrpCFAe7rH
+1yJMmVE5/aLN6+V2UyYrUUDrrpqHlYFeVuLpLdd5zgPBBg7vj5Vpgb5pvgNVbc8g
+Xr258sVFDL6/jWv0Wxs5+8EObTKKY0rveS4UmuBg6fSvAe06H9OXddhHl5kQlWjR
+p/m28wwxNjZ1NzuCjdEu1aByQx2nscfHyDFBmRd5Rw0yndNhXG4VxXIVC4feJVNF
+5G92t0b8mbT+pJT6QmYBC6EFk8UMage92KLOqwFGF6VHn39/4FumDovu9RQ81DHS
+geZrbVDBc2/Q+yWJukts
+=AVxF
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.4-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.4-r1.ebuild
index e5680bda3642..8a170ade88ce 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.4-r1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.4-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/media-gfx/kphotoalbum/kphotoalbum-4.4-r1.ebuild,v 1.1 2014/03/21 20:55:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.4-r1.ebuild,v 1.2 2014/05/13 18:04:45 johu Exp $
 
 EAPI=5
 
@@ -16,10 +16,10 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 LICENSE="GPL-2 FDL-1.2"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="debug +exif +geolocation +kipi +raw +semantic-desktop"
+IUSE="debug +exif +geolocation +kipi nepomuk +raw"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'nepomuk?')
 	>=dev-qt/qtsql-4.4:4[sqlite]
 	virtual/jpeg
 	exif? ( >=media-gfx/exiv2-0.17 )
@@ -28,7 +28,7 @@ DEPEND="
 	raw? ( $(add_kdebase_dep libkdcraw '' 4.9.58) )
 "
 RDEPEND="${DEPEND}
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+	nepomuk? ( $(add_kdebase_dep nepomuk) )
 	|| ( media-video/mplayer2 media-video/mplayer )
 "
 
@@ -40,8 +40,8 @@ src_configure() {
 		$(cmake-utils_use_with geolocation Marble)
 		$(cmake-utils_use_with kipi)
 		$(cmake-utils_use_with raw Kdcraw)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with nepomuk)
+		$(cmake-utils_use_with nepomuk Soprano)
 	)
 
 	kde4-base_src_configure
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.4.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.4.ebuild
index f2ee7f8a4d0e..db37ba90df59 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.4.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.4.ebuild,v 1.5 2013/08/18 19:46:25 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.4.ebuild,v 1.6 2014/05/13 18:04:45 johu Exp $
 
-EAPI=4
+EAPI=5
 
 KDE_LINGUAS="ar be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl
 hi hne hr hu is it ja km lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk sv tr ug uk
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index 342cf6acfe2d..1dc4de4e1bd1 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<use>
-	<flag name="geolocation">Add support for <pkg>kde-base/marble</pkg></flag>
-	<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
-</use>
+	<herd>kde</herd>
+	<use>
+		<flag name="geolocation">Add support for <pkg>kde-base/marble</pkg></flag>
+		<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
+		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
+	</use>
 </pkgmetadata>