Gentoo Archives: gentoo-commits

From: Maciej Mrozowski <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/atlas/, profiles/
Date: Wed, 08 Mar 2017 02:47:36
Message-Id: 1488941005.d17766fee425552614718bf8a4aca20c1020abf2.reavertm@gentoo
1 commit: d17766fee425552614718bf8a4aca20c1020abf2
2 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 8 02:40:01 2017 +0000
4 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 8 02:43:25 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d17766fe
7
8 games-util/atlas: Version bump (hg snapshot), masked due to bug 611980
9
10 games-util/atlas/Manifest | 2 +-
11 ....ebuild => atlas-0.5.1_beta_pre20160907.ebuild} | 47 ++++++++--------------
12 profiles/package.mask | 4 ++
13 3 files changed, 21 insertions(+), 32 deletions(-)
14
15 diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest
16 index 8ce61c280e8..bd63ecc4281 100644
17 --- a/games-util/atlas/Manifest
18 +++ b/games-util/atlas/Manifest
19 @@ -1 +1 @@
20 -DIST Atlas-0.5.0.cvs20141002.tar.gz 470453 SHA256 cffde4b40d607b29204e19b9c67117bc6ce7e956dc98fe01344e2cb4e8a85437 SHA512 7873f1d9ba04979ebb3b94b16967bb834594cc1e84a4f0e27cc063a3b1e3e1aa53e1685298e075218da8f8dcacf756a724b8f705a6ad3c7cc7fc7e0ae2eb3384 WHIRLPOOL 9377a62f78c08c2b3a4b3462ce0ab736a8020230f5273d90bee4251291b334524bbf751049e037e9f9352ad313956198eae402c68d6f967bf0dc0f6eef24239b
21 +DIST atlas-hgcode-e183e3b3a0412b504edcb3664445b3e04fd484a2.zip 530005 SHA256 216661375ac69ec809da959e525cb6d88ed9bcdde0591e0beaead0a8e4d402e5 SHA512 5f4453c81b01451ce69f4f1340a7c34736be3a9ecf638aa340455d0bb0af7a5d1a7e05d0b51e8b75f5c3acef4787d208ace75d4c686e8be7eafb8f81c71df360 WHIRLPOOL 030f10cd5be4ef59020b7bd0b2078910ef5e9740c05ec9a7b200229c8a50474b40272fde3e004dd2f8af8269ef3aa0c67f8130fb1da69e75463b5c2fcddffeba
22
23 diff --git a/games-util/atlas/atlas-0.5.0_p20141002.ebuild b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
24 similarity index 53%
25 rename from games-util/atlas/atlas-0.5.0_p20141002.ebuild
26 rename to games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
27 index 1971d03e3e6..ec154ef2bdf 100644
28 --- a/games-util/atlas/atlas-0.5.0_p20141002.ebuild
29 +++ b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
30 @@ -1,17 +1,17 @@
31 -# Copyright 1999-2014 Gentoo Foundation
32 +# Copyright 1999-2017 Gentoo Foundation
33 # Distributed under the terms of the GNU General Public License v2
34
35 -EAPI=5
36 +EAPI=6
37
38 -inherit autotools eutils games
39 +inherit autotools eutils
40
41 -MY_PN=Atlas
42 -MY_PV=${PV/_p/.cvs}
43 +MY_PN=atlas-hgcode
44 +MY_PV=e183e3b3a0412b504edcb3664445b3e04fd484a2
45 MY_P="${MY_PN}-${MY_PV}"
46
47 DESCRIPTION="Chart Program to use with Flightgear Flight Simulator"
48 HOMEPAGE="http://atlas.sourceforge.net/"
49 -SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
50 +SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.zip"
51
52 LICENSE="GPL-2"
53 SLOT="0"
54 @@ -20,12 +20,12 @@ IUSE=""
55
56 COMMON_DEPEND="
57 media-libs/freeglut
58 - media-libs/glew
59 - >=media-libs/libpng-1.5
60 + media-libs/glew:0
61 + >=media-libs/libpng-1.5:0
62 net-misc/curl
63 sys-libs/zlib
64 virtual/glu
65 - virtual/jpeg
66 + virtual/jpeg:*
67 virtual/opengl
68 "
69 DEPEND="${COMMON_DEPEND}
70 @@ -36,42 +36,27 @@ RDEPEND="${COMMON_DEPEND}
71 >=games-simulation/flightgear-3.0.0
72 "
73
74 -S=${WORKDIR}/${MY_PN}
75 +S=${WORKDIR}/${MY_P}
76 +
77 +DOCS=(AUTHORS NEWS README)
78
79 src_prepare() {
80 + default_src_prepare
81 eautoreconf
82 }
83
84 src_configure() {
85 - egamesconf \
86 - --datadir="${GAMES_DATADIR}"/flightgear \
87 + econf \
88 + --datadir=/usr/share/flightgear \
89 --disable-dependency-tracking \
90 --enable-simgear-shared \
91 - --with-fgbase="${GAMES_DATADIR}"/flightgear
92 -}
93 -
94 -src_install() {
95 - emake DESTDIR="${D}" install || die
96 - dodoc AUTHORS NEWS README
97 - prepgamesdirs
98 + --with-fgbase=/usr/share/flightgear
99 }
100
101 pkg_postinst() {
102 - games_pkg_postinst
103 - elog "You now can make the maps with the following commands:"
104 - elog "${GAMES_BINDIR}/Map --atlas=${GAMES_DATADIR}/flightgear/Atlas"
105 - elog
106 elog "To run Atlas concurrently with FlightGear use the following:"
107 elog "Atlas --path=[path of map images] --udp=[port number]"
108 elog "and start fgfs with the following switch (or in .fgfsrc):"
109 elog "--nmea=socket,out,0.5,[host that you run Atlas on],[port number],udp"
110 echo
111 }
112 -
113 -pkg_postrm() {
114 - elog "You must manually remove the maps if you don't want them around."
115 - elog "They are found in the following directory:"
116 - echo
117 - elog "${GAMES_DATADIR}/flightgear/Atlas"
118 - echo
119 -}
120
121 diff --git a/profiles/package.mask b/profiles/package.mask
122 index 9f80dc576de..a6a62f5fb39 100644
123 --- a/profiles/package.mask
124 +++ b/profiles/package.mask
125 @@ -29,6 +29,10 @@
126
127 #--- END OF EXAMPLES ---
128
129 +# Maciej Mrozowski <reavertm@×××××.com> (08 Mar 2017)
130 +# Fails to build against simgear, with recent compilers, bug 611980
131 +games-util/atlas
132 +
133 # Matt Turner <mattst88@g.o> (05 Mar 2017)
134 # Part of dev-util/hxtools (and collides with it)
135 # Removal in 30 days. Bug #445436