fix compilation for cmake-2.8.10

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

5 files changed, 82 insertions, 5 deletions

diff --git a/games-rpg/arx-libertatis/ChangeLog b/games-rpg/arx-libertatis/ChangeLog
index 390546c9c927..cf9ade3e56ef 100644
--- a/games-rpg/arx-libertatis/ChangeLog
+++ b/games-rpg/arx-libertatis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/arx-libertatis
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/ChangeLog,v 1.9 2012/12/01 21:30:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/ChangeLog,v 1.10 2012/12/07 16:31:24 hasufell Exp $
+
+  07 Dec 2012; Julian Ospald <hasufell@gentoo.org>
+  arx-libertatis-1.0.2-r1.ebuild, +files/arx-libertatis-1.0.2-cmake2.8.patch,
+  arx-libertatis-1.0.3.ebuild, +files/arx-libertatis-1.0.3-cmake2.8.patch:
+  fix compilation for cmake-2.8.10
 
   01 Dec 2012; <ago@gentoo.org> arx-libertatis-1.0.3.ebuild:
   Stable for amd64, wrt bug #428222
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild
index 4b0f0e0a4103..9ffdd2a23ec0 100644
--- a/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild
+++ b/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild,v 1.5 2012/08/11 10:19:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild,v 1.6 2012/12/07 16:31:24 hasufell Exp $
 
 EAPI=4
 
@@ -37,7 +37,7 @@ PDEPEND="cdinstall? ( >=games-rpg/arx-fatalis-data-1.21 )
 DOCS=( README.md AUTHORS CHANGELOG )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-{gentoo,cmake2.8}.patch
 }
 
 src_configure() {
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild
index 298e547ead68..4f5be057c826 100644
--- a/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild
+++ b/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild,v 1.2 2012/12/01 21:30:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild,v 1.3 2012/12/07 16:31:24 hasufell Exp $
 
 EAPI=4
 
@@ -37,7 +37,7 @@ PDEPEND="cdinstall? ( >=games-rpg/arx-fatalis-data-1.21 )
 DOCS=( README.md AUTHORS CHANGELOG )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-{gentoo,cmake2.8}.patch
 }
 
 src_configure() {
diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.0.2-cmake2.8.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.0.2-cmake2.8.patch
new file mode 100644
index 000000000000..b44dce2570c5
--- /dev/null
+++ b/games-rpg/arx-libertatis/files/arx-libertatis-1.0.2-cmake2.8.patch
@@ -0,0 +1,36 @@
+From 1cd224fe2933edf33fa1fe7003fc6580e38217fa Mon Sep 17 00:00:00 2001
+From: Daniel Scharrer <daniel@constexpr.org>
+Date: Sat, 3 Nov 2012 04:43:42 +0100
+Subject: [PATCH] Fix build with CMake 2.8.10
+
+Previously we checked for SDL by using
+  find_package(SDL 1.2 EXACT)
+
+This worked with earlier CMake versions as the find script for SDL
+didn't provide any version, so CMake just ignored the '1.2 EXACT' part.
+
+In CMake 2.8.10, FindSDL.cmake reports the SDL version number as
+major.minor.patch, which is never exactly equal to 1.2.
+
+This commit relaxes the check by removing the 'EXACT' requirement.
+---
+ CMakeLists.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14ec2fe..5690176 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,7 +145,7 @@ if(USE_SDL)
+ 		# due to the need to have NSApplication correctly setup by SDLmain.
+ 		set(SDL_BUILDING_LIBRARY 1)
+ 	endif()
+-	find_package(SDL 1.2 EXACT)
++	find_package(SDL 1.2)
+ endif()
+ 
+ if(MSVC)
+-- 
+1.7.10
+
+
diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-cmake2.8.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-cmake2.8.patch
new file mode 100644
index 000000000000..b44dce2570c5
--- /dev/null
+++ b/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-cmake2.8.patch
@@ -0,0 +1,36 @@
+From 1cd224fe2933edf33fa1fe7003fc6580e38217fa Mon Sep 17 00:00:00 2001
+From: Daniel Scharrer <daniel@constexpr.org>
+Date: Sat, 3 Nov 2012 04:43:42 +0100
+Subject: [PATCH] Fix build with CMake 2.8.10
+
+Previously we checked for SDL by using
+  find_package(SDL 1.2 EXACT)
+
+This worked with earlier CMake versions as the find script for SDL
+didn't provide any version, so CMake just ignored the '1.2 EXACT' part.
+
+In CMake 2.8.10, FindSDL.cmake reports the SDL version number as
+major.minor.patch, which is never exactly equal to 1.2.
+
+This commit relaxes the check by removing the 'EXACT' requirement.
+---
+ CMakeLists.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14ec2fe..5690176 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,7 +145,7 @@ if(USE_SDL)
+ 		# due to the need to have NSApplication correctly setup by SDLmain.
+ 		set(SDL_BUILDING_LIBRARY 1)
+ 	endif()
+-	find_package(SDL 1.2 EXACT)
++	find_package(SDL 1.2)
+ endif()
+ 
+ if(MSVC)
+-- 
+1.7.10
+
+