Bump new revision to get flightgear-2.4.0 support. Take over.

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

5 files changed, 114 insertions, 11 deletions

diff --git a/games-util/atlas/ChangeLog b/games-util/atlas/ChangeLog
index 0ffdb17edf73..4105fd73e971 100644
--- a/games-util/atlas/ChangeLog
+++ b/games-util/atlas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-util/atlas
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/ChangeLog,v 1.27 2011/10/08 17:03:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/ChangeLog,v 1.28 2011/10/16 03:26:02 reavertm Exp $
+
+*atlas-0.3.1_p20101101-r1 (16 Oct 2011)
+
+  16 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  +atlas-0.3.1_p20101101-r1.ebuild,
+  +files/atlas-0.3.1_p20101101-simgear-2.4.0.patch, metadata.xml:
+  Bump new revision to get flightgear-2.4.0 support. Take over.
 
   08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   -atlas-0.3.1_p20100302.ebuild:
diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest
index 33afcef05086..18cace4f9ff2 100644
--- a/games-util/atlas/Manifest
+++ b/games-util/atlas/Manifest
@@ -2,18 +2,16 @@
 Hash: SHA1
 
 AUX atlas-0.3.1_p20101101-libpng15.patch 305 RMD160 bb29cbbafbc63b63f6860c7169b45c7c10194c00 SHA1 d4e947225f868f7ff369a2d7bf0ce22ec3f9c108 SHA256 f1d9fa68be3f5f67adaa48626e89d808066068ba514912ea2a5d81e986abf232
+AUX atlas-0.3.1_p20101101-simgear-2.4.0.patch 628 RMD160 fcef932db542c7af170fdbeebfc6957627d2a71d SHA1 8e22800e9be99a68c2384e986ab02916d303dc38 SHA256 dcc0f38b1ce11bd94295c487b0edd13fa893df162631a4a0969bc0b691512934
 DIST atlas-0.3.1_p20101101.tar.bz2 316895 RMD160 4697d430a434b138ef188d340179a8a1abb60bab SHA1 0665533d950a5b49a8e2a308b1d0ee2472227ea7 SHA256 511b3fc75432b651b0aec925ddb72e3ab454579bcedcbf29622817da888c4fde
+EBUILD atlas-0.3.1_p20101101-r1.ebuild 2104 RMD160 fe3c7d7873321927e64007e25feaf522d2295b03 SHA1 535353f099acf8e029c5a52ab401ff5a936deea6 SHA256 51b7f8a58e92b7d004fedc8e90ff8caed46ae79f12a7fc55fa206ff4fc558adf
 EBUILD atlas-0.3.1_p20101101.ebuild 1959 RMD160 ef0604d42624fad44fcab295f88078e5c1dd2258 SHA1 fc4b0eec871cbd7569467c0950c3f550350778cd SHA256 229f0b7002bba1c8690bcc33b4cefb1dd699f3492d8ff38c42f51888af9ab231
-MISC ChangeLog 3752 RMD160 f65030690452f291fc2d6334044c008751d98232 SHA1 44b473e25bda9f601058b588ebb16eb05549eb19 SHA256 75a4cdb67511ae772308b8e845845914147f1e2d74ae653f49a588b662665bc5
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+MISC ChangeLog 4013 RMD160 68b1fcd0f3bab1903035aed0b577e80f57b4ced3 SHA1 a0722a37cf11c6ffa49c2afb965cb3f53ab27f03 SHA256 bfae83b60a64527e14c0494888ff4b59bd62f363b98b206cf7af10e816572b6a
+MISC metadata.xml 252 RMD160 ff740b48a8231442102a6d8a05de35fa90034978 SHA1 acec02c8c581a36d1750a910a6db41766a0e3c98 SHA256 2dc38e2edb5ef0ce76845cfb7ab60e702c61eaff8e5ae142025b1793ed81084c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOkIKGAAoJEEdUh39IaPFNXbkIAKCt5zczpckQPRxV1Nai+1e+
-Ads/mpsD75AJ/eam5XRMmu4JffN72ezQOAQ15vpzdiuM/GmalZwTITdTTslDtD/n
-geXImeUy6/bj+50W3OFu9pupYdevFoaAgu2u2uE5ErJJDrOpGgHLe+u7aDjpCHRy
-JAPO+r9cFkbnXlpIBZrsAiju+NmCJnRaisH27tjfUmq1Yb1zkUmoU1lYBd5JecWa
-O1kbUtIfxh6B9EdKBQILoHJD2kUXw/BPuhAL1WYlDDpK/2swuRzscTKimTsuq9Mo
-uiW/tXk9Be+5LECWdYcPdHa4+JovIQDzrL3wgOg/CNZCAj6HAOeeYnpEGTu5obA=
-=SL0X
+iEYEARECAAYFAk6aTs0ACgkQFuHa/bHpVdvF+ACff/jb4jXAKcU66gWqDFtGG0ws
+xQcAn1t5NxkKEBlUgtilerJURNOiPaGv
+=Nwyu
 -----END PGP SIGNATURE-----
diff --git a/games-util/atlas/atlas-0.3.1_p20101101-r1.ebuild b/games-util/atlas/atlas-0.3.1_p20101101-r1.ebuild
new file mode 100644
index 000000000000..d3dca7a39327
--- /dev/null
+++ b/games-util/atlas/atlas-0.3.1_p20101101-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 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_p20101101-r1.ebuild,v 1.1 2011/10/16 03:26:02 reavertm Exp $
+
+EAPI=3
+inherit autotools eutils games
+
+DESCRIPTION="Chart Program to use with Flightgear Flight Simulator"
+HOMEPAGE="http://atlas.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	media-libs/freeglut
+	>=media-libs/libpng-1.4
+	net-misc/curl
+	virtual/glu
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXt
+	x11-libs/libXmu
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-games/simgear-2.4.0
+	media-libs/plib
+"
+RDEPEND="${COMMON_DEPEND}
+	>=games-simulation/flightgear-2.4.0
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+	epatch "${FILESDIR}"/${P}-simgear-2.4.0.patch
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--with-fgbase="${GAMES_DATADIR}"/flightgear
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	insinto "${GAMES_DATADIR}"/flightgear/Atlas
+	doins src/data/*.{jpg,png} || die
+	insinto "${GAMES_DATADIR}"/flightgear/Atlas/Palettes
+	doins src/data/Palettes/*.ap || die
+	insinto "${GAMES_DATADIR}"/flightgear/Atlas/Fonts
+	doins src/data/Fonts/*.txf || die
+	dodoc AUTHORS NEWS README
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "You now can make the maps with the following commands:"
+	elog "${GAMES_BINDIR}/Map --atlas=${GAMES_DATADIR}/flightgear/Atlas"
+	elog
+	elog "To run Atlas concurrently with FlightGear use the following:"
+	elog "Atlas --path=[path of map images] --udp=[port number]"
+	elog "and start fgfs with the following switch (or in .fgfsrc):"
+	elog "--nmea=socket,out,0.5,[host that you run Atlas on],[port number],udp"
+	echo
+}
+
+pkg_postrm() {
+	elog "You must manually remove the maps if you don't want them around."
+	elog "They are found in the following directory:"
+	echo
+	elog "${GAMES_DATADIR}/flightgear/Atlas"
+	echo
+}
diff --git a/games-util/atlas/files/atlas-0.3.1_p20101101-simgear-2.4.0.patch b/games-util/atlas/files/atlas-0.3.1_p20101101-simgear-2.4.0.patch
new file mode 100644
index 000000000000..4b8b548d150c
--- /dev/null
+++ b/games-util/atlas/files/atlas-0.3.1_p20101101-simgear-2.4.0.patch
@@ -0,0 +1,12 @@
+diff -ruN atlas-0.3.1_p20101101/src/Subbucket.cxx my/src/Subbucket.cxx
+--- atlas-0.3.1_p20101101/src/Subbucket.cxx	2010-04-26 23:15:29.000000000 +0200
++++ my/src/Subbucket.cxx	2011-10-16 05:11:01.175028326 +0200
+@@ -72,7 +72,7 @@
+     // All points within the chunk are relative to the reference
+     // point.  Therefore, to place points in absolute 3D space, we
+     // need to add the reference point to all points.
+-    const SGVec3<double>& gbs_p = _chunk.get_gbs_center2();
++    const SGVec3<double>& gbs_p = _chunk.get_gbs_center();
+ 
+     // Get all the points, and use them to set our maximum elevation
+     // figure.
diff --git a/games-util/atlas/metadata.xml b/games-util/atlas/metadata.xml
index d3c2cc926f0b..bf9480ea717d 100644
--- a/games-util/atlas/metadata.xml
+++ b/games-util/atlas/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
+<maintainer>
+	<email>reavertm@gentoo.org</email>
+	<name>Maciej Mrozowski</name>
+</maintainer>
 </pkgmetadata>