gentoo resync : 15.01.2020

2 files changed, 20 insertions, 30 deletions

diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 691e1a55978e..24a2c9753477 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -8,5 +8,5 @@ AUX celestia-1.6.1-linking.patch 1526 BLAKE2B 8244fa0dcd7771887c2bd09e5ac2c8abba
 AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475955af733e013fcafb2b37975fb1f2215afe61a715b5ec7716dbd75b5915dd4a5031255adb8fde5f6e64d9b71a5 SHA512 50cce63a701da85b52bee5db5b34eed77118c7c847612b4bc7ae82c80b198c718b4adbf0f21cc82e4afbafe20f53dda191285095d6ee5e796ce7f6c94388b832
 DIST celestia-1.6.1.tar.gz 52600436 BLAKE2B aa5b515a75b0344f6e5d59bf385bf1c368e3c38098a1bb9c273fd87ae34a7c8e88a4bf789935bb35ee16f2037004c8f54e21592023a0675766cb4ce005c704f4 SHA512 5b1221e97ee03f7def317e5e29c5100ebe714a4a3aeb8b9818dc9445e4282b6f87026ab35c7b3d5eb02fa6dbb33693977999d14d9648fc4e6d1947abe32a413f
 EBUILD celestia-1.6.1-r1.ebuild 3062 BLAKE2B b5c913e509ce0706219d93350b5f5657fb9b871fa93604eb493ab496926d5c19bd0afecc448ff1c2bed0fe9098bafd9080a816acdaa5802b25812bd3ff921d3d SHA512 84f0c7f6dc6ec27cf1659178a71b1a936d4d2155530dc51fc457aa08cfe02c89a967f8e169d56d9aa2179265153fe0c998f18e0240255c3dadc5b386f915e6f6
-EBUILD celestia-9999.ebuild 2407 BLAKE2B 465a30c13876ab1b348496f01c44c757ba496a18404e36744b6ca2adc06a64dd70984a535679f0d7d5e270bf0d8896bef1851dcf3090c7acae71ed10ac66a95c SHA512 55a28e63b93c737fdace09e9f64e464dd6e9f4ace95d8e93432ffe445782cd813d87e8861a4b5cccd8e62b9fbdf8c0e51db4228817b2f8023996f679c3972add
+EBUILD celestia-9999.ebuild 2197 BLAKE2B 2ab8e319eccc65457f8a25416a5b7cbfa58070706a83ae6d436152b6b22bc14703ee442073286f22c79b35e5c4efcdcdfe5d1a6fda1f021eefc7cebae5c35f53 SHA512 d79e69077e9bc5c7c57ec42987611665dfafb78693250da977c7d3e81588a9072c6403977d587f33cdeb216ca2066f63f8a49d30666b1dedd2c09c6c76b57360
 MISC metadata.xml 892 BLAKE2B e5bc4a09a9e495bcecf9bc2f5e0c60e7aee0b7c65071ac1636416368a1fc9c49057a23127a964c0cbb9a42c6a679cfed5c8d0511c88c67808f5078cfb3ad04c0 SHA512 f222c4e816f2684d8d8de5d456e81b6f6a9b92f3d3996137ddd371a9934793beeda6d1611e8f510f35eafdbe83837007fbae897efcebd47a6bf00e8b3ae159f9
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index cf7966b4a411..60ddc68e30fc 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop flag-o-matic xdg cmake-utils
-
-DESCRIPTION="OpenGL 3D space simulator"
-HOMEPAGE="https://celestia.space"
 if [[ "${PV}" = 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
 else
-	# Old URI! Please update once we have a release > v1.6.1
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
+inherit desktop flag-o-matic xdg cmake
+
+DESCRIPTION="OpenGL 3D space simulator"
+HOMEPAGE="https://celestia.space"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="glut gtk nls +qt5 theora"
+IUSE="glut nls +qt5 theora"
 
-REQUIRED_USE="|| ( glut gtk qt5 )"
+REQUIRED_USE="|| ( glut qt5 )"
 
 BDEPEND="
 	dev-cpp/eigen
@@ -36,12 +35,6 @@ DEPEND="
 	virtual/jpeg:0
 	virtual/opengl
 	glut? ( media-libs/freeglut )
-	gtk? (
-		x11-libs/gtk+:2
-		>=x11-libs/gtkglext-1.0
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango
-	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -62,7 +55,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	filter-flags "-funroll-loops -frerun-loop-opt"
 
@@ -79,16 +72,16 @@ src_configure() {
 		-DENABLE_CELX=ON
 		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_GLUT="$(usex glut)"
-		-DENABLE_GTK="$(usex gtk)"
+		-DENABLE_GTK=OFF
 		-DENABLE_QT="$(usex qt5)"
 		-DENABLE_WIN=OFF
 		-DENABLE_THEORA="$(usex theora)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	local size
 	for size in 16 22 32 48 ; do
@@ -96,15 +89,12 @@ src_install() {
 	done
 
 	use glut && domenu ${PN}.desktop
-	local ui
-	for ui in gtk qt5 ; do
-		if use ${ui} ; then
-			sed \
-				-e "/^Name/s@\$@ (${ui} interface)@" \
-				-e "/^Exec/s@${PN}@${PN}-${ui/qt5/qt}@" \
-				${PN}.desktop > "${T}"/${PN}-${ui}.desktop || die
-			domenu "${T}"/${PN}-${ui}.desktop
-		fi
-	done
+	if use qt5 ; then
+		sed \
+			-e "/^Name/s@\$@ (qt5 interface)@" \
+			-e "/^Exec/s@${PN}@${PN}-${ui/qt5/qt}@" \
+			${PN}.desktop > "${T}"/${PN}-qt5.desktop || die
+		domenu "${T}"/${PN}-qt5.desktop
+	fi
 	dodoc AUTHORS README TRANSLATORS *.txt
 }