Version bump, remove old, effectively fixes bug 458448.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key B1E955DB)

5 files changed, 25 insertions, 111 deletions

diff --git a/games-util/atlas/ChangeLog b/games-util/atlas/ChangeLog
index 19e7a87e03df..5111bc8825e1 100644
--- a/games-util/atlas/ChangeLog
+++ b/games-util/atlas/ChangeLog
@@ -1,6 +1,14 @@
 # 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.29 2011/10/16 03:32:27 reavertm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/ChangeLog,v 1.30 2014/08/12 23:52:12 reavertm Exp $
+
+*atlas-0.4.9_p20140320 (12 Aug 2014)
+
+  12 Aug 2014; Maciej Mrozowski <reavertm@gentoo.org>
+  +atlas-0.4.9_p20140320.ebuild, -atlas-0.3.1_p20101101-r1.ebuild,
+  -atlas-0.3.1_p20101101.ebuild, -files/atlas-0.3.1_p20101101-libpng15.patch,
+  -files/atlas-0.3.1_p20101101-simgear-2.4.0.patch:
+  Version bump, remove old, effectively fixes bug 458448.
 
   16 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org>
   atlas-0.3.1_p20101101-r1.ebuild:
@@ -120,4 +128,3 @@
 
   26 Aug 2003; Michael Sterrett <msterret@gentoo.org> atlas-0.2.2.ebuild:
   initial commit.  ebuild draft from Jeff Thorsett via bug 25540
-
diff --git a/games-util/atlas/atlas-0.3.1_p20101101.ebuild b/games-util/atlas/atlas-0.3.1_p20101101.ebuild
deleted file mode 100644
index d8a3c4d9288e..000000000000
--- a/games-util/atlas/atlas-0.3.1_p20101101.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.ebuild,v 1.3 2011/08/09 17:29:42 ssuominen Exp $
-
-EAPI=2
-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=""
-
-DEPEND=">=games-simulation/flightgear-2
-	media-libs/freeglut
-	>=media-libs/libpng-1.4
-	media-libs/plib
-	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"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.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/atlas-0.3.1_p20101101-r1.ebuild b/games-util/atlas/atlas-0.4.9_p20140320.ebuild
index fed56422ef44..464fe9f3a6f9 100644
--- a/games-util/atlas/atlas-0.3.1_p20101101-r1.ebuild
+++ b/games-util/atlas/atlas-0.4.9_p20140320.ebuild
@@ -1,13 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 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.2 2011/10/16 03:32:27 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/atlas-0.4.9_p20140320.ebuild,v 1.1 2014/08/12 23:52:12 reavertm Exp $
+
+EAPI=5
 
-EAPI=3
 inherit autotools eutils games
 
+MY_PN=Atlas
+MY_PV=${PV/p/cvs}
+MY_P="${MY_PN}-${MY_PV}"
+
 DESCRIPTION="Chart Program to use with Flightgear Flight Simulator"
 HOMEPAGE="http://atlas.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,7 +21,7 @@ IUSE=""
 
 COMMON_DEPEND="
 	media-libs/freeglut
-	>=media-libs/libpng-1.4
+	>=media-libs/libpng-1.5
 	net-misc/curl
 	sys-libs/zlib
 	virtual/glu
@@ -24,22 +29,23 @@ COMMON_DEPEND="
 	virtual/opengl
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-games/simgear-2.4.0
+	>=dev-games/simgear-3.0.0
 	media-libs/plib
 "
 RDEPEND="${COMMON_DEPEND}
-	>=games-simulation/flightgear-2.4.0
+	>=games-simulation/flightgear-3.0.0
 "
 
+S=${WORKDIR}/${MY_PN}
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	epatch "${FILESDIR}"/${P}-simgear-2.4.0.patch
 	eautoreconf
 }
 
 src_configure() {
 	egamesconf \
 		--disable-dependency-tracking \
+		--enable-simgear-shared \
 		--with-fgbase="${GAMES_DATADIR}"/flightgear
 }
 
diff --git a/games-util/atlas/files/atlas-0.3.1_p20101101-libpng15.patch b/games-util/atlas/files/atlas-0.3.1_p20101101-libpng15.patch
deleted file mode 100644
index 0ed98aeb479d..000000000000
--- a/games-util/atlas/files/atlas-0.3.1_p20101101-libpng15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://atlas.cvs.sourceforge.net/viewvc/atlas/Atlas/src/Image.cxx?r1=1.7&r2=1.8
-
---- src/Image.cxx
-+++ src/Image.cxx
-@@ -319,7 +319,7 @@
- 	return;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	fclose(fp);
- 	return;
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
deleted file mode 100644
index 4b8b548d150c..000000000000
--- a/games-util/atlas/files/atlas-0.3.1_p20101101-simgear-2.4.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.