gentoo resync : 22.05.2018

5 files changed, 10 insertions, 30 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 3ea1cec9451d..44a084a56556 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -10,8 +10,8 @@ DIST xscreensaver-5.36.tar.gz 10600872 BLAKE2B 5039722fa3aae2fdb42fb99516685f0c1
 DIST xscreensaver-5.37.tar.gz 10598833 BLAKE2B 44462bdf735c0eeb460e400b260340a61e57f343f0ca59f38c7b8d2c7fa03a5b08a5ee424062bba8a4c95da2ec32d89cbcf3cc84cd112fbd67314d3db56bd0ef SHA512 9bef3caf4eb495bebb4c1818ed0bb222be28a7a8d525e2bce70e92d7617bc8cf89750dfaa8cf7a3cd0c489b4831c95f9ff8a0164579cf047aa63681254c8e443
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.39.tar.gz 12157285 BLAKE2B b33bf64541d07b2f65788160af0bac308d4bea78a6d2e13332ac0e80a1811cc8270e0922467c76a77bd3481b367e4421b6919d017e7a81b656c4bcc85c404741 SHA512 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7
-EBUILD xscreensaver-5.36.ebuild 3521 BLAKE2B 6dcb3156b850b3f9ab210ab0d5c030c355c6ef6f90639c23316f71d20602cda04176bdb598af4b90f41edb3e5e51ce8195803974752ad128b85b395fb9d88d12 SHA512 085ce103e700f04014a8b769ab9e625763b62fda74d38f474c576eda8dce3b1143769a0662252997c9d4f652d2c0bda483af327b15f9798674eb62812dd2c438
-EBUILD xscreensaver-5.37.ebuild 3530 BLAKE2B 08cf24c2252e4965a07ab3f8bc5728a40a82f287bb1343db2bede836de1d77c6b138478dace70bf54d703ce3d4b209d0bd6b018cf62532890ed6d05cf3b10a63 SHA512 fe2fc361b059b944e94f06013a3c99854f9f4b33fd25f7f75e07e249a88f13899f3c74982e7e0dfde43523474b7b48c610ff63dfcdb08f28f6b9164eee3af68e
-EBUILD xscreensaver-5.38.ebuild 3539 BLAKE2B dff8dabd111ca7cfca526b4e213533e57c2724bae5bf1ecd904da9e6e2a771f5f5ac4cd88ffd964089db62d9ede11b2d7086e53a25635ecf1b84ca59c32cbd73 SHA512 d7f40a43343a04b4e6e17206c20f2f610630c94452e80289e24ad29c1e898e2bfc5aae76e53ff537bed13e40288c0340d8d60a93721d5835e8fc7d8f85d91174
-EBUILD xscreensaver-5.39.ebuild 3547 BLAKE2B dee7b483c7739f038d4e7dcab847368942bd3022331bc4f5feddc9afbde7b24b950acb98a954d804d5bd737306340d553e527202a1472f66a9235ec028db5a9c SHA512 8f3d58d58005dd68a764428cd1e3fa62aa2d3d2cddb6ee666dfc808ff8f5724aae17c8eaf716e70045e927aad957d5472f6d8a62c81fb33c0218c51858aa6882
+EBUILD xscreensaver-5.36.ebuild 3380 BLAKE2B f732eda2a852e786bdf1d721157adc22609ca84291918559c55b29ea9760836f68fd7efeb4ce3910e83a27533c5c1669604cd57557d3a3c28cbc45855fecd4c7 SHA512 6778de53fad71267d6186948996bcdc48b893527fbdff71d1bfb20cb263f6ebdcfcefbf5b0b753dff4e8c308ba47f81e0f37814c97bdb3a7c903c8ce7c59afa2
+EBUILD xscreensaver-5.37.ebuild 3389 BLAKE2B 4c80280782af33d10fe2232398caad29dd471f8c388b925e1586f79f46dda82f36f8801f66416a403094510559fc2b60f1ad6362ff60dd1ee81aeb5a85e35e2e SHA512 30d313f2407d02bf682e0ff7b71773d158293b402da052f3e1439db9ad93b29af9705e190655d2858ec283b7306af4246001625b5e062282d4c30ead7bb5c01b
+EBUILD xscreensaver-5.38.ebuild 3398 BLAKE2B e8c00fb88ab4d95db7fe291f536856735af6e1e0207693f3dd4abc7aee5726ad8142c3ff1650086e9e46c16414235b328f5a2e771d6620a77136976141ee42e1 SHA512 5ad9b59077b2722d421bfaa912a6bf2c38ec20bff3bcbcec8a21aab97159904fc68b2c7e10f2d766538e7283a97b82eee37350245ed59f14163005783d8c20ef
+EBUILD xscreensaver-5.39.ebuild 3406 BLAKE2B c584e9332e24aa43d35b80aa9b55114e13f0f3ceb29504034f27e0143594949c419d08188c16d814553c71acb915ac622cb37e0484db8a03b605ea8c0048d45b SHA512 0a721d26c16ff1c6d1f78975894b2ac89930dbf215f9265f834136a0400717dd08906cf4a7b41a33865445d61dae1780c5d35e0818c3373610fa0eabf2b07f64
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild b/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
index 7b5b69a88e32..1e5f9a6da935 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.36.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=6
@@ -59,12 +59,7 @@ DEPEND="
 	sys-devel/bc
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-misc/xscreensaver/xscreensaver-5.37.ebuild b/x11-misc/xscreensaver/xscreensaver-5.37.ebuild
index 6c8fa54ec6f2..27ea9efb104a 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.37.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.37.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=6
@@ -59,12 +59,7 @@ DEPEND="
 	sys-devel/bc
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index aa05146673b7..7217682cba63 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -60,12 +60,7 @@ DEPEND="
 	sys-devel/bc
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild b/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
index 53d05029957a..cc36c3d5c819 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
@@ -60,12 +60,7 @@ DEPEND="
 	sys-devel/bc
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
+	x11-base/xorg-proto
 "
 
 src_prepare() {