gentoo resync : 20.03.2021

3 files changed, 3 insertions, 44 deletions

diff --git a/x11-misc/xwit/Manifest b/x11-misc/xwit/Manifest
index 018cd03c8563..70643860c66b 100644
--- a/x11-misc/xwit/Manifest
+++ b/x11-misc/xwit/Manifest
@@ -1,6 +1,4 @@
-DIST xwit_3.4-15.debian.tar.gz 20722 BLAKE2B fcec4b3cdfa0f4d0b90e172f4539bfb622e77c902e351d9423555bbb43706c79e3d2cb15bb83021151a4876cc2c3bdacb62f074d6af50e2896a55b20b31df5e1 SHA512 047e00e5ff0282729495f39c7cb264837306da46d24e4d95e835d6d0060acd0bfa8f8cedff37ab8c503f267d8c5d42e5af0120cba6260e6eb9dd8c9a3a9dab46
 DIST xwit_3.4-16.debian.tar.xz 17840 BLAKE2B 05e772134c4c2c97c81b2367cdcbd73b21c5a4498a482b52dbbbc081426a623f242c3c77c73af3d6e6dbf46c1f1a7240b3677700006a691717402c309ccea644 SHA512 09086d375bb4c7b87c468a3ddad0ae62ad58e168c7875ea9e29bc37e599b193c7e8ff167ac471bb49f836b216876279430d03f462b62286130ed5c3ad0859263
 DIST xwit_3.4.orig.tar.gz 14557 BLAKE2B d023b89d02c8520421b35a69c3834d0493a1ab771b160c6c0592e9e43684062a7da9ed56491e90ba2948ba51b2d36f7b0c26ededdfa61a684b2a010d71865a56 SHA512 265114f81ede19e477685373e39deed3cf7cd3fd9dbb445362f34ea96dac6d9686d1c55cf882636f7d02598c83f5ee1ca2688fcbd01f6fc7ef34cac75691df94
-EBUILD xwit-3.4_p15.ebuild 785 BLAKE2B f94c601e4d3eda61e1c743a22f230bcfd30a47536ec962ea31ec07c38af2c69fd340983106bf6adffd807108836b4bfa8fdad1ea13f2526beda02f300ab8d087 SHA512 b5db114caa9cda0568c25653da150d303099bcc403c11886d131d33aa7948c7ca80f7797f4acdb16fb266db5cd158fc161e77b0ccd70fa4fc4282a96df05dc12
-EBUILD xwit-3.4_p16.ebuild 795 BLAKE2B 5d4da652da13809638b305050c15c190825a6864ef26b8d439014d6f31d829bea7a1b1a2fab7d56ba183e80a6b953d6475d3ecd66f84edcc2176b9ff87fa577e SHA512 10566c593b0d3eb9860e12063457eb3896e24922101a912487b7f59d67453f569c6a0a261d96c625da45b4a87440a16c01a3faaf4681e0437a1780c8962cec5a
+EBUILD xwit-3.4_p16.ebuild 794 BLAKE2B de32c3ad7fcde3bc99fd2244e5dfc79212f9e4b21210be14358343f8a394482191d8e2cdbfc3633d0b10cead8e941b21dcdaa879ae27e2424ff547e4469ab906 SHA512 30d5deb2472738da4e222a994cdf4c283e47fa0b4cf411ae6bec463c3341d066495c4162730a81926bfd3fa8c81e1c9623e73e40d0faae1b31bf685871eaa5d6
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xwit/xwit-3.4_p15.ebuild b/x11-misc/xwit/xwit-3.4_p15.ebuild
deleted file mode 100644
index 6f20325979dd..000000000000
--- a/x11-misc/xwit/xwit-3.4_p15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A collection of simple routines to call some of those X11 functions"
-HOMEPAGE="https://tracker.debian.org/pkg/xwit"
-SRC_URI="
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p/-}.debian.tar.gz
-"
-
-LICENSE="public-domain HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${P/_p*/}.orig
-
-PATCHES=( "${WORKDIR}"/debian/patches )
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's|gcc|${CC}|g' \
-		Makefile || die
-	tc-export CC
-}
-
-src_install() {
-	dobin xwit
-	newman xwit.man xwit.1
-	einstalldocs
-}
diff --git a/x11-misc/xwit/xwit-3.4_p16.ebuild b/x11-misc/xwit/xwit-3.4_p16.ebuild
index cc910e726870..5047e5de035c 100644
--- a/x11-misc/xwit/xwit-3.4_p16.ebuild
+++ b/x11-misc/xwit/xwit-3.4_p16.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="
 
 LICENSE="public-domain HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="
 	x11-libs/libX11