gentoo resync : 12.05.2022

13 files changed, 93 insertions, 38 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 239a293d49fb..385138612a7b 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 6ce4675f7eb9..5656629539fe 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -9,5 +9,5 @@ DIST bsd-games-3.1.tar.gz 267636 BLAKE2B 116b340e383430fc56e9d2379a398494b43664a
 DIST bsdgames_2.17-28.debian.tar.xz 58464 BLAKE2B 3f5a70322341b153a8b3cb8df81fea1e773971d0f3b79ba8fb0c0877e95c61c8e8689952333f8ac4263948d781c2dc64c8178f9dac6a1c09ae702f91794b9583 SHA512 7e2db9f830c0657f3fcd1371635bda4a87e7a68180e486e44752904740c0710c02271522ff2d4b606542b3c502dd28795fcecf883360c3ac5bea78c148281f6a
 DIST bsdgames_2.17.orig.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
 EBUILD bsd-games-2.17_p28-r2.ebuild 4692 BLAKE2B 870cb4508d184ede3772dbe890fc146ef0c92d84f7e5db563f52b8087b5caac4c0b0dbf91e6fcc1d910e921624000aad06b3080f5c8026d628d15985cba971f1 SHA512 23d1e06cb44a363e2865563d40b795383e4e824c63e861cd0ac0361c4a0f4f125c3122d2ec1e76dc50bc524b735b8bbfde8f49fae4a37476bcfd70f6af2114d5
-EBUILD bsd-games-3.1-r2.ebuild 4519 BLAKE2B 82e3f084dbdb7ba019bcc111b229d7cd2c64c158016f63939c19aecf9a26e1cd40fa9b0ac353e3aa706d3d1604cb28de02612d7a6703ccf3f90c94b5d1f38639 SHA512 534d34137b9c77c46ef63a0af983fb6dd3581fde5069f34e77a020ab4b618f231e240c12e3842c9f03ab0b9570046e29c2c7e513bf9c194c85f3e46b94b98868
+EBUILD bsd-games-3.1-r2.ebuild 4525 BLAKE2B 6b69f897c94e8a438bd32587f0a96ba63c698a3ffa3294524c99141af065c716a08360142bc87dcbd38acb224ec3d1a84492d8340fe4a259e51bc6a787631153 SHA512 f1eeecdd34d5352bff0bb797ff93757b836bd9b666b5d96b18fe96f7a2a2d49e1edffe93de08b570edaa8388d5e8ebd8ccbc9b531e67586276e1a67e15c08206
 MISC metadata.xml 327 BLAKE2B 89325403c47583b762175ec639c9183287ba2c38b14238a38536ab2084412efadb28bd89d0bee8fcada3b55f8691a096965f8fff0add08f157d4a2d723206045 SHA512 710f729c47be0e809ba982ed6d1845b8ccc374705e60ca7a85145d439e130496c7cd9ebcbe70fc0d4770bad5b420f815eb57cae25734d399bd93c38d61fd9352
diff --git a/games-misc/bsd-games/bsd-games-3.1-r2.ebuild b/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
index 19eb91924bd3..748268ebe63e 100644
--- a/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
+++ b/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 # Subslot indicates the fork / new version
 # 3 doesn't include the same games as the classic variant, etc
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~x86"
 
 # 'check' target doesn't exist, nor do any actual tests
 # bug #779649
diff --git a/games-misc/cowsay/Manifest b/games-misc/cowsay/Manifest
index 400acfaba4c7..2ed150b84914 100644
--- a/games-misc/cowsay/Manifest
+++ b/games-misc/cowsay/Manifest
@@ -1,5 +1,5 @@
 AUX cowsay-3.7.0-head-in.patch 298 BLAKE2B f08b6580fcfbc8efe889ff87c145d99b551de84d9d30a501bb77a92290482af70eeb1cd5816b4755044e4dd79dcbb5674ffef01051b50bdbe1173db22405c6fe SHA512 bf088ffb6c5095bf1b01d7b49ceeece035fbeb524d020827f6fcbb0df8aef5113d4224ec6dd5179f6618dfc567cc757114f99cbba4475d3ba575e87cecae554f
 AUX cowsay-3.7.0-mech-and-cow.patch 430 BLAKE2B 28a2362f2de290d5a7c5a046f2fb22538723ffbf8548f9e1cfe4b0f6dcc8789494ca1b813e62d3ecfac3a3f6d296056d29e22105c8ac299572cdf0b493712968 SHA512 599712969221be2d6784e922bfa138735b0a20ff6f881d27682fafedd1d83cfe61c88532f718c601b79778fd63d876f265a211709e208699326d02eb960e9cb4
 DIST cowsay-3.7.0.tar.gz 34030 BLAKE2B a986ee689ca6856b99dcc148533abfbc81759da6fbabee9ab1ba86e7b288d3bff575706c1e12d6dd809e2e5091ce8d9bdcae51ffefccbfb356fc75ab199c4e8f SHA512 92c169350049d894c36ec753f0b7eb9250da7839d9f1eedcad1ff5d9f2cff188bd1509dabd3b4dd562bdd0e660e80e6a437c7f260ce5b2376b7ef624f0ee673b
-EBUILD cowsay-3.7.0.ebuild 912 BLAKE2B 7eb36d339fec3640cd299a76324928e5726a055443fd40830964d284610572d70744c78a3259c4ebf53f6f9811b41a7bd2ec7d204b4e3001eaae740fd4ffadb7 SHA512 1747603334dce2e7f6f3e75b49580373777f9dbb5f96f192bf8044d2f56850a7989e3f85f3b993eaa31cea4da09880d384ee60676fa6d7abcaed88660a1b8104
+EBUILD cowsay-3.7.0.ebuild 919 BLAKE2B c9b37dc9b26eba4f50f2cbad3f0ed1e98e2a565ccf7ed05490059d54c8b6e87155969ec873e70b32485fdaf2ef08f14d3f86651902e8f315d98ec5cb854c6203 SHA512 65cd742421af6c3739e3e7982ab7ec821ed15e82a5ba1975d0987f5e6754443cf09e8a788c6b1f4f4414655584f7a29b2909411f0aec981cbfef2df487fda246
 MISC metadata.xml 329 BLAKE2B 271344ca92470816790dc35745e4f2f82f364fef4912cea12f51c059bc5c39d834d5519725d5d8b927e030f5240cd9cd522426f33d29033cde7d24b702f4fa61 SHA512 b423de64c800c84f0ef98b80c63fc17d178dd333f3c8763cfe192be3f1f23058d653350dd20a99e3f8ecc647e426aacc2670ed5bb607fbf663bdf9438f9101f6
diff --git a/games-misc/cowsay/cowsay-3.7.0.ebuild b/games-misc/cowsay/cowsay-3.7.0.ebuild
index 48809fbe56ed..2c836214fe5b 100644
--- a/games-misc/cowsay/cowsay-3.7.0.ebuild
+++ b/games-misc/cowsay/cowsay-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/cowsay-org/cowsay/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc64 x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-lang/perl"
 BDEPEND="${RDEPEND}"
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index 273e0e1eddf8..30126c5938c8 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,11 +1,14 @@
 AUX 01_all_fortune_all-fix.patch 711 BLAKE2B a4c6802863fe2d19bdb3080e7f8a039ae0c39235b33d6c6a1d0bad6d2d19607a7ae8e72f292ffa1d755985e24cdd92bb31b54ef0013365ce81c0216c69ed45fd SHA512 ebc0bffa0f7d89eb1b88631984742c109b8703e8116e30b6b0b11c28f12bab5aa929a0567f1bc3a603f01f6618d613a881b046646e20fd685133bbb6daa39aa9
 AUX fortune-mod-1.99.1-gentoo.patch 2495 BLAKE2B 755d525da36c6d5b00ac3635082d788a5bd70e3712b23e6227328c726740b5adbf6ce1d254706901ff183bfbe40c04da73a26edf181fe4a9727bb7623dbf5bea SHA512 338861e27cc82baf4a062fe17029a7f2d05ea19d009be8627c04f66bebd74e8801272c1fc3cdeab2f29da797ad6373f38dd0ded011a7176ee93774b396e45cd9
+AUX fortune-mod-3.14.0-valgrind-tests.patch 684 BLAKE2B eef576d1e7aba921050fe06202c9b817962f41b014047381d2f63b4d1fae79aeeb596fc45b7c37203e6cd1449bed668d74c157e9bba60d3353757f2cf94e424b SHA512 fe322153ef38718c8dc87a87547bfaf05eed488724d816c570bdb3c30233525740eec7ae8f51c44dd40accb4f14e44aa482d98145d45415d5bdc67999b2bdddb
 DIST fortune-mod-1.99.1.tar.gz 1812089 BLAKE2B a5df4a5a518021073ee95ac7e110ac75b961feb1b4dfcc3a40165ea98859f93e6d002ee4906d3f03a40762503ae475b61399a2bd4144609fa4d9815a1a85fa84 SHA512 4c06ea37532dd59f0251d7c49538bee703852c60a3247aba7c516f4f0d4b8ab15b9d7495d004a6423acd74c4dd7532e3dbe1679d6904ab373b617a3386205cde
 DIST fortune-mod-3.10.0.tar.xz 1429132 BLAKE2B e2dcfccee0c8d897971e742e4a5e345f9e825ba73479e2dc056891e16f005dc1d1f843573565741d1b35e4e1d1020cd382db9706f34b0caa4000d265a2c4dd30 SHA512 cb4d171405324a8ebac55ca5c7c8d8f5c06b594c2ded1b1c97fb599a4eaf638317f613fbeee4b3ca9ba7060ba4eeff7e678acddac12d49555a33d33017a90f4d
 DIST fortune-mod-3.12.0.tar.xz 1427848 BLAKE2B 3a3b0c28a0f7c297294b1788c57e01eb78d5083578aba877b896f41b854d2c34f65c9b46a1efe8bfef669f7ced6bb5e8ba667e3df1391a3cd3e5fed22e9058b6 SHA512 3a25d276219bb4f8a3015cd24b43462844d3be481815b587a365acd31dde31afee110dc5a658dd4df43bc6ba7d19e85afeffb215bd8c8f34640d658edb335089
+DIST fortune-mod-3.14.0.tar.xz 1428984 BLAKE2B 9b7df93cd7ced677a391ed30a84503cbd36689de406bbeb346bc9e465420908c9115b0d58e8e0b245f554557f032a014cc52418da4a69281e3844412c8e9641d SHA512 289f11923bd91ac0c46d8879c57c1f4da20ef2ef165be2eea9635b3aca5fc18bfc2438e85bfbc2a872671f41658b68bb3f7dd74bef7e4268889371ff702d7cae
 DIST fortune-mod-3.6.1.tar.xz 1419132 BLAKE2B 0ff684ee8aaf5eaabd75f187a3bff533ab4ee6e66c47c57fc700d2671006c8dff42f732fde78b40516f8ee907a52fc1965fb0ff257b12563d645f97c5ebc0031 SHA512 3f35bf35d62c46dfeaca450a127a7444bb870f6345c92afe626f81548ac375d21306c00a56d31982b8e25129acd6f829402d5afaec676e1200ad5bf586f7a8f1
 EBUILD fortune-mod-1.99.1-r3.ebuild 1647 BLAKE2B 47842da549c84f1b5231b10875fa64fd1334b276e8840cf6823cfdc9b0d5f27f488f61da8d38d885036c457be43b91ee5d7976978afeafb7cda40323e8b6ec41 SHA512 34d5ae85bdf682b945184531d20da7b10526a74c38c12f856afc161c9d3fc1677fc3ce91b06e6bb93b7916520abb98406c21aac7ec5f4a64a530ac91398dc955
 EBUILD fortune-mod-3.10.0.ebuild 1026 BLAKE2B a13b18432e2098f7e88413ca5ca57ee8d72ee2e28cca576edf98e413b2c15c5314e5febe5fe96fcf2611628af1e1a2a149db336581dc2d1eae3eeec3994abddf SHA512 a1ad35f0a72f3671032773c45de0a56a4e92facd36e67df1c67e42ef24cce60142dc1796e0f5d75d0a37c737036ba9f095f27a550084d00ee2f437ac8c5cf116
-EBUILD fortune-mod-3.12.0.ebuild 1040 BLAKE2B a52e628c0f40e7f4dd460b620f0ad99cbd530df5af452324c7850a94b463d81e8fef9a8258c12e9b4ab8bcae2e3349f7fe5f6414bc97972ab4e85802eeb9303e SHA512 b0710353e9c1b3fc339681d59a6c4ff6e816e6c2cb1dbd6e6662c98bd86e6045725a0fe397d395798c42c4c235ac31846626790d431b99e57c04fd92b0ef4aa3
+EBUILD fortune-mod-3.12.0.ebuild 1034 BLAKE2B d88c039bb1357906893dc989fc6c36579e540eb91ec4c53c53edf5bb408ead722c178e8bf9b39a45c2f92defe585672a363c386bc5d5f476aeb62e5d4c252a91 SHA512 cf20c11d1822df4acd81345f2c518f4ba6cd769752181c06ccbeeeeb6f3657abeeadacb51fd2a975d2623550c02a2b89229274cd170234aa2d0b70edaeba47f7
+EBUILD fortune-mod-3.14.0.ebuild 1319 BLAKE2B 5a650f161f3287811135047ec6bbcba0d61e72cc0938a1fed9f241fb457ea0472ce8778cef42e2e056e96be0e259d3d98feb52368eeb321cc4a11b82eea4381d SHA512 b16b321b2d5f63e9d28a684d5e058e8bf50a08d0c06d83dd70f998d31de4c43a9aac6a9d89a9bb5a18fb07dbcc539a7afbc4328395ff3385989064ab045b9724
 EBUILD fortune-mod-3.6.1-r1.ebuild 998 BLAKE2B dc9625552ed2492fdd3f9c7cb07bf79c87d1795cd5c530745055ecf76633d41ade32adf47830dcfb2178759a49891c72f2c5f9765ebb98474a20dcd4c7be8c3f SHA512 f542bdac95508c993d9008075ae86409289455896f843ebb3e2e2a820258c3940cfb9540f4b3426d4f7fad98d7691a93756fbfe895f26215f73ca748d1cd920a
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod/files/fortune-mod-3.14.0-valgrind-tests.patch b/games-misc/fortune-mod/files/fortune-mod-3.14.0-valgrind-tests.patch
new file mode 100644
index 000000000000..166f8dfcd5b6
--- /dev/null
+++ b/games-misc/fortune-mod/files/fortune-mod-3.14.0-valgrind-tests.patch
@@ -0,0 +1,24 @@
+https://git.exherbo.org/arbor.git/plain/packages/games-misc/fortune-mod/files/fortune-mod-Don-t-run-tests-involving-valgrind.patch?id=4c04c9e10bfee01e4c7cc3278c452efb6863d549
+
+Upstream: no
+Reason: Test wants to install stuff, doesn't work and saves us the dep
+
+From eabc85921ccb8ffda14d34d26f6486700bf63b8f Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 15 Dec 2021 17:11:31 +0100
+Subject: [PATCH] Don't run tests involving valgrind
+
+--- a/run-tests.pl
++++ b/run-tests.pl
+@@ -35,11 +35,6 @@ sub do_system
+     }
+ }
+ 
+-do_system(
+-    {
+-        cmd => [ $^X, "$src_dir/tests/scripts/split-valgrind.pl", ]
+-    }
+-);
+ do_system(
+     {
+         cmd => [
diff --git a/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
index f70c23cdda42..203ee916b253 100644
--- a/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shlomif/fortune-mod/releases/download/${P}/${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86"
 IUSE="offensive"
 
 DEPEND="app-text/recode:=
diff --git a/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
new file mode 100644
index 000000000000..121927e8d619
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The notorious fortune program"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/fortune-mod/ http://www.redellipse.net/code/fortune"
+SRC_URI="https://www.shlomifish.org/open-source/projects/${PN}/arcs/${P}.tar.xz
+	https://github.com/shlomif/fortune-mod/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86"
+IUSE="offensive test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/recode:=
+	!games-misc/fortune-mod-tao"
+DEPEND="${DEPEND}"
+BDEPEND="app-text/App-XML-DocBook-Builder
+	test? (
+		dev-perl/File-Find-Object
+		dev-perl/IO-All
+		dev-perl/Test-Differences
+		dev-perl/Test-Trap
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.0-valgrind-tests.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_OFFENSIVE=$(usex !offensive)
+		-DLOCALDIR="/usr/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile check
+}
+
+src_install() {
+	cmake_src_install
+
+	mkdir -p "${ED}"/usr/bin || die
+	mv "${ED}"/usr/games/fortune "${ED}"/usr/bin/fortune || die
+	rm -rf "${ED}"/usr/games || die
+
+	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
+}
diff --git a/games-misc/wtf/Manifest b/games-misc/wtf/Manifest
index 0d0b754547f9..26d0c11a7220 100644
--- a/games-misc/wtf/Manifest
+++ b/games-misc/wtf/Manifest
@@ -1,3 +1,3 @@
 DIST wtf-20210416.tar.gz 30867 BLAKE2B 106e6637bcbbbe30d19f5ae9718032c769ebf21c2f394b32f12e5799401b7a94b3f5029a45afea38b76c7e39df558e03b8dbd86cf5f1823ef53ac3ddd10df77d SHA512 9473759b1cae2750d85201938084e44abf1a061c1c12a0275aad0bf7ba47f5702e799802bcff8716c9b82d740123bbacb0ed335666983295c9a5792a1148a3ea
-EBUILD wtf-20210416.ebuild 622 BLAKE2B dd732822d4c7c68a1d58dfc2ffff643c5fbeff4c3582a80987c38b89298eb5246ab0f63e9cabcad37e1b31be8886ccd0c4e41dc71d463e8be7ce39d3dd4bb2a1 SHA512 1ee907620c4d9f6ba2608e7549460cfeac93b6e653ba5f6ec6d634c680c6074ea21aff8a334e05c573621ae8d9997c6653d4f2751ab28f9fb456c40e9fb23b1f
+EBUILD wtf-20210416.ebuild 629 BLAKE2B efcbf8b0591f6d4dec4252212c798c41ef934802b8853d4f973dabb1de065d5b796f0565dba568f23b86ff2036615cca3df9886e5c3727d1b8ef168ec6b2f606 SHA512 ee20c92d847d9de1969a2f8851f88336119b1c9b630670299fa45ac911346146a1cbe548c7df08107050d35942a969af850e0085122ec725dcaffbd60bf50ab2
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/wtf/wtf-20210416.ebuild b/games-misc/wtf/wtf-20210416.ebuild
index ac5ded279abd..10676a8aa077 100644
--- a/games-misc/wtf/wtf-20210416.ebuild
+++ b/games-misc/wtf/wtf-20210416.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://sourceforge.net/projects/bsd${PN}/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="!<=games-misc/bsd-games-3"
 
diff --git a/games-misc/xpenguins/Manifest b/games-misc/xpenguins/Manifest
index c965df808dcd..dd2b9ddc3a91 100644
--- a/games-misc/xpenguins/Manifest
+++ b/games-misc/xpenguins/Manifest
@@ -1,6 +1,3 @@
-DIST xpenguins-2.2.tar.gz 275210 BLAKE2B e9d20cf8fe210f00dcdaf7789d7fb5f477c6623b81e2ae4071367bc2d645f2e8d719d4ecb59e34642a26a3626ba97bbdc5b2abf632f32935d7cf38c6457c5539 SHA512 cb24e17a5a19df0de162b2214dec2fbfc07396cdea9d138b8426d8fc38e248b1faba65ebfb8ba74a5cf515063ba8f4032c4588586b23b5be6aa0a208cfcfebf1
 DIST xpenguins-3.2.1.tar.gz 411421 BLAKE2B f12cbd907479b02a1e25d10ab48f29d6643a209bb424b3a4536f946f4a49b3fdac9a8f0598b63265ed10be45e623ecc98296eda36dc7e91f47d0c16174c5fb7e SHA512 de1382ff054a7c2dbf99f0c7004bde82aef2725981515954095d776208310c18130ffb5c16285f6190c68c498bb55b26af3bf783475ad703c211d1f9fd7d1a0b
-DIST xpenguins_themes-1.0.tar.gz 215487 BLAKE2B 922d360ed38959bc3e0452949c68f3438d4e2bfa3f8abce997888e2e288e420cae92ef51ebad17a88bd71bbc9f86d8a65d2d49d302d85b6927551144e4cf7cfb SHA512 577dedccfff8f4581c9285deb809d43a09631e15461783bfb5f00d2bf0e687d54f04ad3bcf1051113777d74f57c94c278b99749265a3efe8ebc6aabb1501eaf8
-EBUILD xpenguins-2.2-r2.ebuild 556 BLAKE2B b2f812f33a28dea618444672ccf9639a9b5c96810d1ca557e545bb2512e15345957b01277a4dd2dd566ad2b8e78c575e5d20cad68cdac296a4e70ef9a21aeeec SHA512 c981b93cab6595aaf80db88202018e5d9d6ef7975b5623936c60a7a345266537ca39ec88e6c494173e7d7a4b2cb5ed1239317cd832d9628d7a664f49ccffce82
 EBUILD xpenguins-3.2.1.ebuild 553 BLAKE2B 4bdec4c1cb2cd945c2e0576e10a7a775b2ccb0626e4e0e86903c0d156cdbc4c124a687a83394c8d62d595dcd52f9cb3bf77f727711a4659ba523d940c18865c8 SHA512 d2fc32425472e697c8199286c8e6be1c76918c2ef70783e400d1271724e615c0884349f5be0cabea8cab245ee2d5880b07958ff8ae7a174d5756cdba2d566be7
 MISC metadata.xml 333 BLAKE2B c1d0ab99ecec38094498698444e42357ed842a012e0c521cce23ee360d5e9948b95cb82ae5aaf1ed31343b40ff5de9eafa1a7fb9f76762c77d6729a1c5dd7b11 SHA512 48b76bf03a488ad9254b86774a408f93f38891974382116ddcaf6ace0aa47f70c4e0714dbb6da603961274ae7478b0a8a57f7f766637a6d9a73b3f3ae2d07245
diff --git a/games-misc/xpenguins/xpenguins-2.2-r2.ebuild b/games-misc/xpenguins/xpenguins-2.2-r2.ebuild
deleted file mode 100644
index d3d5a27a0831..000000000000
--- a/games-misc/xpenguins/xpenguins-2.2-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-THEMES_VERSION="1.0"
-DESCRIPTION="Cute little penguins invading your desktop"
-HOMEPAGE="http://xpenguins.seul.org/"
-SRC_URI="http://xpenguins.seul.org/${P}.tar.gz
-	http://xpenguins.seul.org/xpenguins_themes-${THEMES_VERSION}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_install() {
-	default
-	insinto /usr/share/${PN}
-	doins -r ../themes/
-}