FreeOrion unbundling of log4cpp is too much hassle at the moment. Undone.

4 files changed, 11 insertions, 53 deletions

diff --git a/games-strategy/freeorion/ChangeLog b/games-strategy/freeorion/ChangeLog
index ee435f3..dd37eca 100644
--- a/games-strategy/freeorion/ChangeLog
+++ b/games-strategy/freeorion/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*freeorion-9999-r15 (14 Nov 2012)
+
+  14 Nov 2012; Sven Eden <sven.eden@gmx.de>
+  +freeorion-9999-r15.ebuild,
+  -freeorion-9999-r14.ebuild:
+  "rebundled" log4cpp, the changes necessary for unbundling aren't
+  worth the trouble.
+
+
 *freeorion-9999-r14 (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 fe71287..526ba67 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,5 +1,4 @@
 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
+EBUILD freeorion-9999-r15.ebuild 2551 SHA256 e04819080639c7d3f182efe09b127dc08f4157948e252012fc3fb59ecf480213 SHA512 ea33c20544bfa541ac0edd042032b21a485f2cc1f08569e9c7e73c354f05c21c04b3be444d0610fa11a1093c2f5773dce9e7c15f9700e4119f30879854127a1c WHIRLPOOL f7eb96a747a62d85a0c5ffc8b2270fa05fabf9ca0a1b14f2ac06fbbdb7e4e59a6f51ace657249a3eed45fb6cbff84849fa8d3189463bdf4e3ab525a17333d584
+MISC ChangeLog 2969 SHA256 5eefd117ec0f159db5849920b1ec29e433efeebe33940b730f8991f80e3012d1 SHA512 c56074b3d9238cd3f2c3494dfe93b58599171b19977a47a91a65b5d9f7a367b726a33b093d41a72b8ced997f60ab5d7a06f2567617247837ac4b3b10406dbbf7 WHIRLPOOL 6ec9d665e4bea10967a2a6e13e302e05c14aef9651226769f39b0a7fd566b8eb2296c4a5206cc7baa2a48755ff22c046a855efc79bde8d871ee09bee5310c44b
 MISC metadata.xml 482 SHA256 d440736d71b8eaac1b5a2a5171274171e7b5bbbcc6d4b8d2c14fd37c36e51a96 SHA512 5a44824de173b8922658c4983437a5aed0325a0f895bf599cc689d7bc820f91313c005313f35357b2790b698e19c30139616f6d6cad841b9e799529630cbbc19 WHIRLPOOL 43c8d071ce70c235921c3604aed8b4dcd128aab86745ca9de6ce2f682a129125bdbf148f818517184b9996453a10d487f02ff3ee5901bba0e8a8990ac3fcc837
diff --git a/games-strategy/freeorion/files/unbundle_log4cpp.patch b/games-strategy/freeorion/files/unbundle_log4cpp.patch
deleted file mode 100644
index 1e81b6f..0000000
--- a/games-strategy/freeorion/files/unbundle_log4cpp.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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            #
- ########################################
--include_directories(${CMAKE_SOURCE_DIR} log4cpp)
-+include_directories(${CMAKE_SOURCE_DIR})
- 
- add_definitions(-DADOBE_STD_SERIALIZATION)
- 
-@@ -196,30 +196,11 @@
-     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)
- endif ()
- 
- set(BUILD_DEBUG_TMP ${BUILD_DEBUG})
diff --git a/games-strategy/freeorion/freeorion-9999-r14.ebuild b/games-strategy/freeorion/freeorion-9999-r15.ebuild
index b2286c9..11f0baa 100644
--- a/games-strategy/freeorion/freeorion-9999-r14.ebuild
+++ b/games-strategy/freeorion/freeorion-9999-r15.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	>=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"
@@ -53,13 +52,6 @@ src_prepare() {
 
 	# 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() {