| 1 |
commit: caafd4191dff3213ec89e71ba5eab17d884c61a7 |
| 2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 19 22:39:01 2017 +0000 |
| 4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 19 22:45:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caafd419 |
| 7 |
|
| 8 |
games-simulation/flightgear: Version bump 2017.3.1 |
| 9 |
|
| 10 |
dev-games/simgear/Manifest | 1 + |
| 11 |
...simgear-9999.ebuild => simgear-2017.3.1.ebuild} | 20 ++++++++--------- |
| 12 |
dev-games/simgear/simgear-9999.ebuild | 10 ++++----- |
| 13 |
games-simulation/flightgear-data/Manifest | 1 + |
| 14 |
.../flightgear-data-2017.3.1.ebuild | 26 ++++++++++++++++++++++ |
| 15 |
games-simulation/flightgear/Manifest | 1 + |
| 16 |
...gear-9999.ebuild => flightgear-2017.3.1.ebuild} | 21 ++++------------- |
| 17 |
games-simulation/flightgear/flightgear-9999.ebuild | 11 --------- |
| 18 |
8 files changed, 47 insertions(+), 44 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest |
| 21 |
index f5e09310de6..866e7605141 100644 |
| 22 |
--- a/dev-games/simgear/Manifest |
| 23 |
+++ b/dev-games/simgear/Manifest |
| 24 |
@@ -2,3 +2,4 @@ DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491 |
| 25 |
DIST simgear-2017.1.2.tar.bz2 1235662 SHA256 69c8223051b039b00038aabbb8660cecce1866e3f854dadd9543db824d232f6b SHA512 5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404 WHIRLPOOL a6b18db36078e1e26c8915ef72a5bb890bcef7433c6c641f314533c637cbcd3a626e4146ddbf7551fc179b9b07989baba04559a0f1684c4b00e94760ddace2cb |
| 26 |
DIST simgear-2017.1.3.tar.bz2 1235062 SHA256 85304d985b4fc0dc00d9f7603b02d096e3c24ca4c98adc18dc9af1e2d0e3c310 SHA512 600f883ad92d37bf76d5e6beb066da340c7af927b0f2d51ce290cccaf23d1f3289b1aa31d3aa6cc17a4b9bc57c7180f03e234e08601e4169f26624678bf551aa WHIRLPOOL 377caa9327be22f10e0c45a64db7747d66dc7498b425ae5cf330544e727248b84f907b9eebb7c6b8e6a3272d1929a2b2ae1eaf8a4a542469d1e3615e9a2b7966 |
| 27 |
DIST simgear-2017.2.1.tar.bz2 1290780 SHA256 9924592c01cb41ad66a0ff1dc43b7678ceec69fb573d3f4e4637e26c247c7a9e SHA512 168f5e3eab7cdd44643a62e1970c6329ac1121ca98e36c4134d963237e70304a20b7c8df3b438e24c204d51569d6863ef8b16098462d850f72a5f11a10ccbfd5 WHIRLPOOL dc57cb2b87ec0111b0c555b6b87bcba7ec80c34c2277978c3aac7e71a3df260b4ac32f79698b2ea6d84a3bd6a942dc163aabd80c5f5004c409a189456f812d4a |
| 28 |
+DIST simgear-2017.3.1.tar.bz2 1302704 SHA256 0ee08550b737b249dcc91590ec0cb9c5dc9080998f6ba66a7d7209cdfce6e1f4 SHA512 339c9af78e8c0490caec69be34b54f947751a9677cbb1163e73917f6aaa8f3d965ccf8058222c48ca4249cba4bb509205143f846de84595e92abdcd93e64c901 WHIRLPOOL f26535449fd04c18e3a0f31817411f634be669c14d84b112f9d5662e56aeb800b7c801fab9113acb111c4823ed1fc25d2fc92822479d7e87ce93d6b3beaf2b8c |
| 29 |
|
| 30 |
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-2017.3.1.ebuild |
| 31 |
similarity index 73% |
| 32 |
copy from dev-games/simgear/simgear-9999.ebuild |
| 33 |
copy to dev-games/simgear/simgear-2017.3.1.ebuild |
| 34 |
index 00072326c7c..cca44548c83 100644 |
| 35 |
--- a/dev-games/simgear/simgear-9999.ebuild |
| 36 |
+++ b/dev-games/simgear/simgear-2017.3.1.ebuild |
| 37 |
@@ -1,19 +1,17 @@ |
| 38 |
-# Copyright 1999-2016 Gentoo Foundation |
| 39 |
+# Copyright 1999-2017 Gentoo Foundation |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
|
| 42 |
EAPI=6 |
| 43 |
|
| 44 |
-inherit eutils cmake-utils toolchain-funcs git-r3 |
| 45 |
+inherit cmake-utils toolchain-funcs |
| 46 |
|
| 47 |
DESCRIPTION="Development library for simulation games" |
| 48 |
HOMEPAGE="http://www.simgear.org/" |
| 49 |
-EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/${PN} |
| 50 |
- git://mapserver.flightgear.org/${PN}" |
| 51 |
-EGIT_BRANCH="next" |
| 52 |
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
| 53 |
|
| 54 |
LICENSE="GPL-2" |
| 55 |
-KEYWORDS="" |
| 56 |
SLOT="0" |
| 57 |
+KEYWORDS="~amd64 ~x86" |
| 58 |
IUSE="+dns debug gdal openmp subversion test" |
| 59 |
|
| 60 |
COMMON_DEPEND=" |
| 61 |
@@ -33,12 +31,12 @@ RDEPEND="${COMMON_DEPEND} |
| 62 |
subversion? ( dev-vcs/subversion ) |
| 63 |
" |
| 64 |
|
| 65 |
-PATCHES=( "${FILESDIR}/simgear-2017.2.1-gdal-underlinking.patch" ) |
| 66 |
- |
| 67 |
-DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 68 |
- |
| 69 |
pkg_pretend() { |
| 70 |
- use openmp && tc-check-openmp |
| 71 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 72 |
+} |
| 73 |
+ |
| 74 |
+pkg_setup() { |
| 75 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 76 |
} |
| 77 |
|
| 78 |
src_configure() { |
| 79 |
|
| 80 |
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild |
| 81 |
index 00072326c7c..6ee236bee6f 100644 |
| 82 |
--- a/dev-games/simgear/simgear-9999.ebuild |
| 83 |
+++ b/dev-games/simgear/simgear-9999.ebuild |
| 84 |
@@ -33,12 +33,12 @@ RDEPEND="${COMMON_DEPEND} |
| 85 |
subversion? ( dev-vcs/subversion ) |
| 86 |
" |
| 87 |
|
| 88 |
-PATCHES=( "${FILESDIR}/simgear-2017.2.1-gdal-underlinking.patch" ) |
| 89 |
- |
| 90 |
-DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 91 |
- |
| 92 |
pkg_pretend() { |
| 93 |
- use openmp && tc-check-openmp |
| 94 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 95 |
+} |
| 96 |
+ |
| 97 |
+pkg_setup() { |
| 98 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 99 |
} |
| 100 |
|
| 101 |
src_configure() { |
| 102 |
|
| 103 |
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest |
| 104 |
index e897d0b0c71..f9610b4c644 100644 |
| 105 |
--- a/games-simulation/flightgear-data/Manifest |
| 106 |
+++ b/games-simulation/flightgear-data/Manifest |
| 107 |
@@ -2,3 +2,4 @@ DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256 3dfd4b82c99a8bf4b81dd318 |
| 108 |
DIST FlightGear-2017.1.2-data.tar.bz2 1460657435 SHA256 99d38d0478a8c8031f59376112bd54a6f996e1d363807b3bb45786384cfb2753 SHA512 0498b662a26c03dd08a1861d63e982adeded1a01db34ccf09d2acd9420a0b0343242216c58fa2a2ce215806690eb4d1796114f15f3adbd391fa18421629d4f97 WHIRLPOOL 45a1898ed0ca108d501f3bd35153a2107c4e4f682e3b49a7e8f49015fa5a6b6468d5177cc79458e23f5ae9b3ee2744540ab82a48561d9ba994cb147adc898650 |
| 109 |
DIST FlightGear-2017.1.3-data.tar.bz2 1460527272 SHA256 bf35d9a15be9e7bd1c286eee879251e0907a3fb5cca4e7d1fdfbe67690345365 SHA512 eb6140612920b190cec7f2879e4789cfb1ab41ab3c2d463948c592347bfd8f042bb62b499abf94d51e550bc472afe334c77ad750930d954067dc1f6bab66efac WHIRLPOOL c2de9906a0d4f88bafd85edb9b217b1ee766f128c0b6e95f82a6c6a98313c63e26113e5798b5be7e8714831db94bb5c95afc0cbdd570b0c2313dcf856e944523 |
| 110 |
DIST FlightGear-2017.2.1-data.tar.bz2 1590727949 SHA256 c9350e4500a1d97ebc515e7bb9e74081a8726a8fa244966543c9c67bcdacd1a4 SHA512 a6f6ff55d5ff866626b98fdfd77610fcde567aa53f74ccffb22c0580d1b6cc7c50fbc65b9c8b1f75ccfb07434b830b230c73a165c095f9367b67cd37b60018fc WHIRLPOOL dec850a9c1db5d6dec1682671f12b7d8015b29590100ce43f20724eb3d907da37b114f76f51cca4f1cde9e2c0e365cd913d9a42a2f51f91d8a32eef5e98146bc |
| 111 |
+DIST FlightGear-2017.3.1-data.tar.bz2 1560855079 SHA256 df08b06e88a29a9f80f29186afd54d278636a663281a1b68e8f484bbb403d898 SHA512 9a3a68103bbb0f74d7f019b45cca00e686122618c1b5142231ba0c8b83f1283956782d3ea4372b1d96d653ea45f7087c32f39f26fe97695faddad0be12f8d9ff WHIRLPOOL dfa888d2735c25cb44f77812860febb9a983d0f03ff438398352bfca9300550b3b3367c36441323cbb440e75c304a7c69e9893bb9ffd4d4a1d70fa89ba86fab8 |
| 112 |
|
| 113 |
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild |
| 114 |
new file mode 100644 |
| 115 |
index 00000000000..f835ef53253 |
| 116 |
--- /dev/null |
| 117 |
+++ b/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild |
| 118 |
@@ -0,0 +1,26 @@ |
| 119 |
+# Copyright 1999-2017 Gentoo Foundation |
| 120 |
+# Distributed under the terms of the GNU General Public License v2 |
| 121 |
+ |
| 122 |
+EAPI=6 |
| 123 |
+ |
| 124 |
+DESCRIPTION="FlightGear data files" |
| 125 |
+HOMEPAGE="http://www.flightgear.org/" |
| 126 |
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2" |
| 127 |
+ |
| 128 |
+LICENSE="GPL-2" |
| 129 |
+SLOT="0" |
| 130 |
+KEYWORDS="~amd64 ~x86" |
| 131 |
+IUSE="" |
| 132 |
+ |
| 133 |
+# data files split to separate package since 2.10.0 |
| 134 |
+RDEPEND=" |
| 135 |
+ !<games-simulation/flightgear-2.10.0 |
| 136 |
+" |
| 137 |
+ |
| 138 |
+S=${WORKDIR}/fgdata |
| 139 |
+ |
| 140 |
+src_install() { |
| 141 |
+ insinto /usr/share/flightgear |
| 142 |
+ rm -fr .git |
| 143 |
+ doins -r * |
| 144 |
+} |
| 145 |
|
| 146 |
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest |
| 147 |
index 470ee1a646d..3cbfc245fe8 100644 |
| 148 |
--- a/games-simulation/flightgear/Manifest |
| 149 |
+++ b/games-simulation/flightgear/Manifest |
| 150 |
@@ -2,3 +2,4 @@ DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256 d51992cbe40f1812f9821ab27b838d52 |
| 151 |
DIST flightgear-2017.1.2.tar.bz2 8056697 SHA256 41fe2a4ab0c14ed10436026c2edbb83148bf603691487976aaf2a5314f524659 SHA512 26466d6bd567c06cec7744dccba5c4a70d01c5169153c3c660175e9b400b9d1b5cc0d067e4d53d102ba5c20ceffb2217afcc54a0e86bf8aa7b3e7ee5a60aaf07 WHIRLPOOL f7b8a7884d4738a6e803a27b0dd3a5ad7bfc65d25b6c19baca0b0244222b967963ff3663298a8659ff01fd6aa52c4d7ed91f29792c8b77dded36ec6ba687200c |
| 152 |
DIST flightgear-2017.1.3.tar.bz2 8056402 SHA256 3d7cb2b4b1d60b80b0613222b1fc7b6db665eddaf68d7080c07cdedcb544b0ad SHA512 93aa27a976bcdd79c76eb9751ba90a79a6146d8f3961c3bdf1db136a99cb9a0ab644c7409a26267181be0476fa455bf739b78cb7028e3e12d5509f96a1d3f303 WHIRLPOOL 55592116f730eaefb57f1d1eb684629c3cfa4e4167ed4f3a17203b1ce7eacb9885f389cb934a4e3f9d10230ce45410ec09dd2b81220a5077f4c4c545dd8a116c |
| 153 |
DIST flightgear-2017.2.1.tar.bz2 8054033 SHA256 c7d9a63736cafd02236707d0f8e1bb36884a1a989cf49575bad13b4cbb311f5b SHA512 d4063d93d70046532c061cc6e09e0c6514cd8138c3baac1652b098a9196e5b435eee4e5ed19082a9e1994f95738114d13fe043290e7efb1539c70b107bbd33ea WHIRLPOOL 63e0c461551a361a2204f66fb0460d1884b3b078afc86681983ad843fb0a1fb944f26d23926563785211f2cd87b237adc5776c9d1eea4cb30fb0bd6d9907ed27 |
| 154 |
+DIST flightgear-2017.3.1.tar.bz2 8098283 SHA256 6f2e1d992e2f202b8f9c918c9fb19124ef06824ea0e767e2f4dff6ba43728ccd SHA512 e91268b4fc6a5b04761cf64e003e9962e5a66a91c0f089a1de220ef7cc438250dbd93ed99773c09f19255604c4cc5a0b65b80fe19e663fa0eae8107374527b4b WHIRLPOOL 708653d6c80c7041087bd66091de4f838a57ba3f2305d632a0d48867af7774477f492004750e5d89f4aec7a8cf3136d27bbb214635c7a8264f1ccc1eeb24a2fd |
| 155 |
|
| 156 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-2017.3.1.ebuild |
| 157 |
similarity index 86% |
| 158 |
copy from games-simulation/flightgear/flightgear-9999.ebuild |
| 159 |
copy to games-simulation/flightgear/flightgear-2017.3.1.ebuild |
| 160 |
index a4ad24d989c..23182087a6f 100644 |
| 161 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
| 162 |
+++ b/games-simulation/flightgear/flightgear-2017.3.1.ebuild |
| 163 |
@@ -3,16 +3,14 @@ |
| 164 |
|
| 165 |
EAPI=6 |
| 166 |
|
| 167 |
-inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3 |
| 168 |
+inherit cmake-utils bash-completion-r1 toolchain-funcs |
| 169 |
|
| 170 |
DESCRIPTION="Open Source Flight Simulator" |
| 171 |
HOMEPAGE="http://www.flightgear.org/" |
| 172 |
-EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN} |
| 173 |
- git://mapserver.flightgear.org/${PN}" |
| 174 |
-EGIT_BRANCH="next" |
| 175 |
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
| 176 |
|
| 177 |
LICENSE="GPL-2" |
| 178 |
-KEYWORDS="" |
| 179 |
+KEYWORDS="~amd64 ~x86" |
| 180 |
SLOT="0" |
| 181 |
IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax" |
| 182 |
|
| 183 |
@@ -92,7 +90,7 @@ src_configure() { |
| 184 |
-DENABLE_UIUC_MODEL=ON |
| 185 |
-DENABLE_YASIM=ON |
| 186 |
-DEVENT_INPUT=$(usex udev) |
| 187 |
- -DFG_BUILD_TYPE=Nightly |
| 188 |
+ -DFG_BUILD_TYPE=Release |
| 189 |
-DFG_DATA_DIR=/usr/share/${PN} |
| 190 |
-DJSBSIM_TERRAIN=ON |
| 191 |
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear |
| 192 |
@@ -113,17 +111,6 @@ src_configure() { |
| 193 |
src_install() { |
| 194 |
cmake-utils_src_install |
| 195 |
|
| 196 |
- # Install icons and menu entry |
| 197 |
- local s |
| 198 |
- for s in 16 22 24 32 48 64 128; do |
| 199 |
- doicon -s ${s} icons/${s}x${s}/apps/${PN}.png |
| 200 |
- use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png |
| 201 |
- done |
| 202 |
- doicon -s scalable icons/scalable/${PN}.svg |
| 203 |
- use utils && doicon -s scalable icons/scalable/fgcom.svg |
| 204 |
- |
| 205 |
- domenu package/org.flightgear.FlightGear.desktop |
| 206 |
- |
| 207 |
# Install bash completion (TODO zsh) |
| 208 |
# Uncomment below when scripts stops writing files... |
| 209 |
# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \ |
| 210 |
|
| 211 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild |
| 212 |
index a4ad24d989c..2a386a47842 100644 |
| 213 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
| 214 |
+++ b/games-simulation/flightgear/flightgear-9999.ebuild |
| 215 |
@@ -113,17 +113,6 @@ src_configure() { |
| 216 |
src_install() { |
| 217 |
cmake-utils_src_install |
| 218 |
|
| 219 |
- # Install icons and menu entry |
| 220 |
- local s |
| 221 |
- for s in 16 22 24 32 48 64 128; do |
| 222 |
- doicon -s ${s} icons/${s}x${s}/apps/${PN}.png |
| 223 |
- use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png |
| 224 |
- done |
| 225 |
- doicon -s scalable icons/scalable/${PN}.svg |
| 226 |
- use utils && doicon -s scalable icons/scalable/fgcom.svg |
| 227 |
- |
| 228 |
- domenu package/org.flightgear.FlightGear.desktop |
| 229 |
- |
| 230 |
# Install bash completion (TODO zsh) |
| 231 |
# Uncomment below when scripts stops writing files... |
| 232 |
# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \ |
Archives