[gentoo-commits] repo/gentoo:master commit in: games-arcade/grande-KXL/files/, games-arcade/grande-KXL/

[Ionen Wolkens]

commit:     8452ad75bf37de53704fc1bdf435e48b87bef45f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 23:40:50 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 02:40:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8452ad75

games-arcade/grande-KXL: EAPI6->8, use gamestat, add font dep

Also fix .desktop icon, bmp is not valid for XDG icons.

Closes: https://bugs.gentoo.org/682606
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-arcade/grande-KXL/Manifest                   |  1 +
 .../files/grande-KXL-0.6-configure.in.patch        | 17 --------
 .../grande-KXL/files/grande-KXL-0.6-paths.patch    |  9 ++++
 games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild   | 40 -----------------
 games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild   | 50 ++++++++++++++++++++++
 5 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/games-arcade/grande-KXL/Manifest b/games-arcade/grande-KXL/Manifest
index 53ba90c3d5d..70685eda956 100644
--- a/games-arcade/grande-KXL/Manifest
+++ b/games-arcade/grande-KXL/Manifest
@@ -1 +1,2 @@
 DIST grande-KXL-0.6.tar.gz 240869 BLAKE2B a9109dd37d72ffcfd02b9f160acd89c17d5ae13d53948ecc79718f420cb3826491a6f6b024ca65a12ada76b24110f01a52f502db2de8a736f628eda5c0054a4d SHA512 17916e54b2b2bad25d789bc3d4f182f3f104fd4e5cf7b745bb9613f76ec04a2a3d2740ca89b507ecdb653f1d42b793115e76b5b34d53b96fec3d55574632b980
+DIST grande-KXL.png 5949 BLAKE2B 4461b7f90c2abd332708c81829a5b03436163d7652f60c424c2468d08987338febf147457a16794123a7a6d5e64fea06a40071fb3e62fd5ea7bea6dadfb3dd2c SHA512 4fe68a2fa0cb3e57a590cd818953e82b3456d7e160f12d4a87d2160acf6f6b37d39da2ee1df96f14396c5a86765ab6c66e05c62a8fd246a1ce01fbec962be67d

diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
deleted file mode 100644
index 19fec93f61a..00000000000
--- a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -17,12 +17,8 @@
- AC_CHECK_HEADERS(unistd.h)
- 
- dnl installation & score path
--if test "x${prefix}" = "xNONE"; then
--  inst_path="${ac_default_prefix}/games/grande"
--else
--  inst_path="${prefix}/games/grande"
--fi
--score_path="/var/games"
-+inst_path="${datadir}/grande"
-+score_path="${localstatedir}"
- 
- dnl check if installation was disabled
- AC_ARG_ENABLE( install,

diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-paths.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-paths.patch
new file mode 100644
index 00000000000..8aef0e38242
--- /dev/null
+++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-paths.patch
@@ -0,0 +1,9 @@
+--- a/configure.in
++++ b/configure.in
+@@ -21,5 +21,5 @@
+   inst_path="${ac_default_prefix}/games/grande"
+ else
+-  inst_path="${prefix}/games/grande"
++  inst_path="${datadir}/grande"
+ fi
+ score_path="/var/games"

diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
deleted file mode 100644
index 899a615e652..00000000000
--- a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop
-
-DESCRIPTION="ZANAC type game"
-HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-games/KXL"
-RDEPEND="${DEPEND}
-	media-fonts/font-adobe-100dpi"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.in.patch
-	"${FILESDIR}"/${P}-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-	rm aclocal.m4 || die
-	eautoreconf
-}
-
-src_install() {
-	dodir /var/lib
-	default
-
-	newicon src/bmp/boss1.bmp ${PN}.bmp
-	make_desktop_entry grande Grande /usr/share/pixmaps/${PN}.bmp
-}

diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild
new file mode 100644
index 00000000000..f93c692bec6
--- /dev/null
+++ b/games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+DESCRIPTION="ZANAC type game"
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
+SRC_URI="
+	mirror://gentoo/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	acct-group/gamestat
+	dev-games/KXL"
+RDEPEND="${DEPEND}
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-bitstream-100dpi"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-paths.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-highscore-path="${EPREFIX}/var/games"
+}
+
+src_install() {
+	dodir /var/games
+	default
+
+	fowners :gamestat /var/games/grande.scores /usr/bin/grande
+	fperms g+s /usr/bin/grande
+	fperms 660 /var/games/grande.scores
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry grande Grande
+}