gentoo resync : 16.06.2018

3 files changed, 4 insertions, 118 deletions

diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index b8d227df3430..f94472b4b179 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -6,6 +6,5 @@ DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9
 DIST stellarium-0.14.3.tar.gz 137661611 BLAKE2B 560b67d2fd4845f49ebd4801b2ec8a72b1a198b4a87e0263e91204f7d74e9385edf111edf7ef33dddb60c288304ede12b50432a77a7439982197c656784f458d SHA512 83d9a1c53f118c143e81d31e7f87dbf73368bfa981311c8bc41a51307fe6108c9169b43ad1fdde1cec84b9b1e8a4ef51d4de3b91d7aa676be38302b2223a6675
 DIST stellarium-0.16.0.tar.gz 204675673 BLAKE2B fe34ab611569e23277ae9f273d1ae72139d5b860d0ae1b5650a9744960ce8bac6953d7de98b60bd224374aa77db33c00081ed90d1683b2007ef1b5068af158ff SHA512 0f75441435ff1d0fa149264116e9ae6ec3b3553f7c66e78832bdb0ffd55cbef656b820680134d95f89c73e80ef283372660ea7545db7fff205da66cf4cf8e9d6
 EBUILD stellarium-0.14.3.ebuild 2418 BLAKE2B 6b54c260bdcc09a23b83054fd76cdc7357c29af3674aaa5577cb42a51de5481bb2b67cfde273bf5df79cc00f80db67dcb3e9d6c93b2b797d714402d9af233dfb SHA512 abbd4a92df7c89e49bc9e37bed98e7b180b33618efd48b601c1df6c4827d4d6c1e598a5ed3095b584fc7fdb0c952dfe01c0b249fb287460f9fdb86952ea8b159
-EBUILD stellarium-0.16.0-r1.ebuild 2719 BLAKE2B ea4d5cd98e558b4b52247a6a6809d0c811a24aab41f6135f526db6cc38bb1a4eb3a7cb8aa0ef1c65321aad39b14d832afd8ceb4355d79648c68e53e17ca1e89e SHA512 39fa1808d29f1706918b788f99d349a3a9e434d0ebb5c969db3eef79c4a6c772d8ab8e2a2606ad07230725b06146634499f2b0cef4e04fcd289ced1a079e3374
-EBUILD stellarium-0.16.0.ebuild 2728 BLAKE2B aafd2e2e600f16ad8639ff31a2c627edf675aa6842b3307f243e25ac827d184a3c87664d1f41b1fcbcab4afadc4338014ee0bf19e7cbb98ceac6709617c36f36 SHA512 2e21e98032bd900928df7620396c836d36791cd6afd9d5b83afc173505965658456603e7a6fae295f4c61969eed973690b66130971e96fe360b155eac7dec15b
+EBUILD stellarium-0.16.0-r1.ebuild 2683 BLAKE2B cb93a0afab12d0733fae041a561277a134a27743532e2daa0022748bfe94ced5cd6501723748c285c2620644c48a2eeeba8fabbd5378035e3872edee6a261cf2 SHA512 64ad16036c13ec73f4aa60732b2f9f02907b2e0ffcd085db5735baf05ed1df523440f0d0153ceb3e16b12e5aedbaad9e0262c5c1066588499f71d87a85bd76cd
 MISC metadata.xml 809 BLAKE2B 37d40ebbf6629413456f1244ddc0ab896c2a0ecfb89bb12035133eb2c6b988031ad5612ac03c0779dc4e459518e47bf8640d0ca47b73634e20af748bc11741f7 SHA512 b7782e539a43493a90705d9a603f347a56b296817592b70f20799014b99be085709d910a1c7f85409d44c796bbcb8cb0b4c3470d45c3ee1c3cece89689cc2296
diff --git a/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild b/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
index 40fe6f7f2789..6bf33835ae74 100644
--- a/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils eutils flag-o-matic gnome2-utils
+
+inherit cmake-utils desktop flag-o-matic gnome2-utils
 
 DESCRIPTION="3D photo-realistic skies in real time"
 HOMEPAGE="http://www.stellarium.org/"
@@ -18,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug gps media nls stars"
 
 RESTRICT="test" # There are no tests
@@ -98,10 +99,6 @@ src_install() {
 	newicon doc/images/stellarium-logo.png ${PN}.png
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 }
diff --git a/sci-astronomy/stellarium/stellarium-0.16.0.ebuild b/sci-astronomy/stellarium/stellarium-0.16.0.ebuild
deleted file mode 100644
index 2d99d5b9d1c9..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.16.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="http://www.stellarium.org/"
-SRC_URI="
-	mirror://sourceforge/stellarium/${P}.tar.gz
-	stars? (
-		mirror://sourceforge/stellarium/stars_4_1v0_1.cat
-		mirror://sourceforge/stellarium/stars_5_2v0_1.cat
-		mirror://sourceforge/stellarium/stars_6_2v0_1.cat
-		mirror://sourceforge/stellarium/stars_7_2v0_1.cat
-		mirror://sourceforge/stellarium/stars_8_2v0_1.cat
-	)"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug media nls stars"
-
-RESTRICT="test" # There are no tests
-
-RDEPEND="
-	media-fonts/dejavu
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	virtual/opengl
-	sys-libs/zlib
-	media? ( dev-qt/qtmultimedia:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	dev-qt/qtconcurrent:5
-	nls? ( dev-qt/linguist-tools:5 )"
-
-LANGS=(
-	af am ar as ast az be bg bn bo br bs ca cs
-	cy da de el en en-GB en-US eo es et eu fa fi fil fr
-	ga gd gl gu he hi hr hu hy ia id is it ja ka kk kn ko ky
-	la lb lo lt lv mk ml mn mr ms nb nl nn oc pa pl pt pt-BR ro
-	ru se si sk sl sq sr sv sw ta te tg th tl tr tt uk uz vi
-	zh-CN zh-HK zh-TW zu
-	)
-
-for X in "${LANGS[@]}" ; do
-	IUSE+=" l10n_${X}"
-done
-unset X
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if [[ -n ${L10N} ]] ; then
-		local d
-		for d in po/* ; do
-			[[ -e ${d}/CMakeLists.txt ]] || continue
-			local l loc=""
-			for l in ${L10N//-/_}; do
-				[[ -e ${d}/${l}.po ]] && loc="${loc} ${l}"
-			done
-			sed -e 's/STRING(REGEX REPLACE ".po" "" \([a-z]*\).*$/SET(\1 '"${loc})/" \
-				-i ${d}/CMakeLists.txt || die
-		done
-	fi
-	sed -i -e '/ADD_PLUGIN(TelescopeControl 1)/s/1/0/' CMakeLists.txt || die
-	use debug || append-cppflags -DQT_NO_DEBUG #415769
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GPS=OFF
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_MEDIA="$(usex media)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# use the more up-to-date system fonts
-	rm "${ED%/}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
-	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
-	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
-	if use stars ; then
-		insinto /usr/share/${PN}/stars/default
-		doins "${DISTDIR}"/stars_{4_1,{5,6,7,8}_2}v0_1.cat
-	fi
-	newicon doc/images/stellarium-logo.png ${PN}.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}