gentoo resync : 18.12.2020

4 files changed, 2 insertions, 147 deletions

diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 6afd7c5ed136..2743562110a3 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,7 +1,4 @@
 AUX tiled-1.4.3-python-38.patch 479 BLAKE2B ec7a36fbaddb9cd5b954285e25cd02e1c169e9fce4bb51dcdde528c60849086d4a0cf1bd706b909f2fd87be8174faf0f3488317fb05ed4c801dfffdda9af94f2 SHA512 6694d4bd8d79f5575e1b95fc5aa5b832e2193ff9475ea4e624db12f8305eac5b1a20cac4549ae1924e803ee6f5e9ab7835496c02a66c1e7f834671ada8549ebd
-DIST tiled-1.4.2.tar.gz 17806729 BLAKE2B 9f9e6b97c6d95b1f8a1ad6da3540aaf9310a705b412005752afe72c3ce8e35025559ed0e7aaf36a1d65284c29d8406bdc58121f6c13bb658ff84ff43fde7f403 SHA512 1fddd8c8d67e4eaf116c82e276b0941e6dae7c529f2132e49da77d7e215fc7106d5fd3ef55d118f799153b57340effcf2481a131a436be7f00f61c4fc4bd45d2
 DIST tiled-1.4.3.tar.gz 17806808 BLAKE2B 81b5a32cc1e6f5f3b4af5520752d34572f0e78aad90df435d075b53ac18b39961aa22d23cff614cd83f0883fd2fd2bca69026160cb8b1b727fddaeff5764babe SHA512 1e75e323733e05563bf542364778d95f2f22484ec0d85b4a9e7fac782c117934b37b049724979be5c83de86a3900c7ca2e9f3c5a660c530d2ecd0f023eb22c2e
-EBUILD tiled-1.4.2.ebuild 1371 BLAKE2B f617f685c1798996af236f5de5323c50ee7d179a5003b0b53b66a8c6e5de310958c39feeaa4cb17db26aa00c5bbda62b2cc0a1ab69bbf2c3dd4f25ed81aa716d SHA512 ec75cea172395dd2bf0a76728950dc1888ebe1b5e37048bf213a7bedbf2183e5be0472992bf533de22c6bf3039254e18979ef431cb61fe3eb59a4063177feac1
-EBUILD tiled-1.4.3-r1.ebuild 1452 BLAKE2B 1aa12b44b088f964216be058bca1fbad703a80d3f1bc2d799184417a4c93fbbf1c94fd42ab4121e96a7d60aebd0c3e6801e001a6595dc88651a2d15b88583267 SHA512 788e52cb3288ebf213b83de1568f3bbbe4147a714d5a8714bc50f50ca0824c79a241cf64df3f86b6a0105e89f1f58a6936da81c7d5467f86659f7df0810d8389
-EBUILD tiled-1.4.3.ebuild 1372 BLAKE2B 06303c0bf6943dbdbd0d450e00bc81897b999d445a40934b582bfd5a4199d91a7de96d2c634d13749fa895533d59c32b69194facc723090a93ab166fc536c4ad SHA512 fa8137e781cb3334dd2f1f9d98b29c684d192444c13207e6880411f32622e7db7dd5699f2e48b46fc701212e7efad951d21ecf64a913f5f7e14e9dde6b6f78bf
+EBUILD tiled-1.4.3-r1.ebuild 1451 BLAKE2B 2d5b0cbf458d5b8a97db44f654ed96d52951e797a0e32d7b5035cf15348b93c7f2603bf127749e0c030a8f0c2b9c87603edf6ebbab330dadab97d99ea7c6c2d0 SHA512 7538908c51d88d1644163d1539001e2f3038fda95292864673d28a2d79d8223db0cbc27e0de53330ce3fe4476092fa13b9b88d826efad19a79bd8392e0e6225f
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.4.2.ebuild b/dev-games/tiled/tiled-1.4.2.ebuild
deleted file mode 100644
index b355ebdb4fb8..000000000000
--- a/dev-games/tiled/tiled-1.4.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit python-single-r1 qmake-utils xdg-utils
-
-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="
-	app-arch/zstd:=
-	>=dev-qt/qtcore-5.14:5
-	>=dev-qt/qtdeclarative-5.14:5
-	>=dev-qt/qtgui-5.14:5
-	>=dev-qt/qtnetwork-5.14:5
-	>=dev-qt/qtwidgets-5.14:5
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-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" \
-		SYSTEM_ZSTD="yes" \
-		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() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-games/tiled/tiled-1.4.3-r1.ebuild b/dev-games/tiled/tiled-1.4.3-r1.ebuild
index 0a20032a23ba..0f0e25021a49 100644
--- a/dev-games/tiled/tiled-1.4.3-r1.ebuild
+++ b/dev-games/tiled/tiled-1.4.3-r1.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/tiled/tiled-1.4.3.ebuild b/dev-games/tiled/tiled-1.4.3.ebuild
deleted file mode 100644
index fc9a62d7bd92..000000000000
--- a/dev-games/tiled/tiled-1.4.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit python-single-r1 qmake-utils xdg-utils
-
-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="
-	app-arch/zstd:=
-	>=dev-qt/qtcore-5.14:5
-	>=dev-qt/qtdeclarative-5.14:5
-	>=dev-qt/qtgui-5.14:5
-	>=dev-qt/qtnetwork-5.14:5
-	>=dev-qt/qtwidgets-5.14:5
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-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" \
-		SYSTEM_ZSTD="yes" \
-		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() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}