Version bump, bug 458202. Thanks to Christian Schmitt.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

5 files changed, 70 insertions, 76 deletions

diff --git a/dev-games/simgear/ChangeLog b/dev-games/simgear/ChangeLog
index fd63e3208072..ff699e7257ca 100644
--- a/dev-games/simgear/ChangeLog
+++ b/dev-games/simgear/ChangeLog
@@ -1,6 +1,12 @@
 # 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.57 2012/12/09 15:10:08 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.58 2013/02/20 21:21:42 reavertm Exp $
+
+*simgear-2.10.0 (20 Feb 2013)
+
+  20 Feb 2013; Maciej Mrozowski <reavertm@gentoo.org> +simgear-2.10.0.ebuild,
+  -files/simgear-2.4.0-boost148.patch, -simgear-2.4.0.ebuild:
+  Version bump, bug 458202. Thanks to Christian Schmitt.
 
   09 Dec 2012; Agostino Sarubbo <ago@gentoo.org> simgear-2.8.0-r1.ebuild:
   Stable for ppc, wrt bug #425838
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index cf97803759c9..dae016291ff6 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,8 +1,17 @@
-AUX simgear-2.4.0-boost148.patch 899 SHA256 9db85232807d0746d781579441d8cdcaa07c00dbf738f784261fdcccc1b950d6 SHA512 b46e0f3b27cd2e3eefc00d52a5f71f0fa02e37b5a424d5a270fac19bd8fa11fc5a49ea9c649343c386368195dbb83d59db3668212ce61f0352e7ddf274c23a9a WHIRLPOOL 9a09764f66e8ca9a7154b16633fbdd18de3cbf77d7bacd836a68b8f4dbc30ef7b9ef073d7c1980df399643aa765efa226b1d6872c46bc27ccf01f255e12eb838
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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.10.0.tar.bz2 879537 SHA256 582c0d547a58f7dbe841a0ba9eba5a894aae2b65f14ef06361e196b12022615d SHA512 4f994f699b8e06c432e51fcd9b7e15b8d143f6e244b14a6271fab02efd70199fd396aab42ed5fcf05c2c7c8d29bdd0f61f15486a48ea09a13b4924941eb20b56 WHIRLPOOL 4f7e41ca7fc5fd5a0c4428c156defaae495c93c319b14df555ae7e24dd33f6160ed652569155c099d31f0f58b53b02b3437d6522c610e8f88ba4f0ce487c5d17
 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.10.0.ebuild 1140 SHA256 0d131811006cecbc181e117091d2c6b71a8b81d51c2bcb314983a6a17cfe7063 SHA512 7add2aafbb285c04a02083c0c36fd31f85026103e3bdf1dbb335f9396b0b77e60da7858bab3e7024c74092eed3931bcd443d4a465027a7bedd4790ea76a0b80e WHIRLPOOL 330b6fe421f14eb0ddf0268ed8bace055b88d81da702cff474a88bec0cb9cf69724ede6ad4ecd78f2a86bcd85eca83c927ad470a26a1818a5f635b009a998479
 EBUILD simgear-2.8.0-r1.ebuild 1189 SHA256 991979c2eff2c0978a17b827853ebe9c8b3b5226468f71d0b12e47c7156f0d7e SHA512 197b7d94eb4ee5b02f2dc15ce6688450c78c4173b92aa2d13dcd9ac833e26c099266ecdec2bb9caecf54fafe451e41a71bbc66c2564dae10ee0f77417bd3ff59 WHIRLPOOL 1068d59782c8293d5861f45cebbaf1b7762fabb333d795b75a4cefebc83c170fec3ad3209d66b724c2e57cd72a88dfc0f2cbb6a8aee0ef6570bf1582a014aa8f
-MISC ChangeLog 9244 SHA256 cd547eb4f4fca3b212bcabfe54ee20763c36dc6fe262f446653d1c96c3f0bc10 SHA512 a33b6e8360d08734d679af7d726c1acc51b46d36b96fe839f413939ad178aa6736a92f42b12a4cf2c89ddb762eb3b20cb186e8bf7c51465bfa3ce8d35e5b8f6f WHIRLPOOL 7bdf943dbcf4ce396413ae409f5fff3a4161c17765c3f00e821a66df24a562ef5ed37c06f17db72b29df29e9ee23050a40609a08b3311ef903ff3be2808780de
+MISC ChangeLog 9478 SHA256 e3a6be5e919779939f601ad484a4a0adc3ff34cac8c73d274c7868026bc414f6 SHA512 1fd465e89be9465c08f1cf9fdd6b89312c21af43573cfdf0fd59eafbbaac3ede2419c83c057217ac31cce3a89e1f915eb9f6aabc8d515068f2a33cc6db7936a9 WHIRLPOOL c1e209a69bb38eedfccbc7674e8bd82133c8348af2c2e2cda6153ac1be1cafea3b98c0f371e2fb651a931a9b45ca85a200758730d43e9d26907fbb4f7b3d6136
 MISC metadata.xml 632 SHA256 adc03add5cc88a06d5e31503860b2c12a4ca7269465252a78ef1372880dbcc9d SHA512 1ae66b7599b69c0c2ad9eebc2bbb7edb41ca319c8bc2d45043fda7ab59f001143446195fe6120e25e6be5cf6f904dc21aeaeec78085b0e266845e2caaaeec4bb WHIRLPOOL ea3346ea9945c101878de067f2a9545b5241100006fdcdcb3617db995e744e65b98fab59f0538ccb6f7185517e0db4c56c49d536a5e23ec36a151df78acc1e75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlElPmcACgkQFuHa/bHpVdvUcgCghPwPRsxjDNTCpXdbYjkSs7vs
+bI8An0C7XiwS6qqnDNhQbHJkF4c/llli
+=vHPA
+-----END PGP SIGNATURE-----
diff --git a/dev-games/simgear/files/simgear-2.4.0-boost148.patch b/dev-games/simgear/files/simgear-2.4.0-boost148.patch
deleted file mode 100644
index a8b1aacc9cc3..000000000000
--- a/dev-games/simgear/files/simgear-2.4.0-boost148.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- simgear-2.4.0/simgear/structure/Singleton.hxx
-+++ simgear-2.4.0/simgear/structure/Singleton.hxx
-@@ -1,7 +1,7 @@
- #ifndef SIMGEAR_SINGLETON_HXX
- #define SIMGEAR_SINGLETON_HXX 1
- 
--#include <boost/pool/detail/singleton.hpp>
-+#include "boost/thread/detail/singleton.hpp"
- 
- #include <osg/Referenced>
- #include <osg/ref_ptr>
-@@ -22,7 +22,7 @@
-     static Class* instance()
-     {
-         Class& singleton
--            = boost::details::pool::singleton_default<Class>::instance();
-+            = boost::detail::thread::singleton<Class>::instance();
-         return &singleton;
-     }
- };
-@@ -38,7 +38,7 @@
-     static RefClass* instance()
-     {
-         SingletonRefPtr& singleton
--            = boost::details::pool::singleton_default<SingletonRefPtr>::instance();
-+            = boost::detail::thread::singleton<SingletonRefPtr>::instance();
-         return singleton.ptr.get();
-     }
- private:
diff --git a/dev-games/simgear/simgear-2.10.0.ebuild b/dev-games/simgear/simgear-2.10.0.ebuild
new file mode 100644
index 000000000000..ba957a05c755
--- /dev/null
+++ b/dev-games/simgear/simgear-2.10.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.10.0.ebuild,v 1.1 2013/02/20 21:21:42 reavertm Exp $
+
+EAPI=5
+
+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-libs/expat
+	>=dev-games/openscenegraph-3.0.1
+	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.44
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_RTI=OFF
+		-DENABLE_SOUND=ON
+		-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)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-games/simgear/simgear-2.4.0.ebuild b/dev-games/simgear/simgear-2.4.0.ebuild
deleted file mode 100644
index 721ab823196a..000000000000
--- a/dev-games/simgear/simgear-2.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.4.0.ebuild,v 1.5 2012/07/10 04:52:20 xmw Exp $
-
-EAPI=4
-
-inherit autotools-utils eutils
-
-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="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug"
-
-RESTRICT="test"
-
-RDEPEND=">=dev-games/openscenegraph-3.0.1
-	>=dev-libs/boost-1.37
-	dev-vcs/subversion
-	media-libs/freealut
-	media-libs/openal
-	>=media-libs/plib-1.8.5"
-DEPEND="${RDEPEND}"
-
-DOCS=(AUTHORS NEWS TODO)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-boost148.patch
-}
-
-src_configure() {
-	myeconfargs=(
-		--with-jpeg-factory
-		$(use_with debug logging)
-	)
-
-	autotools-utils_src_configure
-}