gentoo resync : 22.05.2018

5 files changed, 10 insertions, 14 deletions

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 968d285f1c9a..a661bb43477c 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -4,8 +4,8 @@ AUX dmenu-9999-gentoo.patch 564 BLAKE2B bd1d71e7e234c00a6d8b2f099b50e04fa6ba848c
 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 DIST dmenu-4.7.tar.gz 15597 BLAKE2B d942c541a0e76d7287c85073324b0107224256d944a87f575e02238a10f16eb62d1eee06182da91242c049e3b17fa4068be72ffd1c70f6a7bbf5a0596fe62162 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
-EBUILD dmenu-4.6.ebuild 1304 BLAKE2B 3ee7a6e77913cb0f56cc993a53a2e0aa6db9e672492fdcba04c3a0ae37156325f4a7a872a52fd038f8065586abb6cfc41b6f0128965c48394ea7d167ced7d1a8 SHA512 7f18e03b71c1624a8e12d3afaac86471d45fbd1112474d13c3e09f32d05f08aa70104e694e467b98f22ea7174396c682e2febefa78d4104a16dc063c421a5e3f
-EBUILD dmenu-4.7-r1.ebuild 1363 BLAKE2B 50df42df0d21c21e021dc65b00e6631f9bd5929ac91cc456e041346dfd62c829e277a1eaf8258596d3ae42dfc2ebf86898429c1a6a2dffcf976c523efb759554 SHA512 ce758035973b61c24c01d23e96cae27e519698a2230ebd5366daf8126a7e065bbc3bc300467264c6f658042834f1fa4d46839894593c2bbd6caf3054f3fc15ac
-EBUILD dmenu-4.8.ebuild 1363 BLAKE2B 327c0395748865b5f653bd983aa24a4f8ae2c4938644149f3517d700c29c8187c55abb57b104202859291bfca2b878cd3db8e7d96ed6367341a4d3acd89ead41 SHA512 ef85769d84e91bcf8ebeff02b9c58d913ba6294fca1690d536cfc1f2529b66068b887a059b3b0b9c0f512be8b45e8174bcebb88a7919b9c2a8b32375da723fc4
-EBUILD dmenu-9999.ebuild 1187 BLAKE2B 43bb2a12438cd4e0b025807cae79940d6af7b1b92ec23ec742d8a81b09c32a6907e1647fe2723924ceaeeae79250151a317e215c39bd58da4f85b249bb829e12 SHA512 90a387bb053d733ee3616d23e227e0620750fa6140e587eee2ad7516f8e97276b4660782c175cf94e23f7d06dc51a14ddcf9b0253a35b76e3a57688f04d66c03
+EBUILD dmenu-4.6.ebuild 1268 BLAKE2B 525a04d499b2b5f6cf2f3b4abede52af3c7cf637185cff3174841b2c833468887b16a54614c7ce97f5a74a924031bc971706a0b79b427197878087fabc6105cf SHA512 6950b25d07543312738ee66bd8031d6a12fa3b19aa9323f1a1847bcbdf79c18e5f23f813b40784b649f4543b64816d5c019b8e5c87c275ea1cf91e468cafd98d
+EBUILD dmenu-4.7-r1.ebuild 1327 BLAKE2B 0646edee514a726203e4c30bfb62ec930f363824759b6d83f6afb42e4f573e0ab781e3c8305229f698209fbcc84a056f2ffb5456f36d6e804545a29974e967e4 SHA512 3262456f61e12f996bcecfcdebf2cf963bff0a3682b25b6881955c875c09586800f0c4acd43963798ab81f30cf6631c990a14a0dcaa8d0a53f1183d78491ee54
+EBUILD dmenu-4.8.ebuild 1327 BLAKE2B 0646edee514a726203e4c30bfb62ec930f363824759b6d83f6afb42e4f573e0ab781e3c8305229f698209fbcc84a056f2ffb5456f36d6e804545a29974e967e4 SHA512 3262456f61e12f996bcecfcdebf2cf963bff0a3682b25b6881955c875c09586800f0c4acd43963798ab81f30cf6631c990a14a0dcaa8d0a53f1183d78491ee54
+EBUILD dmenu-9999.ebuild 1151 BLAKE2B 9c85ecf080068cbac6b58ef558ae99747a854fdd34372e9d5d53513e66af64cbc73dc3b56cdea4428eb2c3ba632cb909e2c87db011d4fa3079cc36c1a0a0922d SHA512 3f5ce19b865487b2ab20e35d05086818c81fc0e315fe4b7e1f8b840ab2e3bb87b0dde735e3a73d7af270e96e73ba70174a25ec35ff4ccbd5dc0de1f776108163
 MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index dbf358fff497..5d02c8d814f9 100644
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.6.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
@@ -21,8 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-misc/dmenu/dmenu-4.7-r1.ebuild b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
index 05dc375cb2ba..1bf43050b79d 100644
--- a/x11-misc/dmenu/dmenu-4.7-r1.ebuild
+++ b/x11-misc/dmenu/dmenu-4.7-r1.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
@@ -21,8 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.7-gentoo.patch
diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index 8740afefa1f1..1bf43050b79d 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -21,8 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.7-gentoo.patch
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index 5cb15906696b..f2222c4d6bc8 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -21,8 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch