Fixed some issues with FreeOrion using GiGi cmake macros

5 files changed, 22 insertions, 31 deletions

diff --git a/games-strategy/freeorion/ChangeLog b/games-strategy/freeorion/ChangeLog
index 236b6e4..ee435f3 100644
--- a/games-strategy/freeorion/ChangeLog
+++ b/games-strategy/freeorion/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*freeorion-9999-r14 (14 Nov 2012)
+
+  14 Nov 2012; Sven Eden <sven.eden@gmx.de>
+  +freeorion-9999-r14.ebuild,
+  -freeorion-9999-r13.ebuild:
+  Fixed some issues with freeOrion using cmake macros from GG.
+
+
 *freeorion-9999-r13 (14 Nov 2012)
 
   14 Nov 2012; Sven Eden <sven.eden@gmx.de>
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 108c75a..fe71287 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,5 +1,5 @@
-AUX unbundle_gigi.patch 1605 SHA256 2b0ca5ecd86317feb0491a71b06ad903879f75c8adcbe64a6800c5d0beb64e92 SHA512 4624cdacb998502a5ec471497da384cfbd94343d6393a330532006deae3993c5d02b55cf4e66bf2090b04f2ef53a0df02fbc13cb9dd28d47f224d8955eb1a525 WHIRLPOOL 6efb4e8d3011cfa87c5d3d7f3b5551bf5bc90eccd965cd8ed5d523800aee6a7ac84d4b10eaef370b2901b32d1300a2eca5b24d3120d84a1ad7508fe99c192939
-AUX unbundle_log4cpp.patch 1316 SHA256 3f77136b1d302d05e20cb91acd3cbb99f2e3dd88ce6614fee337202c341eb27c SHA512 afcff7c86ee63106f1c66be1ecce68f3688b1a5ad1ccaa2a97e5ba870c4fe38f4d61b846bc2ef9aeb3faeff23316527991a50f625929ac24ec100fa53f01b861 WHIRLPOOL ae7971393ec1c1566da46f9baa84b3389a32ef8e96564acfab96eb6620b1e8296f5e84173fb587c6a064c203b9c77da65c998f9fd2d786cab194515b7aceb370
-EBUILD freeorion-9999-r13.ebuild 2907 SHA256 5457e55deac46e6b70e438070e7ce38a42e5504f5f3867c5ccb19ddee596849b SHA512 922dc0f5404db42246c408cdc83db7eaa70b4511a37fe222061ce7efd38a91b17fbfd9122eb73d709045f65b2608cb29f7f4d2725a70a61c470a7ddc050e904d WHIRLPOOL df711d6e9f470fd8909f65e8d24d24c6c566c1c34e2bf00e792cbdc226581bce54219c4d0d9ef87160adf6dc19930780c2158117c30693e29f3833daa9d6c194
-MISC ChangeLog 2536 SHA256 6e236f5876e5760338e081ffa550ff229a63769a16db6676be60871e3418ccd7 SHA512 39bd4b2aecdea0c4cebd6258d403f1aebb7359cc1d352a8bdeefde9d46b2fae9f3cb8ceba7e8efc862fa8a2b49640b960012f0ba4430bec271dd902154cd53e8 WHIRLPOOL b722e20a8b9ed4756eb7a151e66fbc3521c7a9f966cb40841bd1703edf4804d41b366295e6a4e8b24aaa89d6c47d84f2d48cb65e039c33d84037e9f5c7082201
+AUX unbundle_gigi.patch 1334 SHA256 0ad506b313461ef2b74d91f5bc6fe9c0f7bf391d0d6187fd8b9d1f803defb5e1 SHA512 3e0eb93215640927900bf14ff92e42ef475b8e2ec469e363f58e3d421ddee9baa9de94b16ad946b9274346f96687ae9e4860eb620dc5e4dac9dc21ac581217ba WHIRLPOOL 060d8b79120df9f166d2f68bc4d46057c30cc7933b6a8157a81cb700d065616494676f200413a0487331e4090687650c38c619cc4594f6a1bf98361bf9c7f2a1
+AUX unbundle_log4cpp.patch 1290 SHA256 e63f2181ae582e582e04b7fb4442598d854c3fc06dcabb018cde368cc7174e41 SHA512 e216c2da9f0a3f52a38eafd7c5c3374b2ea2a221f3558040c6942e96d083dab74ca5321ce29f03bdc5bd31128e2bdd306fa4f501e3c15fad954103969db4e394 WHIRLPOOL 9262ce62e605abce7d40bbf5db553f82c2f43c9866b3c20f16576516af58dbdde6ce956657b75f75ac2d828c13b48a61a4964e835fedf290ed953ec00d520036
+EBUILD freeorion-9999-r14.ebuild 2767 SHA256 0eceb889006eada26d9776514a28d0eb012ad3d15e71f5ceb06f8649b604508c SHA512 38bd18bc49d115e4a76e172df883b020de7f9005457ee61e3634ee040f84823c914a388934e2a0a1529cd3d929ccacff640af67c5f75ef1783b658857e2e1f43 WHIRLPOOL 81946919aec13c08987c0b89ca3e66016178962bbfd36f0bb07aa5062375a4aaa80ee04e5f5884d200a3f5bde4b200ea6f046c74a1da0b9be8c393e15686ea93
+MISC ChangeLog 2740 SHA256 35a5341d5d067bdda545c8268738100d70d618f2e4e733ff2ea41eae2ab51d11 SHA512 425acd9f207e9cc00b42319db02d5ac705b6aad838127dd9685e6aee34a0e48fdfd8a8bf22a9489e3ab325940756617a6d39bbdd200877a25db5b8a292fd1800 WHIRLPOOL 53f5024845e9b63d40a0c1e9f737f0772ba68d7136e309f435c65f3fc7475243b9bcf903ef49a742ed751126e969bdb29c6b9aadc8e74dd5923bae7887c6b6bb
 MISC metadata.xml 482 SHA256 d440736d71b8eaac1b5a2a5171274171e7b5bbbcc6d4b8d2c14fd37c36e51a96 SHA512 5a44824de173b8922658c4983437a5aed0325a0f895bf599cc689d7bc820f91313c005313f35357b2790b698e19c30139616f6d6cad841b9e799529630cbbc19 WHIRLPOOL 43c8d071ce70c235921c3604aed8b4dcd128aab86745ca9de6ce2f682a129125bdbf148f818517184b9996453a10d487f02ff3ee5901bba0e8a8990ac3fcc837
diff --git a/games-strategy/freeorion/files/unbundle_gigi.patch b/games-strategy/freeorion/files/unbundle_gigi.patch
index 57ecf95..06fbaef 100644
--- a/games-strategy/freeorion/files/unbundle_gigi.patch
+++ b/games-strategy/freeorion/files/unbundle_gigi.patch
@@ -1,15 +1,6 @@
---- CMakeLists.txt~	2012-11-14 09:51:00.000000000 +0100
-+++ CMakeLists.txt	2012-11-14 09:53:20.662111051 +0100
-@@ -11,7 +11,7 @@
- set(FREEORION_VERSION 0.4.1)
- set(FREEORION_RELEASE false)
- 
--list(APPEND CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake ${CMAKE_HOME_DIRECTORY}/GG/cmake)
-+list(APPEND CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake)
- include(Config)
- include(Util)
- 
-@@ -474,13 +474,6 @@
+--- CMakeLists.txt~	2012-11-14 11:07:19.000000000 +0100
++++ CMakeLists.txt	2012-11-14 11:10:38.586774103 +0100
+@@ -474,13 +470,6 @@
  
      install(
          FILES
@@ -23,7 +14,7 @@
          ../build/CMakeCache.txt
          DESTINATION build
          COMPONENT COMPONENT_FREEORION_BUILD_FILES_FREEORION
-@@ -590,21 +583,6 @@
+@@ -590,21 +579,6 @@
          StrCpy $7 $INSTDIR
          \\\${WordReplace} $7 \\\"\\\\\\\" \\\"/\\\" \\\"+\\\" $8
  
diff --git a/games-strategy/freeorion/files/unbundle_log4cpp.patch b/games-strategy/freeorion/files/unbundle_log4cpp.patch
index 9bc24a0..1e81b6f 100644
--- a/games-strategy/freeorion/files/unbundle_log4cpp.patch
+++ b/games-strategy/freeorion/files/unbundle_log4cpp.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt~	2012-11-14 09:53:20.000000000 +0100
-+++ CMakeLists.txt	2012-11-14 10:07:07.823249858 +0100
+--- CMakeLists.txt~	2012-11-14 11:10:38.000000000 +0100
++++ CMakeLists.txt	2012-11-14 11:11:23.786785847 +0100
 @@ -120,7 +120,7 @@
  ########################################
  # Build common code library            #
@@ -9,7 +9,7 @@
  
  add_definitions(-DADOBE_STD_SERIALIZATION)
  
-@@ -196,30 +196,13 @@
+@@ -196,30 +196,11 @@
      util/binreloc.c
      util/Directories.cpp
      util/XMLDoc.cpp
@@ -35,9 +35,8 @@
  
  if (WIN32)
      list(APPEND THIS_LIB_SOURCES log4cpp/src/MSThreads.cpp)
- else ()
+-else ()
 -    list(APPEND THIS_LIB_SOURCES log4cpp/src/PThreads.cpp)
-+    list(APPEND THIS_LIB_SOURCES)
  endif ()
  
- library_all_variants(core)
+ set(BUILD_DEBUG_TMP ${BUILD_DEBUG})
diff --git a/games-strategy/freeorion/freeorion-9999-r13.ebuild b/games-strategy/freeorion/freeorion-9999-r14.ebuild
index b05dcda..b2286c9 100644
--- a/games-strategy/freeorion/freeorion-9999-r13.ebuild
+++ b/games-strategy/freeorion/freeorion-9999-r14.ebuild
@@ -51,10 +51,6 @@ src_prepare() {
 		"s:svn_revision_number ???:svn_revision_number ${ESVN_WC_REVISION}:" \
 		CMakeLists.txt || die "sed FreeOrion/CMakeLists.txt failed"
 
-	# remove GiGi, use dev-games/gigi-fo instead
-	cd "${CMAKE_USE_DIR}"
-	rm -rf GG || die "Removing GG directory failed"
-
 	# remove cmake calls to GG
 	epatch "${FILESDIR}/unbundle_gigi.patch"
 
@@ -75,12 +71,9 @@ src_configure() {
 	# and this thing is full of those
 	append-flags -fno-strict-aliasing
 
-	local mycmakeargs+=(
+	local mycmakeargs=(
 		$(cmake-utils_use_enable debug DEBUG)
 		$(cmake-utils_use_build debug DEBUG)
-	)
-
-	mycmakeargs+=(
 		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}/${PN}"
 		"-DCMAKE_INSTALL_ICONDIR=${GAMES_DATADIR_BASE}/pixmaps/"
 		"-DCMAKE_INSTALL_DESKTOPDIR=${GAMES_DATADIR_BASE}/applications/"