gentoo resync : 28.04.2018

7 files changed, 17 insertions, 37 deletions

diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 8097bc1a197f..795998192b5b 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -11,9 +11,9 @@ DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd24651
 DIST wine-staging-2.19.tar.gz 10241240 BLAKE2B e661e3272328988e9a1aacc22fc02f0773804b58777f208c79c6af866032f31b6140a52e2aa5af954e52437db234712863d1369e960e98e2c212d1efc7f6344f SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483
 DIST wine-staging-2.20.tar.gz 10240761 BLAKE2B 2a212e59c606f4c53e711b0f975a9527cbb930423061eeeb962c3bba7232890f3f4853e1aa98cba11bcb9c9ba6a37c915ef8df7f4f3d3243da96f625e6d45a57 SHA512 16f55130291ca70487a74d01cee9057f95f3eae3e049d30fb2a9aeb8e425b2020289fb805fdbae860708be0615a86da0502c06ff32cc21536d040088cc13605f
 DIST wine-staging-2.21.tar.gz 10229454 BLAKE2B a971b9b96e1e57f658b492e3dd5d6daf5410b6bb6a7df9432d14b48e6ca4b21a4ab62ee362addf370ea5940e4f7a6af05ec6c026124cb9e9b6cc790f7fc8e204 SHA512 701c6352c8bc5745b8078947bcc3b6209e4e6c387905395cc81d42276402243522d7fa543bb34293c74786adcde9a3c50a2cf4cd57e05e0f4c68991a49a00b41
-EBUILD wine-any-2.0-r1.ebuild 20974 BLAKE2B aed3e70527e620f1e2465ff4aad524dffd8fc786b6e71f24546cd2afd9ae0f8d03362550d02d197974f9335ee6186b26a95fc49b75d6479026ef83f5e9c81a2d SHA512 85d72b24ba471ed7b135f773ae88c148c14056e4b79d51bffb048d2a0e0e154029d90d07b31cd5e13d1cba92c43411b738d2bdb49119b89d25c62fbf344ced6e
-EBUILD wine-any-2.19.ebuild 20847 BLAKE2B 5c5e8e10523e1766163716a40f03f46210a25ec7a6eb13beeb775d899d708d61ebe541da62c5b3490bd020794aae71185737a80eb484d1ef305e1874e1dcbf27 SHA512 0adc8691134dcb4f40fbccf1505c78e8cb9a1b39cfecc349f0d30c1be6636dbc24ceca01fc73f6171ff52271b76a53ec72a93f83563b0961188ed53e139838dd
-EBUILD wine-any-2.20.ebuild 20935 BLAKE2B 5ba61308cd3e545cdd1ed9d60f62514ee658928890fc01dfd54ef912665b68cdb81f6a4b2b1d89ac8cd0d58e6816a73d2e98030114affdde0115d2a713726300 SHA512 3ff68826375ce84d5fe7c3733c1d78e306db7ab073d7c201075d7822cd512fffea2dc4275bc1001d4dba223d3b84325c015ff964d44fd202e7129c117de24ec1
-EBUILD wine-any-2.21.ebuild 20935 BLAKE2B 5ba61308cd3e545cdd1ed9d60f62514ee658928890fc01dfd54ef912665b68cdb81f6a4b2b1d89ac8cd0d58e6816a73d2e98030114affdde0115d2a713726300 SHA512 3ff68826375ce84d5fe7c3733c1d78e306db7ab073d7c201075d7822cd512fffea2dc4275bc1001d4dba223d3b84325c015ff964d44fd202e7129c117de24ec1
-EBUILD wine-any-9999.ebuild 20972 BLAKE2B 3a104353358f549ac4ce64b146d5513e224dba16f016a44125ee78daedb0b3aaf690bf8574a218d3f332eb21b46cdc3c33f1a064ea2f2ba8c7bbb127948f09f2 SHA512 4bf8b8f42770a2897293b73c7fe1dab00a81663e3cea55d247601b7e4ac8db979e81f23c49c584576a68f6bfc1a47ae0ba9953cb22895b6efc4ff2f8358472c9
-MISC metadata.xml 3695 BLAKE2B a221f01ae7be77a116aecf75b26186b0de92277d8a1f7ffb7454fe3cff8d47ba5d3322bce34dff1016757757f7a70ea9dab3689ed0e8c85e2e853a64fa9efa10 SHA512 b04362a92615c1cd931c882d9f6aa26564ae8a84f579a3dc5aebf587a2d4c2120b4c0e4b4f1cadd957083af6326be72552d1b75d80b7ea0f3c1a59f83f1dc15c
+EBUILD wine-any-2.0-r1.ebuild 20915 BLAKE2B 7ff1002e303dd2a083267fbf24e4b6cb0e3ff620d6bbf78b8fb15d66fb4d11669812233f1edeea0f46e75b9a0c8a9e63244aa4bebb594b95d158d55fc2506e6d SHA512 8e1bd0d4391f1e9336f9c39ce46d97f921f70cae75d961bc8fe8c7ec6c51bbba621c19a3171f0c351ce6e038d37a7f9a73f6f0bb4622f176e5a994e4a989b2e7
+EBUILD wine-any-2.19.ebuild 20788 BLAKE2B 081765ceec24610d2f8a530cd4720590d93fd34663df69a19cdce81148f2d7f6480d4579d766a5020746738e6e0c8c45b47ee6c22a67adefe0f1c0ed7ed4d862 SHA512 0792affaed2850c08c1ef9f0222f487d179866327709bb546b1980b3b03120906dd04074a33c6e95ae03ddfffb4519bee40aff1ea69d85a0ca5d7743e704cf28
+EBUILD wine-any-2.20.ebuild 20876 BLAKE2B 2b8c4887a638d833be61489787513d77f145b0824c3e59996071a81a1b22a13cdc1f441c048f15d3cf1999594b531b45a8d90b3c5146d97b1d1df38af2f5c2af SHA512 e04642e8f1e76392b0d93b136643ee4e437133b234a64a5591973c320a03f6a6e9d11c4f32997eeb8a2d443808fc42f8e06e05deb0d3977c90d4cefff4b718d2
+EBUILD wine-any-2.21.ebuild 20876 BLAKE2B 2b8c4887a638d833be61489787513d77f145b0824c3e59996071a81a1b22a13cdc1f441c048f15d3cf1999594b531b45a8d90b3c5146d97b1d1df38af2f5c2af SHA512 e04642e8f1e76392b0d93b136643ee4e437133b234a64a5591973c320a03f6a6e9d11c4f32997eeb8a2d443808fc42f8e06e05deb0d3977c90d4cefff4b718d2
+EBUILD wine-any-9999.ebuild 20913 BLAKE2B a98201bcad530ba0291f84397c4c69478c8447b5d3ae8eeb6fd6e68fc5818dd01087cc2f52297cd0a962080b1d81986059c4761dbb4f14fdcfbd23cd3f6393d5 SHA512 87c96f32ad8ad60e013e89177d8b9e4d03a9ee8aa7fa8fe1c4080e051e5c878bec3ba639ecac0057d08c4ec59d0f8f7a5621fdb5c9dfcd91026989f5b263e556
+MISC metadata.xml 3689 BLAKE2B 0117acd0cdbd2d36fcb3effd50ddc00538eb6a5d7a89f0d1b6dc6141e3d4c0c45a3d3ab3d99445b23a57d049aca50460b5bbc62a2f8de0dc565a76ca698c4baa SHA512 10cd4c11abc978f5cb8fc84d319eedc3adddb73c0f72692d882ccfde81cc382029ee6a134b0474a858751ec13b5cee3881419c0e480439d6bc71b0a67c12dffb
diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml
index 8786a15edd53..35b3090be7ec 100644
--- a/app-emulation/wine-any/metadata.xml
+++ b/app-emulation/wine-any/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<maintainer type="person">
 		<description>Only CC on bugs that involve USE="d3d9"</description>
-		<email>commendsarnex@gmail.com</email>
+		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
 	<longdescription>
diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
index 1f394f6f13bf..52aa80d79f24 100644
--- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
@@ -150,17 +150,13 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
 	virtual/yacc
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
+	X? ( x11-base/xorg-proto )
 	prelink? ( sys-devel/prelink )
 	staging? (
 		dev-lang/perl
 		dev-perl/XML-Simple
 	)
-	xinerama? ( x11-proto/xineramaproto )"
+	xinerama? ( x11-base/xorg-proto )"
 
 # These use a non-standard "Wine" category, which is provided by
 # /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild
index 62b897aa0e7a..d0b16c47aa1e 100644
--- a/app-emulation/wine-any/wine-any-2.19.ebuild
+++ b/app-emulation/wine-any/wine-any-2.19.ebuild
@@ -151,17 +151,13 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
 	virtual/yacc
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
+	X? ( x11-base/xorg-proto )
 	prelink? ( sys-devel/prelink )
 	staging? (
 		dev-lang/perl
 		dev-perl/XML-Simple
 	)
-	xinerama? ( x11-proto/xineramaproto )"
+	xinerama? ( x11-base/xorg-proto )"
 
 # These use a non-standard "Wine" category, which is provided by
 # /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-any/wine-any-2.20.ebuild b/app-emulation/wine-any/wine-any-2.20.ebuild
index ceb899dbb839..913e3e1528aa 100644
--- a/app-emulation/wine-any/wine-any-2.20.ebuild
+++ b/app-emulation/wine-any/wine-any-2.20.ebuild
@@ -152,17 +152,13 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
 	virtual/yacc
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
+	X? ( x11-base/xorg-proto )
 	prelink? ( sys-devel/prelink )
 	staging? (
 		dev-lang/perl
 		dev-perl/XML-Simple
 	)
-	xinerama? ( x11-proto/xineramaproto )"
+	xinerama? ( x11-base/xorg-proto )"
 
 # These use a non-standard "Wine" category, which is provided by
 # /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-any/wine-any-2.21.ebuild b/app-emulation/wine-any/wine-any-2.21.ebuild
index ceb899dbb839..913e3e1528aa 100644
--- a/app-emulation/wine-any/wine-any-2.21.ebuild
+++ b/app-emulation/wine-any/wine-any-2.21.ebuild
@@ -152,17 +152,13 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
 	virtual/yacc
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
+	X? ( x11-base/xorg-proto )
 	prelink? ( sys-devel/prelink )
 	staging? (
 		dev-lang/perl
 		dev-perl/XML-Simple
 	)
-	xinerama? ( x11-proto/xineramaproto )"
+	xinerama? ( x11-base/xorg-proto )"
 
 # These use a non-standard "Wine" category, which is provided by
 # /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index 4ac2529840fe..d8688841e0a8 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -154,17 +154,13 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
 	virtual/yacc
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
+	X? ( x11-base/xorg-proto )
 	prelink? ( sys-devel/prelink )
 	staging? (
 		dev-lang/perl
 		dev-perl/XML-Simple
 	)
-	xinerama? ( x11-proto/xineramaproto )"
+	xinerama? ( x11-base/xorg-proto )"
 
 # These use a non-standard "Wine" category, which is provided by
 # /etc/xdg/applications-merged/wine.menu