gentoo resync : 13.05.2018

23 files changed, 22 insertions, 199 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 7e7d33cc5bfd..9efa578a6609 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/networkmanager-fortisslvpn/Manifest b/net-misc/networkmanager-fortisslvpn/Manifest
index 9d5c14c21be4..e71eee3b3202 100644
--- a/net-misc/networkmanager-fortisslvpn/Manifest
+++ b/net-misc/networkmanager-fortisslvpn/Manifest
@@ -1,4 +1,3 @@
-AUX networkmanager-fortisslvpn-1.2.2-location-fix.diff 776 BLAKE2B f99aadbccb50dba28a1e7921cce2353ee0f3b20639de2cce9ca12c997e4d6a8165df7a18a8ec85766b48a9b620176efc08439d74bab516df6a9edcb52a712b85 SHA512 a233657d82b1f60dd154e211991f3ec2ef1fea34d447690d8a864bcafe3451853bc3de56457b4185838c79d4337669902f9dd9a9067a15aaa6fb24404c1304d0
 AUX networkmanager-fortisslvpn-1.2.6-location-fix.diff 1257 BLAKE2B 1ea633c11ec59a634c570873cac3f6c9203cfeb66a60d1056613e794b7dfa9d21331a0abca7ef1f1aff4f8c1317808431a318042963153ee93c92d596fb5440c SHA512 586e408a65cc83cc3e0e8238eab673b484188eb7e7d62c8bc14abaf05a82acff24f9281a904624fe45aae08b0804e7516c393d7ef52f1c2dcbb4949f23873bca
 AUX networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff 747 BLAKE2B c12251887128e21f7025f6a111aa9d022899ace86000ba84e8e139ca02500e60c584b21d101f74c4326a422a299badd62647e1779059fe0425652eebb4b973b2 SHA512 a1701ddb5fcc49ceafd8d87c4a5e50dd7aeebfe32ba589f28c931dc93274531a16a0414db6e79fecfa4c03c182c7824cd3504d76234d544d488a5fdb3b34b9c4
 DIST NetworkManager-fortisslvpn-1.2.6.tar.xz 324048 BLAKE2B 1e3aeab2df0b91b09fba1678861215f164251dc1f51c12c0cdbb4c53c939849d75c5f70552e608a11a0c9c7890a15d5dd4b218c7c440c92bfa8df157ff20babf SHA512 5f1bd180a810ca778bfc4d58522e827281a941f6a9b63bcbcadf42f94edadbe556db6693d77a55f42422fa657b37fc64df9480f4ae691151fa65688247bce69d
diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.2-location-fix.diff b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.2-location-fix.diff
deleted file mode 100644
index 39beeb1e37fc..000000000000
--- a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.2-location-fix.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From 377ba9ca7fb33f3fb2ba5258a5af666869947597 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 18 May 2016 10:16:35 +0200
-Subject: [PATCH] service: don't use sharedstatedir
-
-GNU CS and thus autoconf default to a location that doesn't make any
-sense on Linux:
-
-http://www.redhat.com/archives/fedora-extras-list/2006-March/msg01546.html
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 2725b48..7c0f811 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,4 @@
--fortisslvpn_statedir = $(sharedstatedir)/$(PACKAGE)
-+fortisslvpn_statedir = $(localstatedir)/lib/$(PACKAGE)
- 
- install-data-hook:
- 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(fortisslvpn_statedir)
--- 
-2.7.3
-
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 3d87c30b0cbb..9e387320501a 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,5 +1,5 @@
 DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79 SHA512 cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
 DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
-EBUILD nx-3.5.0.33.ebuild 2338 BLAKE2B 164bedd551b5be5ed917122cfff26069d411c5c5b0829ef9cf6712dbfca350209127d93fa36c18bbc6bdf2445b19d2ecc3bea91b0f9e867652e574655eede677 SHA512 e1f88b0e03f4066df1ef97cabcadd759cf80ed27619a3bbe228bed67a82ce287898cd47ac5f31c4de2e250441cf6eb5e69f6750609c978c56dd476c767828199
-EBUILD nx-3.5.99.16.ebuild 3145 BLAKE2B a3fb6b8a12b81b915cde401fcf4abe9f576266c684f9c1008bed0e32385156929d31f7f7f29ace2b404d7ac65d0bdbafe87c20c446d57b478c8c9cc84cf6bc78 SHA512 a57320258bbb6358577ebeb8c774a3baf09aa56014c7dbe3e5a8530ed1199814050198a7fe0c6a32e323d0cea78b92d66749f39488242bd1913dc0b94df89597
+EBUILD nx-3.5.0.33.ebuild 2337 BLAKE2B a902ccaccafac239a62ccfe6db1543161ea4c47890dc75996744824caee103eb0b6150bcfe10a0befdff4658f60097d06c77d5fd90de79f925e79351ab357c16 SHA512 7e2e099057167fec9639ee20389764d06997a11bb73a94d825dc07c18e563fcba4aa068210e36675c9ca0303edb78e9d564943b26d38e4c67e8ea8ef77a41a54
+EBUILD nx-3.5.99.16.ebuild 3123 BLAKE2B b596c56019b3e50c1170fe3fe4526358347b9a3f6be64510c29c410d8835d53e127a48c93e98ae434ab7adcf0a9fb8b668aec5ee7fb06fc5985d9eac4527a3c9 SHA512 269c21fe596284263b3b608ed0e50f2e5a485f6b897d3774b8fea1acce2b537c53598e9d4d1f5f381d95c1746bf8854987868432184510ac2b64dadeda029b90
 MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
diff --git a/net-misc/nx/nx-3.5.0.33.ebuild b/net-misc/nx/nx-3.5.0.33.ebuild
index ab94da473f76..2623a5acd254 100644
--- a/net-misc/nx/nx-3.5.0.33.ebuild
+++ b/net-misc/nx/nx-3.5.0.33.ebuild
@@ -20,10 +20,10 @@ RDEPEND="media-libs/freetype:2
 	virtual/jpeg:*"
 
 DEPEND="${RDEPEND}
+		x11-base/xorg-proto
 		x11-libs/libfontenc
 		x11-misc/gccmakedep
-		x11-misc/imake
-		x11-proto/inputproto"
+		x11-misc/imake"
 
 S=${WORKDIR}/nx-libs-${PV}
 
diff --git a/net-misc/nx/nx-3.5.99.16.ebuild b/net-misc/nx/nx-3.5.99.16.ebuild
index e073af44a604..7983f9f624fc 100644
--- a/net-misc/nx/nx-3.5.99.16.ebuild
+++ b/net-misc/nx/nx-3.5.99.16.ebuild
@@ -36,11 +36,10 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	x11-libs/libfontenc
 	x11-misc/gccmakedep
-	x11-misc/imake
-	x11-proto/inputproto
-	x11-proto/xextproto"
+	x11-misc/imake"
 
 S="${WORKDIR}/nx-libs-${PV}"
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 6154fa2f9d21..6726402a96ec 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,8 +1,3 @@
-AUX rsync-3.1.2-CVE-2017-16548.patch 770 BLAKE2B 1121869250bcf22b5b5aa133f44d49ca50a203d79a66cdcce1177f7b46cda77d8c747e340f9bfc22bac648ae025fece6ac6d4adc086d486a13aa84e9f0a11ca1 SHA512 6b000e1e13f48050e0cea2ff3741d48d73694601911d961baf41d4a2d8571c2385e90dde2054e4f400767cfc3488d805d19d239c30e1049783efce1151a8a0aa
-AUX rsync-3.1.2-CVE-2017-17433-fixup.patch 1303 BLAKE2B dfbec423114ff9925d9720b0448b168d70dd0e85b8857929abff7d7a1ddb1c6e4b4a08826e6e98620700c1d9a72d068688586fd0ec14cd537863b7e18974cd84 SHA512 63ebdf107f18f4bcad0eeed6d230e8aba93dcb4555b46e05566bc256fbd761122675a4bba29bce75f97e927ec6f82336e0445998277b8eb9d1b4414e1e0fcb47
-AUX rsync-3.1.2-CVE-2017-17433.patch 1243 BLAKE2B 137066fa687b0c0f03726151eac143f401cdebf7b7ce54ac8dbdf5f4261861b0a65a8d4f635292423e6bfcd765a402d7fa9014545b5b0e40972c8adc62e0ba22 SHA512 424ce1c502250d7ac21666ef933cb481c30aebb46249bd62f90af80b714a1409df4888cba91af9d9681947e1eab36d69e191e4fc01a75699b6895af624f7e833
-AUX rsync-3.1.2-CVE-2017-17434-part1.patch 774 BLAKE2B 659863169e2cb3ae6848bc9dfec771bb6a780c7056f3c27fd5ec1a891f0db2679ac01c5cd587215cf9729d2bf58e2f3b8246c13a57c793af443411aa231f353f SHA512 977d5fd31c063f6130f20f3b0c3453c8cb4cf5891fc54be2c661c8e89c19a353b4cfbffd934ee80bf44e4de81d1f4a29fa0f8ae01a2d0a9777c081396a87cbdd
-AUX rsync-3.1.2-CVE-2017-17434-part2.patch 1026 BLAKE2B 8b9472c6da4ae584ea665050aa1c6741d443e281bec56acef86b0296e60339e6beab0588ae01b8fe4a4f5c8731d497dede7dd818c1aafe405ae987fe44dc7cdf SHA512 70f94901a0d2762c22c922bd9999c92562a459cc7169392fd67d187570278f6f51cda2c8eec3a59920f48be01f2a12cda6151a07864a4f9a961decf3592e7485
 AUX rsyncd.conf-3.0.9-r1 449 BLAKE2B 7cb543dc9430a05d21d10951c065ce588d8f774811b36d2380027bf18760776797d790f5c736eece3176a2dc206e695fc3486587dd8a92fbba96102e63dbf4e9 SHA512 8d51b452be88820c38639aa833490a001abc2edba03133441000634c2ec090d243598b0932fc11abdf1286afdab02eb6532df2b28a48bfde781c3a8b61fe8c6f
 AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3
 AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
deleted file mode 100644
index d06607cf772c..000000000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-X-Git-Url: https://git.samba.org/rsync.git/?p=rsync.git;a=blobdiff_plain;f=xattrs.c;h=4867e6f5b8ad2934d43b06f3b99b7b3690a6dc7a;hp=68305d7559b34f5cc2f196b74429b82fa6ff49dd;hb=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hpb=bc112b0e7feece62ce98708092306639a8a53cce
-
-diff --git a/xattrs.c b/xattrs.c
-index 68305d7..4867e6f 100644
---- a/xattrs.c
-+++ b/xattrs.c
-@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
- 			out_of_memory("receive_xattr");
- 		name = ptr + dget_len + extra_len;
- 		read_buf(f, name, name_len);
-+		if (name_len < 1 || name[name_len-1] != '\0') {
-+			rprintf(FERROR, "Invalid xattr name received (missing trailing \\0).\n");
-+			exit_cleanup(RERR_FILEIO);
-+		}
- 		if (dget_len == datum_len)
- 			read_buf(f, ptr, dget_len);
- 		else {
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
deleted file mode 100644
index 0cc9b8256dd2..000000000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Wayne Davison <wayned@samba.org>
-Date: Sun, 3 Dec 2017 23:49:56 +0000 (-0800)
-Subject: Fix issue with earlier path-check (fixes "make check")
-X-Git-Url: https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=f5e8a17e093065fb20fea00a29540fe2c7896441;hp=5509597decdbd7b91994210f700329d8a35e70a1
-
-Fix issue with earlier path-check (fixes "make check")
----
-
-diff --git a/receiver.c b/receiver.c
-index 9c46242..75cb00d 100644
---- a/receiver.c
-+++ b/receiver.c
-@@ -574,15 +574,15 @@ int recv_files(int f_in, int f_out, char *local_name)
- 			file = dir_flist->files[cur_flist->parent_ndx];
- 		fname = local_name ? local_name : f_name(file, fbuf);
- 
--		if (daemon_filter_list.head
--		    && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
-+		if (DEBUG_GTE(RECV, 1))
-+			rprintf(FINFO, "recv_files(%s)\n", fname);
-+
-+		if (daemon_filter_list.head && (*fname != '.' || fname[1] != '\0')
-+		 && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
- 			rprintf(FERROR, "attempt to hack rsync failed.\n");
- 			exit_cleanup(RERR_PROTOCOL);
- 		}
- 
--		if (DEBUG_GTE(RECV, 1))
--			rprintf(FINFO, "recv_files(%s)\n", fname);
--
- #ifdef SUPPORT_XATTRS
- 		if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
- 		 && !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
deleted file mode 100644
index 0ab8de1fce3b..000000000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e06d40029cfdce9d0f73d87cfd4edaf54be9c51 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 2 Nov 2017 23:44:19 -0700
-Subject: [PATCH] Check fname in recv_files sooner.
-
----
- receiver.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: rsync-3.1.2/receiver.c
-===================================================================
---- rsync-3.1.2.orig/receiver.c
-+++ rsync-3.1.2/receiver.c
-@@ -580,6 +580,12 @@ int recv_files(int f_in, int f_out, char
- 			file = dir_flist->files[cur_flist->parent_ndx];
- 		fname = local_name ? local_name : f_name(file, fbuf);
- 
-+		if (daemon_filter_list.head
-+		    && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
-+			rprintf(FERROR, "attempt to hack rsync failed.\n");
-+			exit_cleanup(RERR_PROTOCOL);
-+		}
-+
- 		if (DEBUG_GTE(RECV, 1))
- 			rprintf(FINFO, "recv_files(%s)\n", fname);
- 
-@@ -651,12 +657,6 @@ int recv_files(int f_in, int f_out, char
- 
- 		cleanup_got_literal = 0;
- 
--		if (daemon_filter_list.head
--		    && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
--			rprintf(FERROR, "attempt to hack rsync failed.\n");
--			exit_cleanup(RERR_PROTOCOL);
--		}
--
- 		if (read_batch) {
- 			int wanted = redoing
- 				   ? we_want_redo(ndx)
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
deleted file mode 100644
index aeb8c2ee33cb..000000000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5509597decdbd7b91994210f700329d8a35e70a1 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 16 Nov 2017 17:26:03 -0800
-Subject: [PATCH] Check daemon filter against fnamecmp in recv_files().
-
----
- receiver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: rsync-3.1.2/receiver.c
-===================================================================
---- rsync-3.1.2.orig/receiver.c
-+++ rsync-3.1.2/receiver.c
-@@ -728,7 +728,7 @@ int recv_files(int f_in, int f_out, char
- 				break;
- 			}
- 			if (!fnamecmp || (daemon_filter_list.head
--			  && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {
-+			  && check_filter(&daemon_filter_list, FLOG, fnamecmp, 0) < 0)) {
- 				fnamecmp = fname;
- 				fnamecmp_type = FNAMECMP_FNAME;
- 			}
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
deleted file mode 100644
index 5b94efa0c1a8..000000000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 70aeb5fddd1b2f8e143276f8d5a085db16c593b9 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 16 Nov 2017 17:05:42 -0800
-Subject: [PATCH] Sanitize xname in read_ndx_and_attrs.
-
----
- rsync.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: rsync-3.1.2/rsync.c
-===================================================================
---- rsync-3.1.2.orig/rsync.c
-+++ rsync-3.1.2/rsync.c
-@@ -50,6 +50,7 @@ extern int flist_eof;
- extern int file_old_total;
- extern int keep_dirlinks;
- extern int make_backups;
-+extern int sanitize_paths;
- extern struct file_list *cur_flist, *first_flist, *dir_flist;
- extern struct chmod_mode_struct *daemon_chmod_modes;
- #ifdef ICONV_OPTION
-@@ -397,6 +398,11 @@ int read_ndx_and_attrs(int f_in, int f_o
- 	if (iflags & ITEM_XNAME_FOLLOWS) {
- 		if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
- 			exit_cleanup(RERR_PROTOCOL);
-+
-+		if (sanitize_paths) {
-+			sanitize_path(buf, buf, "", 0, SP_DEFAULT);
-+			len = strlen(buf);
-+		}
- 	} else {
- 		*buf = '\0';
- 		len = -1;
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index efe32421b102..f0c1b3a271d7 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -3,8 +3,8 @@ DIST suite3270-3.4ga10-src.tgz 3398730 BLAKE2B 4adc02b416d5fbf2facbf4e42c58a2bd3
 DIST suite3270-3.5ga10-src.tgz 3412329 BLAKE2B c9ed308cf970da150da985d76ec377c83a03041eddfcbad9baa7211776a7b68292109cccb2ec250952edb77eeca79143137eb8a94da8b774e952c3e5790c6231 SHA512 0cce1212ca7589595cd2f775d18086f231a9e6d621716be5a41123a379358d9ac08c9668de2bd6a2e401ae54d12a4905c3c260cb7ba90482bbce6790d8e3efb8
 DIST suite3270-3.5ga12-src.tgz 3412286 BLAKE2B 5602f8bbe7b916a977c97848ff9a413a873f61e1c0c62b8c118dc43703adcd4a668e3cc301f9e37a139eebeeae44aca3cdedd0c10de15870ad8ead00d783e1ef SHA512 c7cb25b5c82b0d7ccac8c3ed17317a5a5ebce24fb32dcdfcaf7158157578617a7bccc265fdb67fce0557caa9c75d1afc2d8152a06b98af43ad9a9e29b5f2a267
 DIST suite3270-3.6ga4-src.tgz 3288095 BLAKE2B 34245d6050f7d70ef6195dc669fea55eed70cb9b6c616a4bc88bc52bcfd9d837e527debc87eba4ccdc47c4a453e16749c23b9618d5bf4198e4131573f437209b SHA512 5309c4b4ad0d730033166b0bdb7638bba5fc00908776a229d5f0a131f72741897a0bf6b86dee3b1c9f3d480dc4f23e03e812d3349cec7094908c6a54a87d5ccb
-EBUILD suite3270-3.4_p10.ebuild 2057 BLAKE2B f564e1887c6488af0a736e6da5fa03f4f450d2adaa4b46f9bc3b5283182374f69a23d59ba341123a15ceae56079d450bb8136f47264b101108c106a4f175b75e SHA512 91e3015a1ac9460c037464b93d69339e4ec454cf72ee1bf37181d940fc6519086d7571d930c85db9878eb9b5bd01edd8d982a2526191bb48c1fc4096c0bf2759
-EBUILD suite3270-3.5_p10.ebuild 2101 BLAKE2B b798bc6218d65434b08686ecb452c027012ed86f91408bbceb960bf4d1c05a94a4208f0dc7dd99d0926e3f221a0625c58ca88e263c4730e2dac5bd20127613df SHA512 01048cf1b08d52e5d56a2d842c537a472fe78d5d2f0434e07562d50189f175c23f745ea43b8bfeab0c1ea001398517d3f59c615296f1e3c9c5fdfd8e6f0af657
-EBUILD suite3270-3.5_p12.ebuild 2106 BLAKE2B a0f9ae7eb8d7d022e3b46687dbdf5c08d0a03c6baab1baac31345fb151abc242dd78ebf507ff50da9126c9d674ca2bf9a97528abb783979aaf5d215814277bef SHA512 df18bce9cef81130d8b066e80d2d1f2e3d9b6e0d7f362024584668d8e5d518d29be2b1d6a8383b96dd88065dac0bcdcb84640bc3529caed74feb029912ebddd6
-EBUILD suite3270-3.6_p4.ebuild 2106 BLAKE2B a0f9ae7eb8d7d022e3b46687dbdf5c08d0a03c6baab1baac31345fb151abc242dd78ebf507ff50da9126c9d674ca2bf9a97528abb783979aaf5d215814277bef SHA512 df18bce9cef81130d8b066e80d2d1f2e3d9b6e0d7f362024584668d8e5d518d29be2b1d6a8383b96dd88065dac0bcdcb84640bc3529caed74feb029912ebddd6
+EBUILD suite3270-3.4_p10.ebuild 2060 BLAKE2B a971fa860797532519f96c733d6525ef38cab44e3724d4243b771e2308a6ac243c318d76c5ce8d10a060e03be688eaac07d301446458cc7aeeddd6a057d59bd3 SHA512 dd59e26bff90d8d48508430ac0694861726300f3507e87ddc80af501e8045a214fa50b574a1d6808bb19540a322b46200bc5733738b6552942ccc8a5f53e3d9e
+EBUILD suite3270-3.5_p10.ebuild 2104 BLAKE2B 41e2667ef2aecbe97cecec803926c5cc138c74fc2b81d8f8c86cf111456b3846d4075a14cab2a9d3edb85c63551e54b11eef822638e22bdd316711c4121e1aba SHA512 29f7f0dad54c07444dd1718f60e60b520dc6abc1ad7500878355b4aaafdc80f6243e706e74c421b144e097380342ee5d17ee91b904ae77e5f117b4a8df81ad7b
+EBUILD suite3270-3.5_p12.ebuild 2109 BLAKE2B afcae541a73ed17a11d17d4c28cd1162bbd93a1d62df8a105debbaa82e1dbffed20df2a6d7f01a577907d4e8230b94e0d51f77e835f57ee426f18de93f738176 SHA512 20ea6a35f9f0fdef4c8417ed0a7017c7195ec4256535d340cde43fcae72db28c876b8e8d7d085d1a94d96c4d3af270e4b8c05a1361380c93eb5560608affe4ed
+EBUILD suite3270-3.6_p4.ebuild 2109 BLAKE2B afcae541a73ed17a11d17d4c28cd1162bbd93a1d62df8a105debbaa82e1dbffed20df2a6d7f01a577907d4e8230b94e0d51f77e835f57ee426f18de93f738176 SHA512 20ea6a35f9f0fdef4c8417ed0a7017c7195ec4256535d340cde43fcae72db28c876b8e8d7d085d1a94d96c4d3af270e4b8c05a1361380c93eb5560608affe4ed
 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45
diff --git a/net-misc/suite3270/suite3270-3.4_p10.ebuild b/net-misc/suite3270/suite3270-3.4_p10.ebuild
index d3e53d33da3d..8eaf62808b26 100644
--- a/net-misc/suite3270/suite3270-3.4_p10.ebuild
+++ b/net-misc/suite3270/suite3270-3.4_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -38,8 +38,8 @@ RDEPEND="ssl? ( dev-libs/openssl:0= )
 	tcl? ( dev-lang/tcl:0 )"
 DEPEND="${RDEPEND}
 	X? (
+		x11-base/xorg-proto
 		x11-misc/xbitmaps
-		x11-proto/xproto
 		app-text/rman
 		x11-apps/mkfontdir
 		x11-apps/bdftopcf
diff --git a/net-misc/suite3270/suite3270-3.5_p10.ebuild b/net-misc/suite3270/suite3270-3.5_p10.ebuild
index 54e2cc5b3a59..8f3125ae488d 100644
--- a/net-misc/suite3270/suite3270-3.5_p10.ebuild
+++ b/net-misc/suite3270/suite3270-3.5_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -38,8 +38,8 @@ RDEPEND="ssl? ( dev-libs/openssl:0= )
 	tcl? ( dev-lang/tcl:0 )"
 DEPEND="${RDEPEND}
 	X? (
+		x11-base/xorg-proto
 		x11-misc/xbitmaps
-		x11-proto/xproto
 		app-text/rman
 		x11-apps/mkfontdir
 		x11-apps/bdftopcf
diff --git a/net-misc/suite3270/suite3270-3.5_p12.ebuild b/net-misc/suite3270/suite3270-3.5_p12.ebuild
index b3723ee24476..f842aa368b8c 100644
--- a/net-misc/suite3270/suite3270-3.5_p12.ebuild
+++ b/net-misc/suite3270/suite3270-3.5_p12.ebuild
@@ -38,8 +38,8 @@ RDEPEND="ssl? ( dev-libs/openssl:0= )
 	tcl? ( dev-lang/tcl:0 )"
 DEPEND="${RDEPEND}
 	X? (
+		x11-base/xorg-proto
 		x11-misc/xbitmaps
-		x11-proto/xproto
 		app-text/rman
 		x11-apps/mkfontdir
 		x11-apps/bdftopcf
diff --git a/net-misc/suite3270/suite3270-3.6_p4.ebuild b/net-misc/suite3270/suite3270-3.6_p4.ebuild
index b3723ee24476..f842aa368b8c 100644
--- a/net-misc/suite3270/suite3270-3.6_p4.ebuild
+++ b/net-misc/suite3270/suite3270-3.6_p4.ebuild
@@ -38,8 +38,8 @@ RDEPEND="ssl? ( dev-libs/openssl:0= )
 	tcl? ( dev-lang/tcl:0 )"
 DEPEND="${RDEPEND}
 	X? (
+		x11-base/xorg-proto
 		x11-misc/xbitmaps
-		x11-proto/xproto
 		app-text/rman
 		x11-apps/mkfontdir
 		x11-apps/bdftopcf
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index a4dbc24083ea..f37e0fb1b109 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -6,6 +6,6 @@ DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11
 DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
 DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-EBUILD tigervnc-1.8.0-r3.ebuild 4320 BLAKE2B f20dd6c1c9e408e1f3d72c86f5075c360cb2f026222b21337734587d0ff3c2bccecbf34964fcd9308b998cf6f44cbc7b2a9b8e0416cf80aeaae83aad6501946e SHA512 6e46a65f89214ed204f96e674ac7a12eb20fd2a9f3f76c601cd4f9e998d9aa36e3d10cd5dce1cef46fee068bf6fa0fdca449fb7635331aca0e5f9f1c8fce0276
+EBUILD tigervnc-1.8.0-r3.ebuild 4318 BLAKE2B 4132d4b461b9627eea7ad8e016de2edaff1e9bf10eda93ce81ef6146f54ae1305d09823650415875a6d30b81e8ac4b7f059d4925f4c93bfecddb8fea7b76f25a SHA512 704a7da28d6efd686524876537a7ed14619ccdbe1817e0e817ecea70dc1bc994b90884a5be5a6b4aca9aa7452f3ce9a27ac6fea9fb2b31de32832ee1e680bda3
 EBUILD tigervnc-1.8.0.ebuild 4541 BLAKE2B 69e2048ec440910bf941f0d60826243d1ee3c156d614c2abb1a0bb32b62887119fad4d02e6babd0888f339864bf1ca054cb93f4f5bd034ce958e752b48eb770d SHA512 24fc22d60a36d37c5c62df2cf2e20f0852c4797285baf4ab50d5a97395ee7129cfde1758fe280101f3664320e14aceb7548d4265cefbb48351ac3cd0526a8d45
 MISC metadata.xml 725 BLAKE2B 9ea0092828f41c3ef3617f10918436795dd5af0397288f0b0c20debc5aded651c5fa6d2afc5c7b011b5480ea820d42c567cd6b22c822dd16895ce9445310981d SHA512 65f32dbbc20c53f154f87a01bf88bc0e73493921ff73c2b3b482e1c9fc7a3159cf6a94d1d7cb830bb60fd8da2b8ef77cbdd2a3cad329634ea82dd4f288f69deb
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
index 8455670a3d6b..41caa9716b42 100644
--- a/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86"
 IUSE="+drm gnutls nls java +opengl pam server +xorgmodule xinerama dri3"
 
 CDEPEND="virtual/jpeg:0
diff --git a/net-misc/vncrec/Manifest b/net-misc/vncrec/Manifest
index 5f46b1b99b2b..811567c4ed42 100644
--- a/net-misc/vncrec/Manifest
+++ b/net-misc/vncrec/Manifest
@@ -1,4 +1,4 @@
 AUX vncrec-0.2-includes.patch 565 BLAKE2B c8144aabbf6380fa55edeabbfe31d5d4b30b3e215c6f319295ca117a838595a24293307553b338897694c5b20049b6015365c3f377084c61cfa02a7a15af844a SHA512 256bad5e63e2e744ec7a1f1ca2002bb8caf7d9cff8a787c426a7950c0acf1ee4af27342e68f5f6440a292c35d31cebf98b7f085e8feddfa92d4cd7f64d04b651
 DIST vncrec-0.2.tar.gz 65768 BLAKE2B e4879b0af0deda6b4ee4a66bc965c5054601bbc3f6e2ce78956530d9705bd24480ba7fc60822ce32975b9d768725572fc4f6f5d998f929c4ac487ff5fbd6326c SHA512 dd2eb979311e1d04d45aa44362bb7d747719547d3c45ebf18174e7fbcc5bd5be039d53c39077411b636564ea14c0287317f11b16633fa64da314c983250c3ef4
-EBUILD vncrec-0.2-r2.ebuild 876 BLAKE2B a94b25bc4245da56280721d7eafdab3258a24dfd4f7b55843605e68288332025a02ff3a5f8d32e33fd3c4fdb384c616a9753f2ffd4760f4f9b3e9b2c401a8a90 SHA512 202f95d86f1dce3401bde2f47d57576133f1d35916d9351174961524fe0a640e0704856eb8a7838849ba29deb9ab74088e495e301e8a0d69b33812d2f1910f2d
+EBUILD vncrec-0.2-r2.ebuild 876 BLAKE2B b653496c1696af412168f631cd86ab2a46a9ebfd397f624c5e007d0c1a96938188b17d51ac4347ad43acd1617488004600a42b8afc24462852e22263d40f3992 SHA512 006b7fa7721c5a91d770c0d607eb3d47a5c3752c1aee5f5514dab8aa1ff54d1b95b8460c8c769123b0799e1e3f395f623c5c1e7490033f659e0b62d9fd528d80
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/vncrec/vncrec-0.2-r2.ebuild b/net-misc/vncrec/vncrec-0.2-r2.ebuild
index 759d2b27ac5f..cb4d1e4f751c 100644
--- a/net-misc/vncrec/vncrec-0.2-r2.ebuild
+++ b/net-misc/vncrec/vncrec-0.2-r2.ebuild
@@ -22,9 +22,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-text/rman
+	x11-base/xorg-proto
 	x11-misc/gccmakedep
 	x11-misc/imake
-	x11-proto/xextproto
 "
 
 DOCS=( README README.vnc )
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index ef34f657a155..084a646fd571 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -8,5 +8,5 @@ DIST wget-1.19.4.tar.gz 4310657 BLAKE2B 3f2e5a32e897101761d449f079bf9df38e60b682
 DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b
 EBUILD wget-1.19.1-r2.ebuild 3365 BLAKE2B b0fb802be67226322409b35fa6c99814e2747ae85fbfdd95344a49b1aacd8b8c0208848b24cffdd663d4bf0475b41474aa151d4f4bffd3caf1d937cd3e8d144a SHA512 ae46574e6e5bf12161278346fc32eb93c7dd4fc2e776ddebaed9bd857639d9a3c234a818000ba6361a82262d5ee3b05c390efeebd4ec1bf2b7a219e06449ff26
 EBUILD wget-1.19.4.ebuild 3187 BLAKE2B fdd1edc8d6721bfadedd62c3afe979dc111e8950242dd77aa314aa207f012452d6dde1cb9dca2d8366b6a58d3184657034deaf4faf1367127bf638d31753712d SHA512 12ea494dabd74b3f2532952fe07cc6c00753f0ea91b1606c9d4e6b96a7f6595da60be2bb4f8f8e227af4129c736fb72c62fedcbecb56a8ee0c3cc9c1c6a25a32
-EBUILD wget-1.19.5.ebuild 3182 BLAKE2B a622065ca4431aa96b7d617707621b06d65de80f5afe46f7c603a94785b59dc46fcbca21fb50ad68ad7c4724e611c0a26ad2d62a9480fa6bdd996147f6969c94 SHA512 dccddf85ebc904eca0590d662121d8bf1cc1360a48484981b3d16aa12dda371292907fc43da47e758a6444ac94a35267237368516978a069fb0d8a17dabb65a4
+EBUILD wget-1.19.5.ebuild 3181 BLAKE2B 5816beeb59f36644e849abefb50dfc5bfb074a1c28f81a3a44fc355ee64d175673996ab766cf4c2292b6d1df149b0a482d0a14c3bc02ed706094ca26df91c9f6 SHA512 30c57e90f8a671825f966fcf8b866ffc80d3539ed7de6bc251f03d7a4136223fe1b5d04b6c5fcdfc5228fa63f1b8658c6e1bf21a78b29969e3ae8e4f4dd295af
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/wget-1.19.5.ebuild b/net-misc/wget/wget-1.19.5.ebuild
index b4d33f3b37ca..9a4a89aae04b 100644
--- a/net-misc/wget/wget-1.19.5.ebuild
+++ b/net-misc/wget/wget-1.19.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"