[gentoo-commits] repo/gentoo:master commit in: games-puzzle/lmarbles/

[Ionen Wolkens]

commit:     0afa13c3e433d260c56a484845c292cd042fdafd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 13 13:46:37 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 16:07:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0afa13c3

games-puzzle/lmarbles: EAPI 7->8, autotools--, fix highscore file

The executable wasn't suid gamestat and unable to write to it,
and score file was directly in /var/lib.

Also fixed .desktop file / icon.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-puzzle/lmarbles/Manifest                 |  1 +
 games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild | 29 ------------------
 games-puzzle/lmarbles/lmarbles-1.0.8-r2.ebuild | 41 ++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/games-puzzle/lmarbles/Manifest b/games-puzzle/lmarbles/Manifest
index 89f17cf5058..4e7074cc214 100644
--- a/games-puzzle/lmarbles/Manifest
+++ b/games-puzzle/lmarbles/Manifest
@@ -1 +1,2 @@
 DIST lmarbles-1.0.8.tar.gz 914238 BLAKE2B 263f069cdd82d300bd5185152158912a3972bd38b9baf254fe89ba5afced151edbc95c199acb43c2db00c805cbcaf2b0d6a13f4ac5f2a91580b70f3aabd4cb6f SHA512 d765b669a1b0039a0af8b28ede8209e9736c2f967b21d9f8372d1fc5475d49a766bef297615bff090532ade41fe44e084a458227b443566a54afebc3e989b57a
+DIST lmarbles.png 3300 BLAKE2B fb18495174da23370ea85e053b298c0c0d0f682aea9e2c76c60a9b58964d4e365a00c700388f6a59f12e664b5e58646ad7661001372efb37e32c35e0240858df SHA512 722c9d3149a97320d8cf43f4d02c2b7c3a78e7fef945037bd712108ed66d31e012f2f6d3ecad1b572279592ed106e1f028a7f5045793c1bdd4f8b5e5f554063d

diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild
deleted file mode 100644
index e92811a4437..00000000000
--- a/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="puzzle game inspired by Atomix and written in SDL"
-HOMEPAGE="http://lgames.sourceforge.net/LMarbles/"
-SRC_URI="https://download.sourceforge.net/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	acct-group/gamestat
-	media-libs/libsdl[video]
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	default
-	dodoc src/manual/*
-
-	fperms 660 /var/lib/lmarbles.prfs
-	fowners root:gamestat /var/lib/lmarbles.prfs
-}

diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8-r2.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8-r2.ebuild
new file mode 100644
index 00000000000..0e294386e90
--- /dev/null
+++ b/games-puzzle/lmarbles/lmarbles-1.0.8-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Puzzle game inspired by Atomix and written in SDL"
+HOMEPAGE="http://lgames.sourceforge.net/LMarbles/"
+SRC_URI="
+	https://download.sourceforge.net/lgames/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( src/manual/. )
+
+src_configure() {
+	econf --localstatedir="${EPREFIX}"/var/games
+}
+
+src_install() {
+	default
+
+	fowners :gamestat /usr/bin/${PN} /var/games/lmarbles.prfs
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/lmarbles.prfs
+
+	# gif format is not valid for XDG icons, and .desktop hardcodes icon path
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} LMarbles
+	rm "${ED}"/usr/share/{applications/${PN}.desktop,icons/lmarbles48.gif} || die
+}