gentoo resync : 20.03.2021

4 files changed, 3 insertions, 62 deletions

diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index 15d7b34039a3..17640aec503e 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -1,7 +1,5 @@
 AUX xkeycaps-2.47-Imakefile.patch 595 BLAKE2B a4ecbb62eb308357b77a7633eb8c1eb0a8fe25d17e6e912e416120003996438b51684ab60cbe840c5be7b217ce0c283890f40a5c997b952d8d31ab23a4a58c5a SHA512 3412fd9db48460a97c5630a9641bbf147e905b5c5ce357627d6f65e669d044cfb88f271506767a26fd3a6791d5ffa06af85eeb7ebfdb932c20dfcd088c7b2307
-AUX xkeycaps-2.47-man.patch 639 BLAKE2B 4c554a83d65598544d2fb2853c523503b4be9a52d56a6a488aec933600fa39d2e050028ed907d0ea19bf1bf2898113a6c68c2b965c43840abd2dd905ccdfcd8e SHA512 6eab220c2c5c274ae5bfdc5bcf9c028409a3f0ee1b764aaaae81b2b7496fea48e64ea6fbcba0bf175ee10bcc81309ddcaeed3c4b9b831b9f8d8341df20a9c950
 DIST xkeycaps_2.47-7.debian.tar.xz 7268 BLAKE2B 86ddfd8b2ec8761b8e4a4c4de93fcfd0b88c018125c20f987bf5f47ea77edb5b996a3ed45c3fb2452c7647d6f1a3a2583bdd17f0442435d83afa3dbbc280d285 SHA512 85d72cbd4012299ab60ab700049862c1ab514c904acb8e3810fd7886cacb0712c3849fbc52dee499007d97ce8aa301a34d901120a46ba15a32151986121fbbbc
 DIST xkeycaps_2.47.orig.tar.gz 351418 BLAKE2B 0dfd53e6b7af6c14057e56071b70edf3479a55ab4e6ed9651cd5acec68c1db8096264dc8d5b578ccb62b331ad6f14ec8f1b8d0363b614d14b0ba9ce60492b55b SHA512 f5f5ecdf83c2bd86eb3d8b8a28b26af25a2dc9ff0a9c44091d8eb154d617b4373191a2e4479bb0e3025c023d6e5d785a088c64bc269c1c43431a3d2fc91c1a7e
-EBUILD xkeycaps-2.47-r2.ebuild 941 BLAKE2B 84e8a1fb682cc3f69cfe1baa0ef470c161c042a97c4e598e75ac15c24d72867961500258440c6505025ce3d7c9e6f95602a9925514f0d71165cda2fef222b3b5 SHA512 bf3255afbf8ff2f6013ef718fc3f1ecc08554a3604b6e1fc84ea0afa4533b1dc9f9e91a5c5da14c66fb5732f524fcba2f6a990f746cfbbb681a13f380b0fbd1a
-EBUILD xkeycaps-2.47_p7.ebuild 1163 BLAKE2B b768aafbf642620bdd60611a8bd13e9048274167a9d6337c60a5116e0efa49a9966ad88e3ac91801f8a6f46ae2b6a1b764446ed5272db6195d3261e27c15c1b3 SHA512 b953db51507308931a013bbc86abffc265ca0311b6a7aa6c02390daab224002c1a6aa7161037110e41c4060fc32981609e39945761ea7a257b89847328fefc37
+EBUILD xkeycaps-2.47_p7.ebuild 1159 BLAKE2B e84392a72f33cee70169569eef4cf742800d314686e4a319aeae2e3130424af228d133ecf33ba5d71e00bcf08ea2dc0589cd0e7c0aa4a585d7d86e727dc19006 SHA512 4e0ad808cafbbb2af63e61aa31575611f9c3fbbc62e6413f9a6597380ef2a30f8df8eb71afa95505a6777537c9473c4bd57bce8520a10be7b2c19faa722c3bf3
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch
deleted file mode 100644
index f68629ef3eaf..000000000000
--- a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur xkeycaps-2.47.orig/xkeycaps.man xkeycaps-2.47/xkeycaps.man
---- xkeycaps-2.47.orig/xkeycaps.man	2006-01-02 02:22:17.000000000 +0200
-+++ xkeycaps-2.47/xkeycaps.man	2008-12-07 22:51:38.000000000 +0200
-@@ -267,7 +267,7 @@
- the physical keys: it is immutable (unless you repaint your keyboard...)
- .TP 10
- .B \fIChord\fP
--This term refers to a set of two or more keys held down simultaniously (by
-+This term refers to a set of two or more keys held down simultaneously (by
- analogy with piano keyboards.)  All but one of the keys will generally be
- Modifier Keys.  Sometimes \fIConstellation\fP is used to mean the same thing.
- .TP 10
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
deleted file mode 100644
index 0c3b4ce21aa7..000000000000
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="GUI frontend to xmodmap"
-HOMEPAGE="https://packages.qa.debian.org/x/xkeycaps.html"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="x11-misc/xbitmaps
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXaw
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake
-	>=sys-apps/sed-4"
-
-DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt )
-PATCHES=(
-	"${FILESDIR}"/${P}-Imakefile.patch
-	"${FILESDIR}"/${P}-man.patch
-)
-
-src_compile() {
-	xmkmf || die
-	sed -i -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
-		Makefile || die
-	emake EXTRA_LDOPTIONS="${LDFLAGS}" CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	default
-	newman ${PN}.man ${PN}.1
-}
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index 646273eb1ed3..bef2b91b62d2 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.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="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
 	x11-libs/libX11