commit: d17766fee425552614718bf8a4aca20c1020abf2
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 8 02:40:01 2017 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 02:43:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d17766fe
games-util/atlas: Version bump (hg snapshot), masked due to bug 611980
games-util/atlas/Manifest | 2 +-
....ebuild => atlas-0.5.1_beta_pre20160907.ebuild} | 47 ++++++++--------------
profiles/package.mask | 4 ++
3 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest
index 8ce61c280e8..bd63ecc4281 100644
--- a/games-util/atlas/Manifest
+++ b/games-util/atlas/Manifest
@@ -1 +1 @@
-DIST Atlas-0.5.0.cvs20141002.tar.gz 470453 SHA256
cffde4b40d607b29204e19b9c67117bc6ce7e956dc98fe01344e2cb4e8a85437 SHA512
7873f1d9ba04979ebb3b94b16967bb834594cc1e84a4f0e27cc063a3b1e3e1aa53e1685298e075218da8f8dcacf756a724b8f705a6ad3c7cc7fc7e0ae2eb3384
WHIRLPOOL
9377a62f78c08c2b3a4b3462ce0ab736a8020230f5273d90bee4251291b334524bbf751049e037e9f9352ad313956198eae402c68d6f967bf0dc0f6eef24239b
+DIST atlas-hgcode-e183e3b3a0412b504edcb3664445b3e04fd484a2.zip 530005 SHA256
216661375ac69ec809da959e525cb6d88ed9bcdde0591e0beaead0a8e4d402e5 SHA512
5f4453c81b01451ce69f4f1340a7c34736be3a9ecf638aa340455d0bb0af7a5d1a7e05d0b51e8b75f5c3acef4787d208ace75d4c686e8be7eafb8f81c71df360
WHIRLPOOL
030f10cd5be4ef59020b7bd0b2078910ef5e9740c05ec9a7b200229c8a50474b40272fde3e004dd2f8af8269ef3aa0c67f8130fb1da69e75463b5c2fcddffeba
diff --git a/games-util/atlas/atlas-0.5.0_p20141002.ebuild
b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
similarity index 53%
rename from games-util/atlas/atlas-0.5.0_p20141002.ebuild
rename to games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
index 1971d03e3e6..ec154ef2bdf 100644
--- a/games-util/atlas/atlas-0.5.0_p20141002.ebuild
+++ b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit autotools eutils games
+inherit autotools eutils
-MY_PN=Atlas
-MY_PV=${PV/_p/.cvs}
+MY_PN=atlas-hgcode
+MY_PV=e183e3b3a0412b504edcb3664445b3e04fd484a2
MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="Chart Program to use with Flightgear Flight Simulator"
HOMEPAGE="http://atlas.sourceforge.net/";
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.zip";
LICENSE="GPL-2"
SLOT="0"
@@ -20,12 +20,12 @@ IUSE=""
COMMON_DEPEND="
media-libs/freeglut
- media-libs/glew
- >=media-libs/libpng-1.5
+ media-libs/glew:0
+ >=media-libs/libpng-1.5:0
net-misc/curl
sys-libs/zlib
virtual/glu
- virtual/jpeg
+ virtual/jpeg:*
virtual/opengl
"
DEPEND="${COMMON_DEPEND}
@@ -36,42 +36,27 @@ RDEPEND="${COMMON_DEPEND}
>=games-simulation/flightgear-3.0.0
"
-S=${WORKDIR}/${MY_PN}
+S=${WORKDIR}/${MY_P}
+
+DOCS=(AUTHORS NEWS README)
src_prepare() {
+ default_src_prepare
eautoreconf
}
src_configure() {
- egamesconf \
- --datadir="${GAMES_DATADIR}"/flightgear \
+ econf \
+ --datadir=/usr/share/flightgear \
--disable-dependency-tracking \
--enable-simgear-shared \
- --with-fgbase="${GAMES_DATADIR}"/flightgear
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS NEWS README
- prepgamesdirs
+ --with-fgbase=/usr/share/flightgear
}
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/profiles/package.mask b/profiles/package.mask
index 9f80dc576de..a6a62f5fb39 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,10 @@
#--- END OF EXAMPLES ---
+# Maciej Mrozowski <reave...@gmail.com> (08 Mar 2017)
+# Fails to build against simgear, with recent compilers, bug 611980
+games-util/atlas
+
# Matt Turner <matts...@gentoo.org> (05 Mar 2017)
# Part of dev-util/hxtools (and collides with it)
# Removal in 30 days. Bug #445436
