gentoo resync : 20.03.2021

4 files changed, 3 insertions, 115 deletions

diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest
index c9e6947e30ed..1ea591b6049d 100644
--- a/x11-misc/xfishtank/Manifest
+++ b/x11-misc/xfishtank/Manifest
@@ -1,6 +1,3 @@
-AUX xfishtank-2.1-implicits.patch 1306 BLAKE2B fc02cbba3a86316fd660c1e6436f191a4f1ad22fad9e63958d2f4550796c759560c2d6073d3350518db4b35c3d10ae4c0caa0e0acfde4735dcfe22fba5029cc9 SHA512 a67297947eeb3ec2b2db59bbab0e802bfab80c4aed90b2db29a06333aee12074b039b91a0daac0eaa51b2c5f52e7a67a3b0bd84aff9fbf3d56fb3c4b03c1c7bb
-DIST xfishtank-2.1tp.tar.gz 187513 BLAKE2B e2acec91ef52776bee82ea1b4df347b7fe509377687e74422d6dff81d7fce8a4009e4d0f45327a8401e4ae9782440d9f6478d1dd501c6e4e7d595d94b2d40b1a SHA512 641efa1104685d94589c2d9d365108308cb1b0dd238dbba6dc333c5922bda371536c0e26a63645351ac245a18f2386e4c47b4a1fc2a7f4b0400d37db846976a1
 DIST xfishtank-2.5.tar.gz 153464 BLAKE2B 0bb3121b84c3d08ea2251a70f9ad569e90fe6299ad3ee4942ec83d80483fcf4db0b0079161c28ff63461597f76b0d0532a65c1bde8aa821ff6bc92be189843f2 SHA512 1bfe16737bdbc2b7cf74abb98408bf632d8881f15753005424f84eba4afca756b07fa7ad424df800ee3f3e46e033b8f60142877bcd9a7e4e806e318ee283721f
-EBUILD xfishtank-2.1-r2.ebuild 723 BLAKE2B 2b7ed6c8a590f24229ba01f491c4297bc029d2268ec906f07e683d45304b8fd0741e949ec90fc754f7dd90deea90d1f0fe761c239c1fe144cefa7b30f86b3bd9 SHA512 35e2c231645b79c5172bd41922686a14b1e38a7647dfbf5e6a56196ca93bc5c94d85262d44478e7356fba7507cd0f10a359b4f10b99be8bd40a555e8d223db48
-EBUILD xfishtank-2.5.ebuild 708 BLAKE2B b5c84977e35a762fb2cdfd9eb56c3fc44e0bf89257fd46003fc1e1534c3592d516afeea7fe6e1a0a79656dffb98e032bd128edac41511c1fd5540957c8c9b5d8 SHA512 c2735ce248942ea289c32b601dc3d5f3914761ef71e8c2fe3a6cb87f3462c98751700154a49a144705370db7e1aaedd2436e18de477f0c5ef457fdc7aab03c5e
+EBUILD xfishtank-2.5.ebuild 704 BLAKE2B 9f33915ca44a3258b535a7bad9b51438f36150605f3fadf439210053ea3270c3cca616522e84715311db079604464c2f7ba439fe07f34c758e24294b59840840 SHA512 4a27e4f939600ebbe59a1bec25f2161f6cd9402e193c90e1d3fca92864db64897c40103f7703b1e29a1aa9573d38f1c99115a83dbc6d39dd363dd194728f66c8
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
deleted file mode 100644
index b00118631bee..000000000000
--- a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/read.c
-+++ b/read.c
-@@ -1,5 +1,7 @@
- #include <X11/Xlib.h>
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include "compact.h"
- #include "medcut.h"
- 
---- a/medcut.c
-+++ b/medcut.c
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include "medcut.h"
- 
- #define RED     0
---- a/xfish.c
-+++ b/xfish.c
-@@ -46,6 +46,9 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
- #ifdef sgi
- #define _BSD_SIGNALS
- #endif
-@@ -848,8 +850,8 @@
- 	struct colr_data colrs[256];
- 
- 	colormap = XDefaultColormap(Dpy, screen);
-
--	if (colormap == NULL)
-+	if (colormap == 0)
- 	{
- 		return;
- 	}
-@@ -1812,9 +1814,11 @@
- high_res_sleep(seconds)
-     double      seconds;
- {
--    int         fds = 0;
-+    fd_set      fds;
-     struct timeval timeout;
- 
-+    FD_ZERO(&fds);
-+
-     timeout.tv_sec = seconds;
-     timeout.tv_usec = (seconds - timeout.tv_sec) * 1000000.0;
-     select(0, &fds, &fds, &fds, &timeout);
---- a/makeh.c
-+++ b/makeh.c
-@@ -1,6 +1,6 @@
--
-+#include <stdlib.h>
- #include <stdio.h>
--
-+#include <string.h>
- main()
- {
- 	FILE *fp;
---- a/gifread.c
-+++ b/gifread.c
-@@ -56,6 +56,8 @@
- 
- #include <X11/Xlib.h>
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #if  defined(SYSV) || defined(SVR4)
- #include <string.h>
- #else	/* SYSV */
diff --git a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild b/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
deleted file mode 100644
index 3e5fbb14c7ea..000000000000
--- a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P=${P}tp
-
-DESCRIPTION="Turns your root window into an aquarium"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/demos/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/X11/demos/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-implicits.patch )
-
-src_compile() {
-	xmkmf || die
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" ${PN}
-}
diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild
index c98482c9096f..7ef03d5d699d 100644
--- a/x11-misc/xfishtank/xfishtank-2.5.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.5.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
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux"
 
 RDEPEND="
 	media-libs/imlib2[X]