gentoo resync : 28.04.2018

7 files changed, 17 insertions, 37 deletions

diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index cb40a2876b45..2d029cadf5f3 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -7,9 +7,9 @@ DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8
 DIST wine-d3d9-2.19.tar.gz 48818 BLAKE2B b053ee0ad798a7d8ad53b3daff1757caaa52f095435f2fb89893c7313d490a2359217a5638529e918a1446f13533a746836c1c22218cba875a1420816618408a SHA512 be43435cd53f367ca57080c08218db302a90bf85ec6e917e89375904c456b585b61fb6053f9b4366b7e844f8246cabe83460a9866f614dbb5df3edfb43b2f54a
 DIST wine-d3d9-2.20.tar.gz 48822 BLAKE2B b9ae137e05f672990707aa3ae88aa569a517e644579ff545b35393074ca03ac0c6aaea7494a90a4f6c4278f7397e1e5078e90383f5debeb4edfe46c8834446ff SHA512 f1fa4882514d0bbb77a7244448a9153cddd5029fca49c5221783fafc13f30888b606c6be4417ecdf85bd80a659ecf54c57ea5aedd49acb87cdc9b42d98f68dc0
 DIST wine-d3d9-2.21.tar.gz 48813 BLAKE2B a83b558682f19a44f62c33c8782f4415250c537373654b36c4b1aa6e078ed09594ec1f0e5b76093d88b835786dac96047a1584aa94953256d6ca2804e08ec3df SHA512 64edab41be95adb1dc81c040b13901fbc7fd54467e1306639e3d459c41521d61ebf09e7028688166af8fd0f238063e125d8985a4fc66b185fade996ed596bb2a
-EBUILD wine-d3d9-2.0-r1.ebuild 18467 BLAKE2B dbe0efc5ea1457cf82f8998979cab64b75e66f0f6c60a83123f3ced0b9bb6ef1039b698ee5fef3f33354cd1c37c5f32423c72db2b7de4bff5b5fae08c844eecf SHA512 64800a6c4d87d35f8f69214ead72217665f9709aa722b895d75a0c293248c363b2d08572e5d2965849727fa33c2f83c3a3e42efd4f5f742d4b5be8dadac1dd2f
-EBUILD wine-d3d9-2.19.ebuild 18340 BLAKE2B 3d3cc4b14e37061a197f9bfb1619b19bacb2694bfefd84f482e2b00e8e2c1607fcb1c058cb9785694a4239a906cb360db021f21178643a428735948916418535 SHA512 332d1a5e7acb6484234a40b503ab2c1da4704f611e05758d6f7cef0bbe90cc48cca4a0d57294c0aad19155cdbd14a39b2b00ee186eb139a291c62e2785246949
-EBUILD wine-d3d9-2.20.ebuild 18428 BLAKE2B 61caf5d52fec61bdd0f813cf355032b7d0fab9609fec855071326e2654afe82cccf8518de81e72625f1baf1cf5c57447ba9eec4624e7d14b3809d496e5a62729 SHA512 694a75839ebbb1cb94a44125c2487f69f2a88dd91c6546d9ab94593c38c2ceb44f921c6827801f275bfa55e439b7c96755bfec4b8e6194d61844a77681bbf4f0
-EBUILD wine-d3d9-2.21.ebuild 18428 BLAKE2B 61caf5d52fec61bdd0f813cf355032b7d0fab9609fec855071326e2654afe82cccf8518de81e72625f1baf1cf5c57447ba9eec4624e7d14b3809d496e5a62729 SHA512 694a75839ebbb1cb94a44125c2487f69f2a88dd91c6546d9ab94593c38c2ceb44f921c6827801f275bfa55e439b7c96755bfec4b8e6194d61844a77681bbf4f0
-EBUILD wine-d3d9-9999.ebuild 18465 BLAKE2B 3f15f2b07a2b3b4b563932346f7bad4d5cd11171753eded64b3377b0ebfe1a640e0c305f49cd0e1bd6ef80dcc1338dd10d174dc61b5fcfc44d8e93731538d9c3 SHA512 be157c6d11b65608588f7a68548f34556ab5b9191fbcc863fcf0705d1a1d0ff70769f7e5cad4e92852255a95195f46a03148d6220e671d3410e7c8a1add463d4
-MISC metadata.xml 3162 BLAKE2B f8bc25888cfbd20416c30362f3dc1c2d0c273e1a8bf33be4ac5ebc710d79913eb4fb7255a0101bd550320c1914d94c516a718a03e731f1ba29d2af941fe2a2e8 SHA512 59071c6e011da0479f689fd1e672a2843e40509ff0cc8e2cc1bb176025a8c6e111efa41cbc2ff76e6d173ba1b333fb1f929ab29eb18310e5ef2e835e2e60617b
+EBUILD wine-d3d9-2.0-r1.ebuild 18408 BLAKE2B d076c6114c7a8044803c22cc9e3b2ade886c2c5fe95f476fcb69558058733d1e75f178a956ebd5fde2c753690cc120df3c3161293af97031043d59a5f4ba4e7c SHA512 c6e0d90d32af5981ab83093680c0119c39c0843d818672270a83e9d40c5cf368641818fc8e82f29c7de07759cfc18d94990f400564987693c17bd24acb18f413
+EBUILD wine-d3d9-2.19.ebuild 18281 BLAKE2B 8e742d2745b7e1a94628a11467343497b9047246ac66059d0961e4af4d42d4f351fd5de896c0b90cf8367db9c55b68e21ae5b3ac5c23aacef3dd4d5c24b74f7e SHA512 f78ec5b6ff35e26f6291810c8656c284267c85d611aef4d27671b593393b562ee4833a864201f49170e4a1ba76dad09366a59db005a3724de37a04a4b14d9c92
+EBUILD wine-d3d9-2.20.ebuild 18369 BLAKE2B eeb6ca9962a9fadba0ca38bfc897d81d717fca7494ed81f088f74f112840bef66faca28e5ebad670395dde823badd8af5524d87bdbcd0c36ed375500801087b3 SHA512 4d6ea9b593173daa751cff2e0431bbb1372d6bb8783ae04dbef5055ffbe221194108d9fe227821afbf11b697c3cf73071194a131f276b30b87797ecc7e35069a
+EBUILD wine-d3d9-2.21.ebuild 18369 BLAKE2B eeb6ca9962a9fadba0ca38bfc897d81d717fca7494ed81f088f74f112840bef66faca28e5ebad670395dde823badd8af5524d87bdbcd0c36ed375500801087b3 SHA512 4d6ea9b593173daa751cff2e0431bbb1372d6bb8783ae04dbef5055ffbe221194108d9fe227821afbf11b697c3cf73071194a131f276b30b87797ecc7e35069a
+EBUILD wine-d3d9-9999.ebuild 18406 BLAKE2B e981d1c2871021bfc56f343786ea84a2246ca94d887a0f32b5291e46a892bed79832c841569eed20c197269f44543e75c68bf149226683b30d544c46038b66f2 SHA512 e88fe7bed4a0ec868998f73e9d50ba7f1ee6a19afc9c955a9238972f0b0d4d7f5d92fb62a734feeca1db118ea38142d2ef1b4e04f3ccdae7a7dbe8c599513f80
+MISC metadata.xml 3156 BLAKE2B 9de99a0b5858eb0efd1422ffd1814aa18708301bd75743835a44734c13f799611672a2cd4e1bc28359bac3cb9f0e39209f2c94eaad9a5c9024d95fbb8a22f558 SHA512 9bf6d532ba656dbca472ccfec23e916e918089943cd65b37593b7643e34b656fae69fdac4f0036f8de7e8bbdd8b8f3fb7ea57aa65d74a82dca5f19f6e4f7ded9
diff --git a/app-emulation/wine-d3d9/metadata.xml b/app-emulation/wine-d3d9/metadata.xml
index b1ac4c1095ea..0c11e37e8c4b 100644
--- a/app-emulation/wine-d3d9/metadata.xml
+++ b/app-emulation/wine-d3d9/metadata.xml
@@ -10,7 +10,7 @@
 		</description>
 	</maintainer>
 	<maintainer type="person">
-		<email>commendsarnex@gmail.com</email>
+		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
 	<longdescription>
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
index 296fe4e7b71a..0ca4d6a8699e 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
@@ -134,13 +134,9 @@ 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 )
-	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-d3d9/wine-d3d9-2.19.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
index 94d819782d2f..45394c946984 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
@@ -135,13 +135,9 @@ 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 )
-	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-d3d9/wine-d3d9-2.20.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
index cd620120b755..d8fd326eccbc 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
@@ -136,13 +136,9 @@ 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 )
-	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-d3d9/wine-d3d9-2.21.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
index cd620120b755..d8fd326eccbc 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
@@ -136,13 +136,9 @@ 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 )
-	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-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index 7781bcbed2f8..b48cb73fb1b6 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -138,13 +138,9 @@ 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 )
-	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