Version bump, bug 405281. Original ebuild by Julian Ospald.

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

7 files changed, 85 insertions, 92 deletions

diff --git a/dev-games/simgear/ChangeLog b/dev-games/simgear/ChangeLog
index dd4137623c6a..0672fe5ac65e 100644
--- a/dev-games/simgear/ChangeLog
+++ b/dev-games/simgear/ChangeLog
@@ -1,6 +1,14 @@
 # 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.51 2012/07/10 04:52:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.52 2012/08/27 23:57:39 reavertm Exp $
+
+*simgear-2.8.0 (27 Aug 2012)
+
+  27 Aug 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/simgear-2.8.0-underlinking.patch, +simgear-2.8.0.ebuild,
+  -files/simgear-1.9.1-gcc44.patch, -simgear-1.9.1.ebuild,
+  -simgear-2.0.0.ebuild:
+  Version bump, bug 405281. Original ebuild by Julian Ospald.
 
   10 Jul 2012; Michael Weber <xmw@gentoo.org> simgear-2.4.0.ebuild:
   ppc stable (bug 405665)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index c53c51016ba3..6bcd1cc8a4ff 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX simgear-1.9.1-gcc44.patch 270 SHA256 6ff75cc54cc6f86d9e9653ce5954265046969b434aa499a78036c750ba305d8f SHA512 4b01fdf06b0bb38405a448da57b1b4c52804f54254b51e74ad530ed5b120be6ada475762009dc8d08a8eee7a350ece404014241cabbc728ffbd0e3cc653c18d8 WHIRLPOOL 8f1255b2dd01a06479ad0864898be23a3f424cac20b0294f3c107618a9feaa36b6bc9a8dbab39acb063ab43dd6b9d2ca29da4388bbc4d0b4707ac42933762cf8
 AUX simgear-2.4.0-boost148.patch 899 SHA256 9db85232807d0746d781579441d8cdcaa07c00dbf738f784261fdcccc1b950d6 SHA512 b46e0f3b27cd2e3eefc00d52a5f71f0fa02e37b5a424d5a270fac19bd8fa11fc5a49ea9c649343c386368195dbb83d59db3668212ce61f0352e7ddf274c23a9a WHIRLPOOL 9a09764f66e8ca9a7154b16633fbdd18de3cbf77d7bacd836a68b8f4dbc30ef7b9ef073d7c1980df399643aa765efa226b1d6872c46bc27ccf01f255e12eb838
-DIST SimGear-1.9.1.tar.gz 851327 SHA256 ba9014ad08594730db388cfe9ba9f59c82cd81b4e8bc91e2c254f5b47afcfa6a SHA512 c22a1b6d39d619fa573c924b688eff859b6aeff682d0b0d912d052c98cabc78cd780fd57107f91b2f6a2ff9d934c6de6c02bc4f39f6af018c74c19bd5e1c30dc WHIRLPOOL 2b75739eba85c5d517d04da0036c13f954a02134f163237b40a01f212946efe4156247cac8d6352f3ad2efd163023024cdce67932502c92855cdabb9b7fb9bb9
-DIST SimGear-2.0.0.tar.gz 1058343 SHA256 a55847b8aefdeabb511b761a2a39290b36b841b22e813d62217cd32c7351d121 SHA512 71c2ec01ab72c663bcffd273250c87d3bbe73cd8197c1483beb209b885960d6020e478c2a059b97710b732bd3506fe9c4b749d09d87378ddff13e29ec25beaca WHIRLPOOL 6ee9f1972a4d444ba63aeaf6ffb087590bf5331b323b8122ba7c418c6c4557b61ced01bcb1f68cbcafd47ce6d2254286fc89e7dd253be301cc74a72605b7351d
+AUX simgear-2.8.0-underlinking.patch 596 SHA256 d3834b6a4a769197c0c27697f346389fb09002c666daec8b5487f51091719798 SHA512 efc7afaacba3bc4c3e0a3f4e87e8da86595cf98ffbb22fc197cbcd2aeb1706505f6c50893ed9bb3249bc88e7f16a2069e81567a38a97cb318ebf119e015b4b42 WHIRLPOOL 7a03dcb9f41aa9684ae5ba2e80ea6a6e37c2bd3b170e992ed43684f587b0d943081680d91efd7fb59baf53451e7ebdcd85fd77b834e083d36937d19e34c08b37
 DIST simgear-2.4.0.tar.bz2 834501 SHA256 e26007ed015e75a61e140e3ab6a446d8163ea3cfd2baeaa763355db0be4dddf6 SHA512 edd764d7304a595361db1bdfd68e7e3314f8e9d7198f71792ca7976d953d13123d5e92dec8b3295134bf56b01cfb198b1f867a6f93cb56b947db72597e841414 WHIRLPOOL b0c65c2e1412b7182f9fe33cf3bcfb58e93524efa80064792ae302df9a95412b1b6aa0a4c19db72e98dc431307954a1168ed865d44adbcc44db324788892df94
-EBUILD simgear-1.9.1.ebuild 814 SHA256 3af18ab7782abaf4ce641818d00c453ce7c45b0c15509a904f590fc65625eb4f SHA512 f4b1a25098ebd8422ee5c587109853d8857cd35e63dbc8524cff47acff6f7e2cdc3c4c85f18c4aff9e824c3498675f1589af2269dafe0e859f605f6fb0991787 WHIRLPOOL 749023544b095a4756a119e6f30a0f2c57f652c346961b66c31fde641507a7f94fa7e31c9b01dab4e7fdb00e464e0bbcc081eb88b7f636c82015b32b9c964149
-EBUILD simgear-2.0.0.ebuild 807 SHA256 623fcf7daf0b5bc2103e343a9951ec6fb42963ccbdc4d859396a1c4dd67dc897 SHA512 ebc309b0e53a3263d2c99e29592b242b1faaa9f6b3ba03160e937b3edc97d05d4e860c5c149b1f6c4da49447aa16782294570dea49437484747e77d711a0d22c WHIRLPOOL 8f4ff8209fc5873761c477369680c6249f01d04767e58e89f4657cd61b16151c64876e30789303306c2d830c078b53ccd060ffa27fe1e97fa752c3ad3bcd40b2
+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
-MISC ChangeLog 8226 SHA256 a1c28d8c307b15b1ca9afee5ccfb7cb6206eb00fe3b8fa7a2bb921184992efe3 SHA512 f254fab5f3b8a8b5b7fbd76f0b036ead35091c77c9900071d6545a6b95df6c2506d351a8963b8de86cf547f6c0b3f72c65b25a670e522e67866acab26d400552 WHIRLPOOL 4abe3b43798aa2ba18c6cea47ad6291363ad25f1f897ba49304fa183fe7f3e9ed8d1852b88f592c73416e53b3de86942beaf469861a0476b8921dbfa26b229bd
+EBUILD simgear-2.8.0.ebuild 1194 SHA256 68c5987a1a8bfcbe39bf93122f2fa6d11a5709b8d1af338021f34f1ea9338197 SHA512 addf9a27c984e5da82a190ddd3961c58ece6870c7d30f00c57e7050e8f0f592ce7ec089ba1080dfa5086b1e8088c8b13d7f94d7be28bd077d3a8d7e84a59b777 WHIRLPOOL 8e8c66344c4700656567bb050ac527981f493f4e0546a389758e9d7b2bc9bcd014fa07ea06a64ff8fb136118e79471a0cca594bfa804cccae8a5b78e8c5250e4
+MISC ChangeLog 8528 SHA256 5ec9a59db0875f4c322d2d2a96fc630c6915eb3cc818437454cc67fa415c2d50 SHA512 60c46ae3def8e742a6e0f690185d978f4cb6a730a9a1f272fecf49f677ba537ba67a117c7ea35aef0f99a834fca794f91c3a098a357ae24b17a58ca59c90339c WHIRLPOOL 46cc7a6bb5a30cfa2dcc75a8cc94ce658d7cd0c47888ffc421ccd2f81ec539fe7d96552aa8511bd397dcdf9d38c2dce74708b57544d190bde6035a9118a2e883
 MISC metadata.xml 632 SHA256 adc03add5cc88a06d5e31503860b2c12a4ca7269465252a78ef1372880dbcc9d SHA512 1ae66b7599b69c0c2ad9eebc2bbb7edb41ca319c8bc2d45043fda7ab59f001143446195fe6120e25e6be5cf6f904dc21aeaeec78085b0e266845e2caaaeec4bb WHIRLPOOL ea3346ea9945c101878de067f2a9545b5241100006fdcdcb3617db995e744e65b98fab59f0538ccb6f7185517e0db4c56c49d536a5e23ec36a151df78acc1e75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/7tM8ACgkQknrdDGLu8JBxXAD/a6XoA0LNKh6hm0CAAxRJncAq
-uu5D8SNLLjqm1AJiXvsA/1L4dYCqhJE3TdOostXfPXY+T4+vr27VPRGnzKGxbSgb
-=ojfU
+iEYEAREIAAYFAlA8CXQACgkQFuHa/bHpVduRZwCeKmVfuYV83TzrGL5HpZiPJD39
+wH8AnAvjxisxs9e4vmFmsfUQ9cUGfHkM
+=FpMq
 -----END PGP SIGNATURE-----
diff --git a/dev-games/simgear/files/simgear-1.9.1-gcc44.patch b/dev-games/simgear/files/simgear-1.9.1-gcc44.patch
deleted file mode 100644
index 96e6a1c8c702..000000000000
--- a/dev-games/simgear/files/simgear-1.9.1-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- simgear/debug/logstream.hxx.old	2009-05-20 16:27:26.000000000 +0200
-+++ simgear/debug/logstream.hxx	2009-05-20 16:27:59.000000000 +0200
-@@ -30,6 +30,7 @@
- #ifdef _MSC_VER
- #  include <windows.h>
- #endif
-+#include <cstdio>
- 
- #include <streambuf>
- #include <ostream>
diff --git a/dev-games/simgear/files/simgear-2.8.0-underlinking.patch b/dev-games/simgear/files/simgear-2.8.0-underlinking.patch
new file mode 100644
index 000000000000..a1a4d75c9917
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2.8.0-underlinking.patch
@@ -0,0 +1,17 @@
+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-1.9.1.ebuild b/dev-games/simgear/simgear-1.9.1.ebuild
deleted file mode 100644
index 4ecd619a63e6..000000000000
--- a/dev-games/simgear/simgear-1.9.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-1.9.1.ebuild,v 1.7 2011/02/26 13:31:55 armin76 Exp $
-EAPI=2
-
-inherit eutils
-
-MY_P="SimGear-${PV/_/-}"
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="mirror://simgear/Source/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/plib-1.8.5
-	dev-games/openscenegraph
-	>=dev-libs/boost-1.34.0
-	media-libs/openal
-	media-libs/freealut"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc NEWS AUTHORS TODO
-}
diff --git a/dev-games/simgear/simgear-2.0.0.ebuild b/dev-games/simgear/simgear-2.0.0.ebuild
deleted file mode 100644
index 5ceac6c7f3d7..000000000000
--- a/dev-games/simgear/simgear-2.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.0.0.ebuild,v 1.3 2011/02/26 13:31:57 armin76 Exp $
-EAPI=2
-
-inherit eutils
-
-MY_P="SimGear-${PV/_/-}"
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="mirror://simgear/Source/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/plib-1.8.5
-	dev-games/openscenegraph
-	>=dev-libs/boost-1.37.0
-	media-libs/openal
-	media-libs/freealut"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf --with-jpeg-factory
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc NEWS AUTHORS TODO
-}
diff --git a/dev-games/simgear/simgear-2.8.0.ebuild b/dev-games/simgear/simgear-2.8.0.ebuild
new file mode 100644
index 000000000000..4d2bf64898ea
--- /dev/null
+++ b/dev-games/simgear/simgear-2.8.0.ebuild
@@ -0,0 +1,52 @@
+# 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.1 2012/08/27 23:57:39 reavertm Exp $
+
+EAPI=4
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="debug jpeg subversion test"
+
+COMMON_DEPEND="
+	>=dev-games/openscenegraph-3.0.1
+	media-libs/freealut
+	media-libs/openal
+	sys-libs/zlib
+	virtual/opengl
+	jpeg? ( virtual/jpeg )
+	subversion? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.37
+	>=media-libs/plib-1.8.5
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_RTI=OFF
+		-DSIMGEAR_HEADLESS=OFF
+		-DSIMGEAR_SHARED=ON
+		$(cmake-utils_use jpeg JPEG_FACTORY)
+		$(cmake-utils_use_enable subversion LIBSVN)
+		$(cmake-utils_use_enable test TESTS)
+	)
+	cmake-utils_src_configure
+}