Make CMake fail less, add wayland useflag to avoid broken autodetection etc, #537022

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

3 files changed, 18 insertions, 17 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index 8a18dcea5e3b..2ea04f98952a 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/freerdp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.80 2014/11/26 01:00:24 floppym Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.81 2015/01/23 00:34:07 patrick Exp $
+
+  23 Jan 2015; Patrick Lauer <patrick@gentoo.org>
+  freerdp-1.2.0_beta1_pre20141115.ebuild:
+  Make CMake fail less, add wayland useflag to avoid broken autodetection etc,
+  #537022
 
   26 Nov 2014; Mike Gilbert <floppym@gentoo.org>
   freerdp-1.2.0_beta1_pre20141115.ebuild, freerdp-9999.1.ebuild:
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index ccdbde8feea2..472260467047 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX freerdp-1.1-CVE-2014-0250.patch 12976 SHA256 ea10fd71a81596b990c84771a5475de4abbda954af62d7a73d6cee38e9c05b0d SHA512 87f719670701100419483027982c045f39e2d0d0f39c58907ff508ca5a40cb01e18f9411854d3b947c9d07f5ecf32ddd6124484900801f1402396b2c847f2d71 WHIRLPOOL aef1e9233229db9437cd9817041f5a753177c25b4005b37519a66097f16b0addb64f2466d2e56595c934596f3f3fd6de6f5033109b9c234bfac9f517879f36e5
 AUX freerdp-1.1.0_beta1-avx.patch 1424 SHA256 6de8e333ae1b7defbfcd6af1189e33e6478ca52b80c06bb013555413470d31ef SHA512 dd3d0c07d23c112f4405e3cf249137cc14fff8d2ba63e7c45740ca4c1dcd17fe258e434f3c62dad772de55aa3b59d58ac1447cef81c19c4edf843e467d7ab147 WHIRLPOOL 1877a69a89f1c69b59c4bccb5d82dc0300941cfcc8f1816bd2f88fcf0dac5d3307292c46c22e5bfac031dc4a9bcc35cea6b198dd546353480730967ca5c4fb4a
 AUX freerdp-1.1.0_beta1_p20130710-cmake.patch 756 SHA256 1a3b20a0f4635be1d1805d2d8c33ab853cc108e3fb4d4896cece08d20c05d4a9 SHA512 c1fb1df37612adf7e60fabee055c07aea00d30665e4b3c771bc2511d5098b4e74179a58ede84935002bbe885ae03c5a6617fcbc909a75f27910808102f9c123d WHIRLPOOL f8f6a15e65023bf758287c504a1ac7b1e82c1630980f0fc07b1272d8f6eea1a93ba52a9598a0366428b5a364062ed737974d5e4254507d70e651b56e2e39c78d
@@ -10,14 +7,7 @@ DIST freerdp-1.1.0_beta1_p20130710.tar.gz 6682149 SHA256 0d0d2eec7e78b61458415ee
 DIST freerdp-1.2.0_beta1_pre20141115.tar.gz 6096004 SHA256 a9dcd76946878cecddafc79a14794e7f57cb32397b5bc45af9d866d8d76bb421 SHA512 8fdbfba86df2cbb6c980e940df66bf30cd8d06e66df18656e18a120eabdd2b17e78c7612f1349589fcd8d3b37066b3956e0ef977d069f2abde653b4824fee61b WHIRLPOOL 0c0bb6c2a9e0b0efd072d0c46ded4790b69df649fe1e18bd907458e238a8149314ca47e5166523044c14a520e8f1d0d5b910e294c4ee670c1562c7980036cbb0
 EBUILD freerdp-1.1.0_beta1_p20130710-r1.ebuild 2626 SHA256 3975fa6ba078b3e370d2113f660cdff871182df97ea2e963fdac25f3ad0c94a9 SHA512 1f494783cb7f7864aae27a7373fae32f17e140ced832aae0e4be63960a4897355bdd21e40074386b957e374710e825a7ccc1a7f7328087741d7a8fc1d0cb94f8 WHIRLPOOL 656aaa4f9932403db42fd4aad3d7ff56613b78f14c516dfccc1aaf185027b0ee81501791138580435cdf3bdef32b27cd6ce0ffba875a2dd63b0b47b34a810b77
 EBUILD freerdp-1.1.0_beta1_p20130710-r2.ebuild 2810 SHA256 e03e7655dc1ad45ee8e2cc8a9ec0da09a5a1ee28cf65c27a46b316f0ae621bd9 SHA512 b8a3bf63b81a1c28e15ecea4a07cf5542b9125d2fbc45e6fbff0db230315500e499f1b215b2b02433bd6e2658ad2d20a06dfa6a065ea4e5b6d7bce58541de2bc WHIRLPOOL ca0548877999b72e1842d90fded3af789866e257c770751e1c4cd185e6da97a1b722e9967fa1eb95ac88b7f6b70c9bc479f96c9bfb4aa0ef779e66a96b48e251
-EBUILD freerdp-1.2.0_beta1_pre20141115.ebuild 2552 SHA256 8ebeaf9aa9f6da3b26783a0ac2008084028ca9f07bd8e14b1c1c37c889d1437e SHA512 f15de84c8e2ff41e3fcc58462f1ef0dbdc76b0f60cbb4fe504bfb9c3090475e9fb8ff86ffa49464dae4c6d84640108706477c405f200723abd29ca5f02e19535 WHIRLPOOL 03f7556dc618069e501280cbe4d04eda841bb34ad47894a41bc6715c0423f5e9721e6b632007826bf2e0f056207d25a4ed2855dd09339b5fafe9f0b5aaa6f311
+EBUILD freerdp-1.2.0_beta1_pre20141115.ebuild 2751 SHA256 1b045e93146e65ca4a0a3df4fc3875c9f58463dcb72d7f790f996b0dc46590c7 SHA512 2bb299d09fa5af54123ec4e1e334a3209c7e34d131d2a6b70f228d3955377c6f808827e9791ac87e17294db4aa5a34386f4e7b00bdaf40d669a4483942fe4a26 WHIRLPOOL 1ebfb0b1566312896c9b332c335456448a40b7de2070fc0a6297719b13583488c5bde4dcf3f6dff99778171e5a0e7fcbeab1811de57474542fa491f69cc17838
 EBUILD freerdp-9999.1.ebuild 2536 SHA256 dbcdefec7af828ecb76e5aaf473564ac44c339529d7064bef4a0da120dffe2d5 SHA512 08c9ccc87f6adb269b83e022c2143f2737f7e418260ed80668898a50e4d3e77ce44e07039be5571f73fada7de766f6370852105304f9f3961d41bd79e372ced7 WHIRLPOOL 52c0a99f7b3672ebbf8d1a9b38571024e1286a5839cf26226c1477e4a4af623276bb4d04b0552cffb8866e2b5e3dd2221cef9d5db1d9b1662efbebc391ab494e
-MISC ChangeLog 12755 SHA256 ee192d2c2da95e8a0af2ac75435f2dc5abeb5820565deaa4e16b03915af51f9d SHA512 7c0a914b574db55800691ff8b7f05f6348f9fea367e2b8474942ee3bbe7b03956c0a42e2f33d539a78ce6eebf2c097905ca91986ccca6bfaeb46284f85cd4870 WHIRLPOOL fae115f9039d03e04fdccbcd43e5463691db6cf9baecae89ba704a4308b7ca934a30edf2f11053ee75dda89c1273640bacbb06f0e570fb472e5b11f69fa9f1f9
+MISC ChangeLog 12937 SHA256 e201e44ddd80586c34ef9a8b37ebc908c47e1ade3c2efd3a694e1f223172fd2e SHA512 ab6d013fc2fe0c142950a0555a93142985370679747ee5e494d80584fa6ea718d606421ecff7320183d3f1695722efdbda3c35e40b781fc944dd64e87a415748 WHIRLPOOL 95fd39c6268cbb04503b4ff62311844e83f996657e93372afbf73612bcd022f258e510f57175a6bd5b6d10db33febbc31783c5f2c3317e0c93cb58de26397269
 MISC metadata.xml 424 SHA256 677d4fb3c378ea8ee9c4e340b7b32cf57a9f4fe9b92edddb42ddd39448f73f01 SHA512 4f1bb050f9b9889422c2e86b87dd43246b41cf45c1ce4e6c05e1c477c4a3031c20820edfd648cbc4ba2b61d2bae40883fcd5676246a0bc3fe767f5713701cf54 WHIRLPOOL d3ad68eadaf540d6200dc6a15ee3fe3597f80a64c1d2f8b7d22b23fb137422fda2edca1a8438800b31cd5d5dfd74dca23f611ad433b812f8bfe1ac0f1aa85b11
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlR1JikACgkQC77qH+pIQ6R/wgD9F1LH4W8Rumfw9fXd3k1/v4t+
-RhhfLYbGLYooddaHXsIBAKS2u3p43Vije25KM6JG07c56VK3PhJVFYBstu8Pr6Qk
-=mZaV
------END PGP SIGNATURE-----
diff --git a/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild b/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild
index 21b879e0588d..31bc17aac891 100644
--- a/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild
+++ b/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild,v 1.3 2014/11/26 01:00:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild,v 1.4 2015/01/23 00:34:07 patrick Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
 LICENSE="Apache-2.0"
 SLOT="0/1.2"
 IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg
-	pulseaudio server smartcard sse2 test usb X xinerama xv"
+	pulseaudio server smartcard sse2 test usb wayland X xinerama xv"
 
 RDEPEND="
 	dev-libs/openssl
@@ -79,6 +79,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( README )
 
+src_prepare() {
+	sed -i -e 's/list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)//' channels/client/CMakeLists.txt || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with alsa ALSA)
@@ -98,6 +102,8 @@ src_configure() {
 		$(cmake-utils_use_with xinerama XINERAMA)
 		$(cmake-utils_use_with xv XV)
 		$(cmake-utils_use_build test TESTING)
+		$(cmake-utils_use_with wayland WAYLAND)
+		-DWITH_XKBFILE=OFF
 	)
 	cmake-utils_src_configure
 }