Fix the test phase, unblocking Bug #217505

Package-Manager: portage-2.1.4.4

4 files changed, 42 insertions, 7 deletions

diff --git a/dev-games/simgear/ChangeLog b/dev-games/simgear/ChangeLog
index d5f1de82bf7e..a432b5aa7c56 100644
--- a/dev-games/simgear/ChangeLog
+++ b/dev-games/simgear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/simgear
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.33 2008/09/19 03:45:21 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.34 2008/09/19 13:15:37 tupone Exp $
+
+  19 Sep 2008; Tupone Alfredo <tupone@gentoo.org>
+  +files/simgear-1.0.0-test.patch, simgear-1.0.0.ebuild:
+  Fix the test phase, unblocking Bug #217505
 
   19 Sep 2008; Tupone Alfredo <tupone@gentoo.org>
   +files/simgear-0.3.10-gcc43.patch, simgear-0.3.10.ebuild:
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index c7c13de6c580..1172d55ff4bb 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX simgear-0.3.10-gcc43.patch 2015 RMD160 0f2bc87fdfd7c59926494f5983533d9c06658b85 SHA1 25dbb3da6b3f8fb69cc895b32d579146ff840d4c SHA256 342f17f73995bb52a0810bc47737bb3dd61b25c6e7c4bb89cfcb474419eaa8ee
+AUX simgear-1.0.0-test.patch 1044 RMD160 d7be5a850447eb02e82e3419ad1421f02d2473bf SHA1 804b408c45c69f7f77ee52f764e6418ace1414d4 SHA256 77f031b9cff7b3b09522af5c0ab2ed798651d3d3fbd9c88791c94df3d3157685
 DIST SimGear-0.3.10.tar.gz 752225 RMD160 11bfb77efab7562f14c9bc0688f99af9a45f4c81 SHA1 83e8435b52463fdb2736ccb2f0e42b572528131f SHA256 fc14e986d11212a5435d684c4f7cd4245e5afa942db5a8e48b82cbd57ac84720
 DIST SimGear-1.0.0.tar.gz 769214 RMD160 62f260d55d621221076fafb703593f6c4e3c9d53 SHA1 cad6cc8a205005731633d8dec994cfa299f90e8a SHA256 574e1d41a3a310f7904549af62dd0d7029d841c1eb78dcd2fc5649401b378a5d
 EBUILD simgear-0.3.10.ebuild 826 RMD160 8bfb48f100c5a3de2d189ba44540f9a56c5ca662 SHA1 c742e3feb6573fa94a506ae7b4c98bd501b1d810 SHA256 697d31e8e0a34cf1162e45836fc8d77a3ffc77b4a0650aa0ab28c758c9a894c4
-EBUILD simgear-1.0.0.ebuild 712 RMD160 08d4f255c47f556b2bff55a20dcd20c5d56c078f SHA1 2c398bd82b6b929967b1ed9b932d4e9a98b28ff9 SHA256 601c61bd3e213a9db0f704791ac1694cd49adfb3b63a538708b7c4d480617676
-MISC ChangeLog 5858 RMD160 de579d11d3b8e13dc910de4d2246ff5c50997826 SHA1 2ce24967607d3ef6784c2833b59d208a3df11686 SHA256 dfe5df3858441e0d792d72090ef88b2f7ea7a58ebedadf310e8aed906b3e349f
+EBUILD simgear-1.0.0.ebuild 808 RMD160 ef0e8d6a02f0e018623ba5b8a386244eb97f681d SHA1 8aa406eb935699b1e0a7ade4dc61241ec39580ec SHA256 2a218bbfe56fcbc602a39278cbdb0a40be148fe23da48d8d0af6b244dd36fcdb
+MISC ChangeLog 6011 RMD160 3e2e015fb09f146e4afacaea9b67f7c9095b074b SHA1 4cb25abec8ae1f64c329cfbc1beed9abc7230abb SHA256 88c0d098fa9a771adc984093d4a00745da443bc946ef98cd3d63776d2005df9a
 MISC metadata.xml 538 RMD160 ad9da47ba8d1df3750dfedc20cb0d385d9118084 SHA1 b7e65e3f3441922661bc0f73de9e844e4acfe43b SHA256 0e2b83bd660e0709ada2f3e9b5d9db161e505ad9baf7c56dd6ee3299f5ce1963
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjTIF0ACgkQFByi98F1FAgZXgCeLDeHI4xminE6lgls5IpWBXKI
-024AnjMtuj8lq8sdzuKynIs1LgKf/k9j
-=FXWh
+iEYEARECAAYFAkjTpgMACgkQFByi98F1FAiMugCbBvkgG8oMyC9SwrM7B6Yxu+M2
+YPEAoIKCRJx2yi1hVbc/ZVwYuWBmThH9
+=VMVO
 -----END PGP SIGNATURE-----
diff --git a/dev-games/simgear/files/simgear-1.0.0-test.patch b/dev-games/simgear/files/simgear-1.0.0-test.patch
new file mode 100644
index 000000000000..dffbb4678423
--- /dev/null
+++ b/dev-games/simgear/files/simgear-1.0.0-test.patch
@@ -0,0 +1,22 @@
+--- simgear/math/SGMathTest.cxx.old	2008-09-19 14:41:31.000000000 +0200
++++ simgear/math/SGMathTest.cxx	2008-09-19 14:43:09.000000000 +0200
+@@ -200,7 +200,7 @@
+ GeodesyTest(void)
+ {
+   // We know that the values are on the order of 1
+-  double epsDeg = 10*SGLimits<double>::epsilon();
++  double epsDeg = SGLimits<double>::epsilon();
+   // For the altitude values we need to tolerate relative errors in the order
+   // of the radius
+   double epsM = 1e6*SGLimits<double>::epsilon();
+@@ -215,8 +215,8 @@
+   // Test the conversion routines to cartesian coordinates
+   cart0 = SGVec3<double>::fromGeod(geod0);
+   geod1 = SGGeod::fromCart(cart0);
+-  if (epsDeg < fabs(geod0.getLongitudeDeg() - geod1.getLongitudeDeg()) ||
+-      epsDeg < fabs(geod0.getLatitudeDeg() - geod1.getLatitudeDeg()) ||
++  if (epsDeg*30.0*2.0 < fabs(geod0.getLongitudeDeg() - geod1.getLongitudeDeg()) ||
++      epsDeg*20.0*2.0 < fabs(geod0.getLatitudeDeg() - geod1.getLatitudeDeg()) ||
+       epsM < fabs(geod0.getElevationM() - geod1.getElevationM()))
+     return false;
+ 
diff --git a/dev-games/simgear/simgear-1.0.0.ebuild b/dev-games/simgear/simgear-1.0.0.ebuild
index bbe74a8dfc85..0b3dc0572c3a 100644
--- a/dev-games/simgear/simgear-1.0.0.ebuild
+++ b/dev-games/simgear/simgear-1.0.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-1.0.0.ebuild,v 1.2 2008/09/07 13:20:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-1.0.0.ebuild,v 1.3 2008/09/19 13:15:37 tupone Exp $
+
+inherit eutils
 
 MY_P="SimGear-${PV/_/-}"
 DESCRIPTION="Development library for simulation games"
@@ -18,6 +20,12 @@ DEPEND=">=media-libs/plib-1.8.4
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-test.patch
+}
+
 src_compile() {
 	econf || die
 	emake -j1 || die "emake failed"