gentoo resync : 28.04.2021

2 files changed, 17 insertions, 9 deletions

diff --git a/games-puzzle/groundhog/Manifest b/games-puzzle/groundhog/Manifest
index b0bc9139eefb..ab2cce75f046 100644
--- a/games-puzzle/groundhog/Manifest
+++ b/games-puzzle/groundhog/Manifest
@@ -1,5 +1,5 @@
 AUX groundhog-1.4-flags.patch 608 BLAKE2B aec098b6453a3541a087d382f93e4aa1c9ba9deb6435118836cef9825c617e417981a25040ca2b36268de6c688a29d71f62c8e1bab197e824aee9bec81da0d1d SHA512 ee6e08ead434e9285ee6d2b8580effd33528a8c4c13635e9ecf1973ca25a7869a98ed6231f95e4e789867bfa56e8b57e2a939ebf35107f15959eb643df880862
 DIST groundhog-1.4.tar.gz 221871 BLAKE2B e9b7dd2c7498b6320ee4fe396679ba76831c13357b1e7fc9cd14578f387de6d1ca38fa0f5aa4fb3461afb3c27080751de45e3b26ded281dcb59475d85eccbe35 SHA512 9d1cf9073658cd325c4dceb6009825f50d8d4c55d0cca1b762cfdd066663257958d92e0e67ad49593add5821ce202e19c1106793ae8c77e4776c3b2e1fdc093c
 DIST groundhog_1.4-9.diff.gz 8613 BLAKE2B 5bbfd5deaa0f7579369baea93be40e5b2ced14d9356417b0aaef595df830bb29abb4b3676878f49005e68ec81c5ec762ab418fce55c26fbbd2af062263757335 SHA512 ddbb7c8b51fe63a1d318e080133737a851276ab55324875e5d68650d2399ac141667c62ab79ee41ababd2b5426e7bee5f158e7aa4edfe8ee82c6c3b6fb8179b8
-EBUILD groundhog-1.4-r1.ebuild 1221 BLAKE2B c282f82e888dadf7330bce1e4b99018e17fcb3713894ff27591320de9a167b86bebdb93a7ddd9b29545eb205946f61c38b64f5614b958ea554299e9a3b9a6410 SHA512 982cefcc7b8b5df623a5d7e49531334c7453072569efdb9304b7a8445109c0051733c92f88a15c0f6a2b2cce9c00a6c8a4d71828336868776ecfd661f61cf72f
+EBUILD groundhog-1.4-r1.ebuild 1270 BLAKE2B 4bff7749f11ef6de95e23380e3513c922fdbe66e6be4ffab0832c76c2303f23cbdaa6feb026953ae1acdb16ae96fbe59261454f9be2a563975a31a5c2dac7d77 SHA512 84337f732e3225c07366f1820257deca236b271d11648db0a3f8804eaa3b524e1bb7f4ac91e1348ba1e598c6ef0a1d4058b509d09b170e3513a4bbc2f73c21fb
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/groundhog/groundhog-1.4-r1.ebuild b/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
index ba93616b6702..5fc37b168a5d 100644
--- a/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
+++ b/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop epatch autotools
+EAPI=7
+
+inherit autotools desktop
 
 DEB_VER="9"
 DESCRIPTION="Put the balls in the pockets of the same color by manipulating a maze of tubes"
@@ -26,16 +27,22 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	cd "${WORKDIR}"
-	epatch groundhog_${PV}-${DEB_VER}.diff
-	cd "${S}"
+
+	cd "${WORKDIR}" || die
+	eapply groundhog_${PV}-${DEB_VER}.diff
+
+	cd "${S}" || die
 	sed -e "s:groundhog-1.4/::" -i \
-		debian/patches/sv.po.patch || die
+		"${WORKDIR}"/debian/patches/sv.po.patch || die
+
 	eapply \
-		$(sed -e 's:^:debian/patches/:' debian/patches/series) \
+		$(sed -e "s:^:${WORKDIR}/debian/patches/:" "${WORKDIR}"/debian/patches/series) \
 		"${FILESDIR}"/${P}-flags.patch
+
 	mv configure.in configure.ac || die
+
 	AT_M4DIR="m4" eautoreconf
+
 	sed -i 's:$(localedir):/usr/share/locale:' \
 		$(find . -name 'Makefile.in*') || die
 }
@@ -46,6 +53,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	doicon src/pixmaps/${PN}.xpm
 	make_desktop_entry ${PN} "Groundhog" /usr/share/pixmaps/${PN}.xpm
 }