[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/, x11-misc/xkeycaps/files/
commit: 7c650a13afd47a4677ae9d9d03e45cdc74b38ffc
Author: Miroslav Šulc gentoo org>
AuthorDate: Sat Jul 6 09:38:30 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Jul 6 09:39:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c650a13
x11-misc/xkeycaps: update clang16 patch to provide compatible pointer type
sorted vars
Closes: https://bugs.gentoo.org/928511
Signed-off-by: Miroslav Šulc gentoo.org>
x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch | 6 +++---
x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
index 99dc6f4ea827..7abcb27ab43b 100644
--- a/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
@@ -4,15 +4,15 @@ https://bugs.gentoo.org/871129
@@ -1754,3 +1754,3 @@
}
- XawListChange (box->keysym_list, keysym_name_buffer, 0, 0, True);
-+ XawListChange (box->keysym_list, (const char **) keysym_name_buffer, 0, 0,
True);
++ XawListChange (box->keysym_list, (char **) keysym_name_buffer, 0, 0, True);
}
@@ -2528,3 +2528,3 @@
box->set = _sets [i];
- XawListChange (box->keymap_list, (char **) box->set->maps, 0, 0, True);
-+ XawListChange (box->keymap_list, (const char **) box->set->maps, 0, 0,
True);
++ XawListChange (box->keymap_list, (char **) box->set->maps, 0, 0, True);
for (i = 0; i < box->set->map_count; i++)
@@ -2599,3 +2599,3 @@
- XawListChange (box->keyboard_list, list, 0, 0, True);
-+ XawListChange (box->keyboard_list, (const char **) list, 0, 0, True);
++ XawListChange (box->keyboard_list, (char **) list, 0, 0, True);
XawListHighlight (box->keyboard_list, kbd);
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index 136ec95c516f..bb69a6b70dcc 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
@@ -11,6 +11,7 @@ SRC_URI="
mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
"
+S=${WORKDIR}/${P/_p*}
LICENSE="HPND"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
@@ -37,7 +38,6 @@ PATCHES=(
"${FILESDIR}"/${P/_p*}-Imakefile.patch
"${FILESDIR}"/${P}-clang16.patch
)
-S=${WORKDIR}/${P/_p*}
src_prepare() {
eapply $(
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/, x11-misc/xkeycaps/files/
commit: 916f6b97fc1ea3d7c8539a3c740460f602591237
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Oct 11 05:03:20 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Oct 11 05:09:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916f6b97
x11-misc/xkeycaps: further fix w/ upcoming clang16
When last tested this package, did not know clang16 was newly enabling
-Werror=incompatible-pointer-types yet and hadn't looked at this.
Trivial const mismatch, so no revbump.
Bug: https://bugs.gentoo.org/871129
Signed-off-by: Ionen Wolkens gentoo.org>
x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch | 18 ++
x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 1 +
2 files changed, 19 insertions(+)
diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
new file mode 100644
index ..99dc6f4ea827
--- /dev/null
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/871129
+--- a/commands.c
b/commands.c
+@@ -1754,3 +1754,3 @@
+ }
+- XawListChange (box->keysym_list, keysym_name_buffer, 0, 0, True);
++ XawListChange (box->keysym_list, (const char **) keysym_name_buffer, 0, 0,
True);
+ }
+@@ -2528,3 +2528,3 @@
+ box->set = _sets [i];
+- XawListChange (box->keymap_list, (char **) box->set->maps, 0, 0, True);
++ XawListChange (box->keymap_list, (const char **) box->set->maps, 0, 0,
True);
+ for (i = 0; i < box->set->map_count; i++)
+@@ -2599,3 +2599,3 @@
+
+- XawListChange (box->keyboard_list, list, 0, 0, True);
++ XawListChange (box->keyboard_list, (const char **) list, 0, 0, True);
+ XawListHighlight (box->keyboard_list, kbd);
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index be540734790a..136ec95c516f 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
@@ -35,6 +35,7 @@ BDEPEND="
DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt )
PATCHES=(
"${FILESDIR}"/${P/_p*}-Imakefile.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
S=${WORKDIR}/${P/_p*}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: c663d76d498d34d84edd2ecf23ebc6be911f327d
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Sep 30 09:17:17 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Sep 30 10:48:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c663d76d
x11-misc/xkeycaps: force gcc -E for imake's generation
Requires traditional cpp support and is broken in all sort of ways
with clang-cpp / -E. Can still use clang & friends for everything else.
Ideally these packages need to be built another way or last rited,
imake will just accumulate more problems.
Closes: https://bugs.gentoo.org/871129
Signed-off-by: Ionen Wolkens gentoo.org>
x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index cbac2508a679..be540734790a 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-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,10 +23,12 @@ RDEPEND="
x11-libs/libXt
x11-misc/xbitmaps
"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=sys-apps/sed-4
+DEPEND="
+ ${RDEPEND}
x11-base/xorg-proto
+"
+BDEPEND="
+ sys-devel/gcc
>=x11-misc/imake-1.0.8-r1
"
@@ -47,7 +49,7 @@ src_prepare() {
src_configure() {
CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
- IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+ IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
sed -i \
-e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
Makefile || die
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: 7c5037f318142d9c012a6e8b31402f5a46e1d9cd
Author: Ionen Wolkens gmail com>
AuthorDate: Wed Apr 14 12:55:12 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Apr 15 06:38:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5037f3
x11-misc/xkeycaps: fix build with -native-symlinks
Also swapped DEPEND with BDEPEND to put imake in the right block.
Closes: https://bugs.gentoo.org/726240
Signed-off-by: Ionen Wolkens gmail.com>
Signed-off-by: Joonas Niilola gentoo.org>
x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index bef2b91b62d..cbac2508a67 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
@@ -23,11 +23,11 @@ RDEPEND="
x11-libs/libXt
x11-misc/xbitmaps
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=sys-apps/sed-4
x11-base/xorg-proto
- x11-misc/imake
+ >=x11-misc/imake-1.0.8-r1
"
DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt )
@@ -46,7 +46,8 @@ src_prepare() {
}
src_configure() {
- xmkmf || die
+ CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+ IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
sed -i \
-e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
Makefile || die
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/files/, x11-misc/xkeycaps/
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/
commit: 11001c9600977112e661545fed8498d045a99bb3 Author: Sam James gentoo org> AuthorDate: Mon Mar 15 21:55:21 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 15 21:55:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11001c96 x11-misc/xkeycaps: Stabilize 2.47_p7 ppc64, #776475 Signed-off-by: Sam James gentoo.org> x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild index 0ef3edff983..bef2b91b62d 100644 --- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild +++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="HPND" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ppc ppc64 x86" RDEPEND=" x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: 86b7fa4474e6ec96ff89039dc2ae69b94072a13f Author: Sam James gentoo org> AuthorDate: Mon Mar 15 21:23:57 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 15 21:23:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b7fa44 x11-misc/xkeycaps: Stabilize 2.47_p7 ppc, #776475 Signed-off-by: Sam James gentoo.org> x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild index 07ce52a5e9e..0ef3edff983 100644 --- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild +++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="HPND" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ppc ~ppc64 x86" RDEPEND=" x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: ee0389649c1cbcd7de2250e7aad2a87a4408a7ba Author: Sam James gentoo org> AuthorDate: Mon Mar 15 21:19:53 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 15 21:21:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee038964 x11-misc/xkeycaps: Stabilize 2.47_p7 amd64, #776475 Signed-off-by: Sam James gentoo.org> x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild index 065415f6343..07ce52a5e9e 100644 --- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild +++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="HPND" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" RDEPEND=" x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: 5ee62946e9b6f29db8abc6d1d87d20e0e9c11c24 Author: Sam James gentoo org> AuthorDate: Mon Mar 15 21:16:15 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 15 21:18:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee62946 x11-misc/xkeycaps: Stabilize 2.47_p7 x86, #776475 Signed-off-by: Sam James gentoo.org> x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild index 646273eb1ed..065415f6343 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
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: 7a5f89ad93649952c729d6b07770edd22ec4fa9b
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Dec 29 15:56:54 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Dec 29 15:57:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5f89ad
x11-misc/xkeycaps: Add Debian patch level 7
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers gentoo.org>
x11-misc/xkeycaps/Manifest| 1 +
x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 64 +++
2 files changed, 65 insertions(+)
diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index 71598df3e8c..5c4c0b5e96a 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -1 +1,2 @@
+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
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
new file mode 100644
index 000..3ed56c7b259
--- /dev/null
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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/_p*}.orig.tar.gz
+ mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-misc/xbitmaps
+"
+DEPEND="
+ ${RDEPEND}
+ >=sys-apps/sed-4
+ x11-base/xorg-proto
+ x11-misc/imake
+"
+
+DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt )
+PATCHES=(
+ "${FILESDIR}"/${P/_p*}-Imakefile.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+ eapply $(
+ for file in $(cat "${WORKDIR}"/debian/patches/series)
+ do echo "${WORKDIR}"/debian/patches/${file}
+ done
+ )
+ default
+}
+
+src_configure() {
+ xmkmf || die
+ sed -i \
+ -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
+ Makefile || die
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install () {
+ default
+ newman ${PN}.man ${PN}.1
+}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/files/
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.
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: 2e29433b6fec19e0fe84803914d0eda3890ace48
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Sep 23 06:45:13 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Sep 23 06:46:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e29433b
x11-misc/xkeycaps: Use HTTPS.
Package-Manager: Portage-2.3.10, Repoman-2.3.3
x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
index 063502e40cb..504fde9935b 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit toolchain-funcs
DESCRIPTION="GUI frontend to xmodmap"
-HOMEPAGE="http://packages.qa.debian.org/x/xkeycaps.html;
+HOMEPAGE="https://packages.qa.debian.org/x/xkeycaps.html;
SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="HPND"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: e88f992ed9337b1cd7b68e1483f292f153652961
Author: Harri Nieminen gmail com>
AuthorDate: Tue Mar 28 18:31:18 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Apr 1 10:23:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88f992e
x11-misc/xkeycaps: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4319
x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild | 45 ---
1 file changed, 45 deletions(-)
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
deleted file mode 100644
index 968a539c221..000
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="GUI frontend to xmodmap"
-HOMEPAGE="http://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-proto/xproto
- x11-misc/imake
- >=sys-apps/sed-4"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${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}" || die
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die
- newman ${PN}.man ${PN}.1 || die
- dodoc README *.txt || die
-}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: dfc9dd91b955ce38c03d89b72a35ec28f112a37e
Author: Michael Weber gentoo org>
AuthorDate: Tue Mar 21 15:33:21 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Wed Mar 22 07:29:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfc9dd91
x11-misc/xkeycaps: ppc stable (bug 613104)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64"
x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
index e315ea2b1e0..063502e40cb 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
RDEPEND="x11-misc/xbitmaps
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: 2227789825c0d4d11ff6784c7ae7a3c5dc30831a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Mar 21 14:32:19 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Mar 21 14:32:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22277898
x11-misc/xkeycaps: x86 stable wrt bug #613104
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
index 0c30cfe5e47..e315ea2b1e0 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
IUSE=""
RDEPEND="x11-misc/xbitmaps
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: 6d3b2e04d07407692eb826340a19a5bcf4538f3a
Author: Michael Weber gentoo org>
AuthorDate: Tue Mar 21 10:04:33 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Tue Mar 21 10:08:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d3b2e04
x11-misc/xkeycaps: ppc64 stable (bug 613104)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64"
x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
index bbb553fe5a4..0c30cfe5e47 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
IUSE=""
RDEPEND="x11-misc/xbitmaps
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: 40381229626d77bbf9daf27fc2fe24b14692c2e8
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 20 11:03:16 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 20 11:03:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40381229
x11-misc/xkeycaps: amd64 stable wrt bug #613104
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
index b5074ad18e5..bbb553fe5a4 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RDEPEND="x11-misc/xbitmaps
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/
commit: 19aa64095e84bffe6c51d877a7f420b9674f8aaa
Author: Harri Nieminen gmail com>
AuthorDate: Wed Feb 22 15:51:39 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Feb 25 14:14:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19aa6409
x11-misc/xkeycaps: EAPI bump 0 -> 6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4057
x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild | 46 +++
1 file changed, 46 insertions(+)
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
new file mode 100644
index 00..67fe820635
--- /dev/null
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="GUI frontend to xmodmap"
+HOMEPAGE="http://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-proto/xproto
+ 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
+}
