[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/files/, x11-misc/xkeycaps/

2021-03-15 Thread Sam James
commit: a065f4cd7d229e6d599331b25e9cf82f6a4c6c29
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:00:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:01:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a065f4cd

x11-misc/xkeycaps: drop 2.47-r2

Bug: https://bugs.gentoo.org/776475
Signed-off-by: Sam James  gentoo.org>

 x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch | 12 ---
 x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild   | 45 -
 2 files changed, 57 deletions(-)

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 f68629ef3ea..000
--- 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.man2006-01-02 02:22:17.0 +0200
-+++ xkeycaps-2.47/xkeycaps.man 2008-12-07 22:51:38.0 +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 0c3b4ce21aa..000
--- 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
-}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/files/

2019-12-29 Thread Jeroen Roovers
commit: 36a5acf542ecf8cf6744273bc2c3497ebf4d4a86
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Dec 29 15:55:39 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Dec 29 15:57:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a5acf5

x11-misc/xkeycaps: Clean up patch

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch 
b/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch
index 42f7ab6e344..9a562a72d47 100644
--- a/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch
@@ -1,6 +1,5 @@
-diff -ur xkeycaps-2.47.orig/Imakefile xkeycaps-2.47/Imakefile
 xkeycaps-2.47.orig/Imakefile   2005-02-23 00:33:15.0 +0200
-+++ xkeycaps-2.47/Imakefile2008-12-07 22:55:24.0 +0200
+--- a/Imakefile
 b/Imakefile
 @@ -1,5 +1,5 @@
 -/**/# Imakefile for xkeycaps;
 -/**/# Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski.