gentoo resync : 22.05.2018

4 files changed, 10 insertions, 16 deletions

diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index ed1905b35dfe..c009b93c814e 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -5,7 +5,7 @@ DIST xosd-gentoo-m4-1.tar.bz2 5043 BLAKE2B c855a8c114911c2bec1bd582c19ef09f731a8
 DIST xosd_2.2.14-1.diff.gz 8616 BLAKE2B b9eb96eee0bd561923507fb2bddf87e8f9ad986aae1cb8c820d1bf3de00685934b3813dd0e697406855afe1c0aa5111e214260cb2e425725b479a23617fe5c75 SHA512 257ada9e0261c45c4c182acceeb24b95bbce08ec2ccae7ef49f9c5ee7a1e9995bd9527df725e0a871d48fa444899669320dc536674d0de71b766e9106097f86e
 DIST xosd_2.2.14-2.1.debian.tar.xz 17276 BLAKE2B 77caf1f33ba66698ab7f1894da3da27e754fe5989814427de804b9797f71930e2d52ced403f72cdbac9522337876bec2c93fc83b0d97f7e0d05f8b78337d0b34 SHA512 ba5d86d2391e6dfdc6a2994e486f9c5ecd1934438815f4dc01c0633192d74a2fa2cabe647574052c4a87203e0c12b9bb8c38851975c36f19d113787dae3681ee
 DIST xosd_2.2.14.orig.tar.gz 418331 BLAKE2B 2f7b8fbc31a2341ede7bc85c35ede4209c1d3a74ce07dbc62f302aa6d81a00e5e0dd4880d8ac290c0ff0f3babfcdb8b5975f7375cdafdc87fa0747c8ed8295ad SHA512 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473
-EBUILD xosd-2.2.14-r1.ebuild 1156 BLAKE2B 7be00aaab8272e9b143e06908e6e8b95c8f48aebfbbd6148af8638cc3e5378f5748a0fe9565fa8467d3eae10a4291d01b8d17abb6b49fe40044cda25d92577b1 SHA512 d84399e4bd1a77f674e6bf5a594ac09deaf829c077e32876a984e4d4bff8e69bf9d85303b729deb285077556573e937332db7363f1184ea1c7daa8980b7c5d7d
-EBUILD xosd-2.2.14-r2.ebuild 1247 BLAKE2B 23c1013bc117d0fb57580b94bd454fa129624dcc138aee6235002600c1e5e6e98d13861565084e98bc95a21fe09b3fff3ee02e57ce13e77dc059d03607c37188 SHA512 32984e501b28942e69ba29483764dca176a420af1e36772fe0764db8df338e808a44824e042a0187d519266ebddcb57ddf3c9f5452d448e1306f4a23849df2e6
-EBUILD xosd-2.2.14_p2_p1.ebuild 1356 BLAKE2B ff4930d70a9c76fb6f4adc4ced32f7a0eff627ed3869371a4f21f47abcfb4713c9148bc3911aa0d2867479e4073df8752b537191fcdb19198cef6b3da10f009a SHA512 d0ad103f468b1fdaf720f4d3adabcef8d4eca235828fef7bb6767654d10a3f2334e81ce1c0e22a84d7cf4e588bce85354bd423e5023fd53dda993dee22b0f0c1
+EBUILD xosd-2.2.14-r1.ebuild 1099 BLAKE2B a9efbbb9e7b743c9d04f1ebc6c803c427a312ea3e792c1fa5903136a3cf32fee16c1e53358dbd6e9d890c59d7b8665557c247ab8014a30b6bd6b18a372e512ae SHA512 b0b66039f6275381f403a9be4f5354cd4bfbee8b8ac006aff95fe20b0876dbdb866ea01be8ea3b5eceb374cdb21f5ed988edd8d021a44988b0679ee060ba954a
+EBUILD xosd-2.2.14-r2.ebuild 1190 BLAKE2B 054a0dae420343fd1cd566e99a27303db6c2864ce7b3f9f80b951a0cc2d378d1b60991b45a037b0d14c376c35c6408ce9ea82abded92dd082166e401062db3c6 SHA512 07682fb573d500f91c8ec140edd30b7caa438a38f07e05f6fde9b040d4ce26d58023c3f3e3783364faf1bd52ed73cd0ab3ff9b07ead6ccbc62e4d340de1a0f89
+EBUILD xosd-2.2.14_p2_p1.ebuild 1299 BLAKE2B 17b626b5b5fe3a3575c1c5e920a3540ee3dad816090f4144fb2d020734043d19b1756af3b13aad2be880de7ce06eb672bbad6f2133dd862b4df818fb0b3be995 SHA512 b4c294dec4978c8bb2ba6b16d1505f678877b814c1fc0d9231cd085f829177017441b0a0e5fe80215729d069e4702a5d4931b4df97fb26bdb8f110bff15f5b55
 MISC metadata.xml 216 BLAKE2B 21fa7ec50873cc5605163ee8d7bd348d3626bcb0bf69e879aae3dc4f65dfd7fe3b81c862c9d17fb2d97284a119e4282d850879c54b03096059958a308146a4c0 SHA512 8b8a55269a3c1429d2f13a0056d9e500cf3b176584b9dc259eaccc2e68a3eb86234e522fdd960e9ee35d6039ce1e747c6bb986ef00af259279537a29a15adfc7
diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
index 4f7e0879011e..1279eb3dc264 100644
--- a/x11-libs/xosd/xosd-2.2.14-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
@@ -21,10 +21,8 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	media-fonts/font-misc-misc"
 DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-libs/xosd/xosd-2.2.14-r2.ebuild b/x11-libs/xosd/xosd-2.2.14-r2.ebuild
index 69eccafd1c8c..f5629247357b 100644
--- a/x11-libs/xosd/xosd-2.2.14-r2.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14-r2.ebuild
@@ -21,10 +21,8 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	media-fonts/font-misc-misc"
 DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
index c255a3e1ee6e..98ff80fc919a 100644
--- a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.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
@@ -24,10 +24,8 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	media-fonts/font-misc-misc"
 DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 DOCS=(
 	AUTHORS ChangeLog NEWS README TODO