summaryrefslogtreecommitdiff
path: root/x11-misc/xkbd
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/xkbd')
-rw-r--r--x11-misc/xkbd/Manifest10
-rw-r--r--x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch13
-rw-r--r--x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch22
-rw-r--r--x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch19
-rw-r--r--x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch36
-rw-r--r--x11-misc/xkbd/metadata.xml6
-rw-r--r--x11-misc/xkbd/xkbd-0.8.16-r1.ebuild37
-rw-r--r--x11-misc/xkbd/xkbd-0.8.18.ebuild4
8 files changed, 7 insertions, 140 deletions
diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
index 3780fa105479..22688a295a2f 100644
--- a/x11-misc/xkbd/Manifest
+++ b/x11-misc/xkbd/Manifest
@@ -1,12 +1,6 @@
-AUX xkbd-0.8.15-fix-keysyms-search.patch 438 BLAKE2B 881880be1b72af0cd5ae7703a9c9cb98164bbf4ed7f79cc6145866489eeaabb0657439e32da88776e39ed7eb2c14e02c6ac5a6fccdfb329f81d7f921aaf3f00a SHA512 ae494c10df66179739a19a5f5a21ec7c00ab6674fff64042006958778d2fac9c2da9b5a9e945dcd654827850444121b0135a143b4b0e5783f6b420c767009505
-AUX xkbd-0.8.15-increase-delay.patch 770 BLAKE2B 1c96d074ba584cb74718a3ed80751b34b287d4e612e30cfd322c8d44d377fcb1a1b3e64f50c12240948b72d99c632fc342d02db3cf8072adb6435b6eea80e18b SHA512 49487d975134d2319d194b5d5110bd6d93b45f712129d1f6f05d00e6611403a9acd5a6a1183e371d56619a9d7456a00cfefded4aa21a63bdf3e1493a59085fcd
-AUX xkbd-0.8.16-desktop.patch 1172 BLAKE2B 994a60ce696aa09a8a8d5f61e39366ef0dd12970ab1ef8b5bf48a18a731a90713ea20335d7a4715d390e1ae865a99a4f02f4dca87a46d6794db6f49069327edc SHA512 26d4281cfc15a8aaadb0bd9ffc70df7c63b31abc54fd45ec0055abe37d7f960ac4d05056dabaca14bb33f19d34c5e293b4b0b45fe96b7d0078b73897d9ac388e
-AUX xkbd-0.8.16-fix-geometry.patch 1081 BLAKE2B bc0906cc6aa06256cd6c22a288cac1d51ca658871b8d2c014b3efa3fe4f3b2c99be38ee0503a37663a6fdf7d17b71d39e82490c6b84e6e3251990c265e02a9b7 SHA512 03c2fcc4a2d731ea3dc3bb9c596e9d867b01e09713c65f5614f37eb86c2e41edacd16ee67b67a01fb7fab9e2e9e936cfa9ab5bee214f3427710a88829a538899
AUX xkbd-999999-evdev.patch 448 BLAKE2B 43c17e904bbf7e916355dbe97da70e20b1cd10771dd748d9082de4b61ea7deff6ddff8dcd9a9eac0904adf663f8212d0dd7cadf8ee0c01e6941ebb4460621aa8 SHA512 4e4812aa42325a4492d699452700595307c73b5e15fe9116aa6c6aab12fca943580cbc941ab2335750ed89871d1c7ee8fc578a1e1ab0c21f3479ae0426b4cd3f
AUX xkbd-999999-xft.patch 797 BLAKE2B ce1eaa3b1d16baab6269927efe79ee19e611067465793e1ba2313cef28ca7fa55f2541c0714fb58f5157f7f5b9550daad6a3724bd2cae3fa3c2868c8b596507f SHA512 886d83b5653cbd1b49745a997fd9079a5bf6fd0f31b0c009e65ab26c0b43448b41fe58833d482bf099ecaf2529e71b488c37c3896bea47ec243786421fe79cb6
-DIST xkbd-0.8.16.tar.gz 347616 BLAKE2B a7ee906d6ae3328d5366b88ebe960b6fdf84a5cad1c1db4b1a0056fc5842196699dfa749c3c0398054bc54073b422798c0efaf57c8116d05b6754c84d6abae03 SHA512 8410f722cb93069eea26f9d1ed6b9fea76ed5222b8586c2f78ccc1a0f040a964e165df0611ce72c108dbc7adeec31515595c81be3867e68c0cadd8846d985d4a
DIST xkbd-0.8.18.tar.gz 50421 BLAKE2B 7652f33cdf00584cc55fcb9dbced9d92c57cf6383b6164d8c026bf88c962e7469b094de7454b451745feb396fbe5ad561193c9d4de8e7b9f65c27a55e7cf478c SHA512 335e18e76e6bf8b7142eb785c9003e8a3d80719e6737149be8e1178bd7281fada6808ea0b18538caf3c3fa1d62778a3d6a45a1fa8b3b0845dca19f3e62942831
-EBUILD xkbd-0.8.16-r1.ebuild 811 BLAKE2B bd7732d840d253dea3899b3f3d33232c4cf74a2dfd87d25bbf4c00f7850239219903536697a2dc42ad4f9e050e7ade739de3af26b3d81dd9f111b2ee4e479498 SHA512 1f24a011cf05e651ca3e550e8fc693a8ab6e1bd2bc67740c9070bc20092dc3c11ac2acfeee7b1735583010b970fd1af30a61ad299790851ab7997e27387a85df
-EBUILD xkbd-0.8.18.ebuild 755 BLAKE2B 1a7a5ee2c928381eab31c9a30bdd16684deca8b0c2061ed8a54ef1be86d02b106e0456c3970321ba0dea873cc7f1bd27f2d51b9dcc473e53caf0919e334ab270 SHA512 de6c0e4d9f3db6e65e0f04c08c298333a22612c0b24792b226ccdf43d81b5f23c7c631dbed05dc0f15788debc3d68f893996acc113d234726f169ffd88cd91ae
+EBUILD xkbd-0.8.18.ebuild 753 BLAKE2B 917922173b6525232609828b0cbb7c9ec801e0ca9684ddcbb469e12301feb05df3ac390c8bc887cba09bb587bb426bd8372e0596a4ac5f7d68ac25a7c0f09607 SHA512 22b539a0d8b5f6e482fc08a5985a8609690b14b62032e46979171e1964f3d3d7b68f18d21fe35be43c95e43d1d912a8770b1a5eb01e8fa58e819e4a7713320d8
EBUILD xkbd-999999.ebuild 1051 BLAKE2B 4fbba7618b97abf123f7cad735d4254e040ec55a6e830831105ec68d338c2273b2b5a2a4b6052e8099286125ea9bd2ee643fa518c0f88dc120f9d85240a7616a SHA512 38457f50b99e9da9b7425670f098aaaf8314711395fed68355fc28d88e712eea42bb2405547de72964db165a4a6f4bdb6e44efcb45d57796fccd2dc1576ce442
-MISC metadata.xml 528 BLAKE2B 7ed86e072723be552f3d67dd120908f1c08a804a96d2fca8d88af30bc714a5cb65e3d3677076c0b020a780b9b868a92f03d6a1b6bc4edab10f0820e9714c7099 SHA512 cb6cb76112b88837fb99dbc1d6c789edf4760ba64ba24dce5badf1d4bad4995dee19d9f2ff87fdddc608098b013ab31e20fd9cc145c633e9b4a603ea11d76758
+MISC metadata.xml 528 BLAKE2B 0abf3eaef00d50e38990d830da1b4e6efce0e0f16ed41f9efec6ed8373e53e55fa836897e75b38716d163fbfe43fc8d3db99dfe071e86450ab5c222dd64acb34 SHA512 4e2dbf91c09c3fa4b46ce4d6ad5d21bba4851113fc9ce06288985358a8e6086821f259407460d9f879fa5d2cb9c14f47956aa8ec4e947a271587bddbeaf49ec9
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch b/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
deleted file mode 100644
index ff30537add44..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/287075
-
---- a/src/libvirtkeys.c
-+++ b/src/libvirtkeys.c
-@@ -341,7 +341,7 @@
-
- for (keycode = 0; ((keycode < (maxKeycode - minKeycode + 1)) && !found); keycode++)
- {
-- for (column = 0; ((column < keysymsPerKeycode) && !found); column++)
-+ for (column = 0; ((column < (keysymsPerKeycode > 4 ? 4 : keysymsPerKeycode)) && !found); column++)
- {
- if (keymap[(keycode * keysymsPerKeycode + column)] == ks)
- {
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
deleted file mode 100644
index deadcd7cddb1..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN xkbd-0.8.15/data/en_GB.qwerty.xkbd.in xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in
---- xkbd-0.8.15/data/en_GB.qwerty.xkbd.in 2003-08-10 10:46:29.000000000 -0700
-+++ xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in 2008-03-23 02:52:52.000000000 -0700
-@@ -24,6 +24,7 @@
-
- # button style, can be rounded ( default ), square or plain
- button_style square
-+repeat_delay 50
-
- </global>
- #
-diff -ruN xkbd-0.8.15/data/en_US.qwerty.xkbd.in xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in
---- xkbd-0.8.15/data/en_US.qwerty.xkbd.in 2002-11-28 03:46:04.000000000 -0800
-+++ xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in 2008-03-23 02:50:39.000000000 -0700
-@@ -26,6 +26,7 @@
-
- # button style, can be rounded ( default ), square or plain
- # button_style plain
-+repeat_delay 50
-
- </global>
-
diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch b/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch
deleted file mode 100644
index 987270d1d398..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes following QA issues:
- * QA Notice: This package installs one or more .desktop files that do not
- * pass validation.
- *
- * /usr/share/applications/inputmethods/xkbd.desktop: error: (will be fatal in the future): value "xkbd.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path
- * /usr/share/applications/inputmethods/xkbd.desktop: error: value "Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an unregistered value "MB"; values extending the format should start with "X-"
- * /usr/share/applications/inputmethods/xkbd.desktop: error: value "Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an unregistered value "Panel"; values extending the format should start with "X-"
- *
---- a/xkbd.desktop 2003-09-29 20:29:35.000000000 +0300
-+++ b/xkbd.desktop 2017-02-16 16:23:40.927035269 +0200
-@@ -3,6 +3,6 @@
- Comment=Virtual Keyboard
- Exec=xkbd
- Type=Application
--Icon=xkbd.png
--Categories=Panel;Utility;MB
-+Icon=xkbd
-+Categories=Utility;Accessibility
- X-MB-INPUT-MECHANSIM=True
diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch b/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
deleted file mode 100644
index d90824085ea4..000000000000
--- a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- xkbd-0.8.16/src/xkbd.c
-+++ xkbd-0.8.16/src/xkbd.c
-@@ -307,21 +307,22 @@
- 0, BlackPixel(display, screen_num),
- WhitePixel(display, screen_num));
-
-+ wret = DisplayWidth(display, screen_num);
-+ hret = DisplayHeight(display, screen_num)/4;
-+ xret = 0;
-+ yret = DisplayHeight(display, screen_num) - hret;
-+
- // deactivate geometry for 0.8.16 release - mb
- geometry = NULL;
- if (geometry != NULL)
- {
-- XParseGeometry(geometry, &xret, &yret, &wret, &hret );
-- }
-- else
-- {
-- if (wm_type != WM_MATCHBOX)
-- {
-- wret = DisplayWidth(display, screen_num);
-- hret = DisplayHeight(display, screen_num)/4;
-- xret = 0;
-- yret = DisplayHeight(display, screen_num) - hret;
-- }
-+ int flags;
-+
-+ flags = XParseGeometry(geometry, &xret, &yret, &wret, &hret );
-+ if( flags & XNegative )
-+ xret += DisplayWidth( display, screen_num ) - wret;
-+ if( flags & YNegative )
-+ yret += DisplayHeight( display, screen_num ) - hret;
- }
-
- /* check for user selected keyboard conf file */
diff --git a/x11-misc/xkbd/metadata.xml b/x11-misc/xkbd/metadata.xml
index b43c941bd068..bd8d54929bbc 100644
--- a/x11-misc/xkbd/metadata.xml
+++ b/x11-misc/xkbd/metadata.xml
@@ -6,8 +6,8 @@
<name>Gentoo Desktop Miscellaneous Project</name>
</maintainer>
<use>
-<flag name='evdev'>Enable <pkg>dev-libs/libevdev</pkg> support for xtg</flag>
-<flag name='xi'>Enable XInput2 support through <pkg>x11-libs/libXi</pkg></flag>
-<flag name='xrandr'>Enable XRandR support through <pkg>x11-libs/libXrandr</pkg></flag>
+<flag name="evdev">Enable <pkg>dev-libs/libevdev</pkg> support for xtg</flag>
+<flag name="xi">Enable XInput2 support through <pkg>x11-libs/libXi</pkg></flag>
+<flag name="xrandr">Enable XRandR support through <pkg>x11-libs/libXrandr</pkg></flag>
</use>
</pkgmetadata>
diff --git a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
deleted file mode 100644
index d3c9125a799e..000000000000
--- a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="onscreen soft keyboard for X11"
-HOMEPAGE="http://trac.hackable1.org/trac/wiki/Xkbd"
-SRC_URI="http://trac.hackable1.org/trac/raw-attachment/wiki/Xkbd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="debug"
-
-RDEPEND="x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXtst
- x11-libs/libXpm
- media-libs/freetype
- dev-libs/expat
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-DOCS=( AUTHORS )
-PATCHES=(
- "${FILESDIR}"/${P}-fix-geometry.patch
- "${FILESDIR}"/${P}-desktop.patch
- "${FILESDIR}"/${PN}-0.8.15-increase-delay.patch
- "${FILESDIR}"/${PN}-0.8.15-fix-keysyms-search.patch
-)
-
-src_configure() {
- econf \
- $(use_enable debug)
-}
diff --git a/x11-misc/xkbd/xkbd-0.8.18.ebuild b/x11-misc/xkbd/xkbd-0.8.18.ebuild
index d7baae0ef8c1..062dfdd982f6 100644
--- a/x11-misc/xkbd/xkbd-0.8.18.ebuild
+++ b/x11-misc/xkbd/xkbd-0.8.18.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://github.com/mahatma-kaganovich/${PN}/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
IUSE="debug +xft +xpm"
RDEPEND="