gentoo resync : 22.01.2021

3 files changed, 8 insertions, 124 deletions

diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 23b9176d214f..b573b55ec858 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -3,6 +3,5 @@ AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475
 AUX celestia-1.7.0-cmake_lua_version.patch 287 BLAKE2B 29a555fd2443ba4c20508566a909cdcfe47b3e2ca8fea68d9fdc5427cfcdbd332c3179f3ea090c076d20cd36ec694b7cbef3008f87407ba4af7c6ea311853e24 SHA512 f1ae5eb360399d817c90b2ab058452f55f8fdc293568bd9b919cc2d71586da9146db2131abfd54c2c7dc9cb6230728e8435f7663b7125d8caaebe241aa8a7e72
 DIST celestia-1.7.0_pre20200316.tar.gz 69459012 BLAKE2B 8e718e8a4aa064b9be0bd5f0f1c034f3ffec42671c6eae503216f5ea2787e8c5da3315e3cb39e94e2a0eab5f067e189fe70dc9d04bff4127e9e39fba3a7117ae SHA512 db4213e1d76699ff01390f12e3763596dfd2641389743c27221b4e7934be9daca7a884dd389135894d225e8613830468ebede5664543e27e44e21e19d22d1e7f
 EBUILD celestia-1.7.0_pre20200316-r100.ebuild 2994 BLAKE2B 66941e8e98b5d483afb8bdcab2e5ea1ac0aa9cf24881be3075e9acaae4cff8c0345be21ed98d97d819a7d1cf836287f5e4e332b9aa09e34265aa8c688821a6e8 SHA512 1416f35668656810c7f32f53587050d4e692c084c3a3bca1b0c1fce37875b1385c046ea3c8615700f7460abf3c45a1a6ef6933c9778009d0fae8cbbaca4c1b1a
-EBUILD celestia-1.7.0_pre20200316.ebuild 2486 BLAKE2B e7d8ace8e1fa3811cf95207ac45478cdc89cd84a9ec341e982564d000053214b5acdddb3b6d0b6173d5ed92dafc08a2b3ca326cc07db786b91c72efe181d49e8 SHA512 3062453f7e369f4af4afb04018827b247c2c16f0759912ca27b4ddb39a90c5a097c317855ebe0e71d58ca3442ed1a2b5e950d67144967de9196bbe95487742ae
-EBUILD celestia-9999.ebuild 2994 BLAKE2B 66941e8e98b5d483afb8bdcab2e5ea1ac0aa9cf24881be3075e9acaae4cff8c0345be21ed98d97d819a7d1cf836287f5e4e332b9aa09e34265aa8c688821a6e8 SHA512 1416f35668656810c7f32f53587050d4e692c084c3a3bca1b0c1fce37875b1385c046ea3c8615700f7460abf3c45a1a6ef6933c9778009d0fae8cbbaca4c1b1a
+EBUILD celestia-9999.ebuild 2689 BLAKE2B 444213c5e24b16a889204e6aa00755c2b49cad6b5b124a2b39bf9aa4532389137440c19cffcb206ee59677ebc779669cc788f19c1eddccd431a8341339356182 SHA512 ed412e7b30d5a3b1e05cb1c52ac470ccf150f7c7c92d2022ca507fe4cab690af8a25bf24b8e4fa56f9a968637126187384965792c79149576e06f98b949a826e
 MISC metadata.xml 892 BLAKE2B e5bc4a09a9e495bcecf9bc2f5e0c60e7aee0b7c65071ac1636416368a1fc9c49057a23127a964c0cbb9a42c6a679cfed5c8d0511c88c67808f5078cfb3ad04c0 SHA512 f222c4e816f2684d8d8de5d456e81b6f6a9b92f3d3996137ddd371a9934793beeda6d1611e8f510f35eafdbe83837007fbae897efcebd47a6bf00e8b3ae159f9
diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
deleted file mode 100644
index a5fe892dd0d3..000000000000
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		COMMIT_ID="df508a0c597a3d96c1c039fa4a973e294021cfba"
-		SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN^}-${COMMIT_ID}"
-		KEYWORDS="~amd64 ~x86"
-	else
-		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
-fi
-
-DESCRIPTION="OpenGL 3D space simulator"
-HOMEPAGE="https://celestia.space"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="glut lua nls +qt5 theora"
-REQUIRED_USE="|| ( glut qt5 )"
-
-BDEPEND="
-	dev-cpp/eigen
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	dev-libs/libfmt:=
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	glut? ( media-libs/freeglut )
-	lua? ( dev-lang/lua:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# make better desktop files
-	"${FILESDIR}"/${PN}-1.5.0-desktop.patch
-	# add a ~/.celestia for extra directories
-	"${FILESDIR}"/${PN}-1.6.99-cfg.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	### This version of Celestia has a bug in the font rendering and
-	### requires -fsigned-char. We should be able to force this flag
-	### on all architectures. See bug #316573.
-	append-flags "-fsigned-char"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CELX="$(usex lua)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_GLUT="$(usex glut)"
-		-DENABLE_GTK=OFF
-		-DENABLE_QT="$(usex qt5)"
-		-DENABLE_WIN=OFF
-		-DENABLE_THEORA="$(usex theora)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	local size
-	for size in 16 22 32 48 ; do
-		newicon -s ${size} "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
-	done
-	newicon -s 128 "${S}"/src/celestia/gtk/data/${PN}-logo.png ${PN}.png
-	doicon -s scalable "${S}"/src/celestia/gtk/data/${PN}.svg
-
-	use glut && domenu ${PN}.desktop
-	if use qt5 ; then
-		sed \
-			-e "/^Name/s@\$@ (qt5 interface)@" \
-			-e "/^Exec/s@${PN}@${PN}-qt@" \
-			${PN}.desktop > "${T}"/${PN}-qt5.desktop || die
-		domenu "${T}"/${PN}-qt5.desktop
-	fi
-	dodoc AUTHORS README TRANSLATORS *.txt
-}
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index dd539877e827..44ee4d4b3d16 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,8 +59,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	# make better desktop files
-	"${FILESDIR}"/${PN}-1.5.0-desktop.patch
 	# add a ~/.celestia for extra directories
 	"${FILESDIR}"/${PN}-1.6.99-cfg.patch
 	# allow forcing CMake to look for a specific Lua version instead of the newest branch installed
@@ -88,7 +86,7 @@ src_configure() {
 	)
 	# Upstream always looks for LuaJIT first unless stopped, and we only need
 	# the version specification when linking against PUC Lua
-	if use lua && ! use lua_single_target_luajit; then
+	if use lua && ! use lua_single_target_luajit ; then
 		mycmakeargs+=(
 			-DCMAKE_DISABLE_FIND_PACKAGE_LuaJIT=ON
 			-DLUA_VERSION=$(lua_get_version)
@@ -100,20 +98,13 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	local size
-	for size in 16 22 32 48 ; do
-		newicon -s ${size} "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
-	done
 	newicon -s 128 "${S}"/src/celestia/gtk/data/${PN}-logo.png ${PN}.png
 	doicon -s scalable "${S}"/src/celestia/gtk/data/${PN}.svg
 
-	use glut && domenu ${PN}.desktop
-	if use qt5 ; then
-		sed \
-			-e "/^Name/s@\$@ (qt5 interface)@" \
-			-e "/^Exec/s@${PN}@${PN}-qt@" \
-			${PN}.desktop > "${T}"/${PN}-qt5.desktop || die
-		domenu "${T}"/${PN}-qt5.desktop
-	fi
+	local backend
+	for backend in glut qt5 ; do
+		use ${backend} && domenu debian/celestia-${backend/qt5/qt}.desktop
+	done
+
 	dodoc AUTHORS README TRANSLATORS *.txt
 }