gentoo resync : 25.04.2020

9 files changed, 8 insertions, 84 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 89b6e92c64fe..523288d0aa18 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index ec8e4e9b1bb6..9b808760ce59 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,6 +1,4 @@
 AUX 3.36.0-drop-unnecessary-files.patch 877 BLAKE2B f9ca65d20efbf9b40220274881328584803f0395f233062d395c21ca0192399855b78ac7e7da7ee72d08a16736bd62bbc5670f6abbaa1c98500fb4f82917c66d SHA512 9435b8aa2caf1f9cd058ed5fbda629237c67cd9ff161be57947612ed093498d3060b9130e608211b174323a83ba18d528c606a50e8cc156aa394f192a1192d93
-DIST gnome-nibbles-3.32.0.tar.xz 495180 BLAKE2B dd7c14a1ec3900e25b64f92519c51eadedf5eac6faa9f8a35612876cf2bb796049f278e904e796aba427f579c5bda093a15dd5310141b9dd7be179b0ecf5b629 SHA512 f151b66edcde40e971113cdff7f3b92d740b2f04d943a168cc5471a18fabf5649d31d68beb3ad3ce29f91b36d34ff49725ce0c67f87184f6af1cafd0aed92349
 DIST gnome-nibbles-3.36.0.tar.xz 317624 BLAKE2B 6b9a582964ba03520e83900bdf00043133edac3ec3fd63a183687875026f70349efa737fd0f6e27fa2feeaf577f1e2957bd02a24213c2ddd573f6fae7c695922 SHA512 f7753589e2bab5d87528cf5dd4365fdc0920555d480cac225f99a9bb5b6c5670779d43602ce8f715c6a185a304c606a1121fb139eb493df69d17a40dffa8d4a4
-EBUILD gnome-nibbles-3.32.0.ebuild 716 BLAKE2B 11ca8083505a9fc3716a456ab0723c88fc726a4988d7972bc77f36b6357e4fe7f6bee0b96db8409e12616ff78a82392dd9c2dee102edd8eb2aeea19d33a5ddda SHA512 6f5181899f083939fc5d01cef0b20837efeb71af98d52ac7d22f224ba6dd40fc3a72407281c311e439aa47452613a59d3461407b72920668f95101547920525f
-EBUILD gnome-nibbles-3.36.0.ebuild 980 BLAKE2B 153039a84906d97f676a04c9e29f39e72aa58773dfe6aa27971fc9cfa503b49207ad518d86c4130d569db961b89b581790a40f6bac6555e8c8b52aee0ef315a1 SHA512 67630ad8fddeda7b270a00906b69ffc2d9144218bd4ec20e0d6a090a0ed59becb869cf8a1e999a791b346ac5e7761abcd00978a818aa7438075d3446fe086f22
+EBUILD gnome-nibbles-3.36.0.ebuild 978 BLAKE2B 92f3763630107762c69c8befd29054a09ec54e78e0f1a960f1bcb57e4c7497ec1e2661abd8178df310c80c0a18d326cc0aa31328290652f9ace26a93a08636bf SHA512 d318a830738f20344d35f45463d9a4ed36ba746edd6c234fcaa320d900cdbd15b4c366d9c67991cf610e8219a0fd02d88a410eb4957a20615664f3cec46c2aa5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.32.0.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.32.0.ebuild
deleted file mode 100644
index 3050fbed8c83..000000000000
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.32.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Nibbles clone for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libgee:0.8=
-	dev-libs/libgnome-games-support:1=
-	>=media-libs/clutter-1.22.0:1.0
-	>=media-libs/clutter-gtk-1.4.0:1.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.18.0:3
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50.2
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure VALAC="$(type -P true)"
-}
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild
index a8604f0c04cd..d35b63cbd280 100644
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-arcade/gnome-robots/Manifest b/games-arcade/gnome-robots/Manifest
index ba8c4836d290..86f7255d84ab 100644
--- a/games-arcade/gnome-robots/Manifest
+++ b/games-arcade/gnome-robots/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-robots-3.32.0.tar.xz 422684 BLAKE2B bf66057da9ed52ffe641d28aa522d7851a1ac7881369d1329507beffdeb3f9dc6a46988993c899783576e8c63730245dd340b62267809d1334515dabc2d599e4 SHA512 b037d576eea45843ae4c13ddf284a598931b295257688f6fa458fb4e33b987c01dd70d34007703b3f7bcb97cf8aa306e6473e4c24e5ee0253f1beaafcff1c6f7
 DIST gnome-robots-3.36.0.tar.xz 425616 BLAKE2B 1d5a3a0a087ace46af17fd97d7c284ba722d9bec22b9694ebd16b3d18fe1d87e656c6dcfc7b4687c60ea5015577c8319d967b8ad705d3d4d5e398df35c392068 SHA512 8e5eb03f74c1092c26148d0818c9e8118144dbb70c6cb25db449316ede05ff892a9ad06df2e8dc9942fe8c4f5ae638a1c8a8cda381f78f6f01a80c19010df35a
-EBUILD gnome-robots-3.32.0.ebuild 748 BLAKE2B 738526de05754bc10d59628d71633cce42426cca98744aad8f778e0dded92416b7173381f12dbe6015383849d5e8d07e543a753fe2e63130e07674213196db04 SHA512 0c812d687c72331b67c39580ff8a1283497f9ae1fa020f65c340be8c4cef9270f9c7936e097c62a16cca127e08f448fc32956849ab7ed3fd935c95a4e8c42793
-EBUILD gnome-robots-3.36.0.ebuild 740 BLAKE2B 32b01e5f1aea372114858a3f67dcaf143d145aa214ae90317d669c25a57e5bcecbcdc46bf1b905c83f6bf2f68750e6a16159205fff9c9919a94250f48f094053 SHA512 6d0276847cf9d419e56d3e3cd2b321beddd019376cea5a1c1e69812c0f14a26e4888a3b7376609e3020c44897579050262c6cca2ec6867f1f25cfa96bd8bdbca
+EBUILD gnome-robots-3.36.0.ebuild 738 BLAKE2B dcc2fe204e28e7bc0f2b2d6b49d1e1d7273eb7f2ac8d57f24b17630b9015c2607b15ce38e172fa8353ecc6a9502225f2da9febc6f7cf48870c3afd848c916ec9 SHA512 209fccbf998b29a8ea6dc6f7d1597f4ccd02cd0629894464841fddd85c43082003398ac1033e1e518c26807101643f09298d08bf1c7c5e1b675a7d48940ce829
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-robots/gnome-robots-3.32.0.ebuild b/games-arcade/gnome-robots/gnome-robots-3.32.0.ebuild
deleted file mode 100644
index c554a4169a39..000000000000
--- a/games-arcade/gnome-robots/gnome-robots-3.32.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Avoid the robots and make them crash into each other"
-HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/gtk+-3.15:3
-	>=dev-libs/glib-2.32:2
-	>=gnome-base/librsvg-2.36.2:2
-	dev-libs/libgnome-games-support:1=
-	>=media-libs/libcanberra-0.26[gtk3]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-arcade/gnome-robots/gnome-robots-3.36.0.ebuild b/games-arcade/gnome-robots/gnome-robots-3.36.0.ebuild
index fc66f1d18315..f1d17dca8f3d 100644
--- a/games-arcade/gnome-robots/gnome-robots-3.36.0.ebuild
+++ b/games-arcade/gnome-robots/gnome-robots-3.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-arcade/xboing/Manifest b/games-arcade/xboing/Manifest
index 0e5bcec05ef5..a84b3ddd1d9b 100644
--- a/games-arcade/xboing/Manifest
+++ b/games-arcade/xboing/Manifest
@@ -2,5 +2,5 @@ AUX xboing-2.4-buffer.patch 356 BLAKE2B 7a027064739bf3fe51f4ecad262c5461877186de
 AUX xboing-2.4-sleep.patch 397 BLAKE2B cb872777d74f62474c24e58c6cd84888620a761b55904763cb8d1d7efc5ce72596904798a526713129121bcb867b581292cb74c1e9f98c64d5c5b30b3d5e6423 SHA512 3d77c9ac4502c34e3a004b260e01a14f34115dfff7a73bcef0fcfe8e7bcc94cbb959e408d4c6ccc5329f1fb2b2b90500b5c8e51d4e8899a202754645e599f8c0
 DIST xboing-2.4-debian.patch.bz2 7740 BLAKE2B 284aedee90ca6bca940be405c10e5440d9df9237d6cc6f11c51204f3c1e2f383589a918997461c0399747d33e9f7142016323e101c4b48b1c3e35704cab20902 SHA512 bffd9b747b1e8840aef872988f9ef8b341a56e63d390e386a8ca71358318ba9c0b37bebd91b1f036b52c56e70acf98ec35f92f4c0fa1e19e2f8c4fcc83c1e7d9
 DIST xboing2.4.tar.gz 588811 BLAKE2B 1d29c457108c70608ec2c2ea7d4856553e3e174e7a8852f3da671c64e9e6a6349ee511841facc937bf6252cdd0e094ece7fe09e548835b7a288514aa7ece82d2 SHA512 4b6987329bfe79b3b9709ca02974d0043c6e35210aa73903940efbd09e94b1873ce09b1bea014646029b77e9bd063279935843adceb6635817f15c8025a0c454
-EBUILD xboing-2.4-r3.ebuild 1367 BLAKE2B a3d070460e8d6c8e587c0e951119d94ddabda41b64ada7ef4b27267d09570c1526185c89b9277e30c05db79075a0d1002e66238629b073a3dc9655b21160df05 SHA512 747ee0739e3b029c7c052469f58a3eb7be96142ce6af6eb188715c85062a85489fc05925a4a4123ca9b4e3f6809a3cae71923c212d639d490846d79ead4f7495
+EBUILD xboing-2.4-r3.ebuild 1404 BLAKE2B 16a024ed57e9bda8b479946de43195897295a1912feacf6c2b7df5bbc22cb6150b65f8ec39219dd60048c8a958ffd29162c11d4c37acc694ba4c563687526834 SHA512 cbd6a4b8337ab72861bb32b24ea207433c373055344cff382db59a5bb28acbce46536009c4071a426e4467400ff815697f242a5ec01c4b9b9c0fbf371750ba4a
 MISC metadata.xml 214 BLAKE2B 86c649fbb74ec8627ccee25d0b0d3cbac3b6f9ba8e164327c15faf02abca8583969e3e2a35bb629643500d079e873cdb8093c5ed3d7bb5c4348269d485088ae2 SHA512 eb9f85ca2fca14bf2aae5fe6001c2d7d1cf93e00bd4de8dac2f71f23ad3c7a7c8fcd65593b1adf77a07260cc546339846f4b33ec99032e353da07d1b3bff8f08
diff --git a/games-arcade/xboing/xboing-2.4-r3.ebuild b/games-arcade/xboing/xboing-2.4-r3.ebuild
index 9c36b5a49e69..d47824221347 100644
--- a/games-arcade/xboing/xboing-2.4-r3.ebuild
+++ b/games-arcade/xboing/xboing-2.4-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="Blockout type game where you bounce a ball trying to destroy blocks"
 HOMEPAGE="http://www.techrescue.org/xboing/"
@@ -36,6 +36,7 @@ src_prepare() {
 src_configure() {
 	xmkmf -a || die
 	sed -i -e "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die
+	append-cflags -fcommon
 }
 
 src_compile() {