[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/

[Lars Wendler]

commit:     f4c9b76959cdfe54cc1c33236c06b86e21d37b4a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 01:16:00 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 01:16:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c9b769

sci-astronomy/celestia: Adjust live ebuild to upstream changes

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild 
b/sci-astronomy/celestia/celestia-9999.ebuild
index dd539877e82..44ee4d4b3d1 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
 }