Adds patching to CMake build system for FindX11 if >=cmake-3.2, bug #548384

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA8C8FBCF

4 files changed, 40 insertions, 13 deletions

diff --git a/games-emulation/dolphin/ChangeLog b/games-emulation/dolphin/ChangeLog
index f1a4780c4718..c3b9f3448ac4 100644
--- a/games-emulation/dolphin/ChangeLog
+++ b/games-emulation/dolphin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/dolphin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.36 2015/05/02 16:43:42 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.37 2015/05/02 16:50:01 twitch153 Exp $
+
+*dolphin-4.0-r2 (02 May 2015)
+*dolphin-4.0.2-r7 (02 May 2015)
+
+  02 May 2015; Devan Franchini <twitch153@gentoo.org> +dolphin-4.0-r2.ebuild,
+  +dolphin-4.0.2-r7.ebuild, -dolphin-4.0-r1.ebuild, -dolphin-4.0.2-r6.ebuild:
+  Adds patching to CMake build system for FindX11 if >=cmake-3.2, bug #548384
 
   02 May 2015; Devan Franchini <twitch153@gentoo.org> -dolphin-3.5-r1.ebuild:
   Removes dolphin-3.5-r1 from tree
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 6537f8461640..6890b3db5bb6 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -4,19 +4,19 @@ Hash: SHA256
 AUX dolphin-emu-3.5-gcc-4.8.patch 6682 SHA256 8f153b45b354d52e084694d285fe49409a47f0738e064ca7ba88b38cbbd6f1ca SHA512 98a2e0435b262af4bcf875ef29d14ed5ae204faebadbed7778cfedb3c9841552ecab83ef932e943c779d634d83f6df6d43a656c5e72732e85827902cb08622aa WHIRLPOOL 7128c98fcd22efde2a8067a28d9b064689fa7a5f81b068313a19e41f4fc659b726293bc00539be725077ff5529276c0769e7acbf8146c2c8d578c3812776d488
 DIST dolphin-4.0.2.zip 28261421 SHA256 90e49ccd92eddc019bcac3b914bf16ce8d49c59fc2bd165ee02a22ea1a0456da SHA512 cb0c788307e6a0048213a2d947ac44d96b5bab064e5be41ad83c308ab98d0126bb173dd0b8705664f898d02eb571f8cb6d5bd6bfd3bd5e00e70126d04dd1cb99 WHIRLPOOL 5ae2bb04513f91300954cd598555a65527356b5e09d85283cbd8dee1a57a5a068dae8938e25d9a0ac77d6956cd08b33ed12afc774b05208dd432d693e4e2c842
 DIST dolphin-4.0.zip 23439392 SHA256 a698caf05f47a55c30e09d0aab053a412df683de2e139a6348156b03c502a0ec SHA512 02e366c2fa95ab5f37b0a66b94a5b56a632ef81e13febd982d6385cfaf7fa3edb4364180d4b8312e82bc7b8f150d02cde10248996f6a12286a20d684024aca20 WHIRLPOOL 0cb7b28b911111f4b7bf93c56f2dd31d080e7e0418fb53d9cc9093ca995d2c99a1fa7d5d82111e2c8db363e2b07384be39ec0062ab0252233f480b8e45e9304e
-EBUILD dolphin-4.0-r1.ebuild 3490 SHA256 9a937e7ff28c7ed4fa864a61f230bac14b1845867226ee5551c3983198e962a8 SHA512 af36b9d9a03c7344f12f3009e178762597ffb739109ddec924af30be05aff511bcba0be8c844386d1630cbfed503f4b34bd7e9a5b0589d08e578273d8f0ccf2d WHIRLPOOL 7293af34fec152ef067fde96234d297fcdb8e81eacce072ea65b5923d624f8143e56bb13b0cb1696c791592f14a3051ed54c29a9fb82d8cd31f7e18f2664d516
-EBUILD dolphin-4.0.2-r6.ebuild 3527 SHA256 6fb6ea4b6a8bd3470fb566cb8239df0939933d4fa4378f7f111e9324fbd8c407 SHA512 5a0e5ac5f5bb754dd9d238258baa2c5f15e5c669d2ea25715ce41c64b134cc267126ba475b9d71533f9b8cf92bb15bebfbb6bd9e1addc7b4da95800308e1adfd WHIRLPOOL a008a8beceb981b746a26e3e0bfd9a057ec8540db73dc04b808b39fa1d473a60d9704e4e2c893585a5c359861d9d2844abe900c91bbcadab213f29962a920459
+EBUILD dolphin-4.0-r2.ebuild 3915 SHA256 277d6e6c080a582561302ddfb73644b89665381467c48fe747f6492c13102e77 SHA512 87d61dfb97bea82d87e508b67d349aa00455e1b1023de5c91ca64af5a8e4e4a19e6d60b0cfe91c0e53006a55d28685f19c05143fb2f5b24e0e94142f3d72a408 WHIRLPOOL e9f6201f3b6d7f418d84449a43e0ff0cc5eda1785924297f1cd7329817a1e44f281cc257620bc5f80261a4588206f6b41379a7e0cff7a43b021924e6f5c71713
+EBUILD dolphin-4.0.2-r7.ebuild 3951 SHA256 f357f7638d999bb2a7b84022a317641818c960de91e315b4ee630cbf95151cd2 SHA512 872e06f2e860b1356bcd9202360844d1ed61c94b75e8be9aff777204e054360f012d244e427e716f5a90f218cb3f83f81e12fa113339029fa622b6006649f380 WHIRLPOOL c6bb452c6ad113febb813859383bf6e6ee50d1400ed1326d5665561cddf6d592b062c0cdf20774e55433b008b6a8335d886829a00e2372b9c8a3c4a4a4b6964a
 EBUILD dolphin-9999.ebuild 3876 SHA256 7d0f4d36307de8a2548d0701e2185bc866309532566cd45c89a8ce7d7b2d0040 SHA512 7e8d2ff973698410b649ed6bc7940a15b71c3742919b7291837e5f6444a4e095dfd9b2c03f51244afacebe615defea0e80f5557d79aa568fd802ced95309354e WHIRLPOOL 947e97a16838306e6bd4e6806fd22041232d688fec4c0882949acb4b146ed88f2ea126296d6f0c5e57ed6aac224b17996ddbb88bd4a66163151e5840ac1401ba
-MISC ChangeLog 6263 SHA256 d1c504b1dab1cc89115668c492c9a6c6c6d6d2ee30479b90b845012747e51bfe SHA512 be485d57a676c548d04172435170c0b70fef2bc93b9f98de389afe1103620cb536773da3b564621d517ab226bdd9034ba872d4cfa2fd9f59b9278faad19ff073 WHIRLPOOL ba8a349a09e4a6deb3f01e5e62e8aecd0c2f54fe0a835265d14f0ddc549a4919b7f5cbc39f69627cdeff2aa87d471a6178250c61152d2eebeffb7478722e4edf
+MISC ChangeLog 6561 SHA256 cf8afeb82ce181f44034088bf0b0fa934369e1d86361342a6a740ae274d27a24 SHA512 c9306d9f098c0510c8e69e5443f5e7042f279bb0e01c95743f3ae435c13108c2a2d00347213a337784adaed5b7bf47d4b2b6a83a97f7747dc84ea5d3ed236a6a WHIRLPOOL a93df29263ec520e7631e3705a1b5b0feff61685ad486e0a5460a979d1b7412b6f303f87a65a182dcb08f8a26980dad6d4c35d230d9542a8dde8efc89c265eb0
 MISC metadata.xml 442 SHA256 11ac55298ad628e589b592a2da00db1cabfd31ff8621c0fea059d714acdce334 SHA512 96abf53048bb8aea1387eacc40b9cda4e6099f079ddeb669fb23458d67880804fb015970207aa10a21227b87c153208a8dfa4bf4ea279ff7e53dcfebf18ac30e WHIRLPOOL e72458e354da2e4bfeb67de52c31d50a61f3b926fe16c0bcf4aae5e599858e413fcc9057fe1b098e43ee18fabe6a0f05dff008f59065cf34bad02da6480fc120
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVRP7GAAoJEEAKp6Qwg9Y3VkQIALHLuNSx1rSD4cZxKmM5OKj/
-Xf3Oa+WJpabuuDGv49z7WT4rO1nbPSp/1OF9c6/HCEzVqVQQwPagL+HityyNjfSZ
-I2KRpOAjOmTiGEojJxgmZg8EAzUkwi2TfrpPp4RxtfFTOmURnio2zd8L8IhhBbve
-QbJ/xYkBW3N/AgctRT28Kf5rsAb7wiUe4p0YSfB5B9UUypSnXeEnXRf4bnsUpguL
-BwuOvN/hJJuxSZj0yt6JPRDyo5Mzu95T0GHfSLxKxYAWX4PGFEeEzyJn95gvXmr1
-FalE7CGRC8ZQGpXpR3/dOtCiUVm40PDvqqVvbG3y03mWdvDcy2154Btosuib6Y4=
-=c8JR
+iQEcBAEBCAAGBQJVRQBAAAoJEEAKp6Qwg9Y3B7QIAITW9XraLN1h2PwbzsjvWO4P
+iLVQ3I1/k2cqx5LxU/wPsSg+mKwrcCh32P3NRNs8U7eXHIXGOHmQ8TGPw3IKSdxf
+VIlg8ZEHHhRjL9vs7t8TT41WORNDdlVJxpo6NFCF7HsurbRueYuL073RStoi6dHc
+YMxZdkEDItJC3gqktE8+UrsoLnMmeYMZol4zo1uByxqRdfHA69IJE/8GdL0n7hWZ
+w47TB2+dWZlDqr/VTQRGcS5f8WkUBs6kfoEEiVIt++oNJntFR6tKMEm8ntJ17l7n
+Vr1+QxZ0CwjKXfERMI+t3w6YxYVNExbaOgxyMRFVuOnzZhiq4XJIbzqdfUFdqeI=
+=/D/T
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/dolphin/dolphin-4.0-r1.ebuild b/games-emulation/dolphin/dolphin-4.0-r2.ebuild
index 92df7c72d37c..9b1f9bf35a4f 100644
--- a/games-emulation/dolphin/dolphin-4.0-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0-r1.ebuild,v 1.2 2015/04/18 12:47:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0-r2.ebuild,v 1.1 2015/05/02 16:50:01 twitch153 Exp $
 
 EAPI=5
 
@@ -96,6 +96,16 @@ src_prepare() {
 	mv CLRun Externals || die
 	mv Bochs_disasm Externals || die
 	mv SOIL Externals || die
+
+	# Add call for FindX11 as FindOpenGL does not include it implicitly
+	# anymore for >=cmake-3.2. For more info, see: 
+	# https://public.kitware.com/Bug/print_bug_page.php?bug_id=15268
+	if has_version ">=dev-util/cmake-3.2"; then
+		sed -i -e '/if(NOT ANDROID)/a include(FindX11)' CMakeLists.txt || die
+
+		# Fix syntax warnings in FindMiniupnpc.cmake
+		sed -i -e 's/\"\"/\\\"\\\"/g' CMakeTests/FindMiniupnpc.cmake || die
+	fi
 }
 
 src_configure() {
diff --git a/games-emulation/dolphin/dolphin-4.0.2-r6.ebuild b/games-emulation/dolphin/dolphin-4.0.2-r7.ebuild
index 9ee333b36522..0def1068dfec 100644
--- a/games-emulation/dolphin/dolphin-4.0.2-r6.ebuild
+++ b/games-emulation/dolphin/dolphin-4.0.2-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r6.ebuild,v 1.1 2015/04/30 22:42:32 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r7.ebuild,v 1.1 2015/05/02 16:50:01 twitch153 Exp $
 
 EAPI=5
 
@@ -97,6 +97,16 @@ src_prepare() {
 	mv CLRun Externals || die
 	mv Bochs_disasm Externals || die
 	mv SOIL Externals || die
+
+	# Add call for FindX11 as FindOpenGL does not include it implicitly
+	# anymore for >=cmake-3.2. For more info, see: 
+	# https://public.kitware.com/Bug/print_bug_page.php?bug_id=15268
+	if has_version ">=dev-util/cmake-3.2"; then
+		sed -i -e '/if(NOT ANDROID)/a include(FindX11)' CMakeLists.txt || die
+
+		# Fix syntax warnings in FindMiniupnpc.cmake
+		sed -i -e 's/\"\"/\\\"\\\"/g' CMakeTests/FindMiniupnpc.cmake || die
+	fi
 }
 
 src_configure() {