[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     e0d494609a4d9212c5894c8959ae81347945cc52
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 10:10:27 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 10:10:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d49460

net-libs/libproxy: backport patch from upstream solving build failure with USE="mono"

Gentoo-bug: 600254

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../libproxy/files/libproxy-0.4.13-cmake-37.patch  | 27 ++++++++++++++++++++++
 net-libs/libproxy/libproxy-0.4.13-r2.ebuild        |  3 +++
 2 files changed, 30 insertions(+)

diff --git a/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch b/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch
new file mode 100644
index 0000000000..d96879a7cb
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch
@@ -0,0 +1,27 @@
+From 72bda7188408bd3c2491ea664da294cc483220bc Mon Sep 17 00:00:00 2001
+From: Andrey Rakhmatullin <wrar@wrar.name>
+Date: Sun, 20 Nov 2016 18:40:49 +0500
+Subject: [PATCH] Set CMP0054 CMake policy to NEW.
+
+CMake 3.7 exports a "t" variable for all projects and because of that
+the elseif statement in cmake/CMakeCSharpInformation.cmake:311 works
+incorrectly if CMP0054 is not set to NEW (as "t" is expanded to the
+variable value).
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5313787..451e7a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.6)
+ if(POLICY CMP0011)
+    cmake_policy(SET CMP0011 NEW)
+ endif(POLICY CMP0011)
++if(POLICY CMP0054)
++   cmake_policy(SET CMP0054 NEW)
++endif(POLICY CMP0054)
+ 
+ # Make sure we look in our cmake folder for additional definitions
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )

diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
index 725f7d5c08..a5f0d30071 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
@@ -55,6 +55,9 @@ PATCHES=(
 
 	# https://github.com/libproxy/libproxy/issues/27
 	"${FILESDIR}/${PN}-0.4.12-macosx.patch"
+
+	# bug 600254
+	"${FILESDIR}/${P}-cmake-37.patch"
 )
 
 multilib_src_configure() {