Fix build error with cmake-2.6

Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.25.4 Intel(R) Core(TM)2 Duo CPU E6750 @ 2.66GHz

4 files changed, 44 insertions, 7 deletions

diff --git a/games-action/openastromenace/ChangeLog b/games-action/openastromenace/ChangeLog
index 0cc740922cda..54d9c8ad1b67 100644
--- a/games-action/openastromenace/ChangeLog
+++ b/games-action/openastromenace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/openastromenace
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/ChangeLog,v 1.1 2008/05/08 14:15:03 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/ChangeLog,v 1.2 2008/06/03 14:19:32 nyhm Exp $
+
+  03 Jun 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/openastromenace-1.2.0-cmake.patch, openastromenace-1.2.0.ebuild:
+  Fix build error with cmake-2.6
 
 *openastromenace-1.2.0 (08 May 2008)
 
diff --git a/games-action/openastromenace/Manifest b/games-action/openastromenace/Manifest
index b566cbe8b2c3..0346da801aac 100644
--- a/games-action/openastromenace/Manifest
+++ b/games-action/openastromenace/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX openastromenace-1.2.0-cmake.patch 1018 RMD160 ee5a03b2324d23c3d0003d4ae4bfcae54a25edc8 SHA1 04a6a9d2437bacb1caf7d4ab09bda7ac2770732e SHA256 5d1eea84f7522fa5cd4e861c82a7c9bc41e03db35127499d0b43010a7346cbfb
 DIST oamenace-data-1.2.0.tar.bz2 33384465 RMD160 f8ac327a6c95d00e99f3fe8c8c2a0af1eb4cf2da SHA1 0f27e8fbce90d979118f37014a4ca4f97e2bfb4e SHA256 e55fd843b7e6331e3724dd33d160565ae3f154abc790fb95e3566f5fedcb1d3f
 DIST oamenace-lang-de-1.2.0.tar.bz2 1656853 RMD160 6814f5b167a058bf7b189953a0fa2ce71eaaf1a0 SHA1 8a3be279ca79aff7153f8f24a893b921fa8a8a6b SHA256 3c7f4b580c1491c1fe6db521477e644f5139323e3e427bf99effe2da0bd3b7bd
 DIST oamenace-lang-en-1.2.0.tar.bz2 1382975 RMD160 0f69e611588dfe18d93fcdbcd2bcb07da7f5ad2f SHA1 4fea8918b9e5212d576f97dd055dc1d6fdf0730f SHA256 7890431ca80a7456dc77b102c58f9dd9a3f6fc41574ffc4234f805e7dae79d88
 DIST oamenace-lang-ru-1.2.0.tar.bz2 2344872 RMD160 c39d8635603a0ba8b5b8c9af8c204a7995aca47f SHA1 d02891c29f94ddec71993caf077d22657005a212 SHA256 bf4231baae0b3e1f3327da249ab9bb50c226c71bf0fd12b98a05820b5646cb5d
 DIST openamenace-src-1.2.0.tar.bz2 1021718 RMD160 79aee39154051097e42caad4837ea4d31c8d94ad SHA1 135a235cc35130edd3808c88fac202c57e8aafbf SHA256 d81526228b634e7447aaa6cc20023220a542c68837afbf34f4a5a0618e3eecae
 DIST openastromenace.png 20227 RMD160 223154d3626ef0a66cc4327d74e422cf6b1011a3 SHA1 045873d293522f873bdac41a8e8f392246852bfd SHA256 d70e1e08558b6f8480fd45a71be13b854f37deeacd4d78841cf02e9d21662cd1
-EBUILD openastromenace-1.2.0.ebuild 1499 RMD160 1f07c0260b223a78e221543070c84df91acd1ed3 SHA1 35892cc408d85c2b1f8fe720b4e87a9dc1a99f43 SHA256 3c84b9eac7513574d49c16262fb4ec1f858d11638c522931c266e8233555fea8
-MISC ChangeLog 392 RMD160 c942ecf60cb81a2596b2e3b3eb5a45392db67a50 SHA1 a42075a54a4d47c778209da559b7fef664ce656c SHA256 2b1caf0bfa15097219a0bae358ae05d39df09585c97b5bf40a9038a9ecff8994
+EBUILD openastromenace-1.2.0.ebuild 1580 RMD160 b6798d2c28478bf21bf6ff776ec452b829844ad6 SHA1 84cfc727c0185bc0d511c8a020f5924965597c32 SHA256 39f780153b90d024b1ee40ee0bde68c210f5f787965dd97cff1fe90265e41a81
+MISC ChangeLog 548 RMD160 058c4c2d47b4c9c9916741eccdc53150b8e3eea7 SHA1 ad72ea6eef26541ae8748d53d990a2f178e114d4 SHA256 a7491416e471076355240f63b7d222b9feeb483e58ef8aa4841cb174b3e1aaca
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgjCu4ACgkQdz7hIScOURGj2QCg5Zsk1O5AWunNrsuiiECRlfx0
-v00An1nIA9TXnX+YVTNiZDo/FMb4h4on
-=m1jR
+iEYEARECAAYFAkhFUvoACgkQdz7hIScOURG3BgCfR7F5aNN+rh+fpaiQytkNHWUw
+eYMAnArrOZbgddjan8eehD2rtJkLB4zt
+=q8Jr
 -----END PGP SIGNATURE-----
diff --git a/games-action/openastromenace/files/openastromenace-1.2.0-cmake.patch b/games-action/openastromenace/files/openastromenace-1.2.0-cmake.patch
new file mode 100644
index 000000000000..17e194704d7e
--- /dev/null
+++ b/games-action/openastromenace/files/openastromenace-1.2.0-cmake.patch
@@ -0,0 +1,26 @@
+--- CMakeLists.txt	2008/02/15 09:55:15	33
++++ CMakeLists.txt	2008/05/19 08:11:36	36
+@@ -13,6 +13,8 @@
+ # ./AstroMenace
+ #
+ 
++CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
++
+ # project name
+ PROJECT(AstroMenace)
+ 
+@@ -43,9 +45,12 @@
+  IF(DEFINED DATADIR)
+ 	ADD_DEFINITIONS(-DDATADIR=\\"${DATADIR}\\")
+  ENDIF(DEFINED DATADIR)
+- ADD_DEFINITIONS(`${SDL_CONFIG} --cflags` -Wall)
++ EXEC_PROGRAM(${SDL_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL_CFLAGS)
++ EXEC_PROGRAM(${SDL_CONFIG} ARGS "--libs" OUTPUT_VARIABLE SDL_LIBS)
++
++ ADD_DEFINITIONS(${SDL_CFLAGS})
+  ADD_EXECUTABLE(AstroMenace ${astromenace_SRCS})
+- TARGET_LINK_LIBRARIES(AstroMenace `${SDL_CONFIG} --libs` ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile)
++ TARGET_LINK_LIBRARIES(AstroMenace ${SDL_LIBS} ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile)
+  IF(CYGWIN)
+ 	TARGET_LINK_LIBRARIES(AstroMenace -lGL.dll  -lGLU.dll -lglfw -lX11.dll)
+ #	ADD_DEFINITIONS(-mno-cygwin)
diff --git a/games-action/openastromenace/openastromenace-1.2.0.ebuild b/games-action/openastromenace/openastromenace-1.2.0.ebuild
index 4d7c9d97c673..fb8842f53792 100644
--- a/games-action/openastromenace/openastromenace-1.2.0.ebuild
+++ b/games-action/openastromenace/openastromenace-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/openastromenace-1.2.0.ebuild,v 1.1 2008/05/08 14:15:03 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/openastromenace-1.2.0.ebuild,v 1.2 2008/06/03 14:19:32 nyhm Exp $
 
 inherit eutils games
 
@@ -31,6 +31,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/OpenAstroMenaceSVN
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cmake.patch
+}
+
 src_compile() {
 	cmake -DDATADIR="${GAMES_DATADIR}"/${PN} . || die "cmake failed"
 	emake || die "emake failed"