gentoo resync : 16.09.2021

6 files changed, 64 insertions, 61 deletions

diff --git a/games-arcade/grande-KXL/Manifest b/games-arcade/grande-KXL/Manifest
index 95a4baa4d52f..e1f066eb3ab0 100644
--- a/games-arcade/grande-KXL/Manifest
+++ b/games-arcade/grande-KXL/Manifest
@@ -1,5 +1,6 @@
 AUX grande-KXL-0.6-cflags.patch 387 BLAKE2B 6ea42eaaa8f3fc9d97b5de7c613f0998a7fb4b2088ef2d9949013a6d8b74e064c9913c9e8b4dda06650ea214902340d36b19d2545fa0366ddcba688fa433a797 SHA512 a330b5c8b97d941d13c90f5b78709df823d1242765890439a195f6788443c9d13bd5062399d1452eec9f311e6dd88e72d932398f99cdacaa94bc6d080550167c
-AUX grande-KXL-0.6-configure.in.patch 407 BLAKE2B 4e743c52625cffcc44c95657d5dce6bb2c87b6c74e1f6838336210114b15d3aa66dca309673c075293dc8596e56d99d2dbbc1a0c05deaee007cc31026c1962e2 SHA512 a6c5b0c86b40bb8a2236e7df366a5da2510ead498d6648d5c0377f26151854ba99fec0fc0c37be011ca847ba752c135ea3996d5d3a15e5f4bd1d06c85f9fbf2f
+AUX grande-KXL-0.6-paths.patch 211 BLAKE2B 171ead98a48f78e1a5ee909976bc0c1b7a07e01dcb4d53e799c36cc00eef9defe0cb38bd020fb3e0f38bfe92e9f0759f1c123d15779d4e7c0a5c46940d06b863 SHA512 505682a0e01308ec30890d9118c525bc69914b9f866566e35f0c95ffd4226e8d73ad63743d896dd07f1c4c2fc980cfe6043c75e12f28813358df1808947d418a
 DIST grande-KXL-0.6.tar.gz 240869 BLAKE2B a9109dd37d72ffcfd02b9f160acd89c17d5ae13d53948ecc79718f420cb3826491a6f6b024ca65a12ada76b24110f01a52f502db2de8a736f628eda5c0054a4d SHA512 17916e54b2b2bad25d789bc3d4f182f3f104fd4e5cf7b745bb9613f76ec04a2a3d2740ca89b507ecdb653f1d42b793115e76b5b34d53b96fec3d55574632b980
-EBUILD grande-KXL-0.6-r1.ebuild 729 BLAKE2B d5dbb090529b5f97b832d53ed3f78911271101592872ca5aa4817cdd1524a8210b8aafdb9f0b2f581d57dc7b6541d1daaee51050d15a1a3b6f6dbfee18c92901 SHA512 825f22c2358d13c1176dc6eb8d379e8291daf2c775c8daf5a7bbcdc76256d767efe7641484d46e5028ecc068b114e566d5ab610e3a1c76d5f76ac86c3e670a9d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+DIST grande-KXL.png 5949 BLAKE2B 4461b7f90c2abd332708c81829a5b03436163d7652f60c424c2468d08987338febf147457a16794123a7a6d5e64fea06a40071fb3e62fd5ea7bea6dadfb3dd2c SHA512 4fe68a2fa0cb3e57a590cd818953e82b3456d7e160f12d4a87d2160acf6f6b37d39da2ee1df96f14396c5a86765ab6c66e05c62a8fd246a1ce01fbec962be67d
+EBUILD grande-KXL-0.6-r2.ebuild 937 BLAKE2B 4a41e4ec4b27c767cc978335225061163ac9c1cbeca29e5d48aef3e4833d1e049cb157c4cc98014e5cfd01aed146cd48e0fdce3baee2e7ed2fb8a70514a49f25 SHA512 cf1402d6fe9ba433b544fdd6e41adb9d317d47642b84b7c593ac6be8dc97a2d8fe3ce49037ee08cb960c2359cd7024a6c05059e8f72312d108d5b75073ab9173
+MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
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 19fec93f61a5..000000000000
--- 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 000000000000..8aef0e382421
--- /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 899a615e6527..000000000000
--- 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 000000000000..f93c692bec64
--- /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
+}
diff --git a/games-arcade/grande-KXL/metadata.xml b/games-arcade/grande-KXL/metadata.xml
index 78274e0fa550..1c3ba213c494 100644
--- a/games-arcade/grande-KXL/metadata.xml
+++ b/games-arcade/grande-KXL/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>games@gentoo.org</email>