net-misc/freerdp: Fix usage of internal cmake modules, #527700

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 42 insertions, 11 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index bed22b35343d..edfe80cdef65 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.76 2014/08/20 01:20:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.77 2014/11/12 08:35:29 jlec Exp $
+
+  12 Nov 2014; Justin Lecher <jlec@gentoo.org>
+  freerdp-1.1.0_beta1_p20130710-r2.ebuild,
+  +files/freerdp-1.1.0_beta1_p20130710-cmake.patch, metadata.xml:
+  Fix usage of internal cmake modules, #527700
 
   20 Aug 2014; Mike Gilbert <floppym@gentoo.org>
   +files/freerdp-1.1.0_beta1_p20130710-uclibc.patch,
diff --git a/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-cmake.patch b/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-cmake.patch
new file mode 100644
index 000000000000..4ab536a50572
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-cmake.patch
@@ -0,0 +1,25 @@
+From a668a644889bd58405b92c72a91c308c2bad8022 Mon Sep 17 00:00:00 2001
+From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
+Date: Tue, 11 Nov 2014 14:40:31 +0100
+Subject: [PATCH] Don't include CMakeDetermineSystem
+
+According to [1] this is an cmake "internal" module and shouldn't be
+included directly.
+
+[1]  http://public.kitware.com/Bug/view.php?id=13796#c31892
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 79f17bd..5f6859c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,6 @@ include(CheckCmakeCompat)
+ include(CheckIncludeFiles)
+ include(CheckLibraryExists)
+ include(CheckStructHasMember)
+-include(CMakeDetermineSystem)
+ include(FindPkgConfig)
+ include(TestBigEndian)
+ 
diff --git a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild
index cbc5b2cef0fc..560d5f1f84ec 100644
--- a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild
+++ b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.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/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild,v 1.2 2014/08/20 01:20:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild,v 1.3 2014/11/12 08:35:29 jlec Exp $
 
 EAPI="5"
 
@@ -85,6 +85,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-ffmpeg.patch"
 	"${FILESDIR}/${PN}-1.1-CVE-2014-0250.patch"
 	"${FILESDIR}/${P}-uclibc.patch"
+	"${FILESDIR}/${P}-cmake.patch"
 )
 
 src_configure() {
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index bcfaa33208d4..7d4083b3d4ac 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<use>
-		<flag name="channels">Build virtual channel plugins</flag>
-		<flag name="client">Build client binaries</flag>
-		<flag name="server">Build server binaries</flag>
-	</use>
+  <maintainer>
+    <email>floppym@gentoo.org</email>
+    <name>Mike Gilbert</name>
+  </maintainer>
+  <use>
+    <flag name="channels">Build virtual channel plugins</flag>
+    <flag name="client">Build client binaries</flag>
+    <flag name="server">Build server binaries</flag>
+  </use>
 </pkgmetadata>