gentoo resync : 28.04.2019

17 files changed, 78 insertions, 239 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 8ddd2e671686..619f0a75b71e 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/flatzebra/Manifest b/dev-games/flatzebra/Manifest
index f1e6bb3437ac..56519879e920 100644
--- a/dev-games/flatzebra/Manifest
+++ b/dev-games/flatzebra/Manifest
@@ -1,3 +1,3 @@
 DIST flatzebra-0.1.6.tar.gz 359098 BLAKE2B 8f17c76ea70013bc916ef062dbbf333abd5d8935f5daabd47a101a3c16c7dfab169b80dc406e6175d2626b6265f9bc009b8a5f7a5d4bf2dc1ed766e632977d5a SHA512 500df95ee23bd2decf1e11be76725733d9219ef06a844f2de337fc11494eeea57e5ab6298cb4235c394216dd75bfb64a4e9f732362ca5ee95c43086b2ca38f75
-EBUILD flatzebra-0.1.6.ebuild 714 BLAKE2B c492f07a780afd8fb8a0d2597aab1bec8514e877ddec31458e603d65aa0138d5afd72adc9787644c28305f4590289825f402887389e3b06b81d02470645258c2 SHA512 065476edfb99031057a11afb51a6eaa748ef9ea9c67e9a1381f06b5bcd5d0369c990ac9e223354caf5acdd2fddae48d87046238209dcf7a0e93e0b3a42494bf6
+EBUILD flatzebra-0.1.6.ebuild 732 BLAKE2B 3318ed8ae2edb32448eac6098d446699a488885e5746a0b51fb151c4c0d9690f81f14e7401d447e178bfd2fa732cfa960f17bcc48e2d99a474e099de182b0f80 SHA512 50083636bd589012fa033e626513927cd0f30205612863e32e21df0471c9678f1f6d79ecfe32dad7493309c7fab84bfa624d703c891532778fb8cab7c6fbbedd
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-games/flatzebra/flatzebra-0.1.6.ebuild b/dev-games/flatzebra/flatzebra-0.1.6.ebuild
index a8ca6daebdbc..a2656a4bfba0 100644
--- a/dev-games/flatzebra/flatzebra-0.1.6.ebuild
+++ b/dev-games/flatzebra/flatzebra-0.1.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="A generic game engine for 2D double-buffering animation"
-HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev"
-SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
+HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
+SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
new file mode 100644
index 000000000000..0bdc5bf8ed70
--- /dev/null
+++ b/dev-games/freecell-solver/Manifest
@@ -0,0 +1,3 @@
+DIST freecell-solver-5.6.0.tar.xz 392468 BLAKE2B 9b8a22eca95da8675a252bec947dc5edad35a492ce9b04db5bf956e9a8c7051a9ca38902f9704e1f789fe28ce3326515690b2070cbb0318d299fdb8446ec9d1a SHA512 aac86e9bfb5849ffd99c669d8cfdd79272bc2f2a9a7f085e22f775b26fa45fc404efbb7520d23469e96c54c3596e776c8f459e679127de9ec0bc065c82bff246
+EBUILD freecell-solver-5.6.0.ebuild 1042 BLAKE2B 30134fb0e1f697ae360937585df3bef12fced09fa86ab3f6242982b05ccf1e0bfcc57f09f9688d8b5aad9d387527833534687d26e1d6db8a14f9f3ff59f862e8 SHA512 e7d9ca7780594b7bf548a927489cfbd7135e9acb7058e188363fc41d8e7b6a26231ff7480c617af4af2fe4610ad4b42cc89af4da44683b1d7c01301d6bbb758f
+MISC metadata.xml 295 BLAKE2B 9e1e398d2fba90bd5e9a26ba2cb39ad2af9d9e67af9b3006bcb1d3e8374b82f20d3270ac50ee4fc02a04d84a3bbed61a7bfd394974f938025c6ec2f5c726532e SHA512 f3d83ba67322c1065e1fcfa040ffc0c532d86368fdb6552b30e1167058f355337055381407cab0bcc22f78bb451abdef1a3db4f1ffad6a5147ab26f969be1d28
diff --git a/dev-games/freecell-solver/freecell-solver-5.6.0.ebuild b/dev-games/freecell-solver/freecell-solver-5.6.0.ebuild
new file mode 100644
index 000000000000..291588443268
--- /dev/null
+++ b/dev-games/freecell-solver/freecell-solver-5.6.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
+HOMEPAGE="https://fc-solve.shlomifish.org/"
+SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pysol_cards[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-perl/Path-Tiny
+	dev-perl/Template-Toolkit
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
+
+	python_fix_shebang board_gen
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBRARY=OFF
+		-DFCS_BUILD_DOCS=OFF
+		-DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-games/freecell-solver/metadata.xml b/dev-games/freecell-solver/metadata.xml
new file mode 100644
index 000000000000..1eaf1a5b6c28
--- /dev/null
+++ b/dev-games/freecell-solver/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kde@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">shlomif/fc-solve</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/t4k-common/Manifest b/dev-games/t4k-common/Manifest
index d65982721b85..9e19fe250831 100644
--- a/dev-games/t4k-common/Manifest
+++ b/dev-games/t4k-common/Manifest
@@ -1,4 +1,4 @@
 AUX t4k-common-0.1.1-libpng.patch 799 BLAKE2B 3248451847f0b06a2926287b6af09eb2d86aa234cff7a640f499a849955f3faa1646264cbdcace7a30024124fbc647fe5283b96339cc8e55850cec616cce5ac4 SHA512 e9d8c4a2487d972231ef631feac67cea679ec585faf0453cf513290f318778070222b6e9a54725f18f5ea874c009a370ec55245a05151e9ecf19403b876be6ac
-DIST t4k_common-0.1.1.tar.gz 629215 BLAKE2B e85619ae0526aa51dc2075e5b845eaf778772cc7b354cb2a8d6737602695dbeea798de980ddefce1ec951b3700059a936bef291f140acf6424001e6647fe8643 SHA512 ddf9c0ccf1b6a4ab9f009794262fef86587e31e5110e5a8041214d7c94c607b9f4ca5ec21f04254bfc00a625ab75a04a69b3dcaff9ec13dbb92d5d82b6e375cf
-EBUILD t4k-common-0.1.1.ebuild 947 BLAKE2B 1bfcbfcd154eac5bec5910858977634c890331596140c6a34644bf8478c3b981ed1ee8f6c7daba232fd9bb893e1afe6c7d016587b325daf8ab1dc5feadbd1e96 SHA512 80e8688b02901af87c5c38c518f382fb0147bdb26aafc2aaa15e5749116a7b1ea6c4140f2cf223e1f34bf4dd01a96a238d4b345873d54375921c3f0e792a792a
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
+DIST t4k-common-0.1.1.tar.gz 622239 BLAKE2B f2ddbb3b8815ad05001f99b8cfd49fda3c1f59e9dc340bf9739c2072e9f4a2faf069bf9f774f95818a0cb59302e557d3d6408530e8ff82adb6b9fd84b36e2641 SHA512 d7fdb469452637187adcb4b5d2907c05687765b1b75cd3a28b75222b2a0358f1962e1a245d88129b4dbede845fde8ff718cf9a7b0f97a12cb21a8791073fbe3d
+EBUILD t4k-common-0.1.1.ebuild 947 BLAKE2B d2265a99ec3565282e6fae9f6ef1cbd42698a616a211a0ea24692c6c25c98545b81be3e0390763fcf22993b93f3e144a67a46b8554dc9f4ccf15d08a92027c71 SHA512 c12316e7f93ea1b8aaef9b45d41adbe3d921f907100895237a61db39c4c73f1d9909c13c3c8bd42001f02418fd76262d5473e393c57569f9efc44581b5946d96
+MISC metadata.xml 336 BLAKE2B 6e8da7610b8afe5bae34c30ff55d49fac65fcd8889a24e8295516e2a59f41a54b6728c34bedb6588ea6707c0837103a0d2b95598d1743a2a122cc2e54d50f10c SHA512 7f43f1bcfa355ebfe96ae7dfc7165ffa54cf90ea3aa7e58b816f85d04d7c4ba5dcf7a8c7d7eb4395bcff7e8f1206423f853cbc6729774ee582d48603afc123bc
diff --git a/dev-games/t4k-common/metadata.xml b/dev-games/t4k-common/metadata.xml
index 26079e608bed..9abddaa683a4 100644
--- a/dev-games/t4k-common/metadata.xml
+++ b/dev-games/t4k-common/metadata.xml
@@ -5,4 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">tux4kids/t4kcommon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-games/t4k-common/t4k-common-0.1.1.ebuild b/dev-games/t4k-common/t4k-common-0.1.1.ebuild
index ed40644465c3..2b12a55927ca 100644
--- a/dev-games/t4k-common/t4k-common-0.1.1.ebuild
+++ b/dev-games/t4k-common/t4k-common-0.1.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="A library of code shared between tuxmath and tuxtype"
-HOMEPAGE="http://tux4kids.alioth.debian.org/tuxmath/download.php"
-SRC_URI="http://alioth.debian.org/frs/download.php/3540/t4k_common-${PV}.tar.gz"
+HOMEPAGE="https://github.com/tux4kids/t4kcommon"
+SRC_URI="https://github.com/tux4kids/t4kcommon/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -28,7 +28,7 @@ RDEPEND="dev-libs/libxml2:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S=${WORKDIR}/t4k_common-${PV}
+S=${WORKDIR}/t4kcommon-upstream-${PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libpng.patch
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 1cc13ea0a479..7e144784f587 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,10 +1,3 @@
-AUX tiled-1.2.0-qt-5.11.patch 611 BLAKE2B a2113dcb7170c9a750372e6e3e07a56bde77ced34d4c62a5d31e4b93dcef2fb149330614be5f962193e537559efb897214163209c48cafe2ed5319f8bda3cad7 SHA512 5eacb68e75ec3595411cf79d9d565ad7480977df6d0814be27da2eeac83e6b1af106f5b707f6f5e2bc07adb2b139ef9731c88c432228870b32a0a0bcb3ab3f42
-DIST tiled-1.2.0.tar.gz 17007687 BLAKE2B 6bb5a34a19868574801a69015f6a05b299dd5b34df865cacf5d2a747a62ae731b80778fe49a432c5487cbfa3d30186dc80011cc8882cb86ac347fb35a7421cbc SHA512 9c0c151348a90344b355e9bc8a7c9d38e2203d48474e8cf496e2c08cc75f764042e4355db2827f0e3518a1c03bfbcc79be7ba643c44c50430c7ecec09fbb8563
-DIST tiled-1.2.1.tar.gz 16773680 BLAKE2B 1b7c662863d931dadd46d20c90822659b71fe5c7432cc6486813a6db533057d9db9768c2d14832a74b0f768c29b3d340cdc28a67df830ca984ad824610afe662 SHA512 9a66d41ed991b6af226c9456758f27bf5cf2e8d1059042fb684b003608509c0d0e13776710e777bab0e12f55223e4fca4048a07661c36a3273f9c6c5cbf7fa5d
-DIST tiled-1.2.2.tar.gz 16846444 BLAKE2B c359a75c5a3de8b9f9e52f2e772df9e6bc4ff7200330309e071f5497e80916a3512b47d47d6c502e186e95807a899fec7795d4246621ed988523468542a69b68 SHA512 b488f30f258d13e1513df7398b04e76153803c9384f94c0167d0a971c72e9c26f39eeceb8d587b36509b1c92e5e2f4df3c0cc41f49d66db2c1d9cf5b4b985be3
 DIST tiled-1.2.3.tar.gz 16848125 BLAKE2B cc2ab2a2ab14a575da1f47a415e1c544de9a80417ea5a081684893bad253fc742f89f5e17739bfe0617f859f6921ab214c2e8bdefe321545008b277684e654b1 SHA512 0c9e818872b1e8de67ff8d943dc47abb63667bc45917b29dca959b0a32594be4ffb156469375c0f5c4a4fa71ee85b05c018c58a2f581a860405cbb12c9c0aac5
-EBUILD tiled-1.2.0.ebuild 1318 BLAKE2B 165841fe7a08f170b7dca5135dc0bb84a8904d236f05fd32ae0f53d42b74167584008bc16a0b97b97ba10f35c608850f23365611e1cfee4f86350ddfeb5d06a0 SHA512 9d2080e4be6b421800758e0cd2a6d7b3b1f85940ad77791e20fcedbe38cb74efe458ba4f059b6b9c2803dc4488bd63ab888c2237b612d6ab0e3a7ea169412f14
-EBUILD tiled-1.2.1.ebuild 1274 BLAKE2B f52201c15fa94aae73e1e886a7fc770d62e9aa7228be3c1d3dee4f7dde1960f3bf58b9a596ede03e5b9fc146f5c298e2d071bcb330a1cf293069294e3145347e SHA512 8728f63f29bd82807db88b77e061a9648616864e09277c4478563c6b99dafc1d777c525dfdb26bd9a2cab309b228a926f354ad8e2a63247ea075ffd9139712a2
-EBUILD tiled-1.2.2.ebuild 1274 BLAKE2B 82a5ccf9e50a63967912bed315a61ab62216bf9dd0f294c050f670ff714f3b0f769c6cea833933f83e72fd4cb57f5376a6a7168dd9e60a89fe06f7a0123b95f6 SHA512 53cc3ce9c1434964efb83900a5f5db56ef4adf353cad465d476295db06690e4684b05a12d9c37ef777301f97c2d7f7a187a46f655f2865c5a1e244cd99fab3f6
-EBUILD tiled-1.2.3.ebuild 1282 BLAKE2B bf8237182f14bb63c4108d9b17d28ffa1976b25984839df9989d788f11475a5fe18b446833693ace31f41107617323e575f932b6563e28ad1a83bdf9e189529b SHA512 a609f4f85a6bc015e16d79abae91d5731ba4c8fb8b3ac572bce7fceb6fff3910f4c34ad2329ed42cc74b5be4692bee63049ede4b0fbe0681aeccd1e90f63a10a
+EBUILD tiled-1.2.3.ebuild 1281 BLAKE2B 317a129e11a98236de269a835fbbb19f07f89910a434bc9563b31bd4709bb3904389b1e734b7f1c636adbdabcd05f15902c68b9ce28277f3b1546e21b9be2608 SHA512 468eae31ce23e157dda0434e17c1b3a06b1a3351c9d552f99605b78c5a9ac39e412b6f36a3850fd2f1de5081c1e3be266601c65162f10c09cd76c4f076be4ced
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
deleted file mode 100644
index 43b3c64659c4..000000000000
--- a/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Bug: https://bugs.gentoo.org/667000
-
-From 1f039bc40c730cdd93df8213795bbb0fcb634dfe Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 11 Oct 2018 22:51:03 +1100
-Subject: [PATCH] Add missing include.
-
----
- src/tiled/newsfeed.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/tiled/newsfeed.cpp b/src/tiled/newsfeed.cpp
-index ddf988c3..2e2e12b9 100644
---- a/src/tiled/newsfeed.cpp
-+++ b/src/tiled/newsfeed.cpp
-@@ -22,6 +22,7 @@
- 
- #include "preferences.h"
- 
-+#include <QDebug>
- #include <QNetworkAccessManager>
- #include <QNetworkReply>
- #include <QSettings>
--- 
-2.18.1
-
diff --git a/dev-games/tiled/tiled-1.2.0.ebuild b/dev-games/tiled/tiled-1.2.0.ebuild
deleted file mode 100644
index a74c6edbb564..000000000000
--- a/dev-games/tiled/tiled-1.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-games/tiled/tiled-1.2.1.ebuild b/dev-games/tiled/tiled-1.2.1.ebuild
deleted file mode 100644
index fb9cfdad6b97..000000000000
--- a/dev-games/tiled/tiled-1.2.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-games/tiled/tiled-1.2.2.ebuild b/dev-games/tiled/tiled-1.2.2.ebuild
deleted file mode 100644
index b22b7a0e99e5..000000000000
--- a/dev-games/tiled/tiled-1.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-games/tiled/tiled-1.2.3.ebuild b/dev-games/tiled/tiled-1.2.3.ebuild
index 56763ea7c4f4..35f912689644 100644
--- a/dev-games/tiled/tiled-1.2.3.ebuild
+++ b/dev-games/tiled/tiled-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest
index 6e5cf2e92edb..4dc668a06482 100644
--- a/dev-games/vamos/Manifest
+++ b/dev-games/vamos/Manifest
@@ -5,5 +5,5 @@ AUX vamos-0.8.2-fix-c++14.patch 554 BLAKE2B 4b45082dee29de037d9e6bfffb025b0f3cc9
 DIST vamos-0.7.1.tar.gz 1681074 BLAKE2B 6d7c132fc65d1ba59c12d98699e82bd4d6029c0f6bb88e2c661d14ab602dc3aa0fe15b30cb8cc70d5b4c7e81f9d5a27c96b53f450098fb164806618d0ed7d35b SHA512 7560911e12636a4c530b6eeedc942be7121e39312d58f736a72d3b7fa2f632c962e9ccf714709f8f2e4335fa6d718f6870e7ba9e0c84f55c572e7915b4bf03e2
 DIST vamos-0.8.2.tar.gz 2148278 BLAKE2B a8afa661295bd646c0ee1d826dcee452f9788ecea7364116b0026f4950286280ef57d1b0179cb51b5f54c2788ca66f16b97bbc07142e0c92468638ebfbd81975 SHA512 bbc5b71790983b3db60c633f21b15b86c232a560f05ddc407c805d5bc39cf7a90bf556b9c59b4683a187961be755b1578a0a02b8b42599c6a634bd0f5936e880
 EBUILD vamos-0.7.1.ebuild 887 BLAKE2B 36d4484d093b3b7dc8c378d3282ff5d47f2067fcf891a4db51a07c4aa5de8509f6243295374c0aa9ff85ab0938d1db5217754750dac335f4fadb4a9bb4de0249 SHA512 785311b6f0e3fecfbca8b0151fbb8ca2981c880d8eb2776deea9114faa4dda9acffe21eb87ab9225296c9c82ab3359e732a4f9e44e09c4c6efb42dbab8328fda
-EBUILD vamos-0.8.2.ebuild 1201 BLAKE2B e7243562ff19b9ef98838af1833b6b0f20078d41579ee0f5d869bdbdd29551cc78d40bc62b534cb125a51c31d760707c7f2b2f7ce09c0c36eac2bfaf0e403574 SHA512 d1e997a6d90e25aee6e70309a1e1936df96581d72c3c38f45d6a6ac0e197be489ab3d8956e3a581f17a53fe4a64bd386c92f555789d46c733df9f41bc16faf25
+EBUILD vamos-0.8.2.ebuild 1196 BLAKE2B c85dbd56914b8eae3f1ba8dfa2d652682f5733102fd56f8c496d7ec79f15cf44c7dbdabd4d7aff62d398b4c13d8d85bb56e1ab5f08469cdbfb42ae7af3b6abff SHA512 c5f55f474b2768db75090e0dcfae8f19f5c2fc62b4094d92009f13243c832204193e25309d762b62c678e085f9c675a0e81be93fa6939a6e773de1f516ee7e85
 MISC metadata.xml 328 BLAKE2B 2c3269c4159fb3bb89b8e5c119844f960236e72bbd22915a44b901293d040f8c3e65d28e0a84e0075ed870bfb7c52d919c9aebd3456e93c7ed9ed2e2f91d01f6 SHA512 698c72452fe860f88cff1cb1de6a46902e02fe685081693c2dacbd5c9843fe717128cb9a706849adf19359bba1f809863fe62d569e776649bf5f8b5190663cb4
diff --git a/dev-games/vamos/vamos-0.8.2.ebuild b/dev-games/vamos/vamos-0.8.2.ebuild
index 51a6149d8609..ef0530a204c7 100644
--- a/dev-games/vamos/vamos-0.8.2.ebuild
+++ b/dev-games/vamos/vamos-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit autotools python-single-r1