Fix building with simgear 1.0.0 Bug #203303

Package-Manager: portage-2.1.3.19

4 files changed, 61 insertions, 15 deletions

diff --git a/games-util/atlas/ChangeLog b/games-util/atlas/ChangeLog
index 930add45e6db..48fc8f232ca5 100644
--- a/games-util/atlas/ChangeLog
+++ b/games-util/atlas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/atlas
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/ChangeLog,v 1.13 2007/03/12 18:20:22 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/ChangeLog,v 1.14 2007/12/26 00:12:19 tupone Exp $
+
+  26 Dec 2007; Tupone Alfredo <tupone@gentoo.org>
+  +files/atlas-0.3.1-simgearNew.patch, atlas-0.3.1.ebuild:
+  Fix building with simgear 1.0.0 Bug #203303 by Thomas Witt
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org> atlas-0.2.2-r1.ebuild,
   atlas-0.3.0.ebuild, atlas-0.3.1.ebuild:
diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest
index 8ae14fe6d176..4bc15071390e 100644
--- a/games-util/atlas/Manifest
+++ b/games-util/atlas/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX atlas-0.3.1-simgearNew.patch 1069 RMD160 3f8af4566fb58c694f36efb99b98f864750b334a SHA1 71fdc003289056ae3b43af9fddc32dad2d0e0d2e SHA256 91e2310e0f1bfab9f896b3898f9f4bc79cba8c3cb527e6676f9b4e4d4bc5350f
+MD5 4d4cb0db47b899dedc8873b5dfd46590 files/atlas-0.3.1-simgearNew.patch 1069
+RMD160 3f8af4566fb58c694f36efb99b98f864750b334a files/atlas-0.3.1-simgearNew.patch 1069
+SHA256 91e2310e0f1bfab9f896b3898f9f4bc79cba8c3cb527e6676f9b4e4d4bc5350f files/atlas-0.3.1-simgearNew.patch 1069
 DIST Atlas-0.3.1.tar.gz 184857 RMD160 9f84a2e331ebc6eb7e84f256a13c845007a4679c SHA1 9f2aa7309774b943161cb80bf9b0dfaced548763 SHA256 a264edd2b668b96472ca80c0525a2b7ffac33b02a70333bf01fd93714b7f111a
-EBUILD atlas-0.3.1.ebuild 1725 RMD160 19ee5327dda353d574afbd019247ca1c211e33e6 SHA1 b501fa5a5b43df38557b574af6fe707b5c9f4b74 SHA256 b69cd23ec42b376a19087b442f0a7f653962dec9e61483d2a69fee80e80fb49a
-MD5 6a1c2647efdf99137dfbe87f72cb9f9e atlas-0.3.1.ebuild 1725
-RMD160 19ee5327dda353d574afbd019247ca1c211e33e6 atlas-0.3.1.ebuild 1725
-SHA256 b69cd23ec42b376a19087b442f0a7f653962dec9e61483d2a69fee80e80fb49a atlas-0.3.1.ebuild 1725
-MISC ChangeLog 1717 RMD160 8f6edd01694e9cc5b7512355a40dd04ccaa6aeef SHA1 34b80758801f8a5992c7e2ee3bba0a542bdd39e8 SHA256 5dcba3d5ebc1e08b122f828963ed7c2db32d4b0061434bbca0dce43ecdd52f21
-MD5 0d6b87824be9b3f159a614bab7cd6b9c ChangeLog 1717
-RMD160 8f6edd01694e9cc5b7512355a40dd04ccaa6aeef ChangeLog 1717
-SHA256 5dcba3d5ebc1e08b122f828963ed7c2db32d4b0061434bbca0dce43ecdd52f21 ChangeLog 1717
+EBUILD atlas-0.3.1.ebuild 1836 RMD160 4ad4ebc9aed2d599c8990bbeb1bce5a59628a085 SHA1 183aeffc3ca97d7f11de7424e3c7e8d9f907d26c SHA256 fc67319af8d884897cc5c7bc2e4b604810acedd3dcfdad48828fd84113513957
+MD5 503f17d1f5fd7c1ff633a0a1f1bb22cf atlas-0.3.1.ebuild 1836
+RMD160 4ad4ebc9aed2d599c8990bbeb1bce5a59628a085 atlas-0.3.1.ebuild 1836
+SHA256 fc67319af8d884897cc5c7bc2e4b604810acedd3dcfdad48828fd84113513957 atlas-0.3.1.ebuild 1836
+MISC ChangeLog 1888 RMD160 0a50113ab36016219d8ff1a1cb8b55481262f2b3 SHA1 cbd43226c27f87742a93da91222da61a3c093c60 SHA256 160e418e99ff38713bbc89ca20d2833bf4ec5ad7f133f2836b6f6beaac532d25
+MD5 216c7a830bf172c767ff49713c2bd256 ChangeLog 1888
+RMD160 0a50113ab36016219d8ff1a1cb8b55481262f2b3 ChangeLog 1888
+SHA256 160e418e99ff38713bbc89ca20d2833bf4ec5ad7f133f2836b6f6beaac532d25 ChangeLog 1888
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -18,9 +22,9 @@ MD5 62268d56ca32c1f4a54528b28bad68fa files/digest-atlas-0.3.1 235
 RMD160 060b8fdcae0f937e04424e423102ae67d1703a35 files/digest-atlas-0.3.1 235
 SHA256 a4addcd5dc9b53a3435315f3bf57d0360ba9dd9ff8c9a5f95127197d3745c39f files/digest-atlas-0.3.1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGFc0cdz7hIScOURERAh+qAKDE73uMYA9xDgSI5H3PAo3PzZXPcQCggM+U
-2/EF1TUE+kQHjHiBSyXA8WY=
-=BFlJ
+iD8DBQFHcZxu8qKy9+b2Hl0RArXDAJ4/9x1JuV7YAIMcWvjR+jbVszJF1wCg2CNm
+6SSKW99Cg3EFf5TKHu4zpIs=
+=YEJZ
 -----END PGP SIGNATURE-----
diff --git a/games-util/atlas/atlas-0.3.1.ebuild b/games-util/atlas/atlas-0.3.1.ebuild
index d90e2b7adc80..7f624fd9393c 100644
--- a/games-util/atlas/atlas-0.3.1.ebuild
+++ b/games-util/atlas/atlas-0.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/atlas-0.3.1.ebuild,v 1.3 2007/04/06 04:31:18 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/atlas-0.3.1.ebuild,v 1.4 2007/12/26 00:12:19 tupone Exp $
 
-inherit eutils games
+inherit eutils autotools games
 
 MY_P="Atlas-${PV}"
 DESCRIPTION="Chart Program to use with Flightgear Flight Simulator"
@@ -22,6 +22,13 @@ DEPEND="games-simulation/flightgear
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-simgearNew.patch
+	eautoreconf
+}
+
 src_compile() {
 	egamesconf --with-fgbase="${GAMES_DATADIR}"/FlightGear || die
 	emake || die "emake failed"
diff --git a/games-util/atlas/files/atlas-0.3.1-simgearNew.patch b/games-util/atlas/files/atlas-0.3.1-simgearNew.patch
new file mode 100644
index 000000000000..1f0492780f25
--- /dev/null
+++ b/games-util/atlas/files/atlas-0.3.1-simgearNew.patch
@@ -0,0 +1,31 @@
+--- src/Makefile.am.old	2007-12-26 00:41:52.000000000 +0100
++++ src/Makefile.am	2007-12-26 00:42:10.000000000 +0100
+@@ -23,7 +23,7 @@
+ 	Projection.cxx Projection.hxx
+ 
+ Atlas_LDADD = \
+-	-lsgmagvar -lsgtiming -lsgmisc -lsgio -lsgserial -lsgdebug -lsgbucket\
++	-lsgmagvar -lsgtiming -lsgstructure -lsgmisc -lsgio -lsgserial -lsgdebug -lsgbucket\
+ 	-lsgxml -lplibsg -lplibpu -lplibul -lplibfnt -lplibnet \
+ 	$(opengl_LIBS) \
+ 	-lpng -lz -lpthread -ljpeg
+--- src/Makefile.am.old	2007-12-26 00:51:56.000000000 +0100
++++ src/Makefile.am	2007-12-26 00:52:37.000000000 +0100
+@@ -40,7 +40,7 @@
+ 	fg_mkdir.cxx fg_mkdir.hxx
+ 
+ Map_LDADD = \
+-	-lsgmagvar -lsgtiming -lsgmisc -lsgio -lsgdebug \
++	-lsgmagvar -lsgtiming -lsgstructure -lsgmisc -lsgio -lsgdebug \
+ 	-lplibsg -lplibpu -lplibul -lplibfnt -lsgbucket -lsgscreen \
+ 	$(opengl_LIBS) \
+ 	-lpng -lz -ljpeg
+@@ -56,7 +56,7 @@
+ 	Scenery.cxx Scenery.hxx
+ 
+ MapPS_LDADD = \
+-	-lsgmagvar -lsgtiming -lsgmisc -lsgio -lsgdebug \
++	-lsgmagvar -lsgtiming -lsgstructure -lsgmisc -lsgio -lsgdebug \
+ 	-lplibsg -lsgbucket \
+ 	-lpng -lz
+