Unbundle expat, bug 253514. Drop obsolete patch.

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

5 files changed, 162 insertions, 29 deletions

diff --git a/dev-games/simgear/ChangeLog b/dev-games/simgear/ChangeLog
index 74b5e6acd916..0d5ad013e42b 100644
--- a/dev-games/simgear/ChangeLog
+++ b/dev-games/simgear/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/simgear
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.53 2012/08/31 21:25:05 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.54 2012/09/21 22:37:18 reavertm Exp $
+
+*simgear-2.8.0-r1 (21 Sep 2012)
+
+  21 Sep 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/simgear-2.8.0-unbundle-expat.patch, +simgear-2.8.0-r1.ebuild,
+  -files/simgear-2.8.0-underlinking.patch, -simgear-2.8.0.ebuild:
+  Unbundle expat, bug 253514. Drop obsolete patch.
 
   31 Aug 2012; Maciej Mrozowski <reavertm@gentoo.org> simgear-2.8.0.ebuild:
   Remove plib dependency, bug 433143.
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 10c5739885d2..b5d212407ae7 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 AUX simgear-2.4.0-boost148.patch 899 SHA256 9db85232807d0746d781579441d8cdcaa07c00dbf738f784261fdcccc1b950d6 SHA512 b46e0f3b27cd2e3eefc00d52a5f71f0fa02e37b5a424d5a270fac19bd8fa11fc5a49ea9c649343c386368195dbb83d59db3668212ce61f0352e7ddf274c23a9a WHIRLPOOL 9a09764f66e8ca9a7154b16633fbdd18de3cbf77d7bacd836a68b8f4dbc30ef7b9ef073d7c1980df399643aa765efa226b1d6872c46bc27ccf01f255e12eb838
-AUX simgear-2.8.0-underlinking.patch 596 SHA256 d3834b6a4a769197c0c27697f346389fb09002c666daec8b5487f51091719798 SHA512 efc7afaacba3bc4c3e0a3f4e87e8da86595cf98ffbb22fc197cbcd2aeb1706505f6c50893ed9bb3249bc88e7f16a2069e81567a38a97cb318ebf119e015b4b42 WHIRLPOOL 7a03dcb9f41aa9684ae5ba2e80ea6a6e37c2bd3b170e992ed43684f587b0d943081680d91efd7fb59baf53451e7ebdcd85fd77b834e083d36937d19e34c08b37
+AUX simgear-2.8.0-unbundle-expat.patch 4258 SHA256 05746f74ce815b2cf5ec0a01fe76954198bd4adfd04252d389b113362ac704a1 SHA512 e9dfb7d02c61eb57b75cf15547f37caa6b196c732a5350a44b04a3248606dde557a3b55f7a527e58eaae426469b8ca302402c036838efc45cc83bb6057faab88 WHIRLPOOL 1ac4643b7f983b6ea385e88a0d2f6981cb3876c4078bbc3ae3ed0e6781db996127b8708a9cd6002e06c86a745079f91d40f13d5b52f33853713f4840e0d5394c
 DIST simgear-2.4.0.tar.bz2 834501 SHA256 e26007ed015e75a61e140e3ab6a446d8163ea3cfd2baeaa763355db0be4dddf6 SHA512 edd764d7304a595361db1bdfd68e7e3314f8e9d7198f71792ca7976d953d13123d5e92dec8b3295134bf56b01cfb198b1f867a6f93cb56b947db72597e841414 WHIRLPOOL b0c65c2e1412b7182f9fe33cf3bcfb58e93524efa80064792ae302df9a95412b1b6aa0a4c19db72e98dc431307954a1168ed865d44adbcc44db324788892df94
 DIST simgear-2.8.0.tar.bz2 766340 SHA256 24758b0d59ba6d03659398c19145d92c2179174040f42739fc2f9c03c0bf90f7 SHA512 ead06fd394b10a7ae3c98422cc469b3c97450162f6994c40c7cb4818f88e0d25cf0b5dc9c39a10e2b9c0fd849dd322451df93e4febcbacf2fc23fe1860917064 WHIRLPOOL 77b0f59478c4c89a3ea02c48a97312b91df8ab9410cdc75bdbd516c2497f2e9941caf689c3115b2ccfb3419ef2cbdad7b2025d59fd1318b112b8a09bf6d5cd34
 EBUILD simgear-2.4.0.ebuild 891 SHA256 950db9110c7b64d51698fe530be3b97c31c3494e755bcf29d6ec7aff578c8e76 SHA512 f56494eaf4d91a339515bfd09ec2ab2bf5a5976838f4cedc077197209533f3bd40ee441133b769869dc096b7ee898cebdd72934c4f90a12970061770a6c4e5fb WHIRLPOOL 470fcbc0e5d4916751d4f3c9aa2c15a546d65032ec46819377870827327b22decea245a9471b13e3364e30051b42d8a793ae1c12d2152e51a9d1b23a953db3bd
-EBUILD simgear-2.8.0.ebuild 1169 SHA256 841bba5ba2e59879993f8744db737df824c898c39410024f0c98bdb81268193f SHA512 82c926ecd7aea0243239e8f7cc1b1fdf8ad0b92df8968a1af400e2081d737f3d204023f83a77c07e5a51e68a417bcdd6e35d2beba429dae0b1cd1a807344fe82 WHIRLPOOL f12c3b591cdabe584242de14d7a357cf315c19d151ec6bd2b9ee171ab116417aa63e4b532a9622fda0557add1de9fa1739f61e82bd1ba91348ca45767b956768
-MISC ChangeLog 8643 SHA256 18f527e487b3ae700efc5ed2526b3d8a61bcab8168bce1256ae59743e2519082 SHA512 6fe83581eaec97c4344fbbc465cfe7de9a7573c821a820b86db4d2115ef54e11491258a080c20b8a466c0a51e12c452d5b3166bec920b0b28e86cc8f62065ebd WHIRLPOOL 5c301667c0bf035d362a20210189f63ba67dd54bfe975e9168d8942743786fd8339da53d338ce03da0145f59593231fa3740d6aa11d0e36817a5537a762ff92f
+EBUILD simgear-2.8.0-r1.ebuild 1197 SHA256 74061c58afa66386e54a1c8476b9d4dfa4ee7d330cb84db979c8b8a2e99153af SHA512 8e0e8334f11a682f867936b6fb03e02dd7d0b577d5ae267792737d1a7410a78a8819541f135ea02639b935f71b4b2113c209cc690c3cfc878ba30c52661c65d3 WHIRLPOOL 030e674612d798b53fc1e50affc1df701ed2f23fd8ac888fb001a312426cd210cd17550699fef833ddc1455471ceb4e6d2b29e66ba0307c49c1704b68d7111bc
+MISC ChangeLog 8919 SHA256 451a55dd029330b4aa4d70305c39d3b13952c021cb0c40de94f50c6d6249f07f SHA512 0a3aa9e3a31fc2f77ee4d023d1b4a5c0d13c41d731026e14c2c9279b190c487f7bbe9ddbe0e6086f7916e3cee0c68bb5ec195ca6abe03cac006781b844ce12f6 WHIRLPOOL 9d1ef4119b7a4fb180cc212868a145b804afa313c4bc1cd4201333922f306ff4434638a61913623c7dd6d8da9234634cd8661d7512a3ef44d6734ce9e578d0cd
 MISC metadata.xml 632 SHA256 adc03add5cc88a06d5e31503860b2c12a4ca7269465252a78ef1372880dbcc9d SHA512 1ae66b7599b69c0c2ad9eebc2bbb7edb41ca319c8bc2d45043fda7ab59f001143446195fe6120e25e6be5cf6f904dc21aeaeec78085b0e266845e2caaaeec4bb WHIRLPOOL ea3346ea9945c101878de067f2a9545b5241100006fdcdcb3617db995e744e65b98fab59f0538ccb6f7185517e0db4c56c49d536a5e23ec36a151df78acc1e75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBBK6QACgkQFuHa/bHpVdvtuACfUWxNAEEFKxpb3DV5zmkdhqFB
-3WUAniTHQ4TYcFkJSgNekLAkyo8rnpaY
-=hu35
+iEYEAREIAAYFAlBc7BgACgkQFuHa/bHpVdvUoACfYkNJ4yqDRWpA/u/hzYHrMvED
+BRUAnR6dU4BSUqNpjMokrTpvJrqQRtNX
+=KwVh
 -----END PGP SIGNATURE-----
diff --git a/dev-games/simgear/files/simgear-2.8.0-unbundle-expat.patch b/dev-games/simgear/files/simgear-2.8.0-unbundle-expat.patch
new file mode 100644
index 000000000000..f9b8b6068111
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2.8.0-unbundle-expat.patch
@@ -0,0 +1,141 @@
+diff -ruN simgear-2.8.0/CMakeLists.txt my/CMakeLists.txt
+--- simgear-2.8.0/CMakeLists.txt	2012-08-16 16:20:28.000000000 +0200
++++ my/CMakeLists.txt	2012-09-22 00:25:49.814097209 +0200
+@@ -66,6 +66,7 @@
+ option(ENABLE_LIBSVN    "Set to ON to build SimGear with libsvnclient support" ON)
+ option(ENABLE_RTI       "Set to ON to build SimGear with RTI support" OFF)
+ option(ENABLE_TESTS     "Set to OFF to disable building SimGear's test applications" ON)
++option(SYSTEM_EXPAT     "Set to ON to build SimGear using the system libExpat" OFF)
+ 
+ if (MSVC)
+   GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
+@@ -148,6 +149,16 @@
+ find_package(ZLIB REQUIRED)
+ find_package(Threads REQUIRED)
+ 
++if (SYSTEM_EXPAT)
++    message(STATUS "Requested to use system Expat library, forcing SIMGEAR_SHARED to true")
++    set(SIMGEAR_SHARED ON)
++    find_package(EXPAT REQUIRED)
++    include_directories(${EXPAT_INCLUDE_DIRS})
++else()
++    message(STATUS "Using built-in expat code")
++    add_definitions(-DHAVE_EXPAT_CONFIG_H)
++endif(SYSTEM_EXPAT)
++
+ check_include_file(sys/time.h HAVE_SYS_TIME_H)
+ check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H)
+ check_include_file(unistd.h HAVE_UNISTD_H)
+@@ -252,7 +263,6 @@
+     ${ALUT_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} )
+ 
+ add_definitions(-DHAVE_CONFIG_H)
+-add_definitions(-DHAVE_EXPAT_CONFIG_H)
+ 
+ # configure a header file to pass some of the CMake settings
+ # to the source code
+diff -ruN simgear-2.8.0/simgear/CMakeLists.txt my/simgear/CMakeLists.txt
+--- simgear-2.8.0/simgear/CMakeLists.txt	2012-08-16 16:20:29.000000000 +0200
++++ my/simgear/CMakeLists.txt	2012-09-22 00:29:52.244101431 +0200
+@@ -54,7 +54,9 @@
+     set_property(TARGET SimGearCore PROPERTY VERSION   ${SIMGEAR_VERSION})
+     set_property(TARGET SimGearCore PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
+ 
+-    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
++    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY}
++        ${EXPAT_LIBRARIES}
++        ${CMAKE_THREAD_LIBS_INIT})
+     install(TARGETS SimGearCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+     if(LIBSVN_FOUND)
+diff -ruN simgear-2.8.0/simgear/simgear_config_cmake.h.in my/simgear/simgear_config_cmake.h.in
+--- simgear-2.8.0/simgear/simgear_config_cmake.h.in	2012-08-16 16:20:29.000000000 +0200
++++ my/simgear/simgear_config_cmake.h.in	2012-09-22 00:25:49.822097209 +0200
+@@ -17,3 +17,5 @@
+ #cmakedefine HAVE_LIBSVN_CLIENT_1
+ 
+ #cmakedefine GCC_ATOMIC_BUILTINS_FOUND
++
++#cmakedefine SYSTEM_EXPAT
+diff -ruN simgear-2.8.0/simgear/xml/CMakeLists.txt my/simgear/xml/CMakeLists.txt
+--- simgear-2.8.0/simgear/xml/CMakeLists.txt	2012-08-16 16:20:29.000000000 +0200
++++ my/simgear/xml/CMakeLists.txt	2012-09-22 00:25:49.872097210 +0200
+@@ -7,26 +7,31 @@
+     )
+     
+ set(SOURCES 
+-    asciitab.h
+-    hashtable.h
+-    iasciitab.h
+-    latin1tab.h
+-    nametab.h
+-    utf8tab.h
+-    xmldef.h
+-    xmlparse.h
+-    xmlrole.h
+-    xmltok.h
+-    xmltok_impl.h
+-    hashtable.c
+-    xmlparse.c
+-    xmlrole.c
+-    xmltok.c
+     easyxml.cxx
+-    internal.h
+-    ascii.h
+-    expat.h
+-    expat_external.h
+     )
+ 
++if (NOT SYSTEM_EXPAT)
++    list(APPEND SOURCES
++        asciitab.h
++        hashtable.h
++        iasciitab.h
++        latin1tab.h
++        nametab.h
++        utf8tab.h
++        xmldef.h
++        xmlparse.h
++        xmlrole.h
++        xmltok.h
++        xmltok_impl.h
++        hashtable.c
++        xmlparse.c
++        xmlrole.c
++        xmltok.c
++        internal.h
++        ascii.h
++        expat.h
++        expat_external.h 
++    )
++endif()
++    
+ simgear_component(xml xml "${SOURCES}" "${HEADERS}")
+diff -ruN simgear-2.8.0/simgear/xml/easyxml.cxx my/simgear/xml/easyxml.cxx
+--- simgear-2.8.0/simgear/xml/easyxml.cxx	2012-08-16 16:20:29.000000000 +0200
++++ my/simgear/xml/easyxml.cxx	2012-09-22 00:25:49.889097210 +0200
+@@ -4,13 +4,22 @@
+  * This file is in the Public Domain, and comes with NO WARRANTY of any kind.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#  include <simgear_config.h>
++#endif
++     
+ #include <simgear/compiler.h>
+ 
+ #include <string.h>		// strcmp()
+ 
+ #include "easyxml.hxx"
+-#include "xmlparse.h"
+-
++     
++#ifdef SYSTEM_EXPAT
++#  include <expat.h>
++#else
++#  include "xmlparse.h"     
++#endif
++     
+ #include <fstream>
+ #include <iostream>
+ 
diff --git a/dev-games/simgear/files/simgear-2.8.0-underlinking.patch b/dev-games/simgear/files/simgear-2.8.0-underlinking.patch
deleted file mode 100644
index a1a4d75c9917..000000000000
--- a/dev-games/simgear/files/simgear-2.8.0-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Aug 24 15:16:41 UTC 2012
-Subject: build system
-
-fix underlinking
-
---- simgear/CMakeLists.txt
-+++ simgear/CMakeLists.txt
-@@ -54,7 +54,7 @@
-     set_property(TARGET SimGearCore PROPERTY VERSION   ${SIMGEAR_VERSION})
-     set_property(TARGET SimGearCore PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
- 
--    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
-+    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY} pthread)
-     install(TARGETS SimGearCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
-     if(LIBSVN_FOUND)
diff --git a/dev-games/simgear/simgear-2.8.0.ebuild b/dev-games/simgear/simgear-2.8.0-r1.ebuild
index c34c23f605df..ca9d172c6469 100644
--- a/dev-games/simgear/simgear-2.8.0.ebuild
+++ b/dev-games/simgear/simgear-2.8.0-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/dev-games/simgear/simgear-2.8.0.ebuild,v 1.2 2012/08/31 21:25:05 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.8.0-r1.ebuild,v 1.1 2012/09/21 22:37:18 reavertm Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ SLOT="0"
 IUSE="debug jpeg subversion test"
 
 COMMON_DEPEND="
+	dev-libs/expat
 	>=dev-games/openscenegraph-3.0.1
 	media-libs/freealut
 	media-libs/openal
@@ -32,17 +33,18 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}"
 
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+PATCHES=(
+	"${FILESDIR}/${P}-unbundle-expat.patch"
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-}
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_RTI=OFF
 		-DSIMGEAR_HEADLESS=OFF
 		-DSIMGEAR_SHARED=ON
+		-DSYSTEM_EXPAT=ON
 		$(cmake-utils_use jpeg JPEG_FACTORY)
 		$(cmake-utils_use_enable subversion LIBSVN)
 		$(cmake-utils_use_enable test TESTS)