gentoo resync : 09.07.2022

3 files changed, 17 insertions, 32 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 3e8bac0160e5..4db12182a4a9 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/frozen-bubble/Manifest b/games-arcade/frozen-bubble/Manifest
index d0fb4a65c992..3a495367f32c 100644
--- a/games-arcade/frozen-bubble/Manifest
+++ b/games-arcade/frozen-bubble/Manifest
@@ -1,5 +1,5 @@
 AUX frozen-bubble-2.2.1_beta1-Werror.patch 734 BLAKE2B fae9324386d2b0a185dc201970a7157bd2effee029f220ec4d0fc3e502fc712182a4edef0c02cbe0a59809c359ba6ccb70ee235837f4cafecb5950f2583ee1d5 SHA512 37f9f3f6e070a1f7af818f36ab2f9fb542937bd8034a42d962f34c80011b5c9f7fbef94b4ff065ca8a732e5a78615968108637c09a63c775518d9b7ebeea1b2e
 AUX frozen-bubble-2.2.1_beta1-fix-buffer-size.patch 2787 BLAKE2B fa2194d333263f3b521d971c95498d86838bf1188bf4d049a52a83d9afb6e42debd6736c021e35859b11a1283612eecd468ae81fddc4a3331b55a79e6bd47c90 SHA512 413012993a3f9cf16f4db1b66dec1b87c5a62c5b8e8fabb9d4bd689dea935e71ce9c12b213cd0687f2d6f106828d90486d84258385da778122ad6c8e6a61e23c
 DIST frozen-bubble-2.2.1-beta1.tar.bz2 22424798 BLAKE2B 70d23961c45e10cca38afcd7bdbf407dcefde1248af87df7768fe99fc0d926740096942007ba871d57db6095f3ca4bfa126f30ab60514ba3c6eb5fb7759d96aa SHA512 a5d1432195bc41b2823678986fe71223acf5c740636a871758e6337072c74a84bca7aa7088af7b299586e4e261521ae0b3341805692ab684d93e85f52174b1ac
-EBUILD frozen-bubble-2.2.1_beta1-r1.ebuild 1715 BLAKE2B 519f8076f62b453e1574d9c09219621ffdc6f2f16a7df164efcfc27f0d8a43bcbf50047da0aeac7f2faf56881bacfc0b1f442ff860b39d2326999ef7eef9f14c SHA512 ffa36c180a007e616033b9e4c7662fa3501caf5d54973e158e93a3322616aa6f1079747b83f4846eba9f0e7f34364b579dd0bb22a7a83b948440d171c60b8cfe
+EBUILD frozen-bubble-2.2.1_beta1-r2.ebuild 1523 BLAKE2B 99136085eedfc7614f712f32a704ac502dcba5656b6ab30a152a247dcb00ac49df784d2dea8fd449ef60a2944b81b6ba1fba594751f0d70e854e05aa28c6afd1 SHA512 16949636f6187fa988413095411f88f55229730e5d05d12334529e34432f9111ce9a7342cdd773a245a6846e889ea0f8b2e8fadd671c02e403f9b5a2087ec0ca
 MISC metadata.xml 541 BLAKE2B 10f008d9a29736325dbef75e67a9b7d376e76bfa0c25a2a76956d4b0fdfa25584e7e1661c03eb29efdc49cf3f9e0c77f192ff5e284953c9a702dcfe21f041458 SHA512 44a6fdb083ec80a7d9b9e3e12516945f5b764d490fafb6f9a865d0340a604ce8b75fdc059549cf37bc3dedeaf5adfdfb25384d2425ca508f46ebbbcfcb7866dc
diff --git a/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r1.ebuild b/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r2.ebuild
index dfa261124fcc..3a75e5deb783 100644
--- a/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r1.ebuild
+++ b/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r2.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-MY_P="${P/_/-}"
+EAPI=8
+
+inherit desktop perl-module toolchain-funcs xdg
 
-inherit desktop gnome2-utils perl-module toolchain-funcs
+MY_P="${P/_/-}"
 
 DESCRIPTION="A Puzzle Bubble clone written in perl (now with network support)"
 HOMEPAGE="http://www.frozen-bubble.org/"
 SRC_URI="http://www.frozen-bubble.org/data/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
-	>=dev-lang/perl-5.12
+	dev-lang/perl
 	dev-libs/glib:2
 	>=dev-perl/Alien-SDL-1.413
 	dev-perl/Compress-Bzip2
@@ -31,23 +32,19 @@ RDEPEND="
 	media-libs/sdl-ttf
 	virtual/libiconv
 	virtual/perl-Getopt-Long
-	virtual/perl-IO
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	virtual/perl-IO"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-perl/Locale-Maketext-Lexicon
+	dev-perl/Module-Build
 	virtual/perl-ExtUtils-CBuilder
 	virtual/perl-ExtUtils-ParseXS
-	dev-perl/Module-Build
-"
+	virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	perl-module_src_prepare
-	eapply "${FILESDIR}"/${P}-Werror.patch
-	eapply "${FILESDIR}"/${P}-fix-buffer-size.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-Werror.patch
+	"${FILESDIR}"/${P}-fix-buffer-size.patch
+)
 
 src_configure() {
 	LD="$(tc-getCC)" perl-module_src_configure
@@ -64,20 +61,8 @@ src_install() {
 
 	local res
 	for res in 16 32 48 64; do
-		newicon -s ${res}  share/icons/frozen-bubble-icon-${res}x${res}.png ${PN}.png
+		newicon -s ${res} share/icons/frozen-bubble-icon-${res}x${res}.png ${PN}.png
 	done
 
 	make_desktop_entry ${PN} Frozen-Bubble
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}