gentoo resync : 29.01.2021

4 files changed, 0 insertions, 61 deletions

diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index f9f98e1dea1b..4a3e0e7b79a9 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,6 +1,3 @@
-AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471fbfc651cfee7f4c118010b1c38d41f7597f7bd6d7e07e6c261f7fed0b07efefdfd4f09fcee38029f0047ed5fc2a1317f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e
-AUX xvkbd-4.0-destdir.patch 1026 BLAKE2B 473a1499bff1f00846ae81de75973bc77f63f456d071ebd70fc1d112d254345bda108d34d6934075268e1f5c6e02bcc0107bbd1565380ad01dc1c08ce9b243ef SHA512 8c675dd76eb2f126c48cc669dbb5bf87e337816ef4ac5d6c4730f4259862353e4de1dfc255fda36e35f9a93b507add5922595f53e7c91257996e4c5ee6c8043b
-AUX xvkbd-4.0-fno-common.patch 510 BLAKE2B c324653ddf0638f7806a4488a0dd5474097c60c9bf476d3437208aa7b827047b08bad347b2dfef470c0a1198e2341e157c823de0a5c87fdb076793503d2e680c SHA512 62d90307834cc7dfd04c6e1cf6fa0c6e7526d6ca7dccb897c137686e3a4e5d30afffbbba6c8500d144c5ec3dd49691660573957fe6c0b89c1aaedd9183f02797
 DIST xvkbd-4.1.tar.gz 408704 BLAKE2B 45667706005f508e22dcd6d24631b5488ffd32b0bba2cb14e67ce1f77c5fdf3f667ca1431a0833e311bbffbc5baf08daed8ff736158c72178ae5d079f694d9d7 SHA512 6a27a659bacc0f78d70c0afab7ae0f6301f0e7f0c9ed12c581fb4fd5040791536aed50c82ccbd703377244156aade80136567276193f2789a23f05c341b6c0e9
 EBUILD xvkbd-4.1.ebuild 615 BLAKE2B 330f359558c187bb956d15509ba21be02a45288ec625fd30af5aad4a3fa2d82297c806c7454dff03e3e93c0b1a6fc9f7c90492b5804ce1349c21a7205f657c66 SHA512 6b538830bd84981da2a036ddef9fe52f488cfaff57643bcff1b1faeb5319a55f1fe9d4263a9c554fcd3476cc1b52c2fcfaceb944f89cb19c522f21834d3a5ea3
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch b/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch
deleted file mode 100644
index 7fe70773acca..000000000000
--- a/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xvkbd.c
-+++ b/xvkbd.c
-@@ -681,7 +681,7 @@
-     }
-   }
- 
--  last_altgr_mask = (altgr_mask | last_altgr_mask);
-+  last_altgr_mask = altgr_mask;
-   alt_mask = 0;
-   meta_mask = 0;
-   altgr_mask = 0;
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
deleted file mode 100644
index 83879dd9fd02..000000000000
--- a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,4 @@
--appdefaultdir=$(shell pkg-config --variable=appdefaultdir xt)
--datarootdir=$(shell pkg-config --variable=datarootdir xt)
-+appdefaultdir = $(shell $(PKG_CONFIG) --variable=appdefaultdir xt)
- 
- SUBDIRS = .
- bin_PROGRAMS = xvkbd
-@@ -17,11 +16,12 @@
- 	[ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h
- 
- install-data-hook:
-+	[ -d $(DESTDIR)/$(appdefaultdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(appdefaultdir)/xvkbd/
- 	for file in *.ad; do \
--		$(INSTALL_DATA) $$file $(appdefaultdir)/$${file%.ad}; \
-+		$(INSTALL_DATA) $$file $(DESTDIR)/$(appdefaultdir)/$${file%.ad}; \
- 	done
--	[ -d $(datarootdir)/xvkbd/ ] || mkdir $(datarootdir)/xvkbd/
--	$(INSTALL_DATA) words.english $(datarootdir)/xvkbd/words.english
-+	[ -d $(DESTDIR)/$(datarootdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(datarootdir)/xvkbd/
-+	$(INSTALL_DATA) words.english $(DESTDIR)/$(datarootdir)/xvkbd/words.english
- 
- EXTRA_DIST = XVkbd-common.h *.ad *.xbm xvkbd.man README ChangeLog Imakefile words.english
- 
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch
deleted file mode 100644
index 1ca0db048566..000000000000
--- a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/resources.h
-+++ b/resources.h
-@@ -19,7 +19,7 @@
- # define PROGRAM_NAME "xvkbd"
- #endif
- 
--struct appres_struct {
-+extern struct appres_struct {
-   String description;
-   String show_manual_command;
- 
---- a/xvkbd.c
-+++ b/xvkbd.c
-@@ -500,6 +500,8 @@
- 
- static Pixmap xvkbd_pixmap = None;
- 
-+struct appres_struct appres;
-+
- static int AddKeysym(KeySym keysym, Boolean top);  /* forward */
- static void MakeKeyboard(Boolean remake);
- static void MakeKeypad(Widget form, Widget from_vert, Widget from_horiz);