add patch to fix building with newer versions of cmake (bug #547494)

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

diff --git a/games-puzzle/meandmyshadow/ChangeLog b/games-puzzle/meandmyshadow/ChangeLog
index 0886674100258809ba675cd68c53b7d4f11fc57e..b1dd15700b840089e10c1b682fb0d514441f3be3 100644 (file)
--- a/games-puzzle/meandmyshadow/ChangeLog
+++ b/games-puzzle/meandmyshadow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/meandmyshadow
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/meandmyshadow/ChangeLog,v 1.12 2015/02/22 20:22:37 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/meandmyshadow/ChangeLog,v 1.13 2015/04/23 21:38:04 mr_bones_ Exp $
+
+  23 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/meandmyshadow-0.4-cmake.patch, meandmyshadow-0.4.ebuild:
+  add patch to fix building with newer versions of cmake (bug #547494)
 
   22 Feb 2015; Tupone Alfredo <tupone@gentoo.org> meandmyshadow-0.4.ebuild:
   EAPI 5
@@ -48,4 +52,3 @@
   +metadata.xml:
   Initial commit; ebuild submission and patch from hasufell and barul (bug
   #408811)
-

diff --git a/games-puzzle/meandmyshadow/Manifest b/games-puzzle/meandmyshadow/Manifest
index f70e410ce313725619dac4216050a1308255afcb..2d848dc3e19d17c76e1f55069a4a5dd70050204d 100644 (file)
--- a/games-puzzle/meandmyshadow/Manifest
+++ b/games-puzzle/meandmyshadow/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX meandmyshadow-0.4-cmake.patch 513 SHA256 a06b3ad0726ab6b9d6635e3aedadf98922f84d694903fcb4aa9eb0d07052dc54 SHA512 e81037c98f55bebe587f878ff1f5f57c6c5558f8305f5e2cd50db0bbb5634bde418c5254f43051b07b0017b380b2144103eae8ae4fcdc3c780ce2b3134e3f538 WHIRLPOOL 77c7dae2a3049c8a3051e70264ed0f9280f127f38c0b449e0ef481d4df5ee45937cb0955843ba6f43f2f112727ac978e3ac498c29dd0522d9631ae597d3654a6
 DIST meandmyshadow-0.4-src.tar.gz 16962805 SHA256 cd20a7637499f70ac9ed0ff16a506cd6a21557c4b3643b7891fa8a25863eebb6 SHA512 945f096fdc2df58b29f91314cd88953d897bbdbd094d8092d6712d33f7dbacadd298ca797e678ebad08ca579ed67a7b9d664e1fa202753e687a021935032a92b WHIRLPOOL 5dbcaf0d3bfc9cd20b9c6d2f226035ac445b536bd4d0117966c53921d357c34816520bd80b3fefb4cb110861fab065554f9b49c689e25a8c0bb5d66a1af4968b
-EBUILD meandmyshadow-0.4.ebuild 1475 SHA256 468ae074023721680f85ebb7811ec202cee3b7b75ca64bedb2b0388198304ebf SHA512 9eaa24f1efccac32212720fd35a2f27182120f6173673607c11f32574c2ee27e9ea07eb91c15cd29d670e67d75728c364e0d0d42fd27dc4b0031f14be3dab14d WHIRLPOOL dbc98f439ddcb7851bad474acaacae845eedc53e53f95e73c563518d9bad22360c5a81c347aaa59825f0832ba231a7c67bbf2d42dee9533940ce009d9d4eca7c
-MISC ChangeLog 1803 SHA256 677113ca18c0581fab0fea460b15048f0ab713e744a08b4a4664dfffc856116a SHA512 97922b6f91f33577bb1d98a48f9f9e91b0bc942307667414e70bc0c31509e33cb6c8be6b2099476faff718d44936e10c97d27dd008485d02affffcc238455459 WHIRLPOOL cdcc38d09a249a1b5166aef4b2bc98a3e091e2bb32e72a85576e0b8fef9a5195d5438568e81a78b25191b018cd2c270e60386c0ea77fd62b9daa88886919430b
+EBUILD meandmyshadow-0.4.ebuild 1564 SHA256 89daa8f5774205fcbd41f5a71eb3faa566e7c8f7cee5b68860fc10d4d3cd6ae4 SHA512 eb1e65a948d4a9a3f7b42d72f5d0abd75497d74ce8223c87c2547eb5f655726257f9a037dbef574e47f50b9bc033d0a09660c76df1ced7e5e8a6ef2720b60299 WHIRLPOOL 0a58abfc2187e66df46e60b27741c279d5365f76174ff333faf1b2152d1dbf1336c5454d41ad3dea2313a6d8999973267799186ec8558bd5c9344fded0c0aa7f
+MISC ChangeLog 1998 SHA256 918a7fb3180b6f6df165ed63f80f5101609e0f9fe7904d04a98093b42ee2ab01 SHA512 8d0b4c67291a96e4dd7f0567a01990f2dd24a1ecb4aec034a0d25532256f029de7f8f92a97e7803cda3bdf48681d77be44389fb38bf39e7ad9166ed5a2e2f3c5 WHIRLPOOL 801f720b1fed0ff4ce81638e8e5fed33e83f71d546a90c45d0315714572b794edbeaaab49ed0ec0bf767fef38a32feb4f1a2c762514648030da3c2d84b81204b
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlTqOo4ACgkQIY77eQFFFC3XTwCgtwXAkKZs4pIt/Bi7t87pQjTr
-CDcAnREEoppyX2M6m7Lyh9J3GmLNP58/
-=hxAM
------END PGP SIGNATURE-----

diff --git a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
new file mode 100644 (file)
index 0000000..0bd66d5
--- /dev/null
+++ b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
@@ -0,0 +1,17 @@
+--- meandmyshadow-0.4.orig/CMakeLists.txt
++++ meandmyshadow-0.4/CMakeLists.txt
+@@ -15,13 +15,12 @@
+ Find_Package(CURL REQUIRED)\r
+ Find_Package(LibArchive REQUIRED)\r
+ Find_Package(OpenSSL REQUIRED)\r
++Find_Package(X11 REQUIRED)\r
+ \r
+ #Use openGL only when compiling with HARDWARE_ACCELERATION.\r
+ #Otherwise we try to find XLib.\r
+ if(HARDWARE_ACCELERATION)\r
+       Find_Package(OpenGL REQUIRED)\r
+-else(HARDWARE_ACCELERATION)\r
+-      INCLUDE(FindX11)\r
+ endif(HARDWARE_ACCELERATION)\r
+ \r
+ #Add the include dirs of the libraries.\r

diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
index b565ebec61949f5e2819cbbb1550e75a161522d4..fa299096365d8eb4d4b96c88128eefaec3e07ead 100644 (file)
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4.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-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild,v 1.6 2015/02/22 20:22:37 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild,v 1.7 2015/04/23 21:38:04 mr_bones_ Exp $
 
 EAPI=5
 inherit cmake-utils gnome2-utils games
@@ -24,7 +24,13 @@ DEPEND="media-libs/libsdl[sound,video]
        app-arch/libarchive
        x11-libs/libX11
        opengl? ( virtual/opengl )"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_prepare() {
+       cmake-utils_src_prepare
+}
 
 src_configure() {
        local mycmakeargs=(