New ebuild dev-games/gigi-fo, and log4cpp unbundled from FreeOrion, now.

5 files changed, 150 insertions, 8 deletions

diff --git a/games-strategy/freeorion/ChangeLog b/games-strategy/freeorion/ChangeLog
index 9cc45ba..236b6e4 100644
--- a/games-strategy/freeorion/ChangeLog
+++ b/games-strategy/freeorion/ChangeLog
@@ -2,7 +2,27 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*freeorion-9999-r1 (13 Nov 2012)
+*freeorion-9999-r13 (14 Nov 2012)
+
+  14 Nov 2012; Sven Eden <sven.eden@gmx.de>
+  +freeorion-9999-r13.ebuild,
+  -freeorion-9999-r12.ebuild,
+  +files/unbundle_gigi.patch, +files/unbundle_log4cpp.patch:
+  FreeOrion now depends on dev-games/gigi-fo, a new ebuild to only
+  check out the freeorion bundled fork of GiGi. Furthermore log4cpp
+  is in the tree and therefore unbundled, too, now.
+
+
+*freeorion-9999-r12 (13 Nov 2012)
+
+  13 Nov 2012; Sven Eden <sven.eden@gmx.de>
+  +freeorion-9999-r12.ebuild,
+  -freeorion-9999-r11.ebuild:
+  The FreeOrion forums informed me that GiGi is dead for months now
+  and FO has forked an own version to continue with.
+
+
+*freeorion-9999-r11 (13 Nov 2012)
 
   13 Nov 2012; Sven Eden <sven.eden@gmx.de>
   +freeorion-9999-r11.ebuild,
@@ -11,6 +31,7 @@
   are no longer recent enough. Further updates to DEPEND and RDEPEND
   are of more cosmetic nature.
 
+
 *freeorion-9999-r10 (07 Nov 2012)
 
   07 Nov 2012; Sven Eden <sven.eden@gmx.de>
@@ -18,6 +39,7 @@
   -freeorion-9999-r9.ebuild:
   The SVN URL has changed.
 
+
 *freeorion-9999-r9 (12 Jun 2012)
 
   12 Jun 2012; Sven Eden <sven.eden@gmx.de>
@@ -26,6 +48,7 @@
 	The previously applied patch has been accepted upstream and is noc
 	longer needed. (Won't apply, anyway.)
 
+
 *freeorion-9999-r8 (20 Apr 2012)
 
   20 Apr 2012; Sven Eden <sven.eden@gmx.de>
@@ -36,6 +59,7 @@
 	of files are unnecessary and are patched away now, reducing the
 	size by over 80,000 lines. Now it can be compiled with gcc-4.6.2.
 
+
 *freeorion-9999-r7 (19 Apr 2012)
 
   19 Apr 2012; Sven Eden <sven.eden@gmx.de>
@@ -45,12 +69,14 @@
   ogre has been updated and does not fit any more to the old ebuilds.
   Further this eliminates the nead for Cg if multi threading is wanted.
 
+
 *freeorion-9999-r6 (26 Jun 2011)
 
   26 Jun 2011; Sven Eden <sven.eden@gmx.de> +freeorion-9999-r6.ebuild :
   - xml Use-Flag no longer needed
   - FreeOrion no longer compiles against boost <1.46
 
+
 *freeorion-9999-r5 (27 Mar 2011)
 
   27 Mar 2011; Sven Eden <sven.eden@gmx.de> +freeorion-9999-r5.ebuild :
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 5896256..108c75a 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,3 +1,5 @@
-EBUILD freeorion-9999-r11.ebuild 2392 SHA256 afdf60a601c2c6ceda4c0b8f7d9d1f68274632bfe37aa31594d9f3003fa6d862 SHA512 1f7164b779df5439f47418c848f185822b599b53d242b16a774a3935ad80d6acf92da31530237436e6a8f57c40e31fa7d2ae51700281d684d4a52afc7a4cbfab WHIRLPOOL 892bb041bd5a4c38a8546fb7b1aaa394596fb881cd0972584273fbbea6ab2011bde18b801cab41a4e81d223dc3244314c6c7b76990069183ce95705871ed39ac
-MISC ChangeLog 1878 SHA256 f0275439a48639384bf8b3a5312294008c091ae38c3a6c0191f01650cd09e2f3 SHA512 0399475559d8c2caff030189dda61705b7588bcd48e6a82d210b8022fdb378ae2374b7efe20f08621f928220177842b61d286082aca1d509c61b1b6de6d27b95 WHIRLPOOL 7699f5b7a88031125cfdd689d01e2ba63a41bebba8a2e2e9faae12533da1cf785514be5cd442c5f90a794028ed0703e518330e07db672c39154e810f9b9f47a4
+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
 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
new file mode 100644
index 0000000..57ecf95
--- /dev/null
+++ b/games-strategy/freeorion/files/unbundle_gigi.patch
@@ -0,0 +1,47 @@
+--- 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 @@
+ 
+     install(
+         FILES
+-        ../build/GG/CMakeCache.txt
+-        DESTINATION build/GG
+-        COMPONENT COMPONENT_FREEORION_BUILD_FILES_GIGI
+-    )
+-
+-    install(
+-        FILES
+         ../build/CMakeCache.txt
+         DESTINATION build
+         COMPONENT COMPONENT_FREEORION_BUILD_FILES_FREEORION
+@@ -590,21 +583,6 @@
+         StrCpy $7 $INSTDIR
+         \\\${WordReplace} $7 \\\"\\\\\\\" \\\"/\\\" \\\"+\\\" $8
+ 
+-	Rename $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt.in
+-        FileOpen $0 $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt.in r
+-        FileOpen $5 $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt w
+-        ClearErrors
+-        loop1:
+-            FileRead $0 $1
+-            IfErrors done1
+-            \\\${WordReplace} $1 \\\"${sdk_root}\\\" $8 \\\"+\\\" $2
+-            FileWrite $5 $2
+-            Goto loop1
+-        done1:
+-        FileClose $0
+-        FileClose $5
+-        Delete $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt.in
+-
+ 	Rename $INSTDIR\\\\build\\\\CMakeCache.txt $INSTDIR\\\\build\\\\CMakeCache.txt.in
+         FileOpen $0 $INSTDIR\\\\build\\\\CMakeCache.txt.in r
+         FileOpen $5 $INSTDIR\\\\build\\\\CMakeCache.txt w
diff --git a/games-strategy/freeorion/files/unbundle_log4cpp.patch b/games-strategy/freeorion/files/unbundle_log4cpp.patch
new file mode 100644
index 0000000..9bc24a0
--- /dev/null
+++ b/games-strategy/freeorion/files/unbundle_log4cpp.patch
@@ -0,0 +1,43 @@
+--- CMakeLists.txt~	2012-11-14 09:53:20.000000000 +0100
++++ CMakeLists.txt	2012-11-14 10:07:07.823249858 +0100
+@@ -120,7 +120,7 @@
+ ########################################
+ # Build common code library            #
+ ########################################
+-include_directories(${CMAKE_SOURCE_DIR} log4cpp)
++include_directories(${CMAKE_SOURCE_DIR})
+ 
+ add_definitions(-DADOBE_STD_SERIALIZATION)
+ 
+@@ -196,30 +196,13 @@
+     util/binreloc.c
+     util/Directories.cpp
+     util/XMLDoc.cpp
+-    log4cpp/src/Appender.cpp
+-    log4cpp/src/AppenderSkeleton.cpp
+-    log4cpp/src/BasicLayout.cpp
+-    log4cpp/src/Category.cpp
+-    log4cpp/src/CategoryStream.cpp
+-    log4cpp/src/Configurator.cpp
+-    log4cpp/src/FactoryParams.cpp
+-    log4cpp/src/FileAppender.cpp
+-    log4cpp/src/HierarchyMaintainer.cpp
+-    log4cpp/src/LayoutAppender.cpp
+-    log4cpp/src/Localtime.cpp
+-    log4cpp/src/LoggingEvent.cpp
+-    log4cpp/src/NDC.cpp
+-    log4cpp/src/PatternLayout.cpp
+-    log4cpp/src/Priority.cpp
+-    log4cpp/src/StringUtil.cpp
+-    log4cpp/src/TimeStamp.cpp
+     ${CMAKE_BINARY_DIR}/util/Version.cpp
+ )
+ 
+ if (WIN32)
+     list(APPEND THIS_LIB_SOURCES log4cpp/src/MSThreads.cpp)
+ else ()
+-    list(APPEND THIS_LIB_SOURCES log4cpp/src/PThreads.cpp)
++    list(APPEND THIS_LIB_SOURCES)
+ endif ()
+ 
+ library_all_variants(core)
diff --git a/games-strategy/freeorion/freeorion-9999-r11.ebuild b/games-strategy/freeorion/freeorion-9999-r13.ebuild
index 0ed5cb2..b05dcda 100644
--- a/games-strategy/freeorion/freeorion-9999-r11.ebuild
+++ b/games-strategy/freeorion/freeorion-9999-r13.ebuild
@@ -8,7 +8,7 @@ inherit  cmake-utils games subversion
 
 DESCRIPTION="FreeOrion is a free and open source clone of Master Of Orion"
 HOMEPAGE="http://www.freeorion.org"
-ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${PN}/trunk"
+ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${PN}/trunk/FreeOrion"
 ESVN_PROJECT="${PN}"
 
 LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
@@ -18,16 +18,18 @@ IUSE="cg debug threads"
 SLOT="0"
 
 RDEPEND="
-	dev-games/gigi[ogre,threads=]
+	!dev-games/gigi
+	dev-games/gigi-fo[threads=,ogre,ois]
 	>=dev-games/ogre-1.8.0[threads=]
 	<dev-lang/python-3
-	>=dev-libs/boost-1.50
+	>=dev-libs/boost-1.50[threads=]
 	media-gfx/graphviz
 	>=media-libs/freealut-1.1.0
 	>=media-libs/libogg-1.3.0
 	>=media-libs/libvorbis-1.3.2
 	>=media-libs/openal-1.14
 	>=sci-physics/bullet-2.77
+	dev-libs/log4cpp
 	media-libs/libpng:1.2
 	media-libs/freetype:2
 	>=sys-libs/zlib-1.2.5"
@@ -36,14 +38,32 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	dev-util/pkgconfig"
 
-CMAKE_USE_DIR="${S}/FreeOrion"
+CMAKE_USE_DIR="${S}"
+
+src_unpack() {
+	subversion_src_unpack
+}
 
 src_prepare() {
 	# Let's make the autorevision work.
 	subversion_wc_info
 	sed -i -e \
 		"s:svn_revision_number ???:svn_revision_number ${ESVN_WC_REVISION}:" \
-		FreeOrion/CMakeLists.txt || die "sed FreeOrion/CMakeLists.txt failed"
+		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"
+
+	# remove log4cpp. it's in the tree
+	cd "${CMAKE_USE_DIR}"
+	rm -rf log4cpp || die "Removing log4cpp directory failed"
+
+	# remove cmake calls to log4cpp
+	epatch "${FILESDIR}/unbundle_log4cpp.patch"
 }
 
 src_configure() {
@@ -73,6 +93,10 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+}
+
 src_install() {
 	cmake-utils_src_install