Fix build failure #520760

Package-Manager: portage-2.2.12/cvs/Linux x86_64

4 files changed, 13 insertions, 26 deletions

diff --git a/kde-base/krfb/ChangeLog b/kde-base/krfb/ChangeLog
index bc23e35fea4d..3bd2544d3b22 100644
--- a/kde-base/krfb/ChangeLog
+++ b/kde-base/krfb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/krfb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.324 2014/08/20 16:02:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.325 2014/08/25 03:55:42 patrick Exp $
+
+  25 Aug 2014; Patrick Lauer <patrick@gentoo.org> krfb-4.14.0.ebuild,
+  metadata.xml:
+  Fix build failure #520760
 
 *krfb-4.14.0 (20 Aug 2014)
 
diff --git a/kde-base/krfb/Manifest b/kde-base/krfb/Manifest
index 4f3ce8177ef5..b67237b5bbdc 100644
--- a/kde-base/krfb/Manifest
+++ b/kde-base/krfb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX krfb-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch 4795 SHA256 108ca633c41fd6df6537acf95ecca8875b5fb98d87eeb73fdf5554cf862f9297 SHA512 a33f47c552c980eb3f3a025386a21363a1f681641c9cd83636ac27012972573338965544954ff2fa4122d6ccad479c6923fa554ae040ed2902b6d52baf4f4ad2 WHIRLPOOL 3d1c638498941fa4d9935a9c363b34df426718e7c27207b7987201f75f214c63095adc74eb23c1a7e38d9ad5e360559fa20888ddb793b731778d54e26bb3043a
 AUX krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch 4598 SHA256 05d88e11630d5f76fb16ed60cef02ecb4c72d32f1f9796ff1b0436280454c551 SHA512 6c0534ff2675c3c38433b0f196b27b4de5613075bd2615b2dd0d7b97747013b05bbaa3daff32fb3648c389f03d42546e67a6e6dc38e371e9f081720d1de7811b WHIRLPOOL 78f95d7b6cbab7cad8d309ee3242cc1c2176b9cef91e27cf24c3949d5451a9210fa3bef2fde8f27315bec8a1d3f905eb3520ecd636583b6b7d5ab06fde813da2
 DIST krfb-4.12.5.tar.xz 467852 SHA256 ddbf0deeff35f2a4ff8bdde5cfd6e0639596439f048ec11988d6e2f3307c2c6b SHA512 ea0e96c243885441caa00e3a3bf49a90c2415030d82a3fc2d73de8be8a2838945952cbec59d90f9118bcfa36afd9b097ecbb1050ae8e05b4afe42c28acb8adb8 WHIRLPOOL 762cd750bb6c0bce3ada0aaba2f168981e3e0dfab2457d931f000a4967fa41d2b1af819fba226ff916ce1afdd41c4f3a874e0a7f74aaf0acea8b149dd5389ab8
@@ -8,23 +5,6 @@ DIST krfb-4.13.3.tar.xz 467852 SHA256 d264f294c691e014763e869b5655c7f7006342576a
 DIST krfb-4.14.0.tar.xz 474264 SHA256 4d7a6bd27631e447dfb308cf8f0ba4748bd957d7b4ff0eb20c75cca1f2ef8e6e SHA512 b599257b9eeac95a9f8fb1578705b9941c5b882564336bad4bfd56376503e30416b43f0a99a8ef7cbcae1165129869751592f3dc1a68ac4e73cd47ac7400908e WHIRLPOOL a5325a40935dbe789fa3f9671a7bdb175836299b7abc7900d87828e87a8ef0864555bd82cabf163afca825260a78d9f5baf833fd5a34b7042ec55671e584c89c
 EBUILD krfb-4.12.5-r1.ebuild 960 SHA256 c35a3acd7d26e33853a1e797cef7dab9e5ea025319d5f6bbfea9867ad86d20a6 SHA512 535f92ff0d8cbfa0245f283b194f31fc034fce169dfc3a4ec117a533aa41eac9e4fe91b6bc3f047a5aee1aa7ecbc20e3c1e8b2366873b1de7fc6d40930ce5406 WHIRLPOOL b09331a255549bed9e77791a22bb91a7a66a83d086116fee26a7dd9889d019acf859b79584de5e17c828e144c8d401e4e674a119e879f360ac15e4b4148a8b4a
 EBUILD krfb-4.13.3-r1.ebuild 979 SHA256 9e9e9b79785a93e0dc1169c9899e62462df82b7c1035c791a971a028c6bde6b6 SHA512 f8866baa7190a080fbfc99d07d913a248a54085ac81ef10cbc99f6a9c5d888f8fe8d65ae244c895e49da0ea6d3f7f51bb95e1142b9b1a8401eaf67242f3162c0 WHIRLPOOL c573bf5010b7ec42d268e0ad1d63f954eafd632994ca57a89c8a0fef4c0448d18d000726db3b95217dcc7ec5ae1a83b23819398baab3708eb6f16e752a7b280b
-EBUILD krfb-4.14.0.ebuild 975 SHA256 6406ae78946d263ec43447164b7c6c03ccdd381503f984dbd6f98848f50340af SHA512 d84ec50fb0bd1cbf4cd394a4a3d2b4912b9b0fe147e3bc68b724bbce95b5c342866c267b7beb19add15bf9e5146cdfa2098f92623f127828895730cf49085918 WHIRLPOOL 499233911efde32f4bba237827c282eea123c027369768e48723704c5333dd74101c148469a275810ae3ccd3369614d107087c1aa92ac59ae7b14bbcd1214260
-MISC ChangeLog 36886 SHA256 0c8ddffe06114ce9fe3d50c52f8f9cced2d929dcd350052ff0c0e9e0607a4c50 SHA512 355618a4c1b5053da1fb0503aac620c1014b7f07bedb6ae2150be2d82f292603e08aa770711269cc2501f3ebed6257602487bf1d04d37a304421c4f078470f7c WHIRLPOOL 91f7bcd866604054560cf5933e32bcfe8c15845b371d9f74c9eaf23074a58e3a4043ad3657ecf5396b897572dcef458e20ff324a4d80012ac2fa82d94f9e94e1
-MISC metadata.xml 250 SHA256 36acd199b95ccbe518e598d952522358044d2c1aca8a35f1b76a91d6309259b9 SHA512 c943e28cc6151d9a668704b895ec01d8be4661761142764320e7fc9dcd26f1b349eb4d6fa6101fa63172141a12cdd0c0bb2ade649958de58d6a6bef1b47cfc61 WHIRLPOOL 33fa8923d34970a6441ebca1e491d380fe1a8f35231f17a4ea4a84fc2898c27cd8c45eb621b6585cd64fb8702e1379ba43fb644561c50f62e4962ab6b9c0fcae
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJT9MbgAAoJEGVpnaTzz9K9dm0QAK6x3HLvs/1PIJzoKKNxX6bj
-8Sb9VnGgxTfHI78QhamyO+unEBwPIKrGuu1DxeRiQdpSJJbjLVLI2V8cOuSCo2Hf
-njA51Z8AelHcGFqBKA+JP8NEQKHYEWfVRM0Z5cx/M0ORV05XA+CVOlm2H5Qw6cs8
-BjqNfQ61C3ottxZXvBBODNBkZUFjHO8StVXk0PmPRpouXKVd67zpI7oOBeBr5eY0
-Ce6004djpsBDKvljbaHshMOGh+KMLJ2Fpo3DAfHkSqx67K93JvcwmNFIaGwYOeCP
-YwGQSx9YrzipbcF1W/REIlKzTiJDYPsH3HIJCUSeCPpRxotgi1Q8Wuv0kAaANGe4
-RYapx7PKGNiqh1bzXwRFnLIN3yL13F4zODXdQoZrGFFD9udKpUGOsJjBCoTt0tKK
-KbK7WlxCeyCSO6wv4P2J7Ked3so+trFQPf5Z5mkZIhaRuNON3swj2+Hj8VD1SqCp
-7Ln7aOgvmD2XE5gQSGWxse79X2hQXqvV1LdJbyb5VhnJ6LRwAl9Xbs2rVooRtX7I
-2wB8zrSsANkd+vnNCobRZPcyxS+7d9PiUSUVr5ouBSFbanq34fbUfkFFIk9TOZRO
-ZGxNbdGRhwlCWUtRR65KVUO8mga7twmtYUr2nMCY2RfLidnJdezrmq2QERAHSA8o
-e0wqdvaUePm6jKA0uiR+
-=LIW8
------END PGP SIGNATURE-----
+EBUILD krfb-4.14.0.ebuild 1050 SHA256 87990fda0e3288a2b60815788341e7831065cf7459dcd60f913f828919cd7d41 SHA512 322a2f53f735d1ba75a1da7690b3aa376fa8830ee278e3d05c448cd040aa04d8d8a026f1fe908dd31db46bbe0b585bdac2c0df3af97b6412f4c6b3cf2b9fd363 WHIRLPOOL 6e8d55f8ce6f2216372bf494ba1af5b46cd21a02d6ba218c3adde383589714aaca3d1ea3de33b089b63d1fe0fa9cd81b277b7e09d22ce22904bc0ecf6fafed23
+MISC ChangeLog 37004 SHA256 353116d76690e7cf3901899cec8662d8d3b9522ec84b1e8f013ac746b578ef06 SHA512 1d20562c79890ab06da857c97eee0a613b74926981b65a613c80e2a706545196c0ff1fc1be0f7f27e619cb62180cc3925a7d28f7a65f12307650a937882724c1 WHIRLPOOL 6c94c4681939ac245ab5789c366b8c34cc71bd73c4e73a49155ba330ded92e899e53cdfdd1e82a3c2a669c019b36c7fb22ac8bf5bad2dd907b93c5edbae917f1
+MISC metadata.xml 319 SHA256 d695e7837cbf56cdc41daa3e2aa4be890c39b71c4813847f5b226cc683cf2ed3 SHA512 99ca7cb2400d902baad50a8a334e4c192238b6659fcd0112fa03facdc73f750b1f719b2d4e057e411c9c8d696ef5b2004d2539b56d33bb819f0a30cfe6d26829 WHIRLPOOL 00c7a95a23f025f34d6dd9bfeeddb4936302db2f14a92232d27c432cd85d95a2f7832164b709331da8793dd939665030df4a2064a3fab9411289b33081afefcb
diff --git a/kde-base/krfb/krfb-4.14.0.ebuild b/kde-base/krfb/krfb-4.14.0.ebuild
index 259dc1425742..74c422b61f7d 100644
--- a/kde-base/krfb/krfb-4.14.0.ebuild
+++ b/kde-base/krfb/krfb-4.14.0.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/kde-base/krfb/krfb-4.14.0.ebuild,v 1.1 2014/08/20 16:02:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.14.0.ebuild,v 1.2 2014/08/25 03:55:42 patrick Exp $
 
 EAPI=5
 
@@ -10,7 +10,8 @@ inherit kde4-base
 DESCRIPTION="VNC-compatible server to share KDE desktops"
 HOMEPAGE="http://www.kde.org/applications/system/krfb/"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug telepathy"
+IUSE="debug telepathy ktp"
+REQUIRED_USE="ktp? ( telepathy )"
 
 DEPEND="
 	>=net-libs/libvncserver-0.9.9
@@ -36,6 +37,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with telepathy TelepathyQt4)
+		$(cmake-utils_use_with ktp KTp)
 	)
 
 	kde4-base_src_configure
diff --git a/kde-base/krfb/metadata.xml b/kde-base/krfb/metadata.xml
index f6d895216354..d1f060eb58e5 100644
--- a/kde-base/krfb/metadata.xml
+++ b/kde-base/krfb/metadata.xml
@@ -4,5 +4,6 @@
 <herd>kde</herd>
 <use>
 	<flag name='telepathy'>Enable desktop sharing through a telepathy client</flag>
+	<flag name='ktp'>Enable displaying of KDE Telepathy contacts</flag>
 </use>
 </pkgmetadata>