gentoo resync : 17.02.2021

5 files changed, 3 insertions, 116 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index ce490e90b4fb..7ab2aabe8144 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 61693e9e034d..23f0df96654d 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,8 +1,6 @@
 AUX aseprite-1.1.7_type-punned_pointer.patch 836 BLAKE2B ca46926a87411fa74c7d66830bd4fc43dc3ae5130342bbb4300398c11a810949ccc530a8a7e66ae6265b2f89fe0bd667557ee7c647491e93d52768d74a340554 SHA512 c01ca8dc6bcee6276f3f4c7f7f141d8528372f0cbbb33c036b89ba64e639966d9b9955a78ec917ef7ebeda2148abc817bc4df7c1fe02818734f51cd7452df9ca
 DIST Aseprite-v1.1.6-Source.zip 11801981 BLAKE2B f20186a1669d7f9ab1453a2104a54228c22e2ef1703bba200f44c965b3fb3d9310c1ddd343db9c27ddca3564e4245352476c5228e171f1c0e74c553e5a59d419 SHA512 d87bcc5ece64cbc772ea5d4dc1edf29943d9038221905c0263511852afbb4e9119ce82468502a78c286729bb91389d08e3a8b7f358e4f6f8fe88507e7e69c9ac
-DIST Aseprite-v1.1.7-Source.zip 11801711 BLAKE2B 282492c29ece6b5b5bed029c7f27aa0a287bcb475f60066b6c34f54607b2714f35540e4d6ef4737818712776c2202162ce47c5713ba26b756d9e1c1d8af9c904 SHA512 9a92853042c7de567a7eb33d10ddd38c6d6bd53acfe4b93dc96e11408a7bda39ef7503c159934c483f0455700933c541dfdc0cb4c505d3385778e40686e474e6
 DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e
 EBUILD aseprite-1.1.6.ebuild 2161 BLAKE2B 182bd7e62802ff539f4e6ffb71e6e787af9943793f0f6b866d05d052159b2f82b4237ce46744cb5fd07bd94f1283e9968d50f375c94c257cd386e1e0dfeeb95b SHA512 f313d15dc499f7b468ffe78b6df84aba6f663e9abbf4bbb8266a8a3f1e726d53202be92e2637bf264f1ebb37392497af0b52b32bd8a03900734de5502b6baba0
-EBUILD aseprite-1.1.7-r1.ebuild 2666 BLAKE2B 447fa797c1c6c67110ac426816a85414872bf7ed01475fcdc1cc25bda29c57791bfcecfdc2a17896b3470f9ff2460ea28ee3b1effff4758904bbae137ba17521 SHA512 020da5c6c698500ba6ddb4c544a756b0ce285c75b052bcd8d3f1b51af7d23527e0c322efc0434333981f2e4aedcd8485db9d551a2cb11980a292bcc36cdbcc4b
 EBUILD aseprite-1.1.9.ebuild 2734 BLAKE2B 685d2f3ed9be7dba135e500c1860d794e43b7841c2c8fa49332e8ea5868823bee03605ddc16b580cbc104f9fbcd8a1c5ac542e4fcb15bfb00937e94fbe7b055d SHA512 cf0f3a5726f55a438bf26af6fbff7c09e93b552dd1881eeb083384de4e8bbe051220dc43cd9a373880a23cd725ef2b95ffef6a6a9a5ffc79c1b0c04dcf378db7
 MISC metadata.xml 653 BLAKE2B 7bfb4ab9faba731096e693600285b0390be6bf3dacf79076346d011660b7a558fe7711b05ac5bbf9ff9b4de9f0e32fbe7e4f44a7ad9251b7d97afa8094a6689b SHA512 7b3692fa1d9f37b2b15aeae2a7e77373c37b6f5dea9327c675294f23d7cb965d8aabb37be452c7d5a2b85e55f0aa23fd4e5f487f2c5f72e9ec0ffb9fb8c79438
diff --git a/dev-games/aseprite/aseprite-1.1.7-r1.ebuild b/dev-games/aseprite/aseprite-1.1.7-r1.ebuild
deleted file mode 100644
index c272fa35e70b..000000000000
--- a/dev-games/aseprite/aseprite-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop flag-o-matic xdg-utils
-
-DESCRIPTION="Animated sprite editor & pixel art tool"
-HOMEPAGE="https://www.aseprite.org"
-SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip"
-
-# See https://github.com/aseprite/aseprite#credits
-# Some bundled third-party packages built-in:
-# gtest duktape modp_b64 simpleini
-LICENSE="BSD GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="bundled-libs debug kde gtk3 test webp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!bundled-libs? ( media-libs/allegro:0[X,png] )
-	gtk3? ( dev-cpp/gtkmm:3.0 )
-	kde? (
-		dev-qt/qtcore:5
-		kde-frameworks/kio:5
-	)
-	webp? ( media-libs/libwebp )
-	dev-libs/tinyxml
-	media-libs/freetype
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libX11
-	x11-libs/pixman"
-BDEPEND="
-	app-arch/unzip
-	gtk3? ( virtual/pkgconfig )
-	webp? ( virtual/pkgconfig )"
-
-DOCS=( docs/files/ase.txt
-	docs/files/fli.txt
-	docs/files/msk.txt
-	docs/files/pic.txt
-	docs/files/picpro.txt
-	README.md )
-
-S="${WORKDIR}"
-
-PATCHES=( "${FILESDIR}/${P}_type-punned_pointer.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix to make flag-o-matic work.
-	if use debug ; then
-		sed -i '/-DNDEBUG/d' CMakeLists.txt || die
-	fi
-	# Fix shebang in thumbnailer
-	sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' desktop/aseprite-thumbnailer || die
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUGMODE -D_DEBUG
-
-	local mycmakeargs=(
-		-DENABLE_UPDATER=OFF
-		-DFULLSCREEN_PLATFORM=ON
-		-DUSE_SHARED_ALLEGRO4=$(usex !bundled-libs)
-		-DUSE_SHARED_CURL=ON
-		-DUSE_SHARED_FREETYPE=ON
-		-DUSE_SHARED_GIFLIB=ON
-		-DUSE_SHARED_JPEGLIB=ON
-		-DUSE_SHARED_LIBLOADPNG=ON
-		-DUSE_SHARED_LIBPNG=ON
-		-DUSE_SHARED_PIXMAN=ON
-		-DUSE_SHARED_TINYXML=ON
-		-DUSE_SHARED_ZLIB=ON
-		-DUSE_SHARED_LIBWEBP=ON
-		-DWITH_DESKTOP_INTEGRATION=ON
-		-DWITH_GTK_FILE_DIALOG_SUPPORT="$(usex gtk3)"
-		-DWITH_QT_THUMBNAILER="$(usex kde)"
-		-DWITH_WEBP_SUPPORT="$(usex webp)"
-		-DENABLE_TESTS="$(usex test)"
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
-	cmake_src_install
-}
-
-pkg_postinst() {
-	if use !bundled-libs ; then
-		ewarn "Aseprite has been built with system-wide Allegro 4."
-		ewarn "Please note that you will not be able to resize the main window."
-		ewarn "For resizing support enable USE-flag bundled-libs and rebuild package."
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 410aba461f9c..ad81df47a88e 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -22,6 +22,6 @@ DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f0
 DIST ogre-2.1.tar.gz 157457252 BLAKE2B 97e83cb93a07de5bd5f4fd778604e6146105e70045a6019f0fcdd7f96fe20f6ad495e19988dcd5e4c4073a0bcdeb5ce2afb06fae6945363c397a882672c80520 SHA512 9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5
 EBUILD ogre-1.12.9.ebuild 5879 BLAKE2B 40ca82f07bade00a108b257ca17e04e14b96f1455e7145a67a93258c06e7f649c786503a4c2a6cd7362f576f33e33ce41088d17d87e27bfc936963ec41d08c08 SHA512 2ebd8d777ff2145fbd6987835dbd57be177aca764cf213c04d3547ecc069fa00eeda5ea1bd7bec20d22a6d0bd42140340c800427ed2b78a4aba39449a7aab1b9
 EBUILD ogre-1.9.0-r1.ebuild 3791 BLAKE2B cea064e4607e7892d2af6a375b4a7b6845ca27490b0bff72a08beb898d5ff62eff0777f407f5038771bc9181e822a8bc3c825cae9fb59a5aebbe0e20d09b83e9 SHA512 16839c39f7295f039fb59fd2e7422e0e9545070e0cf33b393c7eacdb57e9b84afa8238415f043dc25f7b2eaa20e38f63fc152e63c3e0d1dbf68cdb00bee35c23
-EBUILD ogre-1.9.0-r2.ebuild 3589 BLAKE2B c52ab761a94ebb2d5e6c8ac232d4071d1062b172d849fab6c6e4a55c21f27100899ee53d2ec9f36f9f78b20540d0b98e1c301d47c91db10a645ecfa045f4710a SHA512 32079693e35a493a3b6f093c1ca17f8602cde92a0dbaef82862258a12e3b92fe12ec4d4a55a59601065a9a5a5a1370e8b2d32983f62d7687338e52dcafba767a
+EBUILD ogre-1.9.0-r2.ebuild 3588 BLAKE2B 47bb143db16be151b75c3024c96b9b25cccee64381f5392ffc365cf27f786760fb0a9c23e680288eb17334a6f4350b3b1dcb13632a2cbec590c392a1dbfde919 SHA512 c4449e3d24df82bc27a2b1ea0c9b7c2f5bdaeed63e7d793e4dd99fb34dceaa3d19cbdde3cc70dc0a3d78721e68584c7c468e0ef895704908064bfb3788f2eac1
 EBUILD ogre-2.1.ebuild 5949 BLAKE2B 26522e0c5d3ca1e01a9a533a1fb21d8ca21632abb3d05f26993a32a6c60aba27af8626cb88d537e968981f18429aaa3d2a400447baf4ddaafb962297ca269298 SHA512 50fd86fdc82b252c7ef9fab7c8c2bf99319d838efe4e8e124719658122a4c35213e723ec2d89dba0a8ae06c706867806caf4ae5e11920844a81bbc5323457769
 MISC metadata.xml 6849 BLAKE2B 078f3c5dbe0c558dab497c79b1698e3f9244b0cefadd7f0e2aa2126cc44a98b4dcc8059250765d2e8c662286de5519b7705e7167fd18fb2f4ba59b2dc2ed2c53 SHA512 0b41e4fe3601f07ca51954dd902d33ccc61b07834f8b98539e2f9b039bc9f9371ee58dd69736263a3f517063143fc9cffd0c985dde8696812e1a077bc213cf41
diff --git a/dev-games/ogre/ogre-1.9.0-r2.ebuild b/dev-games/ogre/ogre-1.9.0-r2.ebuild
index 024f38575f1d..4e296d965a36 100644
--- a/dev-games/ogre/ogre-1.9.0-r2.ebuild
+++ b/dev-games/ogre/ogre-1.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.b
 
 LICENSE="MIT public-domain"
 SLOT="0/1.9.0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 
 # gles1 currently broken wrt bug #418201
 # gles1 does not even build wrt bug #506058