gentoo resync : 20.10.2017

5 files changed, 175 insertions, 12 deletions

diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 67613482b245..5a0ee7ab7662 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -2,10 +2,12 @@ DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256 3dfd4b82c99a8bf4b81dd318
 DIST FlightGear-2017.1.2-data.tar.bz2 1460657435 SHA256 99d38d0478a8c8031f59376112bd54a6f996e1d363807b3bb45786384cfb2753 SHA512 0498b662a26c03dd08a1861d63e982adeded1a01db34ccf09d2acd9420a0b0343242216c58fa2a2ce215806690eb4d1796114f15f3adbd391fa18421629d4f97 WHIRLPOOL 45a1898ed0ca108d501f3bd35153a2107c4e4f682e3b49a7e8f49015fa5a6b6468d5177cc79458e23f5ae9b3ee2744540ab82a48561d9ba994cb147adc898650
 DIST FlightGear-2017.1.3-data.tar.bz2 1460527272 SHA256 bf35d9a15be9e7bd1c286eee879251e0907a3fb5cca4e7d1fdfbe67690345365 SHA512 eb6140612920b190cec7f2879e4789cfb1ab41ab3c2d463948c592347bfd8f042bb62b499abf94d51e550bc472afe334c77ad750930d954067dc1f6bab66efac WHIRLPOOL c2de9906a0d4f88bafd85edb9b217b1ee766f128c0b6e95f82a6c6a98313c63e26113e5798b5be7e8714831db94bb5c95afc0cbdd570b0c2313dcf856e944523
 DIST FlightGear-2017.2.1-data.tar.bz2 1590727949 SHA256 c9350e4500a1d97ebc515e7bb9e74081a8726a8fa244966543c9c67bcdacd1a4 SHA512 a6f6ff55d5ff866626b98fdfd77610fcde567aa53f74ccffb22c0580d1b6cc7c50fbc65b9c8b1f75ccfb07434b830b230c73a165c095f9367b67cd37b60018fc WHIRLPOOL dec850a9c1db5d6dec1682671f12b7d8015b29590100ce43f20724eb3d907da37b114f76f51cca4f1cde9e2c0e365cd913d9a42a2f51f91d8a32eef5e98146bc
+DIST FlightGear-2017.3.1-data.tar.bz2 1560855079 SHA256 df08b06e88a29a9f80f29186afd54d278636a663281a1b68e8f484bbb403d898 SHA512 9a3a68103bbb0f74d7f019b45cca00e686122618c1b5142231ba0c8b83f1283956782d3ea4372b1d96d653ea45f7087c32f39f26fe97695faddad0be12f8d9ff WHIRLPOOL dfa888d2735c25cb44f77812860febb9a983d0f03ff438398352bfca9300550b3b3367c36441323cbb440e75c304a7c69e9893bb9ffd4d4a1d70fa89ba86fab8
 EBUILD flightgear-data-2016.4.4.ebuild 516 SHA256 b44cf60ee084202db360b47ac12e16f32238c40652053a1a62ae589915b21e49 SHA512 ae6c1f4c13d4dd776fabfbafcc3b733a300b2f7e43846309cc96f5632d9d76c84103b3606cf5aee94c7970d8e47c1785f018f7c82747ddaeeb66cac70813cf8c WHIRLPOOL 64d619e38e7334f77a4290e70c6e62a56aa7cb8ba2585604273596bcd5f6462f4c6f58b0eb76c323f0606c29a8374f8f11f70997365c5f6606e729d401ac6535
 EBUILD flightgear-data-2017.1.2.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
 EBUILD flightgear-data-2017.1.3.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
 EBUILD flightgear-data-2017.2.1.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
+EBUILD flightgear-data-2017.3.1.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
 EBUILD flightgear-data-9999.ebuild 546 SHA256 4145f97d16b28243830a29d2a8780a2e0505f1103b22abd8609953e14e0ee3d2 SHA512 92dae00bd54b164590c4c9cd66f3797a8f39211a66773c6cb710ecfff4d47f1d65d03861ec9648a8165a823f038f3d19b54dbd2b9b145147d29696569b4ae508 WHIRLPOOL bee0d1836bfe1cf9bf0c45eef3b2412f8a1cc84f2b4adc41ff7633faca0c7bf6c0b9ab3b580bc3dc0f07b839fae0caa8aaee43b72266bce32f4fe9a86656e23e
 MISC ChangeLog 3414 SHA256 08069d29c580931bcce75597ff354c5254e77a90ada53a16b336f66b1ede42a4 SHA512 119d1ed5392f20abe434ab9ceaad010c0113eac3ad139a2d6db26aa45095951a6001c00e0629e5c54238cdd68fd4599b74ff86e30a3e066df3592e03a2361f31 WHIRLPOOL 0b4faae37385bb9b343ed28d3719863e813929e2ff17aee717af8697fedb9e154708256b8964289ab82fe12c1f27e71f97245d328b31910f5d3245f010667eab
 MISC ChangeLog-2015 2399 SHA256 f6b1553db81a37763a7bff18ce113ad72b74cb7c1cc80d7add73aa47553537db SHA512 f235ad5a943659554f42ddb0aed4298324be936e6d3b80df54f54c152a8dfe52c1f3ae406893a5da220f3e4be2370791e8947808a638c484ae6ecabfeb2eea5a WHIRLPOOL 9de9afd13530bc1d6e0b66a9f19a6385dac980ca26cb821051e24e4d8b5ff91d8971b0c6aa91f26531158fd4950f7a83fb40ad87b196e6c9abc60c477cdc6c49
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild
new file mode 100644
index 000000000000..f835ef53253b
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 11fe8a7c5961..e9cb9632b249 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -4,11 +4,13 @@ DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256 d51992cbe40f1812f9821ab27b838d52
 DIST flightgear-2017.1.2.tar.bz2 8056697 SHA256 41fe2a4ab0c14ed10436026c2edbb83148bf603691487976aaf2a5314f524659 SHA512 26466d6bd567c06cec7744dccba5c4a70d01c5169153c3c660175e9b400b9d1b5cc0d067e4d53d102ba5c20ceffb2217afcc54a0e86bf8aa7b3e7ee5a60aaf07 WHIRLPOOL f7b8a7884d4738a6e803a27b0dd3a5ad7bfc65d25b6c19baca0b0244222b967963ff3663298a8659ff01fd6aa52c4d7ed91f29792c8b77dded36ec6ba687200c
 DIST flightgear-2017.1.3.tar.bz2 8056402 SHA256 3d7cb2b4b1d60b80b0613222b1fc7b6db665eddaf68d7080c07cdedcb544b0ad SHA512 93aa27a976bcdd79c76eb9751ba90a79a6146d8f3961c3bdf1db136a99cb9a0ab644c7409a26267181be0476fa455bf739b78cb7028e3e12d5509f96a1d3f303 WHIRLPOOL 55592116f730eaefb57f1d1eb684629c3cfa4e4167ed4f3a17203b1ce7eacb9885f389cb934a4e3f9d10230ce45410ec09dd2b81220a5077f4c4c545dd8a116c
 DIST flightgear-2017.2.1.tar.bz2 8054033 SHA256 c7d9a63736cafd02236707d0f8e1bb36884a1a989cf49575bad13b4cbb311f5b SHA512 d4063d93d70046532c061cc6e09e0c6514cd8138c3baac1652b098a9196e5b435eee4e5ed19082a9e1994f95738114d13fe043290e7efb1539c70b107bbd33ea WHIRLPOOL 63e0c461551a361a2204f66fb0460d1884b3b078afc86681983ad843fb0a1fb944f26d23926563785211f2cd87b237adc5776c9d1eea4cb30fb0bd6d9907ed27
+DIST flightgear-2017.3.1.tar.bz2 8098283 SHA256 6f2e1d992e2f202b8f9c918c9fb19124ef06824ea0e767e2f4dff6ba43728ccd SHA512 e91268b4fc6a5b04761cf64e003e9962e5a66a91c0f089a1de220ef7cc438250dbd93ed99773c09f19255604c4cc5a0b65b80fe19e663fa0eae8107374527b4b WHIRLPOOL 708653d6c80c7041087bd66091de4f838a57ba3f2305d632a0d48867af7774477f492004750e5d89f4aec7a8cf3136d27bbb214635c7a8264f1ccc1eeb24a2fd
 EBUILD flightgear-2016.4.4.ebuild 3573 SHA256 769e4b50ac69ec1b30628f0626ed996233087cbbed769a83e536854b7cb7d6f2 SHA512 55d5b3c0dfee272cef2e2ee20deee26a230b3b339eecb6555cc79605131714c31ceaa5914960b88da3bcde6bf2f01728958b4190217f3da7efbeb67ec03929dd WHIRLPOOL 32f1439c6c93ca52adcdf11dbb2fb1766822a9540eb80f21876e692aedbc74d8f6e95fb64794f4ff61415bbbc993ad2a9e06247ec7929cb3389b014e1924b81c
 EBUILD flightgear-2017.1.2.ebuild 3691 SHA256 52ca76f6110bd6c1a3018dfe4075f722162fc1c8a0318a16c2521083994192d9 SHA512 e53ab6ac5332c118d7292487d9b4ccd17fb6100ebc5588b87de9df84ea622af797236969bc16a7fee287ac63e4a1cd14b9d49e628b4734a2c3a40df3725d3b0c WHIRLPOOL b09741deb57c32c49a72ff89100b9d2c33e45f9f27d7c072b8b129b2027762c516c3a63d899251d4346736aa30ee5c224bbb6112d78eaa2e8bad386416ee20fa
 EBUILD flightgear-2017.1.3.ebuild 3691 SHA256 52ca76f6110bd6c1a3018dfe4075f722162fc1c8a0318a16c2521083994192d9 SHA512 e53ab6ac5332c118d7292487d9b4ccd17fb6100ebc5588b87de9df84ea622af797236969bc16a7fee287ac63e4a1cd14b9d49e628b4734a2c3a40df3725d3b0c WHIRLPOOL b09741deb57c32c49a72ff89100b9d2c33e45f9f27d7c072b8b129b2027762c516c3a63d899251d4346736aa30ee5c224bbb6112d78eaa2e8bad386416ee20fa
 EBUILD flightgear-2017.2.1.ebuild 4015 SHA256 5ccb0ec422cf891d312717df5991b756e5c361337b1224d4cdaebd0b197df9b2 SHA512 446c5bc1a9ac429d14991387704f9d5d40a94c01a0dad1f9cc4a42a79300a70332ddd23e882cd33bf1cc54e92e854bece7629a50c7bce128ddedde5f7221807c WHIRLPOOL 51347a022e789d846f5c3d9e07a2d9df9d2b1282e2783dbbce2069b744a9feaf2a0d4bdd73d1dc60bea16726abdfcd86c8622a0f4a564e714385c471ef23c79f
-EBUILD flightgear-9999.ebuild 4065 SHA256 36fa6d94baa75ae24fe6d6511ec666ce7e475f3c5062aac907bfbf6238a88dd6 SHA512 f7d24c76900b8c265ab6ddddf52a8f7de9359670f061384f16d1467a8ab86bf0fc45d4eea35b63095ac58f975859563b1bf613bc46936dd1237c8c891f150e96 WHIRLPOOL 468c77c47ea1b7618069f80c127fb6909f48cb2475f86bcab1afb5d4c0031b14e923305cc0eb73d0013df09744b4b1253fbc2289fda2739946797963f1aea223
+EBUILD flightgear-2017.3.1.ebuild 3668 SHA256 106e40fbe301be78624ca9ed250259dcc35935be32f2fecb579c74ccf8ad2d6d SHA512 5c35232ce212fce4fe054d1074ca69f91f477afa1a57fcc22b2a45162cc3f6ea8df54c22aa721be506a3fe512b3ad30485d3905cb6395b5ce6d33bf3b33db6b9 WHIRLPOOL 38b940decc52aa56f07fbdb97f604ea9bd33f1cbec5aacca328f78257ca98c99a4618c43032d5087c5ea676c95046186404540ca4b70fcab68f2eff97ea83084
+EBUILD flightgear-9999.ebuild 3718 SHA256 1730fefa794139b339851b5d71f4206bafab109cb3161a5d97b04a9b34b44895 SHA512 c3eaf6e5003e950fe409fe81c13e588179e438cc08bc7e461c86bb23859e441285edabf9d5ba6dd6295f1c602d22736939634ab92965f0b6387af4d2f99eddd4 WHIRLPOOL e8e0439660ac41d7c2fcbfbce79206ec2a04c51635be904811d222179076b853f0f853fc849cfb5e72706d55a4e5af92237e6637fc82f26942ccc9baa89ef517
 MISC ChangeLog 3416 SHA256 c4c271c041eca9d091125c23918c8aa393f787190d8a79f675cd475661f8c1cc SHA512 d02d259f509359b07c3188542abad3dee052eb5cb57a3e75652f45a1b10b9cd965562a91f2ef27170289d512e07f93ad8490a889d5334087dece5214530df65b WHIRLPOOL caf3cef2cf84cff047ee04b9fbf9b8eb5c3f3160c18e319d876c07a84ccdc22025803c03595dceeb0f3b1d921ae33f51de1472a7b9874610b0c01233f9838ffd
 MISC ChangeLog-2015 13813 SHA256 f4912ce531c377cf9c5d71c08db3e419e63e9783b2f7858fa410a2d5119aaab3 SHA512 b090c22881f5bee0262349f3aa63dc6500fe51c69e08d834d0bf72cd5919dd82f6593e6c2cd62dfa4ea91198b5c75c36e723a602ad89f376fcc174ef5abc69b5 WHIRLPOOL 7ffffda05c252ff7162b334ef441c16cb868d8f587213e67de22eb55e33ab7ab5a56cdd79abbfac6701232e49b4c177946cf4ecdc287eca9e320e2172ec280a3
 MISC metadata.xml 867 SHA256 0454c6cb95bbffc7e40e1a8606e0bdb6a7f6d2fdcbda849fd02b5ad4e9a69452 SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943 WHIRLPOOL 54f54ea9a9e81d4ff8799d0ec1b45b236042897029fc010a694a99a1227bad57fe36711051db4a5840ad66951b95d955a3eb9d28c3068c367a6505e592e9384d
diff --git a/games-simulation/flightgear/flightgear-2017.3.1.ebuild b/games-simulation/flightgear/flightgear-2017.3.1.ebuild
new file mode 100644
index 000000000000..23182087a6f5
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2017.3.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[png]
+	~dev-games/simgear-${PV}[gdal=]
+	media-libs/openal
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	gdal? ( >=sci-libs/gdal-2.0.0:0 )
+	qt5? (
+		>=dev-qt/qtcore-5.4.1:5
+		>=dev-qt/qtdeclarative-5.4.1:5
+		>=dev-qt/qtgui-5.4.1:5
+		>=dev-qt/qtnetwork-5.4.1:5
+		>=dev-qt/qtwidgets-5.4.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
+		media-libs/libpng:0
+		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
+	)
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_LOGGING=$(usex test)
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRAFFIC=$(usex utils)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_BUILD_TYPE=Release
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index a4ad24d989ca..2a386a478420 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -113,17 +113,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	# Install icons and menu entry
-	local s
-	for s in 16 22 24 32 48 64 128; do
-		doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
-		use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
-	done
-	doicon -s scalable icons/scalable/${PN}.svg
-	use utils && doicon -s scalable icons/scalable/fgcom.svg
-
-	domenu package/org.flightgear.FlightGear.desktop
-
 	# Install bash completion (TODO zsh)
 	# Uncomment below when scripts stops writing files...
 #	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \