gentoo resync : 25.08.2020

6 files changed, 153 insertions, 3 deletions

diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
index 5780e5a82dd9..3780fa105479 100644
--- a/x11-misc/xkbd/Manifest
+++ b/x11-misc/xkbd/Manifest
@@ -2,6 +2,11 @@ AUX xkbd-0.8.15-fix-keysyms-search.patch 438 BLAKE2B 881880be1b72af0cd5ae7703a9c
 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
-MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
+EBUILD xkbd-0.8.18.ebuild 755 BLAKE2B 1a7a5ee2c928381eab31c9a30bdd16684deca8b0c2061ed8a54ef1be86d02b106e0456c3970321ba0dea873cc7f1bd27f2d51b9dcc473e53caf0919e334ab270 SHA512 de6c0e4d9f3db6e65e0f04c08c298333a22612c0b24792b226ccdf43d81b5f23c7c631dbed05dc0f15788debc3d68f893996acc113d234726f169ffd88cd91ae
+EBUILD xkbd-999999.ebuild 1051 BLAKE2B 4fbba7618b97abf123f7cad735d4254e040ec55a6e830831105ec68d338c2273b2b5a2a4b6052e8099286125ea9bd2ee643fa518c0f88dc120f9d85240a7616a SHA512 38457f50b99e9da9b7425670f098aaaf8314711395fed68355fc28d88e712eea42bb2405547de72964db165a4a6f4bdb6e44efcb45d57796fccd2dc1576ce442
+MISC metadata.xml 528 BLAKE2B 7ed86e072723be552f3d67dd120908f1c08a804a96d2fca8d88af30bc714a5cb65e3d3677076c0b020a780b9b868a92f03d6a1b6bc4edab10f0820e9714c7099 SHA512 cb6cb76112b88837fb99dbc1d6c789edf4760ba64ba24dce5badf1d4bad4995dee19d9f2ff87fdddc608098b013ab31e20fd9cc145c633e9b4a603ea11d76758
diff --git a/x11-misc/xkbd/files/xkbd-999999-evdev.patch b/x11-misc/xkbd/files/xkbd-999999-evdev.patch
new file mode 100644
index 000000000000..087fd74ea01a
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-999999-evdev.patch
@@ -0,0 +1,15 @@
+--- a/src/xtg.c
++++ b/src/xtg.c
+@@ -382,10 +382,12 @@
+ static void map_to(){
+ 	float x=scrX1,y=scrY1,w=width,h=height,dx=pf[p_touch_add],dy=pf[p_touch_add];
+ 	_short m = 1;
++#ifdef USE_EVDEV
+ 	if (pa[p_touch_add] && pa[p_touch_add][0] == '+' && pa[p_touch_add][1] == 0) {
+ 		if (mwidth && devX!=0) dx = (devX - mwidth)/2;
+ 		if (mheight && devY!=0) dy = (devY - mheight)/2;
+ 	}
++#endif
+ 	if (dx!=0 && mwidth) {
+ 		float b = (w/mwidth)*dx;
+ 		x-=b;
diff --git a/x11-misc/xkbd/files/xkbd-999999-xft.patch b/x11-misc/xkbd/files/xkbd-999999-xft.patch
new file mode 100644
index 000000000000..8f803111bc02
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-999999-xft.patch
@@ -0,0 +1,33 @@
+--- a/src/kb.c
++++ b/src/kb.c
+@@ -66,7 +66,7 @@
+   if (*f) XftFontClose(kb->display, *f);
+   return ((*f = XftFontOpenName(kb->display, kb->screen, fontname)) != NULL);
+ #else
+-  if (*f) XUnloadFont((*f)->fid);
++  if (*f) XUnloadFont(kb->display, (*f)->fid);
+   if ((*f = XLoadQueryFont(kb->display, fontname)) == NULL) return 0;
+   XSetFont(kb->display, kb->gc, (*f)->fid);
+   return True;
+--- a/src/button.c
++++ b/src/button.c
+@@ -150,7 +150,7 @@
+ 	&extents);
+   return extents.width;
+ #else
+-  return XTextWidth(kb->font_info, txt, strlen(txt));
++  return XTextWidth(kb->font, txt, strlen(txt));
+ #endif
+ }
+ 
+@@ -441,8 +441,10 @@
+ 
+   b->fg_gc      = k->gc;
+   b->bg_gc      = k->rev_gc;
++#ifdef USE_XFT
+   b->col = k->color;
+   b->col_rev = k->color_rev;
++#endif
+ 
+   b->layout_switch = -1;
+ 
diff --git a/x11-misc/xkbd/metadata.xml b/x11-misc/xkbd/metadata.xml
index 49c86a887b6a..b43c941bd068 100644
--- a/x11-misc/xkbd/metadata.xml
+++ b/x11-misc/xkbd/metadata.xml
@@ -2,7 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
+<email>desktop-misc@gentoo.org</email>
+<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>
+</use>
 </pkgmetadata>
diff --git a/x11-misc/xkbd/xkbd-0.8.18.ebuild b/x11-misc/xkbd/xkbd-0.8.18.ebuild
new file mode 100644
index 000000000000..d7baae0ef8c1
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-0.8.18.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+DESCRIPTION="onscreen soft keyboard for X11"
+HOMEPAGE="https://github.com/mahatma-kaganovich/xkbd"
+SRC_URI="https://github.com/mahatma-kaganovich/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug +xft +xpm"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXtst
+	xft? ( x11-libs/libXft )
+	xpm? ( x11-libs/libXpm )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+DOCS=( AUTHORS )
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG
+	econf \
+		$(use_enable xft) \
+		$(use_enable xpm) \
+		--disable-debug
+}
diff --git a/x11-misc/xkbd/xkbd-999999.ebuild b/x11-misc/xkbd/xkbd-999999.ebuild
new file mode 100644
index 000000000000..8d6139bf4019
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-999999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic git-r3
+
+DESCRIPTION="onscreen soft keyboard for X11"
+HOMEPAGE="https://github.com/mahatma-kaganovich/xkbd"
+EGIT_REPO_URI="https://github.com/mahatma-kaganovich/xkbd"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +evdev +xft +xi +xpm +xrandr +xscreensaver"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXtst
+	evdev? ( dev-libs/libevdev )
+	xft? ( x11-libs/libXft )
+	xpm? ( x11-libs/libXpm )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+DOCS=( AUTHORS )
+PATCHES=(
+	"${FILESDIR}"/${PN}-999999-evdev.patch
+	"${FILESDIR}"/${PN}-999999-xft.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG
+	econf \
+		$(use_enable evdev) \
+		$(use_enable xft) \
+		$(use_enable xi) \
+		$(use_enable xpm) \
+		$(use_enable xrandr) \
+		$(use_enable xscreensaver ss) \
+		--disable-debug
+}