commit:     45a817e5725a8deadd8bcfe945f6b3d05787e765
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  8 17:20:59 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 10 22:47:12 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a817e5

games-strategy/freeciv: Drop obsolete/invalid desktop file creation

I did not question the micromanaging of .../man6/freeciv-sdl2.6 when the
same is not done for other frontend versions, someone else could though.

Bug: https://bugs.gentoo.org/967222
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-strategy/freeciv/freeciv-3.2.0_beta2.ebuild | 6 ++----
 games-strategy/freeciv/freeciv-9999.ebuild        | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-3.2.0_beta2.ebuild 
b/games-strategy/freeciv/freeciv-3.2.0_beta2.ebuild
index 0555e7ba6e5f..5636fd5d3b05 100644
--- a/games-strategy/freeciv/freeciv-3.2.0_beta2.ebuild
+++ b/games-strategy/freeciv/freeciv-3.2.0_beta2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-4 )
 
-inherit desktop lua-single meson xdg
+inherit lua-single meson xdg
 
 DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="https://www.freeciv.org/ https://github.com/freeciv/freeciv/";
@@ -214,9 +214,7 @@ src_install() {
                        -o -name 'freeciv-ruleup.6' -o -name 'freeciv-server.6' 
\) -mindepth 1 -delete || die
        else
                # sdl client needs some special handling
-               if use sdl ; then
-                       make_desktop_entry freeciv-sdl "Freeciv (SDL)" 
freeciv-client
-               else
+               if ! use sdl ; then
                        rm "${ED}"/usr/share/man/man6/freeciv-sdl2.6 || die
                fi
        fi

diff --git a/games-strategy/freeciv/freeciv-9999.ebuild 
b/games-strategy/freeciv/freeciv-9999.ebuild
index 94c9cd9287f6..f18503f5a70d 100644
--- a/games-strategy/freeciv/freeciv-9999.ebuild
+++ b/games-strategy/freeciv/freeciv-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-4 )
 
-inherit desktop lua-single meson xdg
+inherit lua-single meson xdg
 
 DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="https://www.freeciv.org/ https://github.com/freeciv/freeciv/";
@@ -235,9 +235,7 @@ src_install() {
                        -o -name 'freeciv-ruleup.6' -o -name 'freeciv-server.6' 
\) -mindepth 1 -delete || die
        else
                # sdl client needs some special handling
-               if use sdl ; then
-                       make_desktop_entry freeciv-sdl "Freeciv (SDL)" 
freeciv-client
-               else
+               if ! use sdl ; then
                        rm "${ED}"/usr/share/man/man6/freeciv-sdl2.6 || die
                fi
        fi

Reply via email to