gentoo resync : 25.11.2020

4 files changed, 32 insertions, 64 deletions

diff --git a/games-board/gtkatlantic/Manifest b/games-board/gtkatlantic/Manifest
index ab11c3be8b69..a10a082df6e7 100644
--- a/games-board/gtkatlantic/Manifest
+++ b/games-board/gtkatlantic/Manifest
@@ -1,4 +1,3 @@
-AUX gtkatlantic-0.6.1-warnings.patch 161 BLAKE2B 90c51beb2323480c1987a3c79e857cb39b03e596b0ebe55e9b9ec46c4c0a9a8da9ba707377fff3e334d8c0158fa5b092fb62b585870511cecb9683328d2ac161 SHA512 9ccfc0ea087484cf837bff5b29f824ab63f69a8b7599690f3db8fbb2ebe83865fdf8764869b7c973e35901dc6839109b9e6266a606aedc47c063947e71d80f93
-DIST gtkatlantic-0.6.1.tar.bz2 505701 BLAKE2B 5580b6bba4836e99d6c06cda4b3bef9236adf828cfd909497082922a8b3cfe158f4240a399ea879f6700f9c66f29d81926963cbf145af20bd28e2bed33241e8a SHA512 8388cbdd4c73d56eacb18a645bdd2d1f6e1fa8d21be972eaba1c4d6af6d0681a2a54909a82d6846ddd785b46b0ad99193e5afea528c5662956ff89a1e6e366df
-EBUILD gtkatlantic-0.6.1-r1.ebuild 961 BLAKE2B cbbe539ce1fc32805db49e376784966b7ab9589538103706fe243903b1b25670242ae0ee49ec93781a8eea401eac8589ef3496e461bab233a9673f41c8aaa928 SHA512 95cbc7f780cae82fa443aa0681990275357f3d9276f58572728898b8c031a97c4565bfe08faa0abf319ff451d434f687259a92ec2670d1ee8f02b834f37475d9
+DIST gtkatlantic-0.6.3.tar.bz2 546656 BLAKE2B e444f19e9757d5a276ede28f868f226e8cc0b4ed3806af54d56721e20d11df6b9b33265b6f51cd5a24608df8ce9c88ccc4ac0c093b1c3c6bd32f35a4e7cc5565 SHA512 2cca71492f4aac1a3c3a55e51eb389a8f1481a51b4e0be00dfb6c2317eba320a30f4e9d555375300ff56ddd65d2f313e8356a7ec3dab38963904b9a52f3138c6
+EBUILD gtkatlantic-0.6.3.ebuild 604 BLAKE2B b2ca8e6fa6a683877d4c7cb22eda03fbb28abdc3915dfc21bdce9a3766a5fc36b84b10f066b7bd7a7ca5679cdab61cdb32e6dad16af858e9117a4c6b4bbf6cc3 SHA512 42e9e3944cc6acf10a77a4d6ebbffd41e89de9db9f51a45bf0b9aea4a6efbfebcba60679c7d525959045ced0bca8ba6382d2bc9480e50979d2455a1051baa5f3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gtkatlantic/files/gtkatlantic-0.6.1-warnings.patch b/games-board/gtkatlantic/files/gtkatlantic-0.6.1-warnings.patch
deleted file mode 100644
index a55c7ac7e132..000000000000
--- a/games-board/gtkatlantic/files/gtkatlantic-0.6.1-warnings.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/readpng.c
-+++ b/src/readpng.c
-@@ -23,6 +23,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <glib.h>
- 
- #include <png.h>
diff --git a/games-board/gtkatlantic/gtkatlantic-0.6.1-r1.ebuild b/games-board/gtkatlantic/gtkatlantic-0.6.1-r1.ebuild
deleted file mode 100644
index a4f03258084b..000000000000
--- a/games-board/gtkatlantic/gtkatlantic-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="Monopoly-like game that works with the monopd server"
-HOMEPAGE="http://gtkatlantic.gradator.net/"
-SRC_URI="http://download.tuxfamily.org/gtkatlantic/downloads/v0.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libxml2
-	media-libs/libpng:0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-warnings.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's:$(datadir):/usr/share:' {,data/}Makefile.am || die
-	sed -i -e 's/configure.in/configure.ac/' configure.in || die
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-icons-path=/usr/share/icons/hicolor
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/gtkatlantic/gtkatlantic-0.6.3.ebuild b/games-board/gtkatlantic/gtkatlantic-0.6.3.ebuild
new file mode 100644
index 000000000000..8e58e3fb30f6
--- /dev/null
+++ b/games-board/gtkatlantic/gtkatlantic-0.6.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Monopoly-like game that works with the monopd server"
+HOMEPAGE="http://gtkatlantic.gradator.net/"
+SRC_URI="http://download.tuxfamily.org/gtkatlantic/downloads/v$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2:=
+	media-libs/libpng:0=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}