gentoo resync : 28.04.2021

3 files changed, 38 insertions, 28 deletions

diff --git a/games-arcade/jardinains/Manifest b/games-arcade/jardinains/Manifest
index ec5e4c081a20..8951d2015ad0 100644
--- a/games-arcade/jardinains/Manifest
+++ b/games-arcade/jardinains/Manifest
@@ -1,4 +1,4 @@
-AUX strings-pt.patch 8378 BLAKE2B ea79456d7e2f51b476dc13e838de3322db052c249e6c30c1c71806d62b3e99a86544530cd5cb30daa19f4b07cf8d90be62e38c747b54afc5dddceb891ffe783c SHA512 ed7b93a0aea20d164f00aed1760fbf8ec775e3e9e65262099c4c16dcec1c91dc24f6ad845da43b4dba554237e5c8a95831a206dabb9847b57addae6c298e2dc4
+AUX strings-pt.patch 8310 BLAKE2B 575c2faff1daeea851bd5f359b974c40909ece97221787145ee44337046d9f8478f0bfda8eee7956f855b82de432b0df41aeb6fb9babc750b6dcf9697ea1783f SHA512 b57d6f422757fb6edb86f21152d558d2b11bc315d60f7f5b787410f2cc626807216dfc30fd2ee7d8ccb93af68118bce04040e9a9ee5130e350a6fef5d53d0c5a
 DIST JN2_1_FREE_LIN.tar.gz 17433159 BLAKE2B de257584d5e0babc4c0304aec2451e92ec288c77e8aff68eaad63b43238126b4059dc56a1632b66b2bfd4a9f0408cf492a77c56de2521e12f630d498a751919b SHA512 ddb6e48e071b42b7871cb6396c61fdf9bfb85e9bb9f88720e8ac1b7bff499c43784de6bf3f67d3fe61bc05ed0e3f6a24f646aa6c54e387b95e744c16525978e8
-EBUILD jardinains-2.0-r1.ebuild 1624 BLAKE2B 52a73cbed121fcf66ad9ee2a5c3993a313440d9e5fa4a550f8074ee082bf4c09b7196efac1006b20f3bd043a05f2517ae6a9d2fa2236adf9058381cd428dec5c SHA512 0e89af86b9f73c2396eee0b497d9322e74cd2410a3a4f858677229d6e7785c1b683b02f628c6910f1339b199eb37434d434ab5cf82d7a7c07d2bf28e4d4715b7
+EBUILD jardinains-2.0-r2.ebuild 1598 BLAKE2B 64d1e8e705751c468b3cba514fb241ed8d24cb2fd78b0b2981d4062a37970c3942e17b32e8d3c0db2ac4750f76300640f6b78e83306eecc2be586504c2c855e7 SHA512 ee2851e0aca250af4c69fd2963e79e464f3693c4eb5de821602a7669fe5004c166849fc0cb51a91c4a9d701d3b09ccf26c0e4786dd158b917749b42cd192a4dc
 MISC metadata.xml 620 BLAKE2B d7544b15c6c62f4c3d1694e30afb4bf4a7a23402d83a594f35ab1f16a7eef3046121656ded24364b6e09dc93e98c17558e1ecc2e60e19edb6b8db6e95b2f00fd SHA512 4400b85a7b410885b2528a18cde41b35cd4a4034e5aecf2f1ad26c0300ed5d8e4bb01646d5be30f9c198d4d70b0bb9cc45bf52f7664cb9a51c3d704a56fa25b5
diff --git a/games-arcade/jardinains/files/strings-pt.patch b/games-arcade/jardinains/files/strings-pt.patch
index 246017a3f5bc..f4dfe3f5d46e 100644
--- a/games-arcade/jardinains/files/strings-pt.patch
+++ b/games-arcade/jardinains/files/strings-pt.patch
@@ -1,5 +1,5 @@
---- data/strings.xml	2006-11-11 23:45:28.000000000 +0000
-+++ data/strings.xml	2007-02-02 14:14:14.000000000 +0000
+--- a/data/strings.xml
++++ b/data/strings.xml
 @@ -35,5 +35,5 @@
  		<es>Espaņol</es>

  		<it>Italiano</it>

diff --git a/games-arcade/jardinains/jardinains-2.0-r1.ebuild b/games-arcade/jardinains/jardinains-2.0-r2.ebuild
index e98d0da5f03b..177944be5b6e 100644
--- a/games-arcade/jardinains/jardinains-2.0-r1.ebuild
+++ b/games-arcade/jardinains/jardinains-2.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop wrapper
 
 DESCRIPTION="Arkanoid with Gnomes"
 HOMEPAGE="http://www.jardinains2.com"
@@ -11,20 +12,26 @@ SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz"
 LICENSE="jardinains"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+
 RESTRICT="strip"
-QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/jardinains/jardinains"
+QA_EXECSTACK="opt/jardinains/jardinains"
 
-DEPEND=""
-RDEPEND="sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+RDEPEND="
+	acct-group/gamestat
+	sys-libs/libstdc++-v3:5
 	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 	>=virtual/glu-9.0-r1[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]"
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+"
+
+dir=opt/${PN}
+QA_PREBUILT="${dir}/${PN}"
 
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir:1}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/strings-pt.patch
+)
 
 src_unpack() {
 	unpack JN2_1_FREE_LIN.tar.gz
@@ -33,30 +40,33 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	# clean Mac fork files (bug #295782)
-	find . -type f -name "._*" -exec rm -f '{}' +
-	epatch "${FILESDIR}"/strings-pt.patch
+	find . -type f -name "._*" -exec rm -f '{}' + || die
 }
 
 src_install() {
-	exeinto "${dir}"
+	exeinto ${dir}
 	doexe jardinains
-	insinto "${dir}"
-	doins -r LICENSE.txt data help
 
-	games_make_wrapper jardinains ./jardinains "${dir}" "${dir}"
+	insinto ${dir}
+	doins -r LICENSE.txt data help
 
+	make_wrapper jardinains ./jardinains "${dir}" "${dir}"
 	make_desktop_entry jardinains "Jardinains 2"
-	touch "${D}${dir}/data/prefs.xml"
-	prepgamesdirs
-	chmod g+rw "${D}${dir}/data/prefs.xml"
-	chmod -R g+rw "${D}${dir}/data/players"
+	touch "${ED}"/${dir}/data/prefs.xml || die
+
+	chmod g+rw "${ED}"/${dir}/data/prefs.xml || die
+	chmod -R g+rw "${ED}"/${dir}/data/players || die
+
+	fperms -R 660 /opt/${PN}/data
+	fowners -R root:gamestat /opt/${PN}/data
+	fperms g+s /opt/${PN}/${PN}
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "Due to the way this software is designed all user preferences for"
 	elog "graphics, audio and other in game data are shared among all users"
-	elog "of the computer. For that reason some files in the installation"
-	elog "folder are writable by any user in the games group."
+	elog "of the computer."
 }