gentoo resync : 17.07.2021

3 files changed, 40 insertions, 50 deletions

diff --git a/games-puzzle/gfifteen/Manifest b/games-puzzle/gfifteen/Manifest
index 39ef45aa8121..6939d734e940 100644
--- a/games-puzzle/gfifteen/Manifest
+++ b/games-puzzle/gfifteen/Manifest
@@ -1,3 +1,3 @@
 DIST gfifteen-1.0.3.tar.gz 525454 BLAKE2B 253f74439d491b8ff30697c755dd8e04203a9282de0640603ae4e90fc37f3965ca7f1a02dc1263a71f5b00a18ccf42e7ac371cd20c5bc518fe9b12361fc80818 SHA512 a3699a2484ec3334ec9489c6ae6d8b332e41a769c72ea2971684197f8eb9e6c30431232f3423aaa85ded0fa57410929d432b2efe4370409bdcc63f2fb0b31ae4
-EBUILD gfifteen-1.0.3-r1.ebuild 866 BLAKE2B 5f7df7a00769db391a9b2f678b0744efcfc79db8e20d55e8f81a9f67ceadd166402c61ce4d9aade6cbc57afe5f1988f8a5b930cb59f061b278f748f98130c9a1 SHA512 65147433ed36d9c67a979270adc0b371898b217681830173956d82de847e103c87f4eaa61d62d07f43be0520b6a6b131fe8c61b26aa79fd5666385a7d813a176
+EBUILD gfifteen-1.0.3-r2.ebuild 705 BLAKE2B 2373f9cc3a93c7db2b3b791ca47330539078098c4552e9effc194279155e5a388cc8a2cf960c6c6e442f2a398f07717a49c02628575882e2c65c79bc53badac0 SHA512 91590b2462c9ec5e12086da69251c204c0579e79f6a57778c34ebd731de096529e1ab524677529a972e0aa992d46f82e248d8f9ff652309583cc455b5be128af
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
deleted file mode 100644
index 863fc84ff7f1..000000000000
--- a/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="Graphical implementation of the sliding puzzle game fifteen"
-HOMEPAGE="https://frigidcode.com/code/gfifteen/"
-SRC_URI="https://frigidcode.com/code/gfifteen/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# make it compile against newer gtk+:3 (bug #536994)
-	sed -i \
-		-e 's/-DGTK_DISABLE_DEPRECATED=1 //' \
-		Makefile.in || die
-}
-
-src_configure() {
-	econf --disable-assembly
-}
-
-src_install() {
-	default
-	doicon -s scalable ${PN}.svg
-	domenu gfifteen.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3-r2.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..d5c8a0497046
--- /dev/null
+++ b/games-puzzle/gfifteen/gfifteen-1.0.3-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Graphical implementation of the sliding puzzle game fifteen"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# allow using newer gtk+:3 (bug #536994)
+	sed -i 's/-DGTK_DISABLE_DEPRECATED=1 //' Makefile.in || die
+}
+
+src_configure() {
+	econf --disable-assembly
+}
+
+src_install() {
+	default
+
+	doicon ${PN}.svg
+	domenu gfifteen.desktop
+}