summaryrefslogtreecommitdiff
path: root/x11-plugins
diff options
context:
space:
mode:
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/Manifest.gzbin28675 -> 28658 bytes
-rw-r--r--x11-plugins/allin1/Manifest2
-rw-r--r--x11-plugins/allin1/allin1-0.5.0-r2.ebuild4
-rw-r--r--x11-plugins/asapm/Manifest2
-rw-r--r--x11-plugins/asapm/asapm-3.1-r1.ebuild4
-rw-r--r--x11-plugins/ascpu/Manifest2
-rw-r--r--x11-plugins/ascpu/ascpu-1.11-r1.ebuild4
-rw-r--r--x11-plugins/asmem/Manifest2
-rw-r--r--x11-plugins/asmem/asmem-1.12-r1.ebuild4
-rw-r--r--x11-plugins/asmon/Manifest4
-rw-r--r--x11-plugins/asmon/asmon-0.71-r1.ebuild4
-rw-r--r--x11-plugins/asmon/asmon-0.71.ebuild2
-rw-r--r--x11-plugins/astime/Manifest2
-rw-r--r--x11-plugins/astime/astime-2.8-r2.ebuild4
-rw-r--r--x11-plugins/cputnik/Manifest2
-rw-r--r--x11-plugins/cputnik/cputnik-0.2.0.ebuild2
-rw-r--r--x11-plugins/enigmail/Manifest4
-rw-r--r--x11-plugins/enigmail/enigmail-2.0.5.ebuild (renamed from x11-plugins/enigmail/enigmail-2.0.3.ebuild)2
-rw-r--r--x11-plugins/epplets/Manifest4
-rw-r--r--x11-plugins/epplets/epplets-0.12.ebuild3
-rw-r--r--x11-plugins/epplets/epplets-0.14.ebuild5
-rw-r--r--x11-plugins/fsviewer/Manifest2
-rw-r--r--x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild4
-rw-r--r--x11-plugins/gkrellm-leds/Manifest2
-rw-r--r--x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild2
-rw-r--r--x11-plugins/wmCalClock/Manifest2
-rw-r--r--x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild3
-rw-r--r--x11-plugins/wmMatrix/Manifest2
-rw-r--r--x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild3
-rw-r--r--x11-plugins/wmSMPmon/Manifest2
-rw-r--r--x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild2
-rw-r--r--x11-plugins/wmSpaceWeather/Manifest2
-rw-r--r--x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild3
-rw-r--r--x11-plugins/wmSun/Manifest2
-rw-r--r--x11-plugins/wmSun/wmSun-1.05.ebuild2
-rw-r--r--x11-plugins/wmacpiload-ac/Manifest4
-rw-r--r--x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild4
-rw-r--r--x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild2
-rw-r--r--x11-plugins/wmacpimon/Manifest2
-rw-r--r--x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild5
-rw-r--r--x11-plugins/wmamixer/Manifest2
-rw-r--r--x11-plugins/wmamixer/wmamixer-0.2.ebuild4
-rw-r--r--x11-plugins/wmapm/Manifest2
-rw-r--r--x11-plugins/wmapm/wmapm-3.1-r1.ebuild3
-rw-r--r--x11-plugins/wmappl/Manifest2
-rw-r--r--x11-plugins/wmappl/wmappl-0.71.ebuild2
-rw-r--r--x11-plugins/wmbatteries/Manifest2
-rw-r--r--x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild2
-rw-r--r--x11-plugins/wmbiff/Manifest6
-rw-r--r--x11-plugins/wmbiff/wmbiff-0.4.28.ebuild3
-rw-r--r--x11-plugins/wmbiff/wmbiff-0.4.30.ebuild3
-rw-r--r--x11-plugins/wmbiff/wmbiff-0.4.31.ebuild3
-rw-r--r--x11-plugins/wmbinclock/Manifest2
-rw-r--r--x11-plugins/wmbinclock/wmbinclock-0.5.ebuild2
-rw-r--r--x11-plugins/wmbio/Manifest2
-rw-r--r--x11-plugins/wmbio/wmbio-1.02.ebuild4
-rw-r--r--x11-plugins/wmblob/Manifest2
-rw-r--r--x11-plugins/wmblob/wmblob-1.0.3.ebuild4
-rw-r--r--x11-plugins/wmbutton/Manifest4
-rw-r--r--x11-plugins/wmbutton/wmbutton-0.7.0.ebuild3
-rw-r--r--x11-plugins/wmbutton/wmbutton-0.7.1.ebuild2
-rw-r--r--x11-plugins/wmcalc/Manifest2
-rw-r--r--x11-plugins/wmcalc/wmcalc-0.6.ebuild2
-rw-r--r--x11-plugins/wmcdplay/Manifest4
-rw-r--r--x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild3
-rw-r--r--x11-plugins/wmcdplay/wmcdplay-1.1.ebuild2
-rw-r--r--x11-plugins/wmclock/Manifest2
-rw-r--r--x11-plugins/wmclock/wmclock-1.0.16.ebuild2
-rw-r--r--x11-plugins/wmclockmon/Manifest2
-rw-r--r--x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild4
-rw-r--r--x11-plugins/wmcoincoin/Manifest4
-rw-r--r--x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild10
-rw-r--r--x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild10
-rw-r--r--x11-plugins/wmcp/Manifest2
-rw-r--r--x11-plugins/wmcp/wmcp-1.2.8.ebuild3
-rw-r--r--x11-plugins/wmcpuload/Manifest2
-rw-r--r--x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild2
-rw-r--r--x11-plugins/wmdiskmon/Manifest2
-rw-r--r--x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild4
-rw-r--r--x11-plugins/wmfortune/Manifest2
-rw-r--r--x11-plugins/wmfortune/wmfortune-0.241.ebuild3
-rw-r--r--x11-plugins/wmfrog/Manifest4
-rw-r--r--x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild4
-rw-r--r--x11-plugins/wmfrog/wmfrog-0.3.1.ebuild4
-rw-r--r--x11-plugins/wmfsm/Manifest2
-rw-r--r--x11-plugins/wmfsm/wmfsm-0.36.ebuild2
-rw-r--r--x11-plugins/wmget/Manifest2
-rw-r--r--x11-plugins/wmget/wmget-0.6.1.ebuild2
-rw-r--r--x11-plugins/wmgrabimage/Manifest2
-rw-r--r--x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild4
-rw-r--r--x11-plugins/wmifinfo/Manifest2
-rw-r--r--x11-plugins/wmifinfo/wmifinfo-0.10.ebuild2
-rw-r--r--x11-plugins/wminet/Manifest2
-rw-r--r--x11-plugins/wminet/wminet-3.0.0-r1.ebuild4
-rw-r--r--x11-plugins/wmix/Manifest4
-rw-r--r--x11-plugins/wmix/wmix-3.2.ebuild2
-rw-r--r--x11-plugins/wmix/wmix-3.3.ebuild2
-rw-r--r--x11-plugins/wmlaptop/Manifest2
-rw-r--r--x11-plugins/wmlaptop/wmlaptop-1.4.ebuild3
-rw-r--r--x11-plugins/wmload/Manifest2
-rw-r--r--x11-plugins/wmload/wmload-0.9.7.ebuild2
-rw-r--r--x11-plugins/wmmand/Manifest2
-rw-r--r--x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild5
-rw-r--r--x11-plugins/wmmemload/Manifest2
-rw-r--r--x11-plugins/wmmemload/wmmemload-0.1.8.ebuild2
-rw-r--r--x11-plugins/wmmisc/Manifest2
-rw-r--r--x11-plugins/wmmisc/wmmisc-1.1.ebuild2
-rw-r--r--x11-plugins/wmmixer/Manifest2
-rw-r--r--x11-plugins/wmmixer/wmmixer-1.8.ebuild2
-rw-r--r--x11-plugins/wmmon+smp/Manifest2
-rw-r--r--x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild4
-rw-r--r--x11-plugins/wmmon/Manifest6
-rw-r--r--x11-plugins/wmmon/wmmon-1.2_beta1.ebuild4
-rw-r--r--x11-plugins/wmmon/wmmon-1.3.ebuild4
-rw-r--r--x11-plugins/wmmon/wmmon-1.4.ebuild2
-rw-r--r--x11-plugins/wmmoonclock/Manifest4
-rw-r--r--x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild3
-rw-r--r--x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild3
-rw-r--r--x11-plugins/wmmp3/Manifest2
-rw-r--r--x11-plugins/wmmp3/wmmp3-0.12.ebuild4
-rw-r--r--x11-plugins/wmnd/Manifest4
-rw-r--r--x11-plugins/wmnd/wmnd-0.4.16.ebuild4
-rw-r--r--x11-plugins/wmnd/wmnd-0.4.17.ebuild4
-rw-r--r--x11-plugins/wmnet/Manifest2
-rw-r--r--x11-plugins/wmnet/wmnet-1.06-r1.ebuild3
-rw-r--r--x11-plugins/wmpeople/Manifest2
-rw-r--r--x11-plugins/wmpeople/wmpeople-1.3.ebuild3
-rw-r--r--x11-plugins/wmpinboard/Manifest4
-rw-r--r--x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild4
-rw-r--r--x11-plugins/wmpinboard/wmpinboard-1.0.ebuild3
-rw-r--r--x11-plugins/wmping/Manifest2
-rw-r--r--x11-plugins/wmping/wmping-0.2.1.ebuild5
-rw-r--r--x11-plugins/wmpower/Manifest2
-rw-r--r--x11-plugins/wmpower/wmpower-0.4.3.ebuild3
-rw-r--r--x11-plugins/wmrack/Manifest4
-rw-r--r--x11-plugins/wmrack/wmrack-1.3.ebuild2
-rw-r--r--x11-plugins/wmrack/wmrack-1.4.ebuild4
-rw-r--r--x11-plugins/wmrecord/Manifest2
-rw-r--r--x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild3
-rw-r--r--x11-plugins/wmsmixer/Manifest2
-rw-r--r--x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild3
-rw-r--r--x11-plugins/wmswallow/Manifest2
-rw-r--r--x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild2
-rw-r--r--x11-plugins/wmtime/Manifest2
-rw-r--r--x11-plugins/wmtime/wmtime-1.4.ebuild2
-rw-r--r--x11-plugins/wmtop/Manifest2
-rw-r--r--x11-plugins/wmtop/wmtop-0.85.ebuild2
-rw-r--r--x11-plugins/wmweather/Manifest6
-rw-r--r--x11-plugins/wmweather/wmweather-2.4.4.ebuild2
-rw-r--r--x11-plugins/wmweather/wmweather-2.4.5.ebuild4
-rw-r--r--x11-plugins/wmweather/wmweather-2.4.6.ebuild4
-rw-r--r--x11-plugins/wmwifi/Manifest2
-rw-r--r--x11-plugins/wmwifi/wmwifi-0.6.ebuild3
-rw-r--r--x11-plugins/wmwork/Manifest2
-rw-r--r--x11-plugins/wmwork/wmwork-0.2.5.ebuild2
-rw-r--r--x11-plugins/wmxkb/Manifest2
-rw-r--r--x11-plugins/wmxkb/wmxkb-1.2.2.ebuild6
-rw-r--r--x11-plugins/wmxres/Manifest2
-rw-r--r--x11-plugins/wmxres/wmxres-1.2.ebuild7
159 files changed, 216 insertions, 251 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 49d5ce0e2254..1673bde8ebb7 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
Binary files differ
diff --git a/x11-plugins/allin1/Manifest b/x11-plugins/allin1/Manifest
index 8c627e3bec71..102511e1bc21 100644
--- a/x11-plugins/allin1/Manifest
+++ b/x11-plugins/allin1/Manifest
@@ -1,4 +1,4 @@
AUX makefile-r2.patch 587 BLAKE2B 0aab33c0b78c37f097237180663a929fcd1b6cc356afd36dcf07a88573a9214dd588a316ea06f6807536665b6663b0cd2c578873cbf6cdbc4a1f30d3ed844c0a SHA512 13b366ce564ddbf3aac94dae0ac7e4b1f5ea77755ae875bdb70b1ba9706045f6424c5fea3c870f6f9f0da0a986268ebdf81ebf71e9621c9e0256a3ecd738bab2
DIST allin1-0.5.0.tar.gz 43905 BLAKE2B e914d174d4b1c15e8df53deb793388d8d5cbe9e1a663663b08aad052654b6b759670310d1276f0705bd8faa459c33144a6656cb64610b9d6814809e65ea34798 SHA512 2728bc86b59850dd3e928ea62f00e32bb06a1ea4b8dc3611b2fdc952de8decef7d9ac3c51ed3676d242b5de670270e19bf5783658c6651ae534154249d99a4e7
-EBUILD allin1-0.5.0-r2.ebuild 761 BLAKE2B b094093385e214005db9328cbd77393d0f8b942cf5137a4bebd86eeee198542861c1de4bac09e21f69e69a092effdd061ca25a5a3760e661c63bdf9f62972421 SHA512 119bb0732a2a296a503166e08f49cc39b7bc1d40a59329c473bef3764a3b8ab8e3ca61fcb21f8f8cb98e8d01d963d7e8995d8e78a0365b283cdb346e825d441b
+EBUILD allin1-0.5.0-r2.ebuild 764 BLAKE2B 091505c9b4a8ed62086ffd511ec0c4e508741d75e8c082d82c021279ea8b0b2ed7aab5136253328e81bf0ea672bcb11dab43ee9f4d5c0a0ca42dee9ac2444e23 SHA512 2e190ad6ba8943ce8fa467b295086e1a5e7be92c7b4a0d3abefebb390d7b7e392831e1c950f5e15c255b18b39427a16464227770b6e7bd48781ddb1ee94f85fc
MISC metadata.xml 565 BLAKE2B 48f425151c443f6f259dbed623171924efcd303fbe38f6b26a9bc0991afbb50e1d58030dbcd643a3c0cf6b5f6a8c4818a6189615d62a7596c05f3f68a1ba5e97 SHA512 b206247b19e9c89c94f91c0f09cd74f214ea92748f454c4f19a9e8742fd65b852861b43abb5bbaa852e45a4bd77886800fe25c285670e4f3d867795c338d9891
diff --git a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild b/x11-plugins/allin1/allin1-0.5.0-r2.ebuild
index 3777c34d6a03..8fbbd58b567a 100644
--- a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild
+++ b/x11-plugins/allin1/allin1-0.5.0-r2.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
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
PATCHES=( "${FILESDIR}/makefile-r2.patch" )
diff --git a/x11-plugins/asapm/Manifest b/x11-plugins/asapm/Manifest
index 3f1357db304e..04fa400b8a43 100644
--- a/x11-plugins/asapm/Manifest
+++ b/x11-plugins/asapm/Manifest
@@ -2,5 +2,5 @@ AUX asapm-3.1-autoconf.patch 550 BLAKE2B d8d5756a905d63c927c79055ca3279a29065862
AUX asapm-3.1-include.patch 182 BLAKE2B e20dbd9d09cb48b5a2fe7f4f74c0ad6de46bbeecb99a83509a9733b4fdbb5616eb0e8155b255e528f4af8b45ff97eab25546db676cd5bf59a34a06e4f978bde0 SHA512 31308eb25b3ed6c409b38cb298e3bc411d47e28ead61605ce490e0698bacea4d741425259f3192958204899851e339716c99270216d094dd5554a2b54bf5feef
AUX asapm-3.1-ldflags.patch 330 BLAKE2B 068181eb71add675b58766dd336618ebcd64253483d10771052fccf0726b81be6832aa60e99a1979bcdd620350ce6874a4c34551a03b50437dd727b3d9081bfb SHA512 6fbf3311c20ae647d52bcc37c741ba16d5f74d042811e0b97554979cae637fa74bc58fa9ad55ddb20399bee29efe46857bfacf90118207f97c1b3ca58935d89f
DIST asapm-3.1.tar.gz 63203 BLAKE2B 9695c21066c3855a8d945af78751e3f5d0d06950cc199c60d886a5bd8b99fb2f9eb2e2035624f161b85b81bf58acf80b8a494753d74a4e9b1163f16b4037031e SHA512 01859deccba952428671fd77ce87251b1fe0c21221af13db9b14c9ef28babad11e1582fed02b076f16d66bdab398eeb7a48b5e3cdebcb4e153978e04f022a579
-EBUILD asapm-3.1-r1.ebuild 711 BLAKE2B 9ad6443611ecb01641769c79f208e3515e8183132bcf5bfcccfc25e4f05946a29f7c03ca9401a81f3bb1d5eaa65d083305f23a38b5fa1f4f8fd4f597247f4eba SHA512 080c409e544140d44ad80706d9fec200b2b5ac32a18c5542921f1ecd93f15931165120369c368d147682c43c1f52eb00e374f82f8907317dc7592ccd2a7acfee
+EBUILD asapm-3.1-r1.ebuild 714 BLAKE2B 7686d7abe939aea4d3d512af1e39fa6fb8031e2d81a022f7c603db7cf63fca10de688cec7857ff334480cdafe8174187ced7aeb16d45d8abe3261fcdb63a0f45 SHA512 e79fd761521c4220ecdf23fde8d58546ef4316be496c59bf0b672438468cedbe3884ab09dff8f7f4f0e717f3bed2bd4febbff5e8013fd52b0efa6949bd6a58a1
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/asapm/asapm-3.1-r1.ebuild b/x11-plugins/asapm/asapm-3.1-r1.ebuild
index 91e71f33349a..8d6ea14a2354 100644
--- a/x11-plugins/asapm/asapm-3.1-r1.ebuild
+++ b/x11-plugins/asapm/asapm-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_prepare() {
epatch "${FILESDIR}"/${P}-{ldflags,include,autoconf}.patch
diff --git a/x11-plugins/ascpu/Manifest b/x11-plugins/ascpu/Manifest
index b0b6a3a3c17d..8e271a701bff 100644
--- a/x11-plugins/ascpu/Manifest
+++ b/x11-plugins/ascpu/Manifest
@@ -1,4 +1,4 @@
AUX ascpu-1.11-gentoo-r1.patch 1432 BLAKE2B 670d838f10f4a5daa93891154a87e7a0ca1cbcae92e3098ba676d610b7505e722f30cfcfea85f1b8b3caa2af90571af2ced5a687925910f34b7546259c53052f SHA512 efd6ebbc202490ca16cb0c569e7be07699ad4f9829d4e9467fdb1d88f6f6b3940bed8be5ed9d1bd8f81c480828639b1b60b4f1bfd6e875f8de6d4513abbb7ff2
DIST ascpu-1.11.tar.gz 43867 BLAKE2B 208b2c35ac233a3b33a48f27c3173ba05f321b0f235e199d7165e4be3ed5b638f820685847affb12a576a3ed03e684ed99448ce6557e7e7e4416f9b1eeb1a769 SHA512 fd2b4b7f27a9b585b4454237b39f5a8e662e309274a350d55e0c6f552c3d7a9626b47b84d889fd773d3785076fac08d5a595c92f81947e601d23f1f96421eb61
-EBUILD ascpu-1.11-r1.ebuild 711 BLAKE2B c10bcaef68b787ba5f595325063a3847abc265dccca73441d061b07410a34152a2e949372a12129c8dc5abc43134b029b1352977a63cf7c392fb873ff2342c44 SHA512 a52ebd8e56d0fec7af0d396f2a02b54a7ffb9157dbaa3be74dc98e2c7e3f3f5c79716c6e32a9cc41235f054780a02612bedf0817c885c42708b2ec1ea5ba647e
+EBUILD ascpu-1.11-r1.ebuild 714 BLAKE2B ccb3d89fda3714944d7d8bddb0298d5b6d509c2c83109fc4d15e77309baa8cdfd031afbe8fffb7e0a7bfe8ed524e10503398dac6d52eb85e99c52e811d345fea SHA512 33b31b722405dd47445f96185e92a306cd843064d8e22ecabd8cba115fac4f5aaec0f2f1a75048c7382b76fd8a05e781b60d47b45d0dea57c67df1b83d1f166a
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/ascpu/ascpu-1.11-r1.ebuild b/x11-plugins/ascpu/ascpu-1.11-r1.ebuild
index ab325222b55d..3fd3792e775f 100644
--- a/x11-plugins/ascpu/ascpu-1.11-r1.ebuild
+++ b/x11-plugins/ascpu/ascpu-1.11-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
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libXpm
jpeg? ( virtual/jpeg:0 )"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
PATCHES=( "${FILESDIR}/${P}-gentoo-r1.patch" )
diff --git a/x11-plugins/asmem/Manifest b/x11-plugins/asmem/Manifest
index 088d9baa6e14..b1002805d78f 100644
--- a/x11-plugins/asmem/Manifest
+++ b/x11-plugins/asmem/Manifest
@@ -1,4 +1,4 @@
AUX respect-ldflags.patch 800 BLAKE2B cce3ba814ae0b78835543ae95a0b9ed6e52b267068cba4dbf3451e169b84e343d8192608e2ea392b99b7b28f337b671cb0a1a013eb7181829f633742b6f45d22 SHA512 10f1b7cadebdc39ba63ae5adbe9fcb4a5da24f134dfa3ad225c9f09d4aff72d98f3986437ba183a329a3c7cbad07358ddb019f78812e376dc353788e1c253d5b
DIST asmem-1.12.tar.gz 48058 BLAKE2B 8211791d8a7ef2b664552ff89802d84b3fb2cc8b6e1780319e6ea4a3530ad172da439a7ec9ef691fef42b0ec98e5b57af256762c98d03857ad6333fb8234862f SHA512 3f086c55b6ef2804b8c32cf2eb8c9937a6f69886d89bdf09cab29a6f567a9620adb86a7c9ec19d88feece1e03eee3507601d520fe1eca1588a28494516b2e1f0
-EBUILD asmem-1.12-r1.ebuild 777 BLAKE2B a98612434045927dd1524596a722481ab3a377a02762a0373e193d5988d2d3bfe050d3e6e37d1973aeebfaddd834a3f9d69a224470b8ef84364a6983a27e4d3f SHA512 539a8e9542e4c31306af7e61ea28744c7a9f0330072a72c040afd7b19f1db192f5dfc267fb9f51fa2765d6186b7388473a8ebf40c18240a088299ea3b30e2568
+EBUILD asmem-1.12-r1.ebuild 780 BLAKE2B 499f9fd44ea063244e6265fcf655b0fae17fe934d5f32776426d14f8fa816df2eb3578e6b05c03e4d28934c3bdbdec092502f547aed8b6090ee03d877e73e5ed SHA512 96bf633d54169b7b92d8de88d7be0466fc2de9b4f374ea8776bd0f5501cc235ca5bc544cabeb82ad639f8f281a7f7147ac4f520fae1898e23a3a0fb643fb83fa
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/asmem/asmem-1.12-r1.ebuild b/x11-plugins/asmem/asmem-1.12-r1.ebuild
index e0f39bf7ed56..2eb08c18251d 100644
--- a/x11-plugins/asmem/asmem-1.12-r1.ebuild
+++ b/x11-plugins/asmem/asmem-1.12-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,7 +21,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
jpeg? ( virtual/jpeg:0 )"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
PATCHES=( "${FILESDIR}/respect-ldflags.patch" )
diff --git a/x11-plugins/asmon/Manifest b/x11-plugins/asmon/Manifest
index bbcba3416039..802e4a099242 100644
--- a/x11-plugins/asmon/Manifest
+++ b/x11-plugins/asmon/Manifest
@@ -1,5 +1,5 @@
AUX asmon-0.71-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
DIST asmon-0.71.tar.bz2 42235 BLAKE2B 5e82638ae115ea088e4936615e8a67074cb8a1bde42607f37837edb1d774f24bb71d3db1d69780e4810eafcdaef681306fc07ce50e8eed1a96edf610cc081cbc SHA512 20d321b228e0157e9e2611eeac017fdf6a9e9eb8ba6e02c7c30adadb411529da408b7a543e18b30de0659ccf4f86bfde21bef392e2a4756803c58a9f28c31c45
-EBUILD asmon-0.71-r1.ebuild 751 BLAKE2B ab5fee650356f16041891a4841573b2a2c5465d04c2a4314044d9e2935c055dfc4f354fcea1e2488f88b18ed2c012acee8671a7633194bfabe05eb89414f0a1b SHA512 87ea461e2d62948ee3479dac64aa429d59cb359a932365859a75232637fef9f52a8a2998b928dac2c96f88964cb146d712e705b04cdf294c908f175b36e982e0
-EBUILD asmon-0.71.ebuild 740 BLAKE2B 34c4190d3e544515e8e7013708c675e358c43696d8afe30bd789f8fea4b051bf719eeb21e5c091996ddbddee5022de5932941608413b568328e5f7a63c01b1ba SHA512 f99192d2eba01c710dce423d6a461856e922784ee511241134d425897244d7ea0587db0552ff18cf9b1977d9c969ffb1e486fa3f26b779c511243722e0554e57
+EBUILD asmon-0.71-r1.ebuild 751 BLAKE2B d6f0779cebc2b06fa2c20f29e078f2b7de6e30daf5f961a25fa4f978708b53a6a283bbe8b2db0659d5ee1d99f35e4a03436b478ebb1cf04e6558ff7e3d0c72e1 SHA512 011d17c18c486f6efb48b599d840a8fe481f822b60e59da765ca9ed44bb9d884261f6822fe09707811a655f1052d236b954ce6bf1e10802b6f06d8657e9547d2
+EBUILD asmon-0.71.ebuild 740 BLAKE2B a7e4657ad1ec3b75db76ebbeac5e293d4ecf416b4c7b187db63f8b0dccf5a2544cae62d926ff302a05737faf9c2cbf1c105a09534144b411f363ac88f680f9b5 SHA512 40e3ab034daea9a63eb115eb736ebe6a085bb2dc55694a3e2bef985302b80e5a89a3a552859b744f415669462da934dd5453e3bfd4a8706e7552985e344f988a
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild
index f6be82776b11..74d7319ab55c 100644
--- a/x11-plugins/asmon/asmon-0.71-r1.ebuild
+++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
x11-libs/libXpm
x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P}/${PN}
diff --git a/x11-plugins/asmon/asmon-0.71.ebuild b/x11-plugins/asmon/asmon-0.71.ebuild
index 27a25f7cda5d..6bea68eeba79 100644
--- a/x11-plugins/asmon/asmon-0.71.ebuild
+++ b/x11-plugins/asmon/asmon-0.71.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libXext
x11-libs/libXpm
x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P}/${PN}
diff --git a/x11-plugins/astime/Manifest b/x11-plugins/astime/Manifest
index c1b56649b962..1cc5b63be8a6 100644
--- a/x11-plugins/astime/Manifest
+++ b/x11-plugins/astime/Manifest
@@ -1,4 +1,4 @@
AUX respect-ldflags.patch 402 BLAKE2B 959b2ed794c9fe673d48125f55322df2c2abbc3342cba6b395727e0fcf2e96d498c2a8dece91101258f75e11096e722257e63e68b5c4df7cfa330dba207489c8 SHA512 8aed924b8b45b8a0b6760f8b97e4d633819167b317063cb5ae1c7a87e0f79bed583f7f05dc288db889ce9c24dacd921a994c4ea7a7a508068b09d813b4b46c3d
DIST astime-2.8.tar.gz 49679 BLAKE2B 3c0aeee5ae2202b682c6cc0c08704f047e9d1204802fbbfaac78dee2821aa59924fd08cab1ded0167be65c05877ef2a8fe527c3371a2e1a871cd3eb18767ae8f SHA512 e1bd185343c5c55cc6e4fc64599c71a8a523f02eb3d8aa0e4f69d8fbf9038d217a8b9fa943916a97759fa2c9827cab6159c1b497fa78b366f3641b46dd71e792
-EBUILD astime-2.8-r2.ebuild 677 BLAKE2B b3f947094ac6aeb9a425b8d4b2b623d48e9a3600cd54dd8acdd95fc827a7a1e470d6d48093bb417933affb763c6980d68dfb7af0b011221f4dfc101a9d6e8318 SHA512 c82c434e3c2e379c41c3cd4ad22041774d9759cba5d381207a9ce693e5866b3a944061fa889c328fcf53d3f5a430822c7b71736f12dc10fbb387345c3ee4a102
+EBUILD astime-2.8-r2.ebuild 680 BLAKE2B 24b8f11cdb68c115c9745d4bbb8cd5ea1e3a94ae1ea157814e415a574733dddf09aca97f5d1cd923144c3768c575cd31efa8c6ba7c8c8fb331635fe8bcad9ffe SHA512 2af6c72486007884a41b18ed67e60e079a0d9a61c101dbe83f7af4c0b64eb3a3d376e38220ea610ef3766b8f3871c52be86cf251ae49d956bc086129dfba6481
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/astime/astime-2.8-r2.ebuild b/x11-plugins/astime/astime-2.8-r2.ebuild
index ea8e6a19f84d..c50c9190ab75 100644
--- a/x11-plugins/astime/astime-2.8-r2.ebuild
+++ b/x11-plugins/astime/astime-2.8-r2.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
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libXpm
jpeg? ( virtual/jpeg:0 )"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
PATCHES=( "${FILESDIR}/respect-ldflags.patch" )
diff --git a/x11-plugins/cputnik/Manifest b/x11-plugins/cputnik/Manifest
index 0e496366defc..45eb33dbbd04 100644
--- a/x11-plugins/cputnik/Manifest
+++ b/x11-plugins/cputnik/Manifest
@@ -1,4 +1,4 @@
AUX cputnik-0.2.0-makefile.patch 710 BLAKE2B b3b8e0f003fd3ef538b3e5efa49362323e7cc0751324e16b57c11b369b9969f31a796e0f734799fc4c6d738b47b356f333831d39e721423fa40e0c73a316ff83 SHA512 aad5f90f1e8717b539048ee8e0ba1260b7342c8a4f8e9b077b58e1c12b7f057c8f17bb17e94e3afd145dd4aeec746ccc94d339daef302b173f8a17baf565a9aa
DIST cputnik-0.2.0.tar.gz 17850 BLAKE2B 90824218a349d9b6cdf592cafe8dd29674f975a190a19a3dd6b941383d47f4fc492af339cbbb88240499363a1048b2564855d5a17caeaf53437fe34bf0d55ee1 SHA512 829d9d63f82a2d41c0160be575b3fb7840a5c295c6dd16702240a6aa104e557bff83936c46243e850edf918b41ddc22fd123dab7f5ffd6492302d60c374df55f
-EBUILD cputnik-0.2.0.ebuild 733 BLAKE2B 4f59178245c786eda0e0f9e41e8e05d2c928cc66165cb86de3637af0e0860d173e64de46d67ce5bbe655156e537ba338c9d0efd69c1fd2672ce96423bc815f5a SHA512 ab73c447f915d9c4368c0e743fbf6a1b1c65e71d12661fdcc1f61f6ba1d8ed6fb28a7f09a22f2ba52f111751755859618c5a678c211ed0b1aaeb53735f2e0844
+EBUILD cputnik-0.2.0.ebuild 733 BLAKE2B de4d82cd0be22b3bc3c3774e4e5adaaf3a396c49b81459cc1aca84607c04f30caa9b440dea0131a7edfa47df1b0bed96cc09050fc219a7f2d5b203da397c406c SHA512 4c2f93045d322ac64265c244ecc28595fa23373f94ddc6a8fdb014f3ab49afd2a8af5bccba0dd84bcae73798e85d5f72972320e2e3c680558553ac2563a7afb7
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/cputnik/cputnik-0.2.0.ebuild b/x11-plugins/cputnik/cputnik-0.2.0.ebuild
index ee3e78fa8936..439645be1b36 100644
--- a/x11-plugins/cputnik/cputnik-0.2.0.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.2.0.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P}/src
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 96879b2e9b49..cc1f041a3be6 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,8 +1,8 @@
DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb
-DIST enigmail-2.0.3.tar.gz 2532924 BLAKE2B ac1d8ea129b82d22d73632f6f5c9f001a235a2b30c06cbbaedd5f886c2571a5b1606d980a7afcc4230ea414c38c3e194649273afb3303fff7ca671d916729598 SHA512 06f9f5573dddfb3563206b8fda6ff8861971ca5a6c2a64b7e425fb94ce07aaa994173e109faa0fd3a61cf9f43a2b45db389b7f6f6fe14540087531cda1d2c515
DIST enigmail-2.0.4.tar.gz 2533719 BLAKE2B 9c3a38233df2c05e4bbbdfa2fd762b6362cc0bbc143b7a417cdabee44b3873bd73747a7b8d50317987f5d1750acf7badfae631cc2827718ed5702c5df2d10709 SHA512 eadcd6bfe42c43d8dd569a8085d82b7acf94f77e5fc2c7632e4148b9cc21389552de687a81a3e88e9b2639adad677c85d6db9b14a39f994f79c0524500de0b3b
+DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b
EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
-EBUILD enigmail-2.0.3.ebuild 2174 BLAKE2B 8a2cc0d181c27dc6dfdfaf5e0d51983fe290b8b4fdaf7e3dcaba6401a1c874ff20d363a2b13ac14fac225c3d9aeb904e529de5945112a158ac6b32db37690e6c SHA512 be8c9b87f459bf006a2455d492190f5a4ad7a38ef3369c8408cb27fa65cfe36208175df1752cd5715c6f4592cafeec80b8f1e9535158cac771d74823d0d31afa
EBUILD enigmail-2.0.4.ebuild 2174 BLAKE2B 8a2cc0d181c27dc6dfdfaf5e0d51983fe290b8b4fdaf7e3dcaba6401a1c874ff20d363a2b13ac14fac225c3d9aeb904e529de5945112a158ac6b32db37690e6c SHA512 be8c9b87f459bf006a2455d492190f5a4ad7a38ef3369c8408cb27fa65cfe36208175df1752cd5715c6f4592cafeec80b8f1e9535158cac771d74823d0d31afa
+EBUILD enigmail-2.0.5.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
EBUILD enigmail-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e
MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.3.ebuild b/x11-plugins/enigmail/enigmail-2.0.5.ebuild
index c61c12f8ec4a..9e8d0cbb3958 100644
--- a/x11-plugins/enigmail/enigmail-2.0.3.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.5.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
else
SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
fi
S="${WORKDIR}/${PN}"
fi
diff --git a/x11-plugins/epplets/Manifest b/x11-plugins/epplets/Manifest
index de8df280d031..45487f70a2c3 100644
--- a/x11-plugins/epplets/Manifest
+++ b/x11-plugins/epplets/Manifest
@@ -1,5 +1,5 @@
DIST epplets-0.12.tar.gz 894232 BLAKE2B dc86da84888531a1af5b052c739b4f4d06d0d9013fe9d0f996ea529b2ad77541fa9e0b5c7acf30a2443c56c66a6765c6aab30f1bf36a560968194a85d980c723 SHA512 b8b017ed4199f6a083db4e66090611e24d50428d287b1ef414725e68bc48ecedc3f6a3c9f68d38645e9146739e35e43ca08197d832b38d580039f3a050de93dc
DIST epplets-0.14.tar.gz 971885 BLAKE2B c9dbbb268ec4580a81f0c7a8a786a5fcf03c88463be997de469892b57798d11c9e0e33196e2e83c2ea648888c5ec61cc964b06ed596b98606292b3719e3af25d SHA512 d83d60521fe06497f109c3fbb5c2e10abd36a43b050c10787a68d9f9f8c2866f57d78a8559a482654d9bb0eaaf3ce791e4839bb0fda88ccbf026d8ec5dc93824
-EBUILD epplets-0.12.ebuild 624 BLAKE2B 4306f818072f0872899b4456a87da5e59e407dd1ca044e9459b3ecd4a0d046abf9ff060ef443a68c63798f5ae0cf2d902c389c00fef69871e8b2391fff800207 SHA512 3edec26a73ba4e4b9111e0945d82ce2877e4be427d26ac061afaea09320ab519ca13d061b3581567dfc8bad1dc4509e2fb7253e87e90f0cb671d470e10c23b8d
-EBUILD epplets-0.14.ebuild 711 BLAKE2B b1761b5e046100530c0cb660759ea8ad682f082410dc1eedec101fa35b6ed54ed6ac0e41351f9337368b3b0dc9e417d65502fb004575bc8990c593db74e3dda1 SHA512 f046df68a1b813054fc97babd2adc82946a7fa648a2ff195f30610de9e31fcd406c119ddfdcb1ad2c15988fcecc89dada1b828fcd40c0789c44af6aaca28fa67
+EBUILD epplets-0.12.ebuild 606 BLAKE2B 13d48b3727fb1bdd6398bf0212c7d45157922ea39c7a02e0f4a06e91f3794db41a5c604acf1c3c98a0e982c42c05ec164d3e00b0a6c148e1d093f0a5b11a4cfb SHA512 46978afd57abc1938f89337dfe71dbec8e4f6df8b03833871800d44c2ccd8646566500964139c1e0dddea4244015066078ad9c10e76e7434e577024ae821ee59
+EBUILD epplets-0.14.ebuild 693 BLAKE2B ea74e472cf788c17b130c73f30408b6717aa7f0a95607c303e4a524daee18cc88b07555b010944db2c0ff062ba203d4a4c1b02984d020d5843f7203e1e8975dd SHA512 c8a038ba275cf5c57ee8543acf58563be123888755305de68f81812110978d0c1c6774ea0b0600e829ee6c193e6d5190a758b92f3f7115573a2e31c30cc83e41
MISC metadata.xml 614 BLAKE2B b871de4d369d5bfafe24acd7742e416d380a32793e5481cc8c42ef6496842143b5cd2d068b42c1b860b7ef17a18fdfc31dc3043fd645ef3ed604df8e95a823ef SHA512 51a579ede5d5bc1f61af39627085c348fa1caa557af76bd5b0cb4110880bae02022126bab7646c51857550ff906419927d0f5ce8b7eb6cd2acb30b837927d933
diff --git a/x11-plugins/epplets/epplets-0.12.ebuild b/x11-plugins/epplets/epplets-0.12.ebuild
index 1d62439e68dd..1b147792f12d 100644
--- a/x11-plugins/epplets/epplets-0.12.ebuild
+++ b/x11-plugins/epplets/epplets-0.12.ebuild
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
>=x11-wm/enlightenment-0.16.4"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_install() {
emake DESTDIR="${D}" install || die
diff --git a/x11-plugins/epplets/epplets-0.14.ebuild b/x11-plugins/epplets/epplets-0.14.ebuild
index b8abc8e5a2eb..416ba6a70a62 100644
--- a/x11-plugins/epplets/epplets-0.14.ebuild
+++ b/x11-plugins/epplets/epplets-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
>=x11-wm/enlightenment-0.16.4"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_configure() {
econf $(use_enable static-libs static)
diff --git a/x11-plugins/fsviewer/Manifest b/x11-plugins/fsviewer/Manifest
index 8885319f357a..6e56b8d2adb3 100644
--- a/x11-plugins/fsviewer/Manifest
+++ b/x11-plugins/fsviewer/Manifest
@@ -3,5 +3,5 @@ AUX fsviewer-0.2.6-fix_title_bar.patch 2963 BLAKE2B b776fd1e04ae203186a428169d0d
AUX fsviewer-0.2.6-gcc5.patch 301 BLAKE2B b3c427a897b554548e62fbedc9fca134440d727aec146e161e84b498538b9c122b04b448fe079761cb6d4764d9253826612ac337c900b8d778cabdcaed145d37 SHA512 ccb76e22192e174700f06e45e73a2e357e865049c7fc9b6f23bff90e424d78cc13a16dfc220b0d5d4a602055e81c9577e76fb080a2ec0743b45ea93afb689407
AUX fsviewer-0.2.6-wmaker-0.95_support.patch 1624 BLAKE2B 4351d0d079aa8e153f84cede3ea4b9f495f567bdc747db26eb0d8c2992b96677d49f4f176665307a8c7a89e7f3586e062064c3c9d5bd1408d8f5e33262bb9914 SHA512 d9cde107c34f13e4041d8c20d98e2051acf7c518f60454b891b4fe3a83995eb65e4db51f1699911f480fe09ea1d938750f620a85a9b71bc6f5f48affbe3c4dd9
DIST fsviewer-app-0.2.6.tar.bz2 785422 BLAKE2B cd9650fec13cbe6082c7b6cf30db75d179a870673908a02ee5fcf5439bbbb5e86815b634dd536552197c6dc20d3866f3168a49978a0c9c5ec5b3c49543a19a0c SHA512 47c10a049120db8e5b095fdcc82033b66a4413f8f7e88959f0190b568324e85c8362486e0419b9c098e62e19e38dd8f2f56c6f0d1e7829afafd21a4837b4859b
-EBUILD fsviewer-0.2.6-r2.ebuild 1019 BLAKE2B f37d58a5555d096696a012ec04e8f353aa32172723b897f60e7e9abdb901d7df0ad17472b8f69f6169baad77c55c718924d8c736094f34f754c8a4a5e8feed56 SHA512 4029c0c6df716624198bf346dd36e495face7d0c05c10b462c4f5e1f5f07b1443eaba557680099e2dc1aa52769c8df073f6367843faab55aec21b171349a955f
+EBUILD fsviewer-0.2.6-r2.ebuild 1022 BLAKE2B 94ce15ec72cee436251d8cae876cfcc38adb2fa1b742ecb4a724e9f34ccdde69f456773d9997c4bc439c9d5e7e6474739497ee32f9810054b1fa6df1dc933fac SHA512 ea8da0790ce364502fdb7d2130c7f0dd1086497c3f932e8aa576d011469a13d691c0dddb354acb7f211a7f007b6f9e9f1974efd50fc78dd21659a0409a2ceccb
MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
index 3e682aad1fd3..83bc210ced4d 100644
--- a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.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
@@ -20,7 +20,7 @@ RDEPEND=">=x11-wm/windowmaker-0.95.2
x11-libs/libXpm
x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
nls? ( sys-devel/gettext )"
S=${WORKDIR}/${MY_P}
diff --git a/x11-plugins/gkrellm-leds/Manifest b/x11-plugins/gkrellm-leds/Manifest
index accba5afd85d..9ae8e9aae29e 100644
--- a/x11-plugins/gkrellm-leds/Manifest
+++ b/x11-plugins/gkrellm-leds/Manifest
@@ -1,3 +1,3 @@
DIST gkleds-0.8.2.tar.gz 322409 BLAKE2B f5b3303069e923d69ca4c61261428c0d938aa1ed881ea7095ccacac2e01501cd6ec8b71724dc3587c64d79fd7d385532fa296d7127163037415778311f22c0c9 SHA512 0db2f7c62b799c262f1ef3af4bf3eb147717c567862d30c07033b77bc890a33afc40389afd1d4f0a5e05c344d4bc3b12a0b7d2c42044eb4c5be00c5ca5aa7191
-EBUILD gkrellm-leds-0.8.2-r1.ebuild 588 BLAKE2B 2f0b3c08695910cccef7e9ad3c8ce0a6b64443d098d2ca26cb13ff029cb6fb4f0f9d82af0337c2b11149d630de3e36a978cc7730bd1e3c1db21a9d88a214c4ea SHA512 47e5218202a4afd0df82bfd950980358ddc2a87e0e7a810d4641ea675646046fae5145516d0576fac601d90e9e58742981ae757681fcd9b4e32c042a4ac771d0
+EBUILD gkrellm-leds-0.8.2-r1.ebuild 587 BLAKE2B dd7ff3dc26bf46a25ba548ce7c45a952a0468463e44e861a5f0d9c6f24f3010f6971961cb2bb353409d492eaee0e66a4cb7a48730fc627921dca043726531442 SHA512 5a85e7bc14500c964c607411fa30aebf45d83b4af4b52255543311f4bca1402a1b5ae65737a8e671ea36ae0d7b11cf6e71c1559740d965ad7af9e3408fc0803b
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
index 253934df329f..8e75f7effaff 100644
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
app-admin/gkrellm:2[X]
x11-libs/libXtst"
DEPEND="${RDEPEND}
- x11-proto/inputproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/x11-plugins/wmCalClock/Manifest b/x11-plugins/wmCalClock/Manifest
index 8dfad7a4a327..5f50085b15aa 100644
--- a/x11-plugins/wmCalClock/Manifest
+++ b/x11-plugins/wmCalClock/Manifest
@@ -1,4 +1,4 @@
AUX wmCalClock-1.25-makefile.patch 1055 BLAKE2B adbc6e0a5169412c93cbdfdeac02abd38d0cf61326452ccbbf76a4ed19d85a0203714a0b11b347318bb183396fc66625d6beef9ed4d6eb0418e2166932d41745 SHA512 8d03d109cddd2c095d388ab9a91d34ab94b31b534cd66de8d6fe00e97244dcf7af16c75354ede4ce08e7d197cc78659b22891bcbea3a84ac6a97b427dacf90f8
DIST wmCalClock-1.25.tar.gz 71574 BLAKE2B b1e308d99ee1b66fa9bb7cfcf0c83ae5e637ff7f17a2d07bb43a57d941c654d53f37ee9941e0fafedd617d64cde8c2880cfcbf664c03e109e80fa523ea9a6e09 SHA512 499f91856e79fee4fb776b3fa8cbcc70cae2e28a1e9ea5d2c1dbf5a7684cff4be4e5e9362d672aa7cf459d0bfe14f68ec51a10376558a9635d77e5e6ce7f149f
-EBUILD wmCalClock-1.25-r2.ebuild 856 BLAKE2B 8e8301246f2b01a32611ad0ac5f42ad3046fedbf97f994f6beaab562dda2c027c01aea68b52eef5056d77cb653577c9b3df9480a7605bb22bb0a59bf6fbbeec9 SHA512 ee0b73363b5514957bb1ae3e82d089ef377a69d94a2fea5b8fa2ac4a99c9b3a243d26cfdde90f316fafeb358a97e7d77c3850db346223d323fb86d9a477c6d49
+EBUILD wmCalClock-1.25-r2.ebuild 838 BLAKE2B 48f3496a68e1679ebafd8c12d827ebed5184d29eb9bc6b5e66aedfddd5ad33158805154cf868b253e10ffa43f70ced729919b4734b942a4056dbbd11dd63db57 SHA512 e067a54dda32e0a2464161e291f15beeddb97dc5331e2ab6aba18b10012722a464cb9e7811200036031f11a6e603c982b781d970b76af59dd933e35c04a5fc53
MISC metadata.xml 476 BLAKE2B 743b22ba315a1e4f01909148a31b652ff649a05bed840f8c2a2a2c69ddc45afc32b5604083ec9e5c623621291a7603b66c5e0153e782fce98353c513655f049d SHA512 2281d53175fc5377c916eed033127c71d17b572982fb0c0c9264349866f9c0cc784771fb9d34b7542972b623e784c4bb76c0c4524db160884ad1d1e08e29aa43
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
index 235af24fee89..f9f05bc14963 100644
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
@@ -13,8 +13,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
SLOT="0"
LICENSE="GPL-2"
diff --git a/x11-plugins/wmMatrix/Manifest b/x11-plugins/wmMatrix/Manifest
index 2c690fe2c511..a65e29044918 100644
--- a/x11-plugins/wmMatrix/Manifest
+++ b/x11-plugins/wmMatrix/Manifest
@@ -1,4 +1,4 @@
AUX wmMatrix-0.2-makefile.patch 867 BLAKE2B ae3ee0f850c5e9c24050728b8eb488b7fa24ee9e9faf36a2b6e3469d783dc3c1e868698a0db341ee750a88396712741e3a44bca6b40ab32a7ae1c275b4cb3af1 SHA512 cc41c9fda2f50356b5ce5ef5ce06fc707167d797b44ac42abac36da593d321fac28280f2e1011f4f3676e071e6ac00769ce99f449d5b00f4a882a59b2f061042
DIST wmMatrix-0.2.tar.gz 225343 BLAKE2B 4d649ac8e9691a75c7e9a32266074a5624ef83e4f91a6474bfef67df1e3d5b653b63b5909a5bb5460312b36ea661404aa843e2d7ba56a39e43b9a815e734d121 SHA512 4cc65c90e5279645163833f6c8a57bce0d81428c1e5106a98dd74c1b0d693f2dfd3b230e49f9ce710ecc8073477750db94dd9b3c2b96ee026ef0c666f4bc3c4c
-EBUILD wmMatrix-0.2-r1.ebuild 907 BLAKE2B cc24818f48016854ff7c82033fc27b849cc37e47a38d187379942b3e30d33f62f4b837d239e3f2bb307345d9786c7f599e5a72d4628662ce2bec3eee5c4e62f7 SHA512 5648c3ecc7db1f75c552480bd041b8ecb35adf5296302ff8d558ee88656785cef1a9f1248b4242f36957d39e814496e0e07564497036bf7b221c163eef184a4d
+EBUILD wmMatrix-0.2-r1.ebuild 889 BLAKE2B 03bb1ea5a333a4ee4368e7881b6e8534a51cbdf6ed14f34e917fadf47bc8c83e77d81b646d94525a572010f1981fdc3922fa1bfcf9b316be9d1c85e26a6fbad6 SHA512 4bf4a6e1a17f921850ea1604042f25e7139fbf1af5b40feae684e832932cdeeaaa582113bafffb744b674975196159bcc77151e125829c8e4538cc053ab501ed
MISC metadata.xml 399 BLAKE2B 6bfd19f3c2d730bf940451fc81183a61fc8ec623a7d50d5873b0209a66a0c529fe1a04e41f87ccb63f3dcf8fd4c53b188fc16c200c2dd11b6be0ec348626d036 SHA512 88cc0fb5ea844bfe955eb9af1d8d10e333ddce44e27bb10d8cc538c2a662b990ec001e25d86475f26720b76eea8fcbd70885593744395f0e99f33ee6352770c3
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
index 1a6b5e27c402..2fb50977e0ea 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
@@ -13,8 +13,7 @@ CDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${CDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
RDEPEND="${CDEPEND}
x11-misc/xscreensaver"
diff --git a/x11-plugins/wmSMPmon/Manifest b/x11-plugins/wmSMPmon/Manifest
index 6cb9e9ea784c..f17cd27e02a2 100644
--- a/x11-plugins/wmSMPmon/Manifest
+++ b/x11-plugins/wmSMPmon/Manifest
@@ -1,4 +1,4 @@
AUX wmSMPmon-3.1-makefile.patch 1301 BLAKE2B ecd2347a37fb434652c4cb38c3733aeaa0eebe0e4fca7e2ed51e107dae7fdb6c063c66aace9a8c52adec5be1cf8d9f81f091c22e39e27a154db94409579057fa SHA512 7cde2ba93d30a5def32e2df0d0818fe8e86c541b117f7e46f10206d9785afcfe2dcc8ae3fb5cf72a2bf0098aa40424522220e228f05886f314ffcd864c8fcdac
DIST wmSMPmon-3.1.tar.gz 24834 BLAKE2B c02c49810f69b9d28d42f24e7fde6556d46f214d4cb5b47cd705bed2ff5c2c00205829018179ecd6c63162a58d0a957d5fa35d33f0075532c72d3d6876ac6c40 SHA512 b13caa3c4bc7971d35bc52bb66c1f6da482b55a5073b61b3f059fac97f6affbf091816c933981c1c88c17127ab8d21c09c59d0f3c93364e659ca409f13de43b7
-EBUILD wmSMPmon-3.1-r1.ebuild 754 BLAKE2B a32c02817f74da720f7648e76a074850a9adad7333e7abe2153081cb9507f789fc51bd6fbff56934cf03c75544e68542cd80f4e03bcdfd976a740fd1345654d0 SHA512 163a8c9e9bdaa5a68d708763437eac3da19e3a22bee00f1eac888517b8205aea181036593f6972e2e18ab8551bf5818ad00bd84fa365fa92352a501fabbaa14a
+EBUILD wmSMPmon-3.1-r1.ebuild 754 BLAKE2B b33bb97682fe4415b751097459effdfe74389bb4377d1fec3a382d1d75e8d1edfbeb607aeaad577cd8aa7a1112e64c6d6d65623776c196249bfd38f3f5694b2c SHA512 24abfaeb9808bc9d9f893d9702aa3af11c197036aca1aa21699f928be33ef10b859d8ae6389f41109db34b5860f7365fd1bb88d8f23356d13aa0cba90e45a441
MISC metadata.xml 379 BLAKE2B 8d029b244f6cba1311fc8af0fa96705ad2701ffe2d4aad6a45e3e86d6a7b07c1749f7ffdd171217c5f610681921006400f6641618a6cf93541e7b257f2441198 SHA512 2fc60cceb3fbdbbb8fd85048bc50b6777461a9c7cf37d8b672ac09d1556f284acfa5df747d704c9335bfe91f93142be1cf39cd4eb19c808a50eb8fe5a27f67d5
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
index 206382d667a2..7994fea1f0db 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${P}/${PN}"
diff --git a/x11-plugins/wmSpaceWeather/Manifest b/x11-plugins/wmSpaceWeather/Manifest
index 477ae6f44a20..a79de70a974d 100644
--- a/x11-plugins/wmSpaceWeather/Manifest
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -2,5 +2,5 @@ AUX wmSpaceWeather-1.04_p19-gentoo.patch 2034 BLAKE2B b81b73f9fb8c64c8ba9560f999
AUX wmSpaceWeather-1.04_p19-getkp.patch 1290 BLAKE2B dd350e57e2c0d40716ead4fb6bdc215f263bf5340c242550668ba252d78873a5ceab7cbf789209214daec41e33abea3a128b6cd5a5a83ee4e22b9de694ccecec SHA512 54f1ee8d2152bafc7895b2a626f27a4c5bf7b3702a2d14e2523952fcffb8e636f6f3ceb30d95b12b80470a58cb16dd50e04435ccae91e81c83097d41e2949b59
DIST wmspaceweather_1.04-19.diff.gz 9429 BLAKE2B c32b02d123783789962ef56f54b79b7afacc69573526cd5254b7083673a5ae0d70abaa82d84421c86d95139f9033a35de6511d131f73ff1360d43d1d0e320979 SHA512 f8228c15642b88b355f977a8ce73b474bf8874b4b64bce3f519e6ec6c5de1db7bbd1e5f40e57e367dc0a1dec47e5c32b87d4ce61e35043d71cee0005b06a5a78
DIST wmspaceweather_1.04.orig.tar.gz 36295 BLAKE2B 8f12a4ba7dc55d06ab1b3c86f387c0f4dc930d89b8ccf151096d736adb80deaf647e47bb4592f309042e2273936996b215cb2fffe83dbbe20bd10d94b1b7c109 SHA512 d422806d44a2929cfdb3e36c7075a4e02b64416db7c528d08411944f574dc34bb5e5ee48c55a3b9e796b15529857bcb480dc650ebdfe23cf1079ba09e2749154
-EBUILD wmSpaceWeather-1.04_p19.ebuild 1768 BLAKE2B 8444f02d2914f539987003aaa74e2b8e7281c2749f170ffb9b245e64b6ce8349e413d17f1f7c04ca9f3104df4660711fac062b4bccd5098b1ae20355574b569f SHA512 5ac1f0aee39383c90f5924ecde985c2670f170f0215e772d393e2ba3608cd468599e3b03c9a86b7aee1ff87da870140f4e141b53fee3496483567e0fccd71d6b
+EBUILD wmSpaceWeather-1.04_p19.ebuild 1750 BLAKE2B de7b4ac5aba9b7e8a56ba7ad2ea61a5339155ed81d8b83755cb47292951bb044a01691015a2e258b4b6ca4600c28bd89eb1478b3a804745f5a723986fd377c54 SHA512 450dafa5f93c9fcc43db0b76d09f9d733d9995525a4f186bd71d5ba599da918a1eac2c22bcb077f85ad4834b8a6fa8ba4bdb1a55d2b4e6e42ded840ce9eddf31
MISC metadata.xml 349 BLAKE2B 1b79557d30af25f4419b0824e2f99a529447ad80c9c398d22b023eada927a3c840f8787aca77fff8f9073873f01a6be766595bd073cf8b11d335fea81f3e01ab SHA512 f39cf6f8c99788992a57ed0598fcd5d13b25fdf80dc5cf133091f5babae34e269b55e3464bec7b660e3ebb295edc4d46e76dda1978e4fde30e70620cefa21264
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
index 8b9fd175cd6d..bb9f25ab7bc0 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
@@ -25,8 +25,7 @@ CDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${CDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
RDEPEND="${CDEPEND}
net-misc/curl
dev-lang/perl"
diff --git a/x11-plugins/wmSun/Manifest b/x11-plugins/wmSun/Manifest
index 5f5bb1ba7804..0d6db386d55f 100644
--- a/x11-plugins/wmSun/Manifest
+++ b/x11-plugins/wmSun/Manifest
@@ -1,3 +1,3 @@
DIST wmsun-1.05.tar.gz 20680 BLAKE2B 86e75467133b23e3f062203df6bbd8fe0aa1ca90c468bd91f3de3ec360e4d677bf5a117becf63e111557a17dbf346a1b23a61b78030d197264d71989097c9d77 SHA512 baa610db04ba67ca09112765e28c0fa945a98a61b642925dbaaa56a5b3e7da7424d8dd15097dcec932e3b603219d1f8806c0e50c025370226a157791f16911da
-EBUILD wmSun-1.05.ebuild 720 BLAKE2B ea0aa713de46e12e26011a48320e5159644fca96a3ec02b9ae98a0a2e003c0dc792b2a93494d977dd8bc41cf01a14a591dc56fed1fd5da769515bdb72bd27193 SHA512 a4d45a3ded9d6021567c6bddf0598cfab1efd75fffccb162b7bcf91e5f802bbc684f812aab5b0bcf088a61f56a005229ba4a631ffb2762f8635ac519c9022d4a
+EBUILD wmSun-1.05.ebuild 723 BLAKE2B 60e1ef0c33cb53316b2c3bf0b10862880b73bfdb0a83b6eb1690207515d033270d05b1a276cb1130e87310d0db7f9f8e3e394b64d8287ce848e463c95c251ddb SHA512 b0e878e7d950679e66279deea4e9ae76689a665236056b82e42af16eb09f8b2e4b2f2c88e357aa1b35f61b5b7164f9a54ac7522eec86c6fd4df2a83f044092a9
MISC metadata.xml 498 BLAKE2B 5b9cf3d5fc309ce34ff85551823b360a8bab9af01b39896d8c305837dfcbe64b4ada8f2bd61245870bffeec9d64bd7f70db1c16b6676af3996df64ab59898de5 SHA512 e94d3712d961ae49fdb73b15a70270915cfcdaacf95acb7176c35d64ba6b186d6144d55f4c6e1eed36d33656ed82ced988ece1a38f08a5b08658db063d1ce3df
diff --git a/x11-plugins/wmSun/wmSun-1.05.ebuild b/x11-plugins/wmSun/wmSun-1.05.ebuild
index 4926d4505998..a7701df3ebb3 100644
--- a/x11-plugins/wmSun/wmSun-1.05.ebuild
+++ b/x11-plugins/wmSun/wmSun-1.05.ebuild
@@ -19,7 +19,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/x11-plugins/wmacpiload-ac/Manifest b/x11-plugins/wmacpiload-ac/Manifest
index 3339df44cc28..f45c519aa62e 100644
--- a/x11-plugins/wmacpiload-ac/Manifest
+++ b/x11-plugins/wmacpiload-ac/Manifest
@@ -2,6 +2,6 @@ AUX wmacpiload-ac-acpi-fix-battery-unit.patch 1270 BLAKE2B 07a3db0e0ad32778fe994
AUX wmacpiload-ac-acpi-segfault.patch 805 BLAKE2B 00f5d87fda529f3afcc11e4ddcff09c25cc940cad28181514fff77685c93de2839885da32e692660d0f0bdf86cad521629d8b6b5cb2b317223e4a5c00acd21b8 SHA512 9903f06b95e0a372c980d9ca649fa5c11a47ffce709e98e03507303234fd8111cb0bd1e1204b69af332cfe0bb5293a6f758a7a593cc72244ee37547b579735d1
AUX wmacpiload-ac-acpi-sys-temp-hwmon.patch 4320 BLAKE2B 9d36a49fc206b0395d2a388730a8ec3adbce25a8a454b3be70a7452a8a7de1c26e3db00b6ec5589ffbc99b3d1268a598b37b0bbef04167fe2f72e572921fa06d SHA512 fd7a08c6d7473c48c98d741827d33d6ccef592936379323d0c54ec588dde16b7131f2c6517ddac38e61350a122227818a51d4bf68da1121b71915d4bdb3c4467
DIST wmacpiload-0.2.0.tar.bz2 112858 BLAKE2B a981f43e4a4738b662f8a302a0737d9f7ab9ce18fb5cbc40a84608ab75916af3b47cb2da93c130461280492f2624b23712a81d6cabc786a73e4bc83c043b3358 SHA512 f0256ae313ad4ecbaf1604578321b45173912f250ba6fb7abf88edbcf6875dee30f8d2f7547cc207768c9229697dbfd48e77617c590e0ca27113b8c675e32714
-EBUILD wmacpiload-ac-0.2.0-r1.ebuild 1023 BLAKE2B 24e47bc027b55435b8d96c87120a865b785f4a2be38b3fcbe94d26aecf14633b14185a9d87444d8a88e5100ab8627a323477c4c336a78dc6235abd9a88061b5f SHA512 8532695b4db45cfadf02c672287e5e4ad1d7afc5ce2f554b199c1cce5fb0eeb79104a03093b68105ee60c038117101edc24c07ee678d3097b6f68b854b94b64e
-EBUILD wmacpiload-ac-0.2.0.ebuild 736 BLAKE2B 1cdd1f007eeacfce9d22ddc9cdb0ed8af70d0b3693404cca9aaea5a131ea8d24ca5bae5dcba101914d2056359dd8502715177e1abeb23056f04515971aff57c6 SHA512 e07e907a90da89231df2e6e9a5c8169731b16c197f70407fce322f2a3da05da6e01aed352b405e1eeb63dc25e35b0e33213608257a8380926c2e2529847ecf72
+EBUILD wmacpiload-ac-0.2.0-r1.ebuild 1023 BLAKE2B 39c62fb88a686f8e31c4d416f9b95f9f169d5b2c47b824833b30a4ad5f46cb8b88ca7bf33ba4377a38ee57566172e6e812c15fd57e72cddaab8f4cd34abc07d7 SHA512 f7183624746cb0ed317f607603d222448e9b9bf0d22075df9fe24bd1af4d0aa8eab668dbc8439a07711e9103b745af035dd820b850b791825bc671a0df4d3077
+EBUILD wmacpiload-ac-0.2.0.ebuild 736 BLAKE2B 074da7060ffdd7f243504111eb148b5e5c22be786af67b39bb3ed00401c19ada93bd72f013e214b5c231c57da62524292d5927bec99515db10870b1ff0c6dc5c SHA512 b264cd346cd08036bd9e219afe29afddcaa1f316a70c0de4d6d8526c64d2ca6f99ca6f76d329fb4143ffa0a8fd66e067c3e3fbbb78c413eb787a859f7fb297c6
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
index 564f104c855d..5336ef10ddd1 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-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="2"
@@ -21,7 +21,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
index 8af070e1e11d..ca8e850f9a53 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/x11-plugins/wmacpimon/Manifest b/x11-plugins/wmacpimon/Manifest
index f5cb1fbbd7a9..7cf33863d612 100644
--- a/x11-plugins/wmacpimon/Manifest
+++ b/x11-plugins/wmacpimon/Manifest
@@ -2,5 +2,5 @@ AUX Makefile.patch 650 BLAKE2B 6bd6bf5be53d188fda5b8daaf25e658cfa6b65aa00a5817f1
AUX wmacpimon.c.patch 968 BLAKE2B d94cd135917bfc682f002ee936b58822068d1167518ee4fb573fc44505523051cbfbc2783cd8526a901b93a461172f85be37773335c12254c97c38f3d348cf7d SHA512 ac719283af137e794430760919b300036e4bc9eb88011edf601fbfb5d4dcebfb5cad4115db26d1497e1a935b77ca0fd55df1077f12c5cc16e9996591967210f7
AUX wmacpimon.initscript 407 BLAKE2B f8a37c7f73febf9c1bc5403bf8f70ae95def8a2d411540ddda19d97bf07f4514ff13361a255dd52bf615e4243f3e9a32c38aa09d9b009068a5db01b259229c93 SHA512 cecadb137bc6acf2ef4c85afa75dd186c9217435c07384c8190a81e727509aa3715bf3b0e5c9851f0a54c6bb9d70c08339275aee30d110bd0cd3f37a9410f866
DIST wmacpimon-0.2.1.tar.gz 26498 BLAKE2B db1d308b24786a0db0fed5763ab5191f6ac2654c62d75996acaa93867cf7bc588da1f763b5483d64563b1e26b8d48063f143c28a61b61c4cbdb8de6c7ad58d1b SHA512 2b2d1da7608272969f0a2c98fae6398ebaa663a847acb79c795870cad85ca8d1317f5dfde6443634419c0c59b7457356bb8c195c1e7936f3cd8f3b251406084b
-EBUILD wmacpimon-0.2.1.ebuild 1107 BLAKE2B 5c07bb6f6788a133ae99656bb3d4d91dd34d008ba06d4153793bdaf5ed595ba932437d0407572f23d1700e31c528d126cd8912a7a49aa0f7cac83d08e525b53f SHA512 51e63a82662cda39781ae1cf3c9cff1eed84345e6528d207a71c026b3c9e08feffae0fb91e935a91c0fded61441fb9d52020be74f568b2fb7a3db4b8539e252a
+EBUILD wmacpimon-0.2.1.ebuild 1089 BLAKE2B 3ecf49c18e98b5c9dfe54bc6e6a8b7782fc5fb6270d6fed066e2318f56cd9c5ef0f7dc530bf64c1fe2d4f5e566a564974ceac610e3b3c8a1aa8c681742b0a973 SHA512 65c56718312e7488a1360b4db7a8ee4cc727df326155cbed0e95e10f3d0d0fa97cc6c7860bda0c31dec27664ca5037584a26d96a678ffa8e189c175a941712a9
MISC metadata.xml 571 BLAKE2B cd4ecf0c7fdd14001596376389736f3efb5ae152884a188d9dd4568ac62385635e2d331de2a445e8a22947c1f48dd417784d0fc3e2cbacfaad8ec79a19ff2546 SHA512 a749cc0ff0e2ac2aed7f2e06e5d389e7a98142468c971940343ee704eae69b9e9d440056cae76b33d69d330096fd1c216504ac0509b0c4a2bc1a4e98e4111959
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index 30262c7d8128..d902e3de4a33 100644
--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.2.1.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=2
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_prepare() {
# patch wmacpimon.c file to set default path for
diff --git a/x11-plugins/wmamixer/Manifest b/x11-plugins/wmamixer/Manifest
index 274930114a5c..df4ea6709496 100644
--- a/x11-plugins/wmamixer/Manifest
+++ b/x11-plugins/wmamixer/Manifest
@@ -1,3 +1,3 @@
DIST wmamixer-0.2.tar.gz 93067 BLAKE2B 9e888b9b3214eee6c8e59da564e36e8f7c1e55df711ebeaaf73300b27b934840994177d003f2be14f40b5e30321c572e82888e030534ccc7cbe0ff12109231d4 SHA512 94f971ac59134f926b637c6c4ef80be1e082b9b81d2e744b921562140e610e958233645c0ee12310086f1aaa3bbb20622c6c92666dac51df3a963e725374583c
-EBUILD wmamixer-0.2.ebuild 686 BLAKE2B 69a6eb27ab1200acacf2442933db287e09ec709ef947272c176208f82512f99c34290d4faf974931dffa199bc511785cc81bfd4bc502c62b1196f614bf6c4d37 SHA512 a3c72164687ffb7098ce4c34c906fa418a5085a327421d0b0c142b66ad2e75998ad55b731ffcc10f3e772278b6562815c194d2aaf801898566829ad22d1f91b0
+EBUILD wmamixer-0.2.ebuild 689 BLAKE2B bfb4fe4651215b362cb80ff4cf73b1c292460f22e0092098fa02a2c6d390d349e054286980398cfd0b5c70b3c9fcfb315ae4f8c2f2dd7955331edb1ab480839a SHA512 a61081ce73b586568d6cf49141daa079be7e5590e19c3a218be1354c19291c156ff1f9685e8d3323c88edc02c2ff9795ec02c496e5678b8d67772ac9f68f9e9c
MISC metadata.xml 474 BLAKE2B b04cb3956e9f0b9043bf692a6d61024c8986ff04217f8bc9ce0fa15f7db50522798085eb5f4fe828dd9dd8c5baa11bf3ad658bc9cbd703b7e9cee3ab31320357 SHA512 2ef950ff6ffc4ec050aaa62f0da4589043a2b56df7f4e9c80bac8614e5817872dd08bacdb15b584f90a0b790812cbf3a6ebc343ffc65ffeb0cae081266891283
diff --git a/x11-plugins/wmamixer/wmamixer-0.2.ebuild b/x11-plugins/wmamixer/wmamixer-0.2.ebuild
index a684fbdad792..47ea86948d75 100644
--- a/x11-plugins/wmamixer/wmamixer-0.2.ebuild
+++ b/x11-plugins/wmamixer/wmamixer-0.2.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
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXpm
x11-libs/libXext
x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( README.rst )
src_compile() {
diff --git a/x11-plugins/wmapm/Manifest b/x11-plugins/wmapm/Manifest
index 952ca881bdf7..5b075d10f977 100644
--- a/x11-plugins/wmapm/Manifest
+++ b/x11-plugins/wmapm/Manifest
@@ -1,3 +1,3 @@
DIST wmapm-3.1.tar.gz 28321 BLAKE2B 13373f675bb2561c6034268d4afab12bfb6b5ef99da7fd975842392519a8f87726455e807baecc29f15403a0c711228be8513125def3b32b36683dd386b91f54 SHA512 478edf6b48d4c44017f5f2d50efc7e757b33b14d283dfa062dcf2084c9bffe1e7624651dfd22236a98ca9aa49306849cabd1a1fd09d1d3f709e715cf0fa2f84e
-EBUILD wmapm-3.1-r1.ebuild 810 BLAKE2B 8b52aa6d13b61c4f0ec773cf4cbcf1919f9eaa4ffe374df5ded0edd8f8d714457d93e43d5719b3e9c495e2d019b176af82b238027e9c6c8ae162b90a9ecf29e7 SHA512 189c9bf1b0ff08df976faff2da3aefb6e014c225309f47aeea28db88f51cee7a4283ddc32d6f11b17623c96e773788b15882ffd13d0395e73869b5f226ec1b74
+EBUILD wmapm-3.1-r1.ebuild 792 BLAKE2B 35b62b38ce13c45d9a57db23f6d41ba82f2677bc319413635997dfc480b9f7664fb0ef65c0386ece20cc0e4408d634b7c91526cb6f7a30004c829a8e4df8322c SHA512 b10e47959a10db778ef77bbd530831b03e36e33b87ebbc8d2a8805c43f3e7097de500bf5e2acff475aa31571b36a4962c75f91e15ab6b34b73d8e96f9d2b1693
MISC metadata.xml 586 BLAKE2B 1cab619da94bf64d9919cad5164f23e03fbb7b1a503e6012a7c99701291dbc9e842df5f28327cb67135bd86f3ea4c6c4f622610eb45dd3cb004b2610baead1f1 SHA512 e0ccbf5129fce75fcfb4ead8ab9d90403a12647541517f1ca62e75f029d63e0e50c805714189d411eaf146d559c011ce194c6f3e79904e14222496e9d3d4b0ad
diff --git a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
index d463cae956e2..6825e6d6a68a 100644
--- a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
@@ -16,8 +16,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P}/${PN}
diff --git a/x11-plugins/wmappl/Manifest b/x11-plugins/wmappl/Manifest
index d8a45b12c011..7a55573c1f96 100644
--- a/x11-plugins/wmappl/Manifest
+++ b/x11-plugins/wmappl/Manifest
@@ -1,3 +1,3 @@
DIST wmappl-0.71.tar.gz 139219 BLAKE2B 0c28182608e446f1d65441ba57a86105a745b374b9e54c84d52bee58876097b83520a33a7413358ccf0d687696cee11541cbf6536c42442f85b64aae6e70b451 SHA512 dbcf1441960fd22b5436515c28c6870ff8400cfbe0b2aa4129ff1eaad6faeb5e0a3500b4c6f19b6ce3ea3dc8b52bc38a6fc591b93e6cb12e13d8447c3eb371d2
-EBUILD wmappl-0.71.ebuild 629 BLAKE2B 3786e0c06cf0cb2b03c28d9d5388013899ee06b3c65f047094c3299bb4e7b833a25006c37b3aa2e4935911de81b4e528e17783f46cc5057404078b2e2b169856 SHA512 25f0d1d4ae9f489c7e0a6a4ade1ef039e4257fc2be9c33ff062cc90b08db8287db6cb056733200a0eb7749662e8846119ab9ef4cd3961e3ea73065c872791372
+EBUILD wmappl-0.71.ebuild 629 BLAKE2B 36ceec0171fae959236e9a8362690ab6a8a1a6b9c8b04a3c43f8b932bdd3769029451b872cd2f9dc87268ece142901c5dda395e8b3a31ce4a56c60a73f6769b2 SHA512 be139fac98b7bf611c01628705d00fe1019897f2fbe7fd62cb08ba8ce664a97557db0072658c65ff7b4673936a99be22a26e9394ecb1c549099c72e420b9e1bd
MISC metadata.xml 328 BLAKE2B 7de8ce1608ae1aac3b67ec0c5a28fe355bc7d0806b8f08256bd13e05ca8546c65a883db1101d7ce378a95258f642485a1b42c91ac5b03cd1e1eedd548656a001 SHA512 8fe600c98e902f450398b33925f201716397f0ace965dff49a6e6edc8c243cab7931b9719b01c6b4e63a44a3467c48ce4310ef87b3667f6d4358f65b31d66783
diff --git a/x11-plugins/wmappl/wmappl-0.71.ebuild b/x11-plugins/wmappl/wmappl-0.71.ebuild
index 07b149ea1707..797a891879de 100644
--- a/x11-plugins/wmappl/wmappl-0.71.ebuild
+++ b/x11-plugins/wmappl/wmappl-0.71.ebuild
@@ -13,7 +13,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXt
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
LICENSE="GPL-2"
SLOT="0"
diff --git a/x11-plugins/wmbatteries/Manifest b/x11-plugins/wmbatteries/Manifest
index ed4e58db9a33..e5cfe83b1317 100644
--- a/x11-plugins/wmbatteries/Manifest
+++ b/x11-plugins/wmbatteries/Manifest
@@ -1,3 +1,3 @@
DIST wmbatteries-0.1.3.tar.bz2 113695 BLAKE2B 5da5dcd5a524fe61e7b51d6811fe2c582284cd0e7cc8d075b526e29483c41019de2f306b8a595358cf0729274a6037e15429923e35e21b2e5cc1a764c9b954f9 SHA512 0a553f12bcf9a673d2a956da04b14fd6d80cf75f47e912f01893ec06880d63275bc31bc8bc1655a13f11dc1361e96f9023290006e134956b625401a03f92575c
-EBUILD wmbatteries-0.1.3.ebuild 619 BLAKE2B d304fa4e7cfb8232f756fb62a33f36d81525a4f9a7dd3ae648df734dbca1bca9c9d833e94b9f5d2d2898f609e9c6d5395a70aa98fa1ff97607ba5307b1e91426 SHA512 656a917e75505ab8e0426c6addefe735b0c506af6173aeae3cac8719781558dc21c1d2031ab21a2206e25787cc92ecad8a407f466c0390852a0e3bb455a9e04d
+EBUILD wmbatteries-0.1.3.ebuild 619 BLAKE2B 2fb86b5ab9391088caba6235975c4cc793ecabe60f022b929f8d317a18f4a169835472a601cd773d22d6a37c021b445f01b097785bb93a028b43d13228a7607b SHA512 5c95ca0214c614a8f583ed6eda6f1a7db8ec6b95b799b6cbe06ee6e9a6c416248132c41d088d325cd7373df19ea2478b99c76e175794dd527f517a851c7ca39e
MISC metadata.xml 333 BLAKE2B da5de2543e03f4e93842f1c8fbefdaf6da0514baed589b415b5a32d05f213e748ed40521dcaaa9bfd0f5fe8587fdf6c1d08c6c14bf8f275002ee99b5d66fff53 SHA512 7652956bf1e9eca65901163e2eb91786619a42d33c012c187701fe1d200243c6233295207401dfd14d13c270e6b3830f8e0d9299afc636c1b5105a01a3de8617
diff --git a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
index 8c74061700f1..534f09d4db2f 100644
--- a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
+++ b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXt
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_install() {
emake DESTDIR="${D}" install || die "Installation failed"
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index 5b710618abd2..4694a284db84 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -2,7 +2,7 @@ AUX wmbiff-0.4.27-invalid-strncpy.patch 816 BLAKE2B 8c9dec1bb64014c4d99dcfe0214f
DIST wmbiff-0.4.28.tar.gz 111398 BLAKE2B 39ba4dbf50639b02c8969ae72b696fa83353ec3dcd46802f8333eb597f068d3d0d209f39a352a8f53830695c19c897b7d6f970c5362c2910128b80b0cdb24d32 SHA512 a17fd4b4c3de09a907b7ffccc50f4560a7fddd5cb4dd01c72460806dc55259ba0b587d75f7505171a2a833f6735ddc4ded0a484d4227bfd552cc7343d79d7720
DIST wmbiff-0.4.30.tar.gz 269315 BLAKE2B 11690bcb54b33320c433a191dbbaa769efd490cf5efdbf3cd30ce46c59542092a91fb42ac19afa7718321d99764f8df1c0021795bc6ec1c94304dd46d253b50f SHA512 10b5a6673763a48694cb9cd87f5972c09b0fc50acedde7658133830a06dea8c98ffb9943591cbef802330862d7ccf7a7322d7e9e25ee82209b5a0e40a22353b4
DIST wmbiff-0.4.31.tar.gz 269883 BLAKE2B 45ecdd6116fa30d2aa71aace18fbf9c6d2ee755188a56a7cc067697ed4a55d7b7ad24b4430d8f36d5c6dad17a152186a12c78cd49d1c86004a0a21ebb56f8d7e SHA512 768207887e92edc4a36f02d6b048cc393e75f9ccabca86f54368fafbd822bb6de5258890395da3f3e7a4f4f951628d15796d38e315b1176c6a3e084d10c167cc
-EBUILD wmbiff-0.4.28.ebuild 843 BLAKE2B 359e267a6471edb8fc74bbd81499245ec2e72be7bfce7b31e6dc9c254d24589123eace49974a790dd2e6ccb712b8e0b9d2e9e328622109d62067e07090ac3a33 SHA512 37d5bd1a4e326884a8c5daf917dd9bba0122953b33dc267fce9a66cc04947cc5483e7c3d86bb4adb5929b0838eca54634d3d172d58d3be3650db8d5758051326
-EBUILD wmbiff-0.4.30.ebuild 823 BLAKE2B ef438fc664d2b5beaad2ba87e761c86e566512cf8a5c73f1082d4bf339ac6ffb5686a01decdedd9fa7fdf54a1ef98e1e766bbfa06ce95f8107f5ba5e8339a159 SHA512 8d3b50025d26e904c1605c338542168ba7a012aa7e21a976508ff550610c8f3b0b0501475f6474177d1d46cb1218326858d43b65d8d54cc9e9737db87cdcec0e
-EBUILD wmbiff-0.4.31.ebuild 823 BLAKE2B ef438fc664d2b5beaad2ba87e761c86e566512cf8a5c73f1082d4bf339ac6ffb5686a01decdedd9fa7fdf54a1ef98e1e766bbfa06ce95f8107f5ba5e8339a159 SHA512 8d3b50025d26e904c1605c338542168ba7a012aa7e21a976508ff550610c8f3b0b0501475f6474177d1d46cb1218326858d43b65d8d54cc9e9737db87cdcec0e
+EBUILD wmbiff-0.4.28.ebuild 825 BLAKE2B 3e27116ec3256f882303581d48c4911aee3f360e581bb58c5da55244e94edc89a978333cd2654b2d49d2e8e141df6b05a236456c5768bb5fd5f7f0c8156518d6 SHA512 cf73dca2d7798577fed2e223f25e66261915220d198edc90884181c7d71c9b6b909e29aee41a7a9a5e284221048b4dc29b97388bba9e3a117cdad73adf2cf283
+EBUILD wmbiff-0.4.30.ebuild 805 BLAKE2B 2d671c601fdce049993792b717c5a42fd37f0cb62dceba28598682c445c9aa1b7a946fe77e30fd30aa3e19d7a7aa1d0383ab46ecc474a309ef37911fcccc8fdc SHA512 879f2ab466cbaf97e59085e9c421e1269f8bc493bd5de3b68a9de07149b620550efe20a402361f43258c8f59faa4dda4b3b79d13d4abc6d93d228e7e06fd034f
+EBUILD wmbiff-0.4.31.ebuild 805 BLAKE2B 2d671c601fdce049993792b717c5a42fd37f0cb62dceba28598682c445c9aa1b7a946fe77e30fd30aa3e19d7a7aa1d0383ab46ecc474a309ef37911fcccc8fdc SHA512 879f2ab466cbaf97e59085e9c421e1269f8bc493bd5de3b68a9de07149b620550efe20a402361f43258c8f59faa4dda4b3b79d13d4abc6d93d228e7e06fd034f
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
index 96a725b2eaa1..8e73b022cf3e 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
@@ -22,8 +22,7 @@ RDEPEND="x11-libs/libX11
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/dockapps
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
index 1185a4b13af9..58c48049945b 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
@@ -22,8 +22,7 @@ RDEPEND="x11-libs/libX11
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
index 1185a4b13af9..58c48049945b 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
@@ -22,8 +22,7 @@ RDEPEND="x11-libs/libX11
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
diff --git a/x11-plugins/wmbinclock/Manifest b/x11-plugins/wmbinclock/Manifest
index 1ee359249896..62e90d1a1976 100644
--- a/x11-plugins/wmbinclock/Manifest
+++ b/x11-plugins/wmbinclock/Manifest
@@ -1,3 +1,3 @@
DIST wmbinclock-0.5.tar.bz2 15909 BLAKE2B 71a5e53fea8f042bd8e01c0a8dde9057b22e398a4d483b556221d8344b5542f097e835f0d4eafd7cf24964b4b08f04f844c476cddc443ebc8f469e8fbb5142ec SHA512 f0f1f46b19e9c34f9168e03df2d4be2f9c7a73b09dd8247a7bc977309a3354069adf34032f3c0106aa763fe259993176edd84b029941191d05a11505e27de695
-EBUILD wmbinclock-0.5.ebuild 705 BLAKE2B 806161fb45c12eee8c2e55d1e2b453848cd05e0adcdf8e80e3919dfb2196552aa3020b1c521ab4d8a0b3726e66ea3d050b65b335dc7b7e7f23d7d10bd4e17af5 SHA512 1f9e2187f4d76dcb718b5d5e86e4bb0e16dbc9c373f493780f8f5bef502d522663f95b2da281fd202dd5849c556a9d9562130e3a81f59b2a6e27a3b89a070950
+EBUILD wmbinclock-0.5.ebuild 705 BLAKE2B 36245c4ad2ff6dac3a4399e73d2527a20331b6eb31077dc26407d780e39d158ca5f869e2e6d8a9bbc9aa2bcc4290bddb8ae67d8ccddf042af6cb50adbd2bb429 SHA512 7dbb74028b9afc166528ae8ff9d6f51ff4f76fed4038e1b1d4a099d5e721fa4bf2f0657aeb0f1d01013b1f08d76497b3b3268eab8febcd97893cf9e3f497b2fb
MISC metadata.xml 531 BLAKE2B 03abe401a3acf82a4a19b432b2f82f8cd8b8aa411618b7f54181cb32e999426c53f141a1c754cbc942abafc8d161aed8565e7e3b34036f489dda2f4b782707bd SHA512 b2a68bb29e867c54506f6b2594d3567353c86ba050127c07fa44f8abd4414aee251c297dfa569ec413e86699c088c61965104f5cafe326da0a376a6d0252098b
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
index 28d23517f4d3..91e026814028 100644
--- a/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
diff --git a/x11-plugins/wmbio/Manifest b/x11-plugins/wmbio/Manifest
index aef7dbdcc243..76531cc8a128 100644
--- a/x11-plugins/wmbio/Manifest
+++ b/x11-plugins/wmbio/Manifest
@@ -1,3 +1,3 @@
DIST wmbio-1.02.tar.gz 21799 BLAKE2B f3736ad83e4441f027b8091d398f7f819de79d29d9d48dff0f1ab3c159e1da2fc367f8faa92addedb770d7137e7a93f8e91a29935264a6505d16c9598daad64b SHA512 bebe8de364f782c38164fdd3910c3f63ff8313fa46fce1215218a4d14b9be0c793ee1d234fdb694798c1ab49b17eca90957d22c076920bf50ecf24b563a07d5b
-EBUILD wmbio-1.02.ebuild 794 BLAKE2B f171f2d589c15053e2daf19f5606006897b1f25ff205c8defdf640e1018a4555f1f0a1418831c5f6a5fc8b98c2d485d3410ffad1987c572a85e01d71719764b2 SHA512 8b9576899109289893a86f6c66e55f6701e482c444e73280bae883d045985a1d7ea724dbf73e5d49f758bb93f384e6c72c437efc6dbcc04b44e3b36d6f26d688
+EBUILD wmbio-1.02.ebuild 794 BLAKE2B 1a8916983313a986dcd424309f3acfbde29c24f0ecdbb63235ffc60b89e4c3613ae4f5620ef4eb833fc758624fbb87a4021029ba5a8311c386309f68bc621ecc SHA512 d18004236959202956b6b77904cb155c6551bd16dab07f2a1a14085ce6998327ffaaa6466fb1ce29d93ab0b4492d59d82e8659e3e49815c1885d796d1c8d7df1
MISC metadata.xml 603 BLAKE2B 80e4c0fe2c556274da84f248b415737be477445c3da6e9fce5fd6a66480a2c2455c3100d6e2466d124ca6f2c6d6939dff229eb948ac9ef30127b68e9172d25f8 SHA512 fd27767ae3ef58f3eae5cb89cb62257989d5d574b2cdda8b2acdf25fb35091c1903037121cb127189f7c35343d588c4ea99741f292097854a6aebdda01ed3e3b
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index 7c9d8fdf8607..b6fcce6d4152 100644
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.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=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P}/src
diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest
index dd99ca9679ca..de66ffef2bad 100644
--- a/x11-plugins/wmblob/Manifest
+++ b/x11-plugins/wmblob/Manifest
@@ -1,5 +1,5 @@
DIST wmblob-1.0.3.tar.bz2 160657 BLAKE2B e36f7b8c6dd38466da490bd85d03ff2f378caced8d5908b00422428223aaa1fc3754bfd35dcacb2f162b0d44c8c04b509cf5c00d678d687e5b90cad886ce98a6 SHA512 4d8c7e30218d9ec7dc965c69e69b0fb5839c468f695ec2cc9fd9bb0b8fbc89b1386122e11b75906169bb16d13dae16cd8287c5bcf8bd28ccbbad4d4f057b3414
DIST wmblob-1.0.4.tar.bz2 179284 BLAKE2B 79025a4d80c05bd8f9d1a962762680e24ae0eb09c8bf961833f4f4c59b086ecc8563ef71c28678c969da75f1f074c691c9fd6a6919358886e64f7fcb814611a3 SHA512 d325711e6c6c865a97386793a7c3f0e0833044001ccc336f2a4e9974799e5ff00936b0d90a0dc4a3280ba27a8d1f97239ba51d61e6e5b104e7cf82c8aeed5ec1
-EBUILD wmblob-1.0.3.ebuild 745 BLAKE2B 6610ad4bac52fd5b10461c513aeeeedb90a0a872cf68c8348a9e4f4be82e8ddfa5baa85aee9aca229b47b6c229d3754bf0df92ebfe9caa432b98a4f8e92e2a6d SHA512 3ecadf3b6c06025fb110b136c4be35e0420e408e220f31fcde83934d1193f2dece629c2aff1213d04cf57085294c8ffb2b663b788b3d450815a5c00b69326f36
+EBUILD wmblob-1.0.3.ebuild 745 BLAKE2B 2e4335ccb84489621bb75f05443781a289380c899140ffd2676256afe6606b090af4c72841d9f31e3d8387e7a82807adebc540046ddfdb8312ef2d7cbeaa0c57 SHA512 093adf00d315be7a6d7d51fe4dba68685503a6cf5f12bb74f57364dc8683a7fd6a7cbb31ee6ff90da39090b1c07467999c06b71ab4ac45937293625308f21cf6
EBUILD wmblob-1.0.4.ebuild 738 BLAKE2B c81a5da95ee998723bfa557c350095a040bbf99142c61ae264b50e3860b5d7c02e9b82da59bbdce8132d93054a1c51e9ba558d13c5cc3d7eb88fc7cc2d7469bf SHA512 515fdda67a225b2c8af2260d9906bb0aecad09bb7c2f0387b7aaef7cb36bbfba55794772eae8e200a8809bcf1786e593435657708c596d1eeff22298351ca122
MISC metadata.xml 326 BLAKE2B 1da63467b87683bcbb2e3e8a74094449c20b94c5a891a59fa154cb9f0ad21ee89c4bacec8b19bbc74d3ce687f18740eb972a0051e7fbb6794e3b1ef30a83ecb2 SHA512 73f3d392f88613008cd221ee98c5836f324127237cd3e64681b90f7067c3d60ed1b52855e79aada62cd70157fe78cb2c7f7d93c6cc81c58498b8b6734f2dc420
diff --git a/x11-plugins/wmblob/wmblob-1.0.3.ebuild b/x11-plugins/wmblob/wmblob-1.0.3.ebuild
index 188ec7aa803f..177155ed0a7b 100644
--- a/x11-plugins/wmblob/wmblob-1.0.3.ebuild
+++ b/x11-plugins/wmblob/wmblob-1.0.3.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
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/gtk+:2
x11-libs/libXext"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-libs/libXt"
DOCS="AUTHORS ChangeLog NEWS README doc/how_it_works"
diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest
index aa8281c11639..c168d520c603 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -3,6 +3,6 @@ AUX wmbutton-0.7.0-Makefile.patch 753 BLAKE2B 5dcf27655194b834f63f5c9dcc25ed3a3c
DIST wmbutton-0.7.0.tar.gz 48381 BLAKE2B 051a6da83e575425aca44c88e3011e1c9413d2321ecf3d2387520270d4f5f23eb23df0526332d8913d9a5aaa5f813e5d179f8deca39b705d64687506d9e3da8b SHA512 dc631caca0b1ed6daf8781a0893464b91d788b3d0f81dc22a33d13715cda7becbb145d2d3d34ab93a9a343ed178171c376f81e2eb25e9436d1da8ee2d6455ce2
DIST wmbutton-0.7.1.tar.gz 140293 BLAKE2B 55ab4926b833ae4e57e73cbd4e0fdb6177510099a140bd17d1378c31fe4f42a5fa35c1dbe58398412d465ceb99065a3c7a45a496dc3cb71d045edd879bd70f18 SHA512 61e846c2c7edf6375fdf7e86490ef80feab986b24ce83110283b7e336562a670142e326bfda24ddad832c563da0cb4bc2c3d7379e88e647954c6d93a4dcf6068
DIST wmbutton-buttons.xpm 25003 BLAKE2B 84830b939cf22605977796ab756d03c110bae8e565eec2b75f479a5b19d9027851ef0178e170da34537b0725073f24544dc0f9c1c701f0f0089701bdfaffd87b SHA512 eb73812b8a4060a6bb13a477275224a2e6d50f7b77944f2f674c4995e0053f3d3c667d483c86dda98b69f398fd332e4c836ddf9eb3410e1e29b69449b874537c
-EBUILD wmbutton-0.7.0.ebuild 905 BLAKE2B eac3adcbc1805b56275941fff858f138730dcc5424ebbaed3062dfa64e3e8920c9b418e89b36ee30064f1045704ba3c6ab64af6f30e5b6926628bda34369bbdc SHA512 1af7b1696e58fe456202b6e157b72b7388c9ba702b87e5fea9c8839d4b1b922bd1d65f4d2070d6115037ceb173d9fc44defb6fd2f2e07640eb0f0e58fe1e7468
-EBUILD wmbutton-0.7.1.ebuild 470 BLAKE2B b24a05a00e816d3e0c20b18a1a169694153fa07308a6f11acb524c427fcad5d4526c97616d119d9848010541dc82141fe272286e2b6b7510810863a17700f952 SHA512 7042753d124ba4a70182799347b4a2c2636795aa39e9ece5b7f341b6125b3e975863afd20e8fb8260283e15561226cf44e38fec2bf417b424f633c5e13014a94
+EBUILD wmbutton-0.7.0.ebuild 887 BLAKE2B e3eb678104beadca07744851347b5ca5566c007fc8e6fbf209669d122cf527d68556cd5e8a0cf3311d0b1ea0082d26afe75be449d7152d6b0a839e5da0a51f22 SHA512 80e0788d374244587175b8dff5268d58e27e1cc08c0a0b79a0a6af2ce24dc537c91737b4d24f62a9cb99ddc7a1971eabec27ebe3e43ba8ac669fc55f18b7cbc1
+EBUILD wmbutton-0.7.1.ebuild 473 BLAKE2B 2d0e38d99194a5725424f4c049685d357c104484272091e08b1a6fcafda062d94ad50bc8a3f14cd1a1aa5e85a4b8701ac441734fb96e7eb8c57bbef1363aaa63 SHA512 7d0835c01ed903b61947af2f0cbd42bb5dfbc0ecc191b23699b33501ac20360d28828a6d3d71d2b0a5642706ddac0805c8a43eee0f78227faf4813a0d0f7a0ac
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
index 353094287d03..4a5bc61a5db6 100644
--- a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/dockapps
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
index 5de26b6bd1eb..a681773c8a4f 100644
--- a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
@@ -16,4 +16,4 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
diff --git a/x11-plugins/wmcalc/Manifest b/x11-plugins/wmcalc/Manifest
index 7cf8df7c45d4..29311a80a40c 100644
--- a/x11-plugins/wmcalc/Manifest
+++ b/x11-plugins/wmcalc/Manifest
@@ -1,3 +1,3 @@
DIST wmcalc-0.6.tar.gz 44250 BLAKE2B ddcc90bb9d8cf203e1c24b73ff5556d7d11265eaaa93d70908c4e300cbd91bf7fbdca87b67bbd07d7e95439c5326c4853c60d80cfc3401507968fb80b2dd3bb7 SHA512 bdde94f44462733bfede021329b44f21d377fe8a6089c1c457d71f35481b8a01918d92aa79f60d47c791ddf8ee2a9abdb4185ab30584afba558a289a3e786841
-EBUILD wmcalc-0.6.ebuild 654 BLAKE2B 6eed3c05e468d71d1844642b4579bd2e0d4a941ad00bc63e124641252841ae8f8b1a6c75db4f9657d986da7b493a830bf60c21c641c97f7f8eb19247f8714526 SHA512 c63779bfda5bf0939192b40d0aa94840c95cb5d3a2e2fe4993d480327e418713c0ab362ceda59055d923f8f66e0285b0209ffab082d95d5d80e898db27ff2be5
+EBUILD wmcalc-0.6.ebuild 657 BLAKE2B a5a6f5e3ee783eee75dab43d9739f5520d40ba67520cbe68cccd064ed5dc3d576ddd89218d917543b040ce5915611cc4f4234da7eeffd60f49100f2a2bb0c322 SHA512 dead24ce7dbe4f839df85b14eda9b9a6b1e2cee282e05fd48f2de208a19cf6cbf0ed44215842e7ef06cefc00c0f1bbbeb8ee428ffd8f675b136964252dec309b
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcalc/wmcalc-0.6.ebuild b/x11-plugins/wmcalc/wmcalc-0.6.ebuild
index e71e445a3cea..a10e1ac605d3 100644
--- a/x11-plugins/wmcalc/wmcalc-0.6.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.6.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
# Specific to this tarball
S=${WORKDIR}/dockapps-43ddcdf
diff --git a/x11-plugins/wmcdplay/Manifest b/x11-plugins/wmcdplay/Manifest
index ea3dca8cd542..2804415b8b51 100644
--- a/x11-plugins/wmcdplay/Manifest
+++ b/x11-plugins/wmcdplay/Manifest
@@ -4,6 +4,6 @@ AUX wmcdplay-xpmdir.patch 271 BLAKE2B 1826482d05b36892d0e2b29ed2e9117b44e4601735
AUX wmcdplay.desktop 178 BLAKE2B 74f1f10064d6e3e1738bb21b135ba479ce2bec97e084d4d3b402b823abbeb6db9b0590c2e12c427661518f099c478f7de35b161d788d01359053bed88224d69c SHA512 54e48ca979d5348e58b7b7057665dab9ff1429be534ea2dee970900c14b853ba9616487ff27500bf4a28145ca2b8809b4d6fffebbc99ac684238fa708a946293
DIST wmcdplay-1.0-beta1.tgz 31919 BLAKE2B 4c2654a13670a892e159c3ad5f1460e8228d76226eccc3e76f09120efa0a9ea6766a69ee40277789b568041b276e2173c624ab548ca2d527ac29179bc49fd81c SHA512 bf771e7b8e46096514dd2060230238cb6875ee36e473b8339650026276b97a83ee6862bcbf55ae8c06e55a5f7070d856e9158154a59778199de96b9f8e5116e0
DIST wmcdplay-1.1.tar.gz 32082 BLAKE2B 5fd8f57aca1d3d53d34a31f9814c132a98241b848ac04e69c367065ea291add5f025598b7b03c44033024d20e24271690cdb38830e56d3795f6232b02f1d81c6 SHA512 db657ee2cf0a1a7e323e1a6fbf2ec70251005b84fb18808661cd44a50b4203786e56e90329d81957d2496a6e79d76e9d87620680186c85e476b7f94d8f234133
-EBUILD wmcdplay-1.0_beta1.ebuild 1021 BLAKE2B eac2e9791f8aa598937f5729defece0cb29cd7b636b8f18f98cb4a39892fdb8a5b61f96a8ae9cbfc4d6a4d675591501d94770415cd2b2dfa5cc6a8c67565d5e7 SHA512 fb390d41100aefe743a83440c2bb952fc1fc643c25f77ea616ab8196366d931a55c5d4cde6e266b45afb80775150634d88966434d9b92a15af04fd36ae07df95
-EBUILD wmcdplay-1.1.ebuild 607 BLAKE2B 4abe02f3eacde230f882affe6c6316c8727062adbf6cc52144a1cafe63e991075c3158e0f080b905c32bcb6a69ec35b9bb6998d9bcde34fd88e3be86222fd272 SHA512 7373d98d8159efbc20ad99aec6c8663e443d2fb7708bb881ae0a68ebfa0847a3c47be40bab6b9fc1ae9d6f6aef3b94cd08c25fa6006c401e2d6263bd505e9819
+EBUILD wmcdplay-1.0_beta1.ebuild 1003 BLAKE2B 56c0a9d10dd69489cc3b23946ff863ce57285fe375947e7894ab2b6dcf602a969173f5f8493c77d739829d6f31f3e61b9a72e0f4327a7c9c7c9cff3109248fa6 SHA512 c2ad0564aca1ffeec941cfc78397e8cb51d0f6af022360e14c8fcb3ca43e3caa2cec9152339258bf8b362b84e6e62242bdf16949b738f58e41fc5e7158249906
+EBUILD wmcdplay-1.1.ebuild 610 BLAKE2B 7c56356fd002cff6d63b3979add7356cc7b698a666497a95428686e6ec8cc63d770b87660508f4bc3b59933fe2623b45cd9a2f0b507db571472e483cf66eb065 SHA512 74b541c25289b070d52de2b0bdb2dfe15a5051bda633b71ab99c982c8cb374aa0ee84ca3740b86019806edbee43b989124f8c743566fe1559945f014a72cbcbd
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
index 7827b4a7dbfb..a5309acde845 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-misc/imake"
SLOT="0"
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
index d3b33734988a..f0a1d39b633e 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/dockapps
diff --git a/x11-plugins/wmclock/Manifest b/x11-plugins/wmclock/Manifest
index 4c46b0d98bdf..51d9e159fe6b 100644
--- a/x11-plugins/wmclock/Manifest
+++ b/x11-plugins/wmclock/Manifest
@@ -1,3 +1,3 @@
DIST wmclock-1.0.16.tar.gz 35448 BLAKE2B 2a6ee148664b10850a31bb7f20f68b8f2d0c7e1e9d353f6823e9280b40ab7e43ebf1e824428e233d03608217a2cdb7f7463480530ca89d5bd7278ffeabf2de80 SHA512 1325a3a25d03a04e5321bf99bbd6ffac0e08f9f2a635425689458cf74219a9338d60d832143031639f75575dfc63fd307a15e651f90345887cf95de90cc8fbe0
-EBUILD wmclock-1.0.16.ebuild 580 BLAKE2B 7716bd90bf0cc99e99cd865281528d90d48bcf4dd1c01365eb1115b709d9dd8208d558594f7fd1ed81d6bd909ec9a13748adca26fc556d36536170f17ac5c287 SHA512 877af78658e335980507e949725fb49b00d18340de4ca133fc847e882c168f46e155f76b84877682d15f2a6ba2e15047c8f07d36880daced31677251f778bdd5
+EBUILD wmclock-1.0.16.ebuild 583 BLAKE2B 70d42cfb3e21b9380c242d093436d12fb7bc5460ef1b398f5f44be81641a4a36235c211ae1ea16543132ebcefa50eeddc857836666434bd8907865808fd531b6 SHA512 5f77c47ddfdb3b084fd365165509a532d3360d7f314145343a2a9f4c97a48b12e03b1803c35b926acad62d841b58371d012b0fa268d96f8956f75ed4f744ccea
MISC metadata.xml 688 BLAKE2B 227ee0b283753824b8e06e77fe0905eb26142adf58a7b376519281dc67e19ff15956baaab9af4b375a550782b281525187332b38ab128d4192a76926ed240e8d SHA512 a11af53f6a28b0791ab43350e677a07b587b6bbe65bc1e5495277ae12d4cbc89417e6757b5561dd55e123fe7f83e7202adec0fc3dfa2a2887ee0c5f817d5b112
diff --git a/x11-plugins/wmclock/wmclock-1.0.16.ebuild b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
index b36973114547..8a6ac6cd1922 100644
--- a/x11-plugins/wmclock/wmclock-1.0.16.ebuild
+++ b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
# Specific path for this version
S=${WORKDIR}/dockapps-daaf3aa
diff --git a/x11-plugins/wmclockmon/Manifest b/x11-plugins/wmclockmon/Manifest
index 1ec0a74235b6..b43f7a665bb7 100644
--- a/x11-plugins/wmclockmon/Manifest
+++ b/x11-plugins/wmclockmon/Manifest
@@ -1,4 +1,4 @@
AUX wmclockmon-0.8.1-gtk.patch 11386 BLAKE2B f624a1720dc51db5af1298bdf334065e1e707f83a4561f94ad35ed32a057270db1a3a3234132d3d526c8cda50847b976c3ce9393f35c8460c6791b0b7fcec6aa SHA512 60e9cccabe142dae7cc24a3f6a261ed60f1b9c85dabb439fda8fc8657bc082997bd4558cc9e360b5911a6a8e1a46ada42eaccad6729b1e859fa9b81b60f2146c
DIST wmclockmon_0.8.1-1.tar.gz 139233 BLAKE2B fef6cc69afe54fc966008097c15ebf08db5dc585e3789f610b5f0d5d550312a6e0a00e5ee07d6e86d5efd78358e00a4d0fa44cd3b7ac69ecd9c7374037be61f4 SHA512 6216737b9df3ba2ec453570c477764b89b386bbaf954abcb5a5dc2e8841b08d4a8b0b9a4b7eaea73af59544a004cd685f15ce5a0cf098e4db29208151e5309a4
-EBUILD wmclockmon-0.8.1.ebuild 794 BLAKE2B 4c6ab2f464c0beaf81efb3b926f3dba920c0ecc6583724a43623e07d6e33c3b949dd301c575d8a7a829ae06ae6e7a8db8ea30d85125cbbc051b7dfa02e2ff6f0 SHA512 0a92fbc9f021e19faec82ef8f1353382b4b9d0a21d66efcc24fe7c178f9778ba5837b61d5edbbddc14e7ccc59c7ff3968020a7a62c67961225012ef4600b0921
+EBUILD wmclockmon-0.8.1.ebuild 794 BLAKE2B 912a1bb5aef273e7fdbc0408eeeb6a3e88ee3382c21e67ddc515910644f2277fed52eff3d429676333554c5fedb1b7cc60c87eee6832a0d80868d5d3b18dd448 SHA512 ed659a3329914a29cc69aedd844b711d0d88a0c34962f7da6ee73fabc8e3b8f3a0139eb814b26af3f734b8b0b7e0fa9e3f5d49d27a242cfbb7412e98bb2a083a
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild
index bb657bedb11b..15c05d3ee3b2 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/gtk+:2
x11-libs/libICE"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-libs/libXt"
src_prepare() {
diff --git a/x11-plugins/wmcoincoin/Manifest b/x11-plugins/wmcoincoin/Manifest
index d045b8f5b8a5..1e2cbe4d0f89 100644
--- a/x11-plugins/wmcoincoin/Manifest
+++ b/x11-plugins/wmcoincoin/Manifest
@@ -1,5 +1,5 @@
DIST wmcoincoin-2.6.2_p20140602.tar.gz 972358 BLAKE2B a30acaa7b20e88c1d2f4b5329f02321d6a7431bf22379e9d8074b48c1953bcd411b011097546b905f406e21f5de3e9057923109f0e63136cc19d5b5bdfbc47ef SHA512 ddf1b24d9c9021e9cb02817e80f3327074ef7d09ba7d8033d5d0c8b39a25106a1d54d32f211d31a910e2175d98bbda940f309cc137edd1b02b5a656891e89b2c
DIST wmcoincoin-2.6.3.tar.gz 973973 BLAKE2B 4dcbb79ddb23c47fb891fde56137bb385ccf841eb54ce7a34cf060d4924d859a5a2ac40d504a26e763f1fe075796e09ec6a00a0080d214add2469db6b2f3a4d4 SHA512 daffd94387a03e780250877ae43e5431a7c0710862dd9fab04efc254e02e648215fa9c301bf1ed6d1a9ca5182a2a88d10ea4c385d92752d047492e6e9ad01d2d
-EBUILD wmcoincoin-2.6.2_p20140602.ebuild 1035 BLAKE2B c282a8f5bf0ad1b69ddf8e89af5fd81647108af6f4a4293e30106ca032b57dfdf74895cfcb70dcb21d92706e506c03f23d1a0d557f3fa1feadd1fa8db944ab97 SHA512 03a26f9dd2b64852d428bbf9b663e56bcefd1571b7a5543721ba4e098283b4c1e3a45e88f636101f4a18407d20c67c54c003df28d505c3a6c8d3df84d37c815e
-EBUILD wmcoincoin-2.6.3.ebuild 786 BLAKE2B 69036d3850d256a2a3b8d3e0e9ea5240af7e44c00ef818b6a54b00ff5db5e3e1e5038574feadf29c914c4c60a4291beb0a8a4c71fcec8098c15807a6e481fcac SHA512 afe3048a5b3be986762bb7ef5635c4f45bd9650cd26aca03896af1e2a142e9a722efae18206e6b0889ee1c721c525bec810194235b82d63aa0cd05a9700b7203
+EBUILD wmcoincoin-2.6.2_p20140602.ebuild 978 BLAKE2B 74c122836e1bfcd89fc77117349d48dd88566f143a37c25426c2322362a2d586d3513bcd5559e0a73f58761b1b274eb037b422c37d67a1164deb5b286fe135b9 SHA512 ad01f83b53cd4a2d5dd9da3f8daa8830eb4c2b227ebae3279302c5afcedd56183c07f6ca70ebb0b4938b8d4f90c264c161e5b655f5a237f2133befa3586eafaa
+EBUILD wmcoincoin-2.6.3.ebuild 729 BLAKE2B 3ceae2309b8ee1f9555e5f71a882ee78cbdb28ff4eb087b6fe3213eef615b2a9b1e26aacf0ab6bd78fa66a137dac2438874f45a83348c896cbed874b491ae006 SHA512 50069109011d30d09fc31fda17876030da101691d97f826ce92c287c496a4b4c4dd4847c508952101dc5372c88ba6e5cf96881de9d794531f7ef6ffaebf3350d
MISC metadata.xml 641 BLAKE2B 8ceb569e438dfe8de74de91d31c6b858db7dc20508257fa371504352664cd409c0339e356401cf68f8a59a5cae8aee10dba93134ca353d6a63c47405bc07a229 SHA512 e2d77f95ba4774261ec4ec669d18bc5cdc11558e935bfb3d4e759e9755e15e7ef88b9207a7498c44bab9061f01483c36b2c9624648fc05df526dc91f5637bc64
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
index b0a61a2aa8a2..a8546bdbafa0 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,12 +22,10 @@ RDEPEND="x11-libs/gtk+:2
x11-libs/libXft
xinerama? ( x11-libs/libXinerama )"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto
- x11-libs/libXt
virtual/pkgconfig
- nls? ( sys-devel/gettext )
- xinerama? ( x11-proto/xineramaproto )"
+ x11-base/xorg-proto
+ x11-libs/libXt
+ nls? ( sys-devel/gettext )"
S=${WORKDIR}/${PN}-debian-${PV/_p/-}-1
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
index 3c3c57013756..6b23f379b40f 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,12 +20,10 @@ RDEPEND="x11-libs/gtk+:2
x11-libs/libXft
xinerama? ( x11-libs/libXinerama )"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto
- x11-libs/libXt
virtual/pkgconfig
- nls? ( sys-devel/gettext )
- xinerama? ( x11-proto/xineramaproto )"
+ x11-base/xorg-proto
+ x11-libs/libXt
+ nls? ( sys-devel/gettext )"
DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-plugins/wmcp/Manifest b/x11-plugins/wmcp/Manifest
index ee05954a044e..956cf75c5a2b 100644
--- a/x11-plugins/wmcp/Manifest
+++ b/x11-plugins/wmcp/Manifest
@@ -1,5 +1,5 @@
AUX wmcp-1.2.8-gcc33.patch 2397 BLAKE2B faf1538bdd47573478ce79c71a9e273348ecccfe472f709cc39ffc4085aa13f3bbebe0046e8ded77bc7e17102c891e64a81bb737e451154dd613d3e30b9ba737 SHA512 92155c2213425ebab4938c00f9b9164b247c7e3437d332d7bd479dc5eec6394d63cfb3383f98f9508ae8c12d18dec862875a5b2da69bf7b8f97f30b72a29c716
AUX wmcp-1.2.8-stdlibh.patch 321 BLAKE2B d32f57cdd8617ed1d511d0e2b3deca1513106bfa69b07a92b8485deaa356bb71e0b19d12e601193d8ac91bf186c8f3529e7679fd8f94f5a8e19abe297ec09ab8 SHA512 1fbc0c1a26539a989de20e4abc90663e52fa65cb4279e93e22f30b7bd818f6993eca69f5a6926e2d1d2fe76bdc9be1c5e556569dc2b335d6b308cd22c4726f11
DIST wmcp-1.2.8.tar.gz 8673 BLAKE2B 28cad145f6c41829a740cbcef043fe54d940019ea42cbc6aebbc6b8022cf15c642f1c1dbbc0e34721442d4c3974224b498e436b5eae4ea30c766b2512f58939d SHA512 ac8db45800573810389d8103b5086966bd6bd5b03620338e736e05633fca570639d94e1ceaf24f882619f7de048c70e5ba9996849e0062407e32a74d971a3b01
-EBUILD wmcp-1.2.8.ebuild 999 BLAKE2B dad56e0c2f1f4ed9e0b9115e777cd6570f9c7918dec3da3d08d0430d02b01edef537ae65036553ac86def03cda87df638e8dd9c05c0ddf37bb90be9cbbd1f420 SHA512 6d91ebda63d00beac00a29dd2824cb9163bce98b69a71b78e4e552960eeb3baaf39d0e50fc4fc669bc98c4ef770c5e5b56afd34087f8a2105b938ecb187b0d4b
+EBUILD wmcp-1.2.8.ebuild 981 BLAKE2B 910a7c56ee2ff6af5dfbf441d10da264c9042853c56eb2ff1eeda25a2e490e5dfe43498a2b28d03ce03dbc35bc136f66ebaa38a75e8f96d187b0a387ef2eecc1 SHA512 3424ffb1b0f34e6e855f2d6ef07fb4817d33f64a08c14a6eacd58a315b9f95d34dca8f95d60b2c479f8a6a4881aa432824859eeaa882665609dbb6ee4a14c18a
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcp/wmcp-1.2.8.ebuild b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
index fbd061cbaa0f..eda159623e38 100644
--- a/x11-plugins/wmcp/wmcp-1.2.8.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_unpack() {
unpack ${A}
diff --git a/x11-plugins/wmcpuload/Manifest b/x11-plugins/wmcpuload/Manifest
index 282120786544..d1c5bb3903d4 100644
--- a/x11-plugins/wmcpuload/Manifest
+++ b/x11-plugins/wmcpuload/Manifest
@@ -1,5 +1,5 @@
DIST wmcpuload-1.1.0pre5.tar.gz 121921 BLAKE2B 3a2c226782e432cf71fc8ae2897219e5a808f4fa02566cbbf48dcce703e105831e21bd3794b153e823ba1a8964e21bffe410681de97433216776ca45a2e8c183 SHA512 9f55609d2d2fde1ee1d02e06840c7769317d6bb5a49de30928d307b514ceb4d05875485a8708420f4a322cdbf1c4aa9d19ec081175a8aabc2f6b15e1a4bb5054
DIST wmcpuload-1.1.1.tar.gz 167751 BLAKE2B e3e80edbf969a849798ee665e6d8f28a3869f4a6125e99f2e3793d9397574549c8462c53d835d2c18b6817e797bb89d1614a66d7fb84e3241b36ee947b38f0eb SHA512 7271a9216d52a8bc904be9ea401f52b35f0086da4bfc16c76a8348b58818199ecfcf8fb7768fe4d5a1e5cbb986e8d89a92f81f2f1aeea59f84d564607be73b6e
-EBUILD wmcpuload-1.1.0_pre5.ebuild 625 BLAKE2B 4e7b9890201fba16a26e87ec5c2248a5480903297ef8b9c1c45bd6ad743817e939b61a93f7103ce043fbb65146644ef8c127862693effc4d75e94b8b2d972a69 SHA512 48825a61ee4d04ed2ae4e7ee2b0cb0d0255017bc7e686b005f5936ab4eb264d00ecc220bbe34bde72dda799f7e65a11b58ec2035f5a73a8d1e49e0c0b75f9f4d
+EBUILD wmcpuload-1.1.0_pre5.ebuild 625 BLAKE2B c2c30507e7bd4756f2fdf1e68e69d2aa031923347e8a1a3cc28bc9a578487471b8eee8490826ce55db5745f909932f09c41aba4eb3d1eeefd67dc89fdd5f5295 SHA512 5fa740eac218192453eeb6014df37a62eec671ebe2141afa5518ba8930712fb66749490bf939e169958ab8c39f2ee7b6a6094bd24c340532b8495dd8cf6a71c3
EBUILD wmcpuload-1.1.1.ebuild 526 BLAKE2B 15bde5323b0f9d5dde869522e36806fa8b8c966c52096d9d1dc047bc212911bf4b96fcd6199f67ca29d52ee536f7b73b585bb9a9b8554722a02fdd4e2c083b93 SHA512 5769ec094f492c307c7318789a4b306e71953b0f68bd5ea32937c017efee9831d2494e61a73ce0ebb1e8bafa149a023d9523fe3c82dafbc2abe5f810cce4b3a6
MISC metadata.xml 755 BLAKE2B 99af546994519ef129f172dbb8cdfc99efaa25e68bc7030ec17d11e19482e2969bb158a1f953c4747f55913624890b437e4e86c50293b7869da104e27fc168b9 SHA512 bb53d6458b3d61d382e27c36dad9745ef6af4b9f6b9ea23178cbafe49abe74923a9e22c31786f111178f9cbf02048a2f2ca3f29e7f3a3f3cc63ae38ae9930c35
diff --git a/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild b/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild
index 74a0ed574174..47eeeabe835c 100644
--- a/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild
+++ b/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild
@@ -16,7 +16,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-libs/libICE"
S=${WORKDIR}/${P/_/}
diff --git a/x11-plugins/wmdiskmon/Manifest b/x11-plugins/wmdiskmon/Manifest
index f394742b1308..57a1896ff693 100644
--- a/x11-plugins/wmdiskmon/Manifest
+++ b/x11-plugins/wmdiskmon/Manifest
@@ -1,3 +1,3 @@
DIST wmdiskmon-0.0.2.tar.gz 91996 BLAKE2B ecf4b9ed151dc9bef1dd6e68f7b62af77774b6527d37b833527a45caf56cf7f58e70cb2b78e4e2c13cee063532fcc81418ce0b5e0f4c8b7d177cf03a11e21c0f SHA512 c39c298961129fc6951d27096c2993b0cafcba52b5898518fdb6f446b6fd6332db1df36bd1c812f1b1ab7fb0c59759f749176a675a29eb271a72430709ef550b
-EBUILD wmdiskmon-0.0.2.ebuild 561 BLAKE2B 846eaec3a038885e22cbb2edfa98285eba4a9ca2ea7e6a5f7437b7ca02ee5a996d1eb4a9b7ed79dab24ba78611f8fff483946f397c82183ae1c1b29b78e593d9 SHA512 29388616b9cb93875add337ea7682f3991f48738e8ee0f68d55e61fe79a6babab47bb7df6cb8b5a789a960e16a7b647e5114f8a2f40ddca8a951c9ed67518064
+EBUILD wmdiskmon-0.0.2.ebuild 561 BLAKE2B e4303e65e02684a9a5ad282e665a9c60793f2533237d0b0a87d45eed03580714cc10bad9387ca8794b046612081f532ddc43124e0c91858aa18379e84b7e2245 SHA512 dc7da8c5bd1c3edbcccede085250bc3c508e3054efc08149ecec760f70c3b95b398d84fdbf79e6dfef721edfd845f498c775fbb243cfdc380b3e4a040cf58d87
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild b/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild
index a85d7e55763a..86e2770cfb0c 100644
--- a/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild
+++ b/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -15,7 +15,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-libs/libXt"
src_install() {
diff --git a/x11-plugins/wmfortune/Manifest b/x11-plugins/wmfortune/Manifest
index 9790df6faca2..8f88b3b7c51d 100644
--- a/x11-plugins/wmfortune/Manifest
+++ b/x11-plugins/wmfortune/Manifest
@@ -1,4 +1,4 @@
AUX wmfortune-0.241-stringh.patch 382 BLAKE2B e8772171211d5ce4ee56d18a340a86ab42675ccaf6448462f58de87e916350ca10cfb1a0f2f8e3b96f56e22c9927f354575603a68069bc97bd1c5f1802dbdc33 SHA512 ff03a7473f3dcb45a882f3298d04830253f9d2b88466b2e8201f0c2bd96fce979c70c184446e35b665b41a173c7fb494423001b7a7208c4d5c7d993fd928d0b0
DIST wmfortune-0.241.tar.gz 23406 BLAKE2B 2a104d4f5d9ca1865618b95c2d6e4bb49cb841325442f58712c4bca1d971b9ef6512d509e80753b8a96e7978d5198b3a4f6fc2d54c6182b439b4d30cbe73d6df SHA512 d5640090c2f2ba788ab9367b70d948d4f1d846174714e2415e81500f5fef6c3e7e81b12575274bdb3a760fa3e2e9ab499880713a923add136089969b394f9409
-EBUILD wmfortune-0.241.ebuild 874 BLAKE2B 80ceb16aa35345fef975de4e5d22ceae1f3911941c0c2002bd30b5e64cf825e2932b7208f1df62e108fd35c19f47a33156572c8e21d02b3c9789acbcdabf1874 SHA512 b6923a0632e4abda58980a968aac80371d615b520484a8410a82baa51540fca5b24f3c0e8f6dc1b8a6bea9a1f5dbcd7e159706fec2727cf61fcd96f8bfc93ef7
+EBUILD wmfortune-0.241.ebuild 856 BLAKE2B 0769a4a43c84aff52d2e40f5a99d2db6112d0cdb8098db2e27e19dae8d5242c219f0fb9e85f27047c30f302f36c5641d9178ffd9814434947d80873ede2ca27f SHA512 49b0b26b2a3987f1a3a0fc40fd7aeb54ae97d7c2c33afe7f883a23adb14a36d59d15a303121ef2a0b127654b925350c6325e8d6045c7d05376062e68d17c6702
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmfortune/wmfortune-0.241.ebuild b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
index b355001833d0..4165e7e95b94 100644
--- a/x11-plugins/wmfortune/wmfortune-0.241.ebuild
+++ b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
@@ -19,8 +19,7 @@ RDEPEND="games-misc/fortune-mod
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_unpack() {
unpack ${A}
diff --git a/x11-plugins/wmfrog/Manifest b/x11-plugins/wmfrog/Manifest
index 02ce7e7b532f..7ec4fd8039f8 100644
--- a/x11-plugins/wmfrog/Manifest
+++ b/x11-plugins/wmfrog/Manifest
@@ -2,6 +2,6 @@ AUX 01-fix-segfault-0.2.0.patch 1350 BLAKE2B 6847a3689fa1de257c59220b98a66101133
AUX 02-buffer-overflow-0.2.0.patch 1794 BLAKE2B 03e9cb505b4cedb3d094d997f4754ab9f55101ba0df02808563eb88343499d58bd72f55e4883a52deffa41ddb1c601f7017b7600e7dbd3e08ea3202fb2830ca8 SHA512 62a2b38bba61426810c3833a22733b3d4a7541f31b0153e3881e08b495150a819764769b55fa3f878ac6e62f603a52f0e5c074df364522347af670d979e61f26
DIST wmfrog-0.2.0.tgz 59113 BLAKE2B 39241240ee0477e8d587e634be74184c50b34078be329bab1786a0223395e76e6284693096fc0050ee6a32308dbe0b1f8540ead21c1c2509d158a1ff4b94b0c4 SHA512 e704600d2a3ce4ff64e4c5393ec4b977356ed18545b937102c2a120f6407f1b879f050a1a7f324c8ea40e2360dfb8147bf24e9910483aebb24a3f8e2692537f4
DIST wmfrog-0.3.1.tgz 128499 BLAKE2B 5bde4ccf41fda8e1a7e4fe9d40727e0d86d65830cc749955f5b1c97949c543f8f7253ddc6fffa48fc606e23c2ff6b4c66e07c66807a43e02f68961dfbb20d683 SHA512 35cd7da8ec0173f4799119191cd28befaed0fd5ea09c0dd2e9789ce37e9a1a4a83a9fb4562051a8da9c1449eafc8299c86914cb6f0e5bc35bd051560442af7ee
-EBUILD wmfrog-0.2.0-r1.ebuild 796 BLAKE2B 5e4b49a53f3110101bbd25813f840f4a2b5c357fcb391da6d3e4823b8deda11f4d5971a76264bc5f96eb9b2c2b5d50ec8149763961cbdb5987e835d23bd602ed SHA512 441c877d59a571d638af43446e4786937453d0f92c4af5aefa4ce2c5a0c7f5a03136bfb3de752bab9d439f1554e8754a87032a2fcb6d0a37088e6f9672af8c04
-EBUILD wmfrog-0.3.1.ebuild 742 BLAKE2B b1d2c05ea144d2f8ac1a25410823f4b35f0f4a4bf4be5b43ee5e6e62b78799336dfdc5bbffa23f372d7226d41af3b7505668f0f6f2575f1e98b9c637258ddf70 SHA512 f165b79b18d50691b8e3eecd7fe7436b33a086d026c7184b1ff10c61a67a3c80b9787be60ce4590028cf8de7629980061d562241665cf9122c120b18f641e7d7
+EBUILD wmfrog-0.2.0-r1.ebuild 796 BLAKE2B 1027094fc338b7f24d3473547aff2a37f20ed20428d81633d709c5ef75972f55c18fa3a861b10ffd00ce2523ceff0f335cff999d7dcda1ee9361203ac2357b6b SHA512 487f0052e17ada996a75915ddd09f80b67c499c768f876d182a6a3c16c05c3a452158da77d9447f43f643c38189620f3c63ad2247da362a429362447b7fef625
+EBUILD wmfrog-0.3.1.ebuild 742 BLAKE2B d8bd2107de67c9a7731763bf0323c5e5753dc1126580aa259907762138da541b594c15608042cf14ac0259be9e7a3bd6591fe4bce8ac5155f1163952674dcf66 SHA512 b8539aa697520faccb3308bd7379a89584d5f53379ffac5cea0205c6067997bf33685ddf16c75336dcb8305d7957b514ceb2377b2e1b4f7d619a3f81e747397d
MISC metadata.xml 328 BLAKE2B 4d9379b73162de003a92fc6b9aa8bdce8969c815e2181b62a1be2331e422deb78ae7283a29f28a85a20ff7664378ee88e41f3db4cc302a2351f08e8a349e0fab SHA512 279b5bfe4731afe774f94c0588cb4939e33a8680d07fd1c0504f18f23e47dd4b11bea2237c5422896a5b204926dd6fc39237a62dc70d751891f2cd1bacfa48e7
diff --git a/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild
index ad134fe8a64d..ec123100e9b1 100644
--- a/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild
+++ b/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
x11-libs/libXpm
x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/Src
diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
index 9bbe9bda51b6..74ad1e179680 100644
--- a/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
+++ b/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
x11-libs/libXpm
x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/Src
diff --git a/x11-plugins/wmfsm/Manifest b/x11-plugins/wmfsm/Manifest
index 1336316b6ed3..9457b29466b3 100644
--- a/x11-plugins/wmfsm/Manifest
+++ b/x11-plugins/wmfsm/Manifest
@@ -1,3 +1,3 @@
DIST wmfsm-0.36.tar.gz 20456 BLAKE2B a9832bb4d6ae45b451c564d45ab2af085a17b3089b2f62411b70dab8f78e9c8725f6e1abfed75aa9334969dcea8258b6746c07e5a1e43cc021ab2083ae897de3 SHA512 d5d148f67f226e38a8b3c2475cdae9d93cb545ca79afe93060137b36f09a328db82b4561a6dd76abe7f5d59e944e8c8ed0f85ab1ff1727c659195c88d1d7406b
-EBUILD wmfsm-0.36.ebuild 689 BLAKE2B 8881c8ea94ccce5636c1a8e5820421bb292099a8e66a898343e67cf2dd82c313220e5edef9b40c3a85959849c9604ace6a02a2c32fb8253c5136bb9ed331bd08 SHA512 f3cd56dc63ff291057454de25c28df20a8cc3447fb6bc748c5f9f2855151beace034421a1fbe133a100f9c290f5faab2cf506e2452d8332e801ac127eed6e283
+EBUILD wmfsm-0.36.ebuild 692 BLAKE2B a5f2759160ab9f22612fedcf2363bd037ff8f2164657a0161476196780a26b409a2b974aebb8d1efc5ac395d1420b1ebac703c14c408a184974b0a88a4fcdd5d SHA512 e5f7656ec36fd2a6a8b75c1f8cab2fbcc51ec86e9b5742fb238f6867c62b48cc33c32d7846ab8e2820a4b0e01c3a7447f09f0483435edf19584d21c5725f9f1c
MISC metadata.xml 423 BLAKE2B f8e13f183c54fd207cc333f9ed10f1d02e30c1e02a8fc1b1ed5ed4d5031e2cb3646b5a4d922b4617add3d523a8b0e5f473f065777216372d287a44cefd6549b1 SHA512 aef12ee2b0434ebf22869050ac6060f6effef07c5743f2b9e8a48705b7d9c09b149473b985d419f21a4b20dc86eb59eb2b0aaf617a1395d0ce7070d5763a3cf3
diff --git a/x11-plugins/wmfsm/wmfsm-0.36.ebuild b/x11-plugins/wmfsm/wmfsm-0.36.ebuild
index 62f0eb72ea04..43937a34e436 100644
--- a/x11-plugins/wmfsm/wmfsm-0.36.ebuild
+++ b/x11-plugins/wmfsm/wmfsm-0.36.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
x11-libs/libXt
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_prepare() {
sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.ac || die "sed failed"
diff --git a/x11-plugins/wmget/Manifest b/x11-plugins/wmget/Manifest
index b9b7bb24ef39..fa92883ac7ab 100644
--- a/x11-plugins/wmget/Manifest
+++ b/x11-plugins/wmget/Manifest
@@ -1,3 +1,3 @@
DIST wmget-0.6.1.tar.gz 35538 BLAKE2B 5e7b8bd7504fc23a7ebca04b8628f9c847888ae9a9161f78446ca8976151344d4c2aec5fb422df9069f4c6a1480bb347ba19f7e5d3a7a9ca4e6dc4560bc810b9 SHA512 7e8db4610eb6d57181d10ed46e09aaba8b4f1672f1a8846dd97beb7eb6dd5bbac9a38ed7c33dc7ff7198001660500c2543402b000574d43ef3026682bf4d06e0
-EBUILD wmget-0.6.1.ebuild 582 BLAKE2B 3a2c1814b9d8ff98c42925adf34e7a46f1aa822a471cd9ac33438b793f55a81586d86bf8eb37de37dc64cb671f5321c22c9a56e624f004d6944a2a9a6a84b62a SHA512 9d8c5340a0f59a68f6dbf456056de4e25354e8703942916518aa8b850b7ff931e170ee14f6dc6b6ee175f003697630ab7d584ba5e5a3aeb5b9867b299e019505
+EBUILD wmget-0.6.1.ebuild 585 BLAKE2B bf436f2c1fc97f9fdabca9104b64b0b3f4024621e3ed0489f46765a6a59939e9b5c730b4b88a6cd55291291dbe3b470df8870274cd15d3720f0a80526dc7e402 SHA512 a7c3d5e42ba288ec4fd5d926743e45859a059c32595485872b3e7e391fb0d279f4a1c78edd2db3f7efd1307de8765d980bfdd391ee58e15dc10da856760136fa
MISC metadata.xml 520 BLAKE2B cadb06d4f215a2334ede099929e74ff6d84a3784189ef7a414503cb4b10103f2e8a6018c21c5cb8aae0e01a55b30baa5519ae944e4624ab9c66778d40f4c7534 SHA512 e7b294921f27518b774bcda274e497c2cd3bc752564d14f486e8bcfac659418776082a414418c3762dfcdede4823328f928d90fdd3dabe07879ae32c32f190a4
diff --git a/x11-plugins/wmget/wmget-0.6.1.ebuild b/x11-plugins/wmget/wmget-0.6.1.ebuild
index 17190d7c7a80..7c6f99f0c6dc 100644
--- a/x11-plugins/wmget/wmget-0.6.1.ebuild
+++ b/x11-plugins/wmget/wmget-0.6.1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm
>=net-misc/curl-7.9.7"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
# Specific to this tarball
S=${WORKDIR}/dockapps-5aaf842
diff --git a/x11-plugins/wmgrabimage/Manifest b/x11-plugins/wmgrabimage/Manifest
index e2985adbf8ab..84045d6487de 100644
--- a/x11-plugins/wmgrabimage/Manifest
+++ b/x11-plugins/wmgrabimage/Manifest
@@ -1,5 +1,5 @@
AUX wmgrabimage-noman.patch 296 BLAKE2B fd055cac17460696c688b8e078a9759047cb02e84d6efda95d87d9c67e61b3fc618b172240b0632f4f02ecb99c0ed4392cc1982a869ace5b18e8bf38036c6850 SHA512 201cd10897b1862dbfbc07fc381e34f86cb4b7660f543617bdd83bbacca57b996c20ce20b85c83b98862f0a7771d5a836bbc9c68b74a34538af4d139c5f71aa5
AUX wmgrabimage.desktop 165 BLAKE2B 8faac723c7263861d7c348c33310882b39e4ca864e275d139a970d1377f4531c939dfffb569e29dcb952468e0d0dac61477125b77c4b6adb0ed3c1e76aaf227e SHA512 3d08f5a93d1ff356adb86b8636f092bf89fee18e238b8cbd2f7739239e996dd524f5fddc3821bf24f8c7271f1d9c7cd67300d58e31814a117697cfd9f3fd1458
DIST wmGrabImage-0.72.tgz 19902 BLAKE2B d9000c03e4f9a3584f356c18fd4e4767ccc235708e0d3554fd6a0defa6108de3f52a90825b4ed7d334b545340ec9e463e67aae89062f5b0e2622c9e6d851a796 SHA512 64909db71d141ccf849eacbb100072a53770601fdf23949f76a45d1d25f5015ebb8f3a3da99e8f311977967d44a6db6596c2bcbe961fb8e313e41cad4960c92e
-EBUILD wmgrabimage-0.72-r1.ebuild 1185 BLAKE2B 84128a745b71e7dec1acb47c76583cbd1d2866efeca1e8e5e781f7b2d685c2c7922c1d4c10b2458cc90677e4763e71b793f40cbc9d7b5146c925f755b7f06c73 SHA512 ab2c3036a325c5147f334443f0e72bf21686885d527556e49094d347df16da1966485367cbf7cb3ec3071c9b47200257534b47e5281ca3718ca109676195ee9c
+EBUILD wmgrabimage-0.72-r1.ebuild 1142 BLAKE2B b0791fb38bf0a9b1fefcf1855c60a531a28e93ee30045cde3a2882dc63fed219898c793a3a5c83f2fbeb47cc00bc181299b49e6a8c014af4c979ea0ec7c75244 SHA512 db663e3133363628e79dc64161b67997c8b5f76f7d6823e8dbd9e06516a5a4c8bb8dbfc1296f8d58ef7c9c95845d82c99a0df2edfeafac3bfa2d981863ce55e2
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
index 6586c9fd143f..b64e3a685bf8 100644
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
@@ -22,9 +22,7 @@ RDEPEND=">=net-misc/wget-1.9-r2
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto
- >=sys-apps/sed-4.1.5-r1"
+ x11-base/xorg-proto"
S=${WORKDIR}/${MY_PN}-${PV}/${MY_PN}
diff --git a/x11-plugins/wmifinfo/Manifest b/x11-plugins/wmifinfo/Manifest
index ab14a301fbb7..3f69c7552b6c 100644
--- a/x11-plugins/wmifinfo/Manifest
+++ b/x11-plugins/wmifinfo/Manifest
@@ -1,3 +1,3 @@
DIST wmifinfo-0.10.tar.gz 17418 BLAKE2B 74debc88268e45779131ad6587733343e8be51cfa871ea368ca305a755008fb0a7e3faa332157e79ecea7553d3e523cce4bb9b4a650c2ee73dc1b6acb3db4ff9 SHA512 57731f482b950e968e760315b99ceb715c3aa101f77e5363ee08db231369c5addc4d9cf4da4a24f624313073bc67cd8742030956c5f866fb02c1b24b3cc4e965
-EBUILD wmifinfo-0.10.ebuild 679 BLAKE2B 597337ad8c6fe10241fc7a6d7bdbca970659f1b50d204812b72af40154f8ecbf5c1e5aa074b4d40b1e51228190f14dc9c5cdeed311e4661a48908aabf59206e6 SHA512 6f273a3c7691204b9f063508902e323885a196d22a6de252fce12e03f15a7bbd552b0995d46e96d8b5d9d03e4cd2c0e739710960877cc97149e9c9b9b1174234
+EBUILD wmifinfo-0.10.ebuild 682 BLAKE2B baaf5f148969058f54c93b8afbd8a17b612ab1e8848bcaa87e6a9381d6e2dedcdaea613adce68e3d1408fb2cb9bf2f91b25d7966801865cf54a098efc633fa63 SHA512 41ff48470c20943ef23bcf006eb9ddc89d574d6cc6ef68bc48ab0c017af1b807d1c3d6b0789c8aa31771c0a39239ace53c7cf0445d907574360ced4c36d5ed31
MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
index 45b51b595243..6d796359dc84 100644
--- a/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
+++ b/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/dockapps
diff --git a/x11-plugins/wminet/Manifest b/x11-plugins/wminet/Manifest
index 355b39ee8b57..13881404f125 100644
--- a/x11-plugins/wminet/Manifest
+++ b/x11-plugins/wminet/Manifest
@@ -1,4 +1,4 @@
AUX wminet-3.0.0-list.patch 7026 BLAKE2B 4a4011cbb4e74caee67a6974967a69189702510a7319679c3f2b039c1039f9a62338d0abf960aae598fc06c49c5bc349e3d86b3b445ca45a7592b14926f7c8c2 SHA512 9c51ab9ed8f00648f7f24d070657c9126b26e19a4dbda8dac8d127030858f2a9eb385443fcd452560974bad6ccb986962087bd60fe78c5c1cc6ba43c91313b96
DIST wminet-3.0.0.tar.gz 47576 BLAKE2B 318a180998f815e4ac274b98fdc14914f2d69eac1a5bf6c4382b0f8b01594d56dece8f168a069fd45cb6be373f1c3507aa0a0e5fd27ab571ee21912d0c02e5e6 SHA512 594d4a2019e424b27e717d3ffd64071f7888b40bf9b31332a877e71d85c0eb89f65490268276def30f530f187f3796a14c5e412af8cb461311e3f1e0a6478e51
-EBUILD wminet-3.0.0-r1.ebuild 720 BLAKE2B 40bb47e193bc317fc28e39e9e8f1d24d70fe702a686f6e55501ad509af5ec9ec0ee6b90ef5e6572fe78da220ee1f429354d4eca998167d74784d48be65465d53 SHA512 5b6279aa7f1778d01bb8c3536ab9c9215ff66e54c3d21fbbf589feadbc120e232b9fe84963ebd5728fe09d479036bc58c2dbad9028d1dd85abfe38d254afbe12
+EBUILD wminet-3.0.0-r1.ebuild 720 BLAKE2B 9fd7759f4a20008da705d4256e1db9acaa5e7928ac39ffccc396dbc497a15cf9a0d462d32bd89bebc68c853f3ced999189f00e7f05fc9d23c19f36e516bfffae SHA512 c78df063dd73673e31ba823cf45938c1f4a4ab258f61b51b8a4a76412877862a7851b14f0eca77db57a142c932f985d3cdebbfbbd8e5725ea308a14fccd7daa9
MISC metadata.xml 455 BLAKE2B b17f992bf7af49680eff6c95cde64caa3dce145e40c385fa03bce4a4075793eb946e79fd80f56d88c006149915ccc68499f538eff59b2888b617f47d638e332f SHA512 c27ab04917d6dc1e914f77ae4c215fb9c9f8f0062357ba8f4c197a5ee879335ba196f4249eca2b036717d4eb896c7802ba274fbf39288559012e4992140f70d7
diff --git a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild b/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
index aa8802b5c5b7..31fcd6df0660 100644
--- a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
+++ b/x11-plugins/wminet/wminet-3.0.0-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=5
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_prepare() {
epatch "${FILESDIR}"/${P}-list.patch
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index 0c24350a77ee..4c1162d84036 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -1,6 +1,6 @@
AUX wmix.1 1969 BLAKE2B 9599e110ef1efcfb1582749cc58355f5d055920f5d1d0834073bd161af65cea300c100a9cd64ef65906842858da0e4539527a0c448616228280f7b283bf2a29a SHA512 3937513506295543cef1a12a0a739f4923e2fe6500436433969351547493b712c891ac41ccf627a325eaf03c8552cbe6cac0cedc3ba3548a26c138f4eec084d6
DIST wmix-3.2.tar.gz 33504 BLAKE2B cafc6d4d1d52094edc459db8ab82b46ea0a216ca8035a2882be7ab2dba6945c155a73c2fc3601e9697076f8cf032b7943617680fd70ef889590a9976c2b147a8 SHA512 8382ab849aeacfc88d28cd094c0d9a3218f8aa26b763d9fb4fd8b9837c275a835cc3e29df0659c244fa94b884ebc36b571fe824eaa785a736e630dc2e0081417
DIST wmix-3.3.tar.gz 118037 BLAKE2B b219f607ea31132b7753ba7e92e7ff3ce1ddbb992a3f0295ca68001ee81c55ed347196b2d864058f09763e6cf438865060a768c466f3f647474382a9434f76e8 SHA512 5bca1ca70ba8e76e66d70dd01e2198d85d7ac57a5180740c453f349458ba38291bbb7a87697a25c36b79722a1ada5edd1ff3f1c9021998cdf33d248a1f554d4e
-EBUILD wmix-3.2.ebuild 671 BLAKE2B bac17e23b632476a7bd97302cbc1b1eb52b606f6e2cd3a2d2614e53f766e62cdc36de0bb93efa076ea185336893efa9aec54f58c39b60c81a26ceabffb937c76 SHA512 d4ee015c64041fc0e88d200260d618df2c74834cd1728456ac047e80edab498e3a83596f6bfadff1e4dbbd595020c4df38cf3004f445fafd58aad4631da701e4
-EBUILD wmix-3.3.ebuild 450 BLAKE2B 4d5eb3a267d68aef43552fac97d8317272e573cf1a8f4104b08f890cd716df850d61417eda21842ea7e7b1eedb5dc715e6681e8ea3efa7cb4314ebab63740db6 SHA512 836b5164898d2deaf7585214838dda25358cdce2696b230eb734bd0a3b35becf26e88e2c26a56fcbfcc6039fe36ab5a76c364417bcff300eedb45e4ef63389c9
+EBUILD wmix-3.2.ebuild 674 BLAKE2B d7c082f0d5e54415ea880d0ddc08695fdecc7bb4db3916dad02069579cd7aa1101c5f2b2764e3f5a498a9e99e45d4d13758f43e3ed9e1a26bf2b72ca92616b57 SHA512 74e06a9c9b2007284e8688192c60880557208aeab1c23bd0f45ea1470b6f24a0588166ecd24ed1d3660679dca0a2ae808cf7e35ef2b37049d2ae804e1e1cf444
+EBUILD wmix-3.3.ebuild 453 BLAKE2B 8f167957e72952d0933db3a838add25a469e3637a82dea89ad336d8670c4f3b95a6f199edfeeafcdee65b4722da59845da6b1a832d07dee59d74b92e0bf7d8bf SHA512 0be0211a46fc3a955bff9f61436055319ac00e43bbad3a6c0b97ac36c5f07e23f960e96a2af2c3417904d3a667497e4e0aa34638b3c63cbddda7991f2916cc7f
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmix/wmix-3.2.ebuild b/x11-plugins/wmix/wmix-3.2.ebuild
index 84b87b79bfa5..6164f74253cb 100644
--- a/x11-plugins/wmix/wmix-3.2.ebuild
+++ b/x11-plugins/wmix/wmix-3.2.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/dockapps
diff --git a/x11-plugins/wmix/wmix-3.3.ebuild b/x11-plugins/wmix/wmix-3.3.ebuild
index a82978ca7e55..c5b23a95a591 100644
--- a/x11-plugins/wmix/wmix-3.3.ebuild
+++ b/x11-plugins/wmix/wmix-3.3.ebuild
@@ -17,4 +17,4 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
diff --git a/x11-plugins/wmlaptop/Manifest b/x11-plugins/wmlaptop/Manifest
index 4f0afd30ebac..fcbc2373e00b 100644
--- a/x11-plugins/wmlaptop/Manifest
+++ b/x11-plugins/wmlaptop/Manifest
@@ -2,5 +2,5 @@ AUX wmlaptop-ACPI-detection.patch 983 BLAKE2B 3d58e9af032290209f2f7637d4516eea3f
AUX wmlaptop-Makefile.patch 738 BLAKE2B 405b23ce3891106cb17cfed48a65eac1eb13c7a2baa6e5f15f5f55926bc8b56ac578637f862b73b3adbc101f48dbb29d5289380559e15aed136e8b3a75d5d3f4 SHA512 cb0bf56ae9040655979003ec8430c775bc4059c7416c386a761145aed7a62026ac39f4af4a72964cb42df95e441d236ab77fd931c7e10ebe1bf815631716481f
AUX wmlaptop.desktop 158 BLAKE2B a12d5d5542920134877b4c270d4638fabf4a7feab641f70070e56b50a98301b68bc440341924f0114f05bdd66127860d256be55187b4550836624ecaa6f63530 SHA512 8a5e58a8419a3d6ec46164a57cd3af2b62fe0e5ad66b60a62bc9b5ec417b5869e60be6793e480ae6f8c9f4053b8aa3ca027ee8f64c4f45a627e3c761779a6c9e
DIST wmlaptop-1.4.tar.gz 77023 BLAKE2B 6365bc98a580d943fa7a159546d290bb3ea93a83a1d1445982dfb6313b0b97f4ef21aa5c5ec8442969ffe2e2911d208d0b54e2d341d835d1e3ce00da13a352fd SHA512 6f9ef6a04e556c811b2470ba9c1a57cde0047e8ac4936b84f5313f0f05a8809ac441e9a8e871fbb93dd29ae1deb9044ba7a16847e9c16ad80fdbda21e1a6ac58
-EBUILD wmlaptop-1.4.ebuild 872 BLAKE2B bae35477de1864c0badaa67ff0f2c344f8c906f6d58cea046a90d9465b695bb5a0bb2e9256baa4250643e2532b4b33e48957b8a36eb66200a517e9f180763699 SHA512 6850fe91335d1501066ff5bcddd5236633733bce8886fdf5ed8e3f3e2ab85be786923296cde4a4491fba2b4cedc2c8707bc3b132361f40da1117833f6e6a6274
+EBUILD wmlaptop-1.4.ebuild 847 BLAKE2B 1ecca830b60b67d1eb38d77901f7346ee3b8caf9da913537682690c3e6a9d6a36f05854885e63ca5627d6a85e6fe47cd62077446a20ef376c3995915ed1b2c82 SHA512 d8883cb2de18d0f441d4c6d4f3db693fcc501c8ad90ffcd649828a4c48a2fbdf8f149838f2f0c8f62a1bdbeb044b4e1fa7c6b8d5a919edf83b26f8af60530019
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild b/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
index 8a1f8644c5a9..da724eecc00b 100644
--- a/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
+++ b/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- >=sys-apps/sed-4.1.5-r1"
+ x11-base/xorg-proto"
SLOT="0"
LICENSE="GPL-2"
diff --git a/x11-plugins/wmload/Manifest b/x11-plugins/wmload/Manifest
index 0a602321d3e1..96fb166cf2c9 100644
--- a/x11-plugins/wmload/Manifest
+++ b/x11-plugins/wmload/Manifest
@@ -1,5 +1,5 @@
AUX wmload-0.9.6-solaris.patch 3036 BLAKE2B 46982b6bad9e2b5a731ff5d90ee5ccac730a7645876d390b0dce664548740549624fdbec064e760401dfa18c5bbeedb5271d58b007428710815b92704996b751 SHA512 8884d0f742cfa6536f436bc4656d1e6d44eb6f4de076a9f68c0d8bb6ab66bc93a8e972094593e367347a580f53d56697e2dbe98810257532e08f99111597f07c
AUX wmload.desktop 155 BLAKE2B 50461febd5980fce4d55231c958b1959066b791cd99c807ed9c82a96c6d833d930f3c9ee90148c3a99efbed789399669363129f26fb5d676e092eb610ac48489 SHA512 260b0370bbd730ce89f7452e1c8d8ccdacee047aa025ea4e832405534e9a0418983e1724fa01ab143e7d978906708697ea338d1f831a8de5c3a790f0f238395b
DIST wmload-0.9.7.tar.gz 17648 BLAKE2B 418b18390035eec14fdd2d715519aff0807c7c5171448818e113ebe27ba908c5416baaa2e605daf3701c7acac6cde6d76c2b26a85f8cae18efd95b000d0e510a SHA512 5d08f34013c23c85de88adbfeca31e8399f0f9ce5573845aa50c1f4a06488d729de637b1d0f8b5739194b30ba8e085d40022926a3a8328d3cdab462f9e649801
-EBUILD wmload-0.9.7.ebuild 790 BLAKE2B 395731cc57de40743d363d9f93362a075aa9ea27526739994e2559c7f57093adfe4fb69db388344a0309b45cf6b9f40e69c4ae094e32e37bebf9a0bf6c0b5426 SHA512 5175f6703bc131b28066fd9e971eb876234013e9275e8d3d6f2a9c2d1ac40482fd79b1f2ea3f38dc9e36a2c34fe28073a4a6ea2e069d4380db1337c131fc2e8d
+EBUILD wmload-0.9.7.ebuild 793 BLAKE2B b2125693aa6672aca3f6fd238ef39f45b3f179c72223feb89a075119a0ebd64d456381ef767e726791daa07f892cbb74a7ba3fff5aab97fe1e72dfad113eec0f SHA512 87c1d718acff0dedc4574409c772fd9578e0205ec54fcf702ad6ad320bf396908c24a7ac23aa9a768b5a0064e02d1e765278e1d3d0ae9c7bf47bbcac750d51d2
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmload/wmload-0.9.7.ebuild b/x11-plugins/wmload/wmload-0.9.7.ebuild
index 9d170235dac5..424fa397b0ff 100644
--- a/x11-plugins/wmload/wmload-0.9.7.ebuild
+++ b/x11-plugins/wmload/wmload-0.9.7.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.9.6-solaris.patch
diff --git a/x11-plugins/wmmand/Manifest b/x11-plugins/wmmand/Manifest
index 448b8204532a..eb25fd2778ca 100644
--- a/x11-plugins/wmmand/Manifest
+++ b/x11-plugins/wmmand/Manifest
@@ -1,3 +1,3 @@
DIST wmMand-1.3.2.tar.bz2 41268 BLAKE2B 75eb252c162d2403e15a7e4df9ed79e0af5d9835c5c6ffc0208ac20f856f148a513f48460aedee7d26053867f464dd1b1c13d3fabbb2151513eab6102dfaefe0 SHA512 03a06c114371bf98037ac8859010fcbd20ec675fdd563b655c1be58a384a48f59d36bcb795759e45dba798af765ae179df1bf591d2ee7fe245069af06c8b5587
-EBUILD wmmand-1.3.2-r1.ebuild 804 BLAKE2B 80af5d57355805724add1e6b29eb47f44b4b49312379f948a78e28ae1fa1a177739776370f5eb41fc82c894912d54ed675f869268eda37298f106563e88ec838 SHA512 385c413138b6069faacec8ca5550a52dce284aed9c3a3f4f7be55c484776d31cba57bdde14dcb71819413fb6f1b7c8fad16300274c0d9f309557b30e2e57abb8
+EBUILD wmmand-1.3.2-r1.ebuild 786 BLAKE2B 798a53b7025e2cb1914e0e0192f8794c71fcd7d623279c78fd9966c30a980dba8cc4462ad370bb461a64916018dcdd7f9649764723af6a1e401f87e1c03a743a SHA512 97955f6d2ef632e040a9d8f7adeacd23f1dfa2764f56e4bb662359fa8ee0a0707009da5285e215b12fc9f4585aa2b9c925a16c915a376e170d1e9652f923da35
MISC metadata.xml 328 BLAKE2B 2cafb02a6d098593306f48c13f5ed3d9c47028536aaef04558d65049c47f4b1469c29c19bd75580e42a2bb1a0f3ef083cd561451e442dab9d8d48944ecce9445 SHA512 40eb06ee0f23923822f16f7c14b0c608db8d1266ca3b58b30313f81a1cc82da4987f22d4f32dbd85b6ee0c152bce40108b4168402098792338ac05da68e9cdf8
diff --git a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
index ca06b0cbe563..95d390651648 100644
--- a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
+++ b/x11-plugins/wmmand/wmmand-1.3.2-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
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${MY_P}/wmMand
diff --git a/x11-plugins/wmmemload/Manifest b/x11-plugins/wmmemload/Manifest
index 76a784a37cef..3b3802afb69d 100644
--- a/x11-plugins/wmmemload/Manifest
+++ b/x11-plugins/wmmemload/Manifest
@@ -1,3 +1,3 @@
DIST wmmemload-0.1.8.tar.gz 23114 BLAKE2B 3d0a56a6908dc1e0617ea43aa73fc07a294575fce8e3f54b7769d8eda49b134cf292caf8d92930bf8a22e7a4f33080da531403bbea6443333859def6937cfbfe SHA512 7139e92e15371ff493784c0677d6697074d85c5f4457d0c5caa146bf1aef481a4afc31a4b70bf8ec0edcc90390c18e16daa8efff7d418f96c137c72f7c7819f9
-EBUILD wmmemload-0.1.8.ebuild 666 BLAKE2B 36d1ff100bb46de19aa36184c8e2f2668f1887ab200592ad4dfa8f19fc13cdea255b7994940d75890122bc791862360791d2ad46d6b0624e6cf71872134efc2d SHA512 f3c2d209be4a985de36f7020ffa9528bc7a410f5d936abfbcabb037eacef6ef2fe925c4e90bc80376cd81d256129df24fad4616719a9cc7120d13ed64438c8c0
+EBUILD wmmemload-0.1.8.ebuild 666 BLAKE2B 18a9cac6e02679ae8b9e9a2fe4e85af4fe78dab7e1d3e6edd139ac47ed37a62fc9d581475f5b81ca017c2cb58ead71df62e6f63f5cd62bf2b973dce377c5741e SHA512 5c84bb721f88bf9138c686e0f72d3c083275e999f7d90373417092c1dfca291b8f8d2eb2e8014a60b8a5dc8573646ac60ec6509f122ca54100ffa5af204f5479
MISC metadata.xml 428 BLAKE2B 42e4fa840c3d15800b5a4fbbadfdb824b0885f50dc83a01b06c9bb0b5db3e2b8b81557abda856ff2e6a46993c7dfb8f712afcfef1595d6debe45993a51ea2386 SHA512 ddd7223a4e535dc0f919347778fb1ad9edc1a183ff9cc85b5dcc5820454021d38ba57d230c6825055252d007c0b63e20b2b374100748ecc6e18cbceaf51adb37
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild
index 4dcb8d04e282..27e6684bf27a 100644
--- a/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-libs/libICE
x11-libs/libXt"
diff --git a/x11-plugins/wmmisc/Manifest b/x11-plugins/wmmisc/Manifest
index 96a46f926b83..2f8400162d50 100644
--- a/x11-plugins/wmmisc/Manifest
+++ b/x11-plugins/wmmisc/Manifest
@@ -1,4 +1,4 @@
AUX wmmisc-1.1-build.patch 1366 BLAKE2B 57fd17a1cf148b45a4011c942141c306a689f1ca691b529d727d1993ac49970a925eda33bd9cf38bd5351ac16453e3ebaa4c4195240a15574374f1c893fc29cf SHA512 8bcad4c6af472c7c93473d3d93e83a1931f9de93ecd7be18ae4db57f0c242d963deb42286ceae065b3f33aa623f03084ed62fc4da7adc506da5819d57988ea49
DIST wmmisc_1.1.orig.tar.gz 18032 BLAKE2B 2e1957bc9e6efd0e646dc1403eac125d06fb7176ed92617f9d3e767c85b3d347dbe60e61da90e2c11ba160ddca29db28049f39dc89ab9bc45cc0068c27192a82 SHA512 9f9e93df309902e97a5b42a674bb06767a1cfa524553d140e370060c01a398bfdafcebfc806daa4b4f42b1422932512d48e33ebce444011ad410a5b460592582
-EBUILD wmmisc-1.1.ebuild 755 BLAKE2B c0aacc8862e6eb0c91a8c31a8320e42e6997fa34e8d766e1261a3bf92f7441ad08a37aec2514b58dbaa996f2d4e0d34b96a30f5d3cc7273882649b5af54bfb25 SHA512 d99ce94940a7ca5a808d7911ba97cda15ac9acd4ab8d9d264a87af6ecc2eae26b1a4cda5d58eac9c052fbe4f08d91519d3ef1a69bdebc17e935045b1d3dbbeac
+EBUILD wmmisc-1.1.ebuild 755 BLAKE2B 4a368078298a8b67059350373a960ba463ea09d1feced4a20f8fa98b0a8314f0030c99feaccb2a2e8626aad4206fc74354620089f356a868e4e757308d658519 SHA512 311ac1f687a75557fdfd172dfde6ffff67f37619dc45df38907d62244e664a39faac23c62c5c2831cad36595d99c1293d16cdd61afb1d9f88193a3b2c0dcb93c
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmisc/wmmisc-1.1.ebuild b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
index 342162e0f659..5b4d2a91fae1 100644
--- a/x11-plugins/wmmisc/wmmisc-1.1.ebuild
+++ b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_unpack() {
unpack ${A}
diff --git a/x11-plugins/wmmixer/Manifest b/x11-plugins/wmmixer/Manifest
index 4477f1f14031..32232deca372 100644
--- a/x11-plugins/wmmixer/Manifest
+++ b/x11-plugins/wmmixer/Manifest
@@ -1,3 +1,3 @@
DIST wmmixer-1.8.tar.gz 102723 BLAKE2B 2e64b7c81e97d288e2c48cad01fdee5e4a85effc4e831ca4b0391e4df67faa11f5556c07129740b3d07607251ac8fbb98ffbcc573c888f367e288c338600de93 SHA512 3b5c7f27da6ed2cbf8d06c431584186799d17e72db663db6ffc488f777c31de0b13fcc3f665099925efab036a14e70da4bbbabaff6ffc12280698e91f555e276
-EBUILD wmmixer-1.8.ebuild 431 BLAKE2B 370965b644069d487437197d42b64ba518f38f1ab90ebf5ab3bf30471ebba39397eb2e10e7948261a2930f460cca865234bcef62bc674a23c02841ca76be484e SHA512 69545da029a577a521fa7364a522b7f8649b4cc7f412c26f128e91ddb9b281bb9ffb854676cac1fb696139698c574a68b7410b8f8e53e0017e8d0f0c61027cc7
+EBUILD wmmixer-1.8.ebuild 434 BLAKE2B 12162ccd23d2d7bf35a861832952808c39165800bfc5e4cce5e5bfbe9d4bc543ef1d4be3071fa75792b76a996528b062bd9baeee393593cbced73f2c366899b0 SHA512 2ded4355bdb30c56199f55d94b06388499bfc6c7a6e71b7f5d8abb02861a90397d84ba74a8563873cc4c62887de2c1b4ff51fa1a02648f7e28c1f0acf7f63ed7
MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmmixer/wmmixer-1.8.ebuild b/x11-plugins/wmmixer/wmmixer-1.8.ebuild
index 72b8ef660d7a..e557c839133f 100644
--- a/x11-plugins/wmmixer/wmmixer-1.8.ebuild
+++ b/x11-plugins/wmmixer/wmmixer-1.8.ebuild
@@ -16,4 +16,4 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
diff --git a/x11-plugins/wmmon+smp/Manifest b/x11-plugins/wmmon+smp/Manifest
index 9f0467217025..91fe18b6ff1e 100644
--- a/x11-plugins/wmmon+smp/Manifest
+++ b/x11-plugins/wmmon+smp/Manifest
@@ -1,4 +1,4 @@
AUX wmmon+smp-1.0-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
DIST wmmon+smp.tar.gz 15807 BLAKE2B e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728 SHA512 9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94
-EBUILD wmmon+smp-1.0-r2.ebuild 846 BLAKE2B fb44553127453ba07a3c6075f7badb6dea934ad9e669d7a5366c1260ae2d55c0c0277867aac15ce250ea9d92aca419b3257fb3b3b3989e56a16b7db45c22337b SHA512 9e2dedf5d440e158a6bf0d9e2d6c4a3ec4a993e8fcaf48d1b0b9a6639f46e575123b49205e0a0e7447beb8bf3d3b054953b1b8761e9b522aa9f1e6babc99f4c5
+EBUILD wmmon+smp-1.0-r2.ebuild 846 BLAKE2B 80dd4f0534ff34e484807e4cf55dba234d5a209593a14899643ab88e77833cf14ee116a7c5e247f37e6300d83c9fcf7fe7e2662c3946e76c8bf30fa4df2a41d4 SHA512 27f649a6d4fd987eb4a042649e3fda50194836ad3740ec78a02bfb6267f3c25b051543ecac7e4a713f5f6eec537025315b0c76b0d520228298b891488047666d
MISC metadata.xml 533 BLAKE2B e0e0d04cd468503f8219f1fb6b0c30eb7272344f23e8477670372f3d5d347dc9e3558326bb90cfe79ec245f591cc28d5c20520f76f250a58f279a003385cbb90 SHA512 9ea486d5d5b12a67fb8b25ab2be9c67420f8f7903a00ebf414f3f85441b543775085c2c85cfb2c5eda28e264e9ac0878bdb670e7eb9646644bae0b803f90d67e
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
index 9dc5da613248..3da3e885fae8 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.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
@@ -19,7 +19,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/wmmon.app/wmmon
diff --git a/x11-plugins/wmmon/Manifest b/x11-plugins/wmmon/Manifest
index a9ea671f9b31..59363718c2bc 100644
--- a/x11-plugins/wmmon/Manifest
+++ b/x11-plugins/wmmon/Manifest
@@ -3,7 +3,7 @@ AUX wmmon-1.2_beta1-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d743
DIST wmmon-1.2b1.tar.bz2 25610 BLAKE2B fcaf37c869e5cfc9c105c1924f66a03a726239ef5a6c473a312a8d8e4bd34203fa71d6ded607894b0feae1f4a352c365828dba284c629c81dea0973b05ad98b8 SHA512 359ff4024cdc606d3520445d31b9e59c79a957b081bf46dfabde7c970aecab8d640f789f34c1599e18e15e50a077248e06600151d7c1e66ef028215d6d88ff1f
DIST wmmon-1.3.tar.gz 107622 BLAKE2B 41eabaf506882f9e230ffd5bcb2c28325b49a1594423f9e950941b5f3a343ceee19bd22c91a29d62a4eaeee920fba19caf1fcb7656db646cb464a9ec6d1a1890 SHA512 2308bf5ef9aa9f93979e63ea7d405e304a1a7ea55b966affc200239829f3cd2b7039fe96e42fcf59b52dddd5a72b3f8f64d8397853c3847356733644045e5529
DIST wmmon-1.4.tar.gz 107477 BLAKE2B 973dedb994c0e688dbdcefde12d186e1d3712164adeb454e97367c6592e223dd61f01ddc7c5258bc387619ed185f049439b8692a18a1bd28bccafda986359e36 SHA512 ca5a0d8278d6fda4ae1be2e76e17ad7e550e91398dba1c5aa09b501c4e17b8d4f597bcaa0c9ea844d3a307a5c60d6d28e44cbffd54fe44c92be0386450f25951
-EBUILD wmmon-1.2_beta1.ebuild 819 BLAKE2B 909e557bdfc101a271a6299e7b37c35fb3003e4011e198c1f04bba902efb85dbf371a2bfaa55c8fb356c96f72b5f5fc3589b97f2d2ad62da2dc9f78c1f972367 SHA512 313c285b1b1743db4371cb1f0e1bf6383bea37361e9dc5fd07d8b2e73350790272171045ed0e4ebebcff3228015001790a65bb5a083e7addf74b9ab7046685f2
-EBUILD wmmon-1.3.ebuild 463 BLAKE2B 87e375ec3654a7ef67e3b285eb9f5ff5a1636cbbbd055eab1f2df720ce328f5c9ec3946642a812109c5429748723a0fe25fca746b11cd90076fc7b855be184ed SHA512 33fee223cf841e954e34ddd06ca24a23c53026fe0950c0e85c70fafd159be108282563ccecc9bb4dadc3223af4020b5329370772242200d20d92ef72dc4792c1
-EBUILD wmmon-1.4.ebuild 463 BLAKE2B 3af2f1d3298de0d2db85632286c645745c9e5b59db11e98bed2356805cfd9105d21963b8cf3faa0ad4ebda268cb9736e7cf3cbf807651ec02902d8c8c6538475 SHA512 a3db7a5a5e9e971e95996a7a6ca3c45dbf845924b67ad1eba2674341fad9ca6fc9856cbc3bcc16888a4ed08c4a3de43d0e93356d0d4d60588c414cd8151f0e82
+EBUILD wmmon-1.2_beta1.ebuild 819 BLAKE2B 2f2f7ab8bd04c85786061c7fa5823b9fe02a44937b31a3e2f7063da0f40b7f1e24f126abbf5f514b42d2f7a39988b76e614c7ac62a912a8ce7b9f098acd4c5ad SHA512 f331f2046e15d1354baf73a9630ce47d014de21f9d5b022ed1489aedacccf6ee706573a4ba1779a1148162e129ae4f10a43f21208797290ee3d25cd609737a6b
+EBUILD wmmon-1.3.ebuild 466 BLAKE2B c007f0e4386fdb213fb2fbc9023d3c12f6e11d57cd8b32667f31ce08196739dcea2ead285ce69414e6b8897aff8aca236c8ca44468119f9566da48e8316b63d8 SHA512 82ef8a4cc9757ebd187c50ecefd1bda5ee0d55a27e36c213c39e8a72e9cdb98bbadd5b7771be0cd6bf400cde66099cf8089e73d92ab921ce9a389dd0a9a9f3cc
+EBUILD wmmon-1.4.ebuild 466 BLAKE2B c007f0e4386fdb213fb2fbc9023d3c12f6e11d57cd8b32667f31ce08196739dcea2ead285ce69414e6b8897aff8aca236c8ca44468119f9566da48e8316b63d8 SHA512 82ef8a4cc9757ebd187c50ecefd1bda5ee0d55a27e36c213c39e8a72e9cdb98bbadd5b7771be0cd6bf400cde66099cf8089e73d92ab921ce9a389dd0a9a9f3cc
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
index 54f0ae422f8b..94e8f0cbdbcc 100644
--- a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.2_beta1.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=4
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P/_beta/b}
diff --git a/x11-plugins/wmmon/wmmon-1.3.ebuild b/x11-plugins/wmmon/wmmon-1.3.ebuild
index 7705ab2e7056..ed8ccc7f24b3 100644
--- a/x11-plugins/wmmon/wmmon-1.3.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.3.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
@@ -16,4 +16,4 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
x11-libs/libX11
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
diff --git a/x11-plugins/wmmon/wmmon-1.4.ebuild b/x11-plugins/wmmon/wmmon-1.4.ebuild
index 9b4d238fc259..ed8ccc7f24b3 100644
--- a/x11-plugins/wmmon/wmmon-1.4.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.4.ebuild
@@ -16,4 +16,4 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
x11-libs/libX11
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
diff --git a/x11-plugins/wmmoonclock/Manifest b/x11-plugins/wmmoonclock/Manifest
index ddfafa02a3f3..670c1beb1d8e 100644
--- a/x11-plugins/wmmoonclock/Manifest
+++ b/x11-plugins/wmmoonclock/Manifest
@@ -2,6 +2,6 @@ AUX wmmoonclock-1.27-implicit.patch 359 BLAKE2B 9545998a2ec5479ee213638aa8eb9e80
AUX wmmoonclock-1.27-makefile.patch 1056 BLAKE2B 77b018d13e30cd944373ff8d41cfae3394d0a5764c62200a94f219de1c6b61ab5abc97667c8c8638e7169e25d910e19924f5305efffd8fb6a2042a8262f6d225 SHA512 3448ff4c178cec3b593adf07699a90a8686616517e18d4d8670772302a14b9f7e32685f4a9036496c82cac75605b06855d30d00704f62cddca2a9c4fed8c4cee
DIST wmmoonclock-1.27.tar.gz 153080 BLAKE2B 9cafa3c53c18b73ab69e0c114d3dfb3424825cd1770c1ff6cc0ceb58ccc904865bc926196608873dc669f0fecf154bd80cded165a3267b32f30fa400e6cc1b71 SHA512 94c4b80882e1564780498e11e88ec31918605f64dd39f0c87544d29d9d8bc0db54823fd1fe5fbc992f212526a762de867598cb94236d18723d316bd04f5b097d
DIST wmmoonclock-1.29.tar.gz 234991 BLAKE2B 7d38b4758d6bd4b78d069ae7d872c60f1a43a25fc424a51615ff0506d249bc0ee416cec9dc389ea27281f0b1eafa299bb126f0ea177334508ebb2b3542162162 SHA512 c36850034a0f3b7863ecfd03f73f91f9b935f645362cebeb33186873f700585d682dc5c35f3b5d67932afd3c5699fca56bf012e8f8a06615ff52c44a47ba552e
-EBUILD wmmoonclock-1.27-r1.ebuild 867 BLAKE2B 4182ef933e38f807b942b089b4877f069875ba6849deb8006818b7f0deeb45b660f5450dd9827a756179f6ef24ad49e73f78d3d91130c0b4320c75850cc2b469 SHA512 d70a9349dd5121e44ab5f89b75f297007ed60c79ac10e541a5910ea1ad44c2fe1ff936a03e3fdac2c2d39ffb7ddbe4a44a8d0af9a0b5ec21934618e502526135
-EBUILD wmmoonclock-1.29.ebuild 484 BLAKE2B eb848567eae197e6448e873544e764a2f01131c16f0a655064a5b71643ea2f5dedf3a372da058267206e4f941c25f6f292a0b185e3f53a4dbebd355654a3a7dd SHA512 af6c856a5929732b70899c54502d98ecd84fd1fe12e9923781ae6af2035e8843fa9bb13ab57f74c720e0190f60e0ebb14644a23e70b7f86f87dedf4d10d703e8
+EBUILD wmmoonclock-1.27-r1.ebuild 849 BLAKE2B 49b051d3fdec06da68c437df680b5c750feb2bbf3cd3a7998393b78cafeffcec6a5606cc8388a084a6ec9191b2cdc1afef3302818d999ab4e6af1d1156b034a6 SHA512 303b660900f9aab3c527b07a275e99f09068fd42be1664d664dc3d25754fce116f6a11923eb1267f26a2e273258d48e469a92906d3c74e0ec79877799ab07617
+EBUILD wmmoonclock-1.29.ebuild 466 BLAKE2B d47b41bab68bcd7c67eef7f583141c063a5b324674af083d231fdae69e0538dc019951eadab9cd57fa6d1a6674c2307044243e118544af987b4f097ca6ed3ba5 SHA512 e0081a0b192b427fbcaadb64caf3d4bc989f8b199cb0486c67ecf56abc6ae9d871977d0742b96907324df5f30b912024bdf75db7abcb2c54e0352b210547f4d6
MISC metadata.xml 717 BLAKE2B e5c17235e51c6f1491c4b9005324c9f8d8a718bd4ded9dd8e7b314109c69c88cb7583a57d7023ccf7dd06a86da4d5980152b4fdde077d43f8bf633027b0ba4eb SHA512 8b4e39220460db02c6adc76d282fa041650b96af82c46f7f308e8afa098d3f016a5646079f48e37b3814d6e168f0468f4ce921225e28bb3fe2b0ab5832a76a1f
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild
index 702588106f7d..d7fbf53d8020 100644
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild
@@ -13,8 +13,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
LICENSE="GPL-2"
SLOT="0"
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
index 3daf78facc86..3eae322ded2f 100644
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
@@ -16,5 +16,4 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
diff --git a/x11-plugins/wmmp3/Manifest b/x11-plugins/wmmp3/Manifest
index 22d3646a9765..b1fa81be6a3d 100644
--- a/x11-plugins/wmmp3/Manifest
+++ b/x11-plugins/wmmp3/Manifest
@@ -1,4 +1,4 @@
AUX wmmp3-0.12-x_includes_n_libraries.patch 582 BLAKE2B 59f4b5a5ca18d4396994a6cf793843a908d5ad4a8d8f1dfb9bcc065b0d2be0fb4932d62105ecc466bba0c6bcbc795582fe2975e5fb76c225f79916f539dc9e28 SHA512 70edb6f72a7cb0ade0166cdd99842318bcdee5b222337cd253208a657babe8b975c0d3bbfca493f9853f8695e10376d596481981b27561e731625ec8015c3264
DIST wmmp3-0.12.tar.gz 43977 BLAKE2B bde74194020e65dfea27e94f5a4e937e0811da12c3af28b8d7902c3d08adc27499cd5414ee4826e6f5b25709bf784e6b27d1df07e8079953ec2a602b332b17bf SHA512 6cc06f109d6ab6c69ed3b8175010a2f38053138291f02e59780fc7394c35cc629ddd6b982bd5069e20a3cb81d81b3d08b9e10d1f7984f783f22c9b012c933740
-EBUILD wmmp3-0.12.ebuild 917 BLAKE2B 7ca8f6c94f9e613719303aad279ff9fafb05088b3c20fd4c41cd31fb98cab8d689d5274829efcb6d0ec43f6ac347d9b683f958266981fcb0f636b656f17a8a95 SHA512 28d0e0f1edd7b9d0ce3d3cb84500cb22ec202239b591f425f8f5a2e38e24f23bf35d7be38406ccfde2d74cb27beb1b5537ed835d04ae62f2c780808b19038124
+EBUILD wmmp3-0.12.ebuild 917 BLAKE2B ad12aa6d413658e3d2edb07eefdc89a3ec4a73a47f59f04ad9da30b0953d902ff92123618918c74fc203cb999fe2f0767ef311034478cffc0c6ddd03bd9ae98a SHA512 63a670b98aa4ee1bfa845f4f7ed6273706ac832d576609fd176fe4d5bc78ba8270ce91006bf12b21a001f2300567a2d6f96569f4f6749d9cf6c57d7402e3a5d5
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmp3/wmmp3-0.12.ebuild b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
index e4b39917b7a4..9b9d18396b0f 100644
--- a/x11-plugins/wmmp3/wmmp3-0.12.ebuild
+++ b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
@@ -18,8 +18,8 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- media-sound/mpg123"
+ media-sound/mpg123
+ x11-base/xorg-proto"
src_unpack() {
unpack ${A}
diff --git a/x11-plugins/wmnd/Manifest b/x11-plugins/wmnd/Manifest
index 2e3137d79c57..22cedc67c0e5 100644
--- a/x11-plugins/wmnd/Manifest
+++ b/x11-plugins/wmnd/Manifest
@@ -1,5 +1,5 @@
DIST wmnd-0.4.16.tar.gz 188614 BLAKE2B 58e5098cbd06391909b28f491fc55a5977360c3bf14072f8ee9a665c957ea4a7b9043911def0c922c0d93f9436456e35fdf3d1b4d96f583f98f593d919a6b2c8 SHA512 dc18f5d912f6b82fde72f17d4a6785cb7380b46265c9b3e080bfc46b28678b2021e6a580b1eb88a61ab6574e29ce1021e0ac0c0d8ae9fbe7a5418982a5f17eb7
DIST wmnd-0.4.17.tar.gz 191089 BLAKE2B 4a4703896297b86297c369d9058113382c6de13416839bd0922c3772cb3422e164cead318874bd62c77e5c35054df97fb4509388057adfe3642f58aef1de166b SHA512 09ecb0d21df2ca996dbe18b8711abb327200fd6c098e57bda19b960854bc9fae5c5c4f5d5a8cb306c21393983f602f591af87a0afdf009380d9a6ae1a2e81eb2
-EBUILD wmnd-0.4.16.ebuild 651 BLAKE2B 86808f4eaf1fc948491867dedf01d1ee96b7783956baa495ef11cfc7783fcb0f724054aa438fb40b94f75986431f4fdac3c7151af57f24faa0d87d9d036f1c7e SHA512 a61124629346ed85f563ec27a5ccd4f4de2f87a5e2222293ddde391c0cfb502220ea8aebf4401304cc86f56860bc06ba9897ab0a25cc028d427df8bd988168aa
-EBUILD wmnd-0.4.17.ebuild 654 BLAKE2B b26cef04cff96ca74e3e139675161cf90cad2f6d17240fc333bbeabe0fd7883a362e9b03e3c119fd0c3beaacfd1afb4d0b43e85e35042e99a14c357b0f8d5cde SHA512 8b73cedd01854c62a38d847c0f2dcc983ec6015143aa5b8f7e26b4b15756e9283942642ff5bcd68b9ad2daa056c7d62d434509dbb173f4c11977c3beaed8d8ed
+EBUILD wmnd-0.4.16.ebuild 651 BLAKE2B b134e35e16433b8ecf4f18f5f652b549431c9a88008064ae4e688f6a97c13b8741ccb7bc5275722ac741dfb8e3db52c03ffb8711de76b04fc1c60886a79ec05e SHA512 5a4f5e86f06383e5ab4acd38da3522aefed9daeb1729514ade134d0df7f056acf7ab1f1530c07ba0d1ace67d495b5571b6c2930cb7867885ed816c185521f357
+EBUILD wmnd-0.4.17.ebuild 654 BLAKE2B 458dcea262706b84acdc196bc1bf6193f65129edb80897b19a6372685478bafdaf6dc609f62444a7b4dbd224c22ac10fec7614111d460ace6528dfda36b875a3 SHA512 0b2372cf7c728d473997d85c102a3cf2bdd103eba197d71af42731378a95609ebb816d4d95d1f5586e049211d2eb535874a1f2fd0ed6a860a12bb0f7c2569bbb
MISC metadata.xml 532 BLAKE2B 821edd22bfd2bb521096461087b405478d914636775d69e74b48df005bacc34deabcc066787304e61cfc64b825e180ec5f9ca5dd79202a2c0362242282711c96 SHA512 ed1640807b73b1738d6ee214485dfbb079f709196bc4f23ddde6305c3b33920d818a2b5dd76447b61850ab688bf39ee1a947e9ddb6d8bbf55cf8259331c9babb
diff --git a/x11-plugins/wmnd/wmnd-0.4.16.ebuild b/x11-plugins/wmnd/wmnd-0.4.16.ebuild
index 0e607154895e..b33c06f48689 100644
--- a/x11-plugins/wmnd/wmnd-0.4.16.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm
snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_install() {
emake DESTDIR="${D}" install
diff --git a/x11-plugins/wmnd/wmnd-0.4.17.ebuild b/x11-plugins/wmnd/wmnd-0.4.17.ebuild
index 516ebf9f1ffb..5f888de90ca1 100644
--- a/x11-plugins/wmnd/wmnd-0.4.17.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm
snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_install() {
emake DESTDIR="${D}" install
diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index fc9f15c9d46c..51d6ef040da5 100644
--- a/x11-plugins/wmnet/Manifest
+++ b/x11-plugins/wmnet/Manifest
@@ -1,4 +1,4 @@
DIST wmnet-1.06-misc.patch.bz2 11327 BLAKE2B c03f25270c37e9a54731547a51c00983df802b5f4278d02b7051571de45bd326bb5eda330bbba8e09be6bcb4b3afca111956d6506e73c13f955afd40b9c967ea SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3
DIST wmnet-1.06.tar.gz 27506 BLAKE2B 9cd5cb626406238e5dc20ff58f26b13389c5b8bff9569e3cc8fc4f083422d213702fc387521bffc003339ef4e0c6223f5cfcec8617ba3e71b516786c6950cdf8 SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a
-EBUILD wmnet-1.06-r1.ebuild 820 BLAKE2B dabffbe078d13fb2ca1fecb28b1f6e59ac1d9212faa078017656c7c92f6fdbd645f63f57ae4c4af7cf446ca17a22767911d23b5effbf283015418cfff737962e SHA512 60325025dd4bf2bf18a319f4dbe4def4254259e2a3fb79df03441b42e5ea563c8e7cd8306d527445ebabc6b0ba655e26692b5175c5b0259f7312fe45317fb31d
+EBUILD wmnet-1.06-r1.ebuild 802 BLAKE2B 57f3c5b9d3f8e7c7bde527c0478a27262e96c60c7ae92ac513d96480810a447cc20518753296adae1e7baa61408bd5e2068f4e1044486b44f527b41ec7823b40 SHA512 8d04f139fa204528b3778043363f37c441d12eb06a9f00e4b8abbec6fc3cc583ef01ea45b7a955f1f247150e417db709cf1ad83e75c349262e166b17fc03133f
MISC metadata.xml 780 BLAKE2B 254fdfced5817ebf8e2594d8cdf77828066acd2b27c17bb8050dd7cb6d4ce848de69485064fab61473b3313b19bcd6b30fbad2cf0cdaca2cac72f802d1d1ac5e SHA512 c9382651f9b9aca829c4cbbb5d27451351f56b7ed9138ede20646c591a54711d3170b45b6c021ca7ca728e6bd22ae421ce8eb18d09a65ad69d37f3cff260b860
diff --git a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
index 9dfb8a9c75a0..8c28d8b06e11 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
@@ -14,8 +14,7 @@ HOMEPAGE="http://www.dockapps.net/wmnet"
RDEPEND="x11-libs/libX11
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-misc/imake
app-text/rman"
diff --git a/x11-plugins/wmpeople/Manifest b/x11-plugins/wmpeople/Manifest
index 34af3f07b234..8cbeef2f5bcb 100644
--- a/x11-plugins/wmpeople/Manifest
+++ b/x11-plugins/wmpeople/Manifest
@@ -1,3 +1,3 @@
DIST wmpeople-1.3.tar.gz 111148 BLAKE2B 6a3fbfa8d4d47d6a80da7eaaaf07dbc269c529bba20bde9e229b415a54c8dd016f9fbbd021dcf9e9788d5d22f62f58bd8a2e745cd5e1014cb52cad7e06d54104 SHA512 af01e2d43d158eab3d520ebb0b9ebd50e1b5955920e3b86d5238d9bc0313cc055001bfa44d76e1ccfe721f668b9494373f18175f2ef7d248a0e237bbefe9e129
-EBUILD wmpeople-1.3.ebuild 909 BLAKE2B 1e0652e5c201e678ec65cb815c3e86083ccf6f943ded9d0302403872bf559e1390a2d2b2caef04cac2b4b575adcba5e3c7c50bec369fc1ccfc2704ac6a4dcce3 SHA512 1780fcf665ae9efbcc909bcfc2253572de4a10598e9093535087c1ad829332b4de1b9c0e544c647ef186b111a5b3100b5963a32912cd162bc3053d13d0b7fa22
+EBUILD wmpeople-1.3.ebuild 891 BLAKE2B 29282bfca6b0b615a4974813cc86587ee93e4ccefa2092291c261f58bf867ae305b5435376b20439b6220248d340d9888efc1930c8b2cef18057545054083ba0 SHA512 f8695d99c5eb32778905977e6e3c6f085717471100fb2da575e0820c09bb16273b442909f4c2065e2ec31280d54e08e57959e443377a807ca9028912b0d29e25
MISC metadata.xml 330 BLAKE2B b6738c078f6ef15476ae01b2ce8f8a792a26e5c5bc2d79cd26ce3d76678bf9a8a3b5638592a8c95360c9a438bc2eeace80b149ee9d10fb86501dfb6ee01aed94 SHA512 2f1848b2c96ef0957292045ad958b252910c8f3a29428e72f8131659575f095bbd18e8a594ac9bff21c2634d86556894b0fadd9b7f9d7990f637da2f30f0320a
diff --git a/x11-plugins/wmpeople/wmpeople-1.3.ebuild b/x11-plugins/wmpeople/wmpeople-1.3.ebuild
index 0498d568e410..1b9773539ea3 100644
--- a/x11-plugins/wmpeople/wmpeople-1.3.ebuild
+++ b/x11-plugins/wmpeople/wmpeople-1.3.ebuild
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXt
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto
+ x11-base/xorg-proto
>=net-mail/peephole-1.2"
src_install() {
diff --git a/x11-plugins/wmpinboard/Manifest b/x11-plugins/wmpinboard/Manifest
index 9e33f96e5b19..689b2913e3ef 100644
--- a/x11-plugins/wmpinboard/Manifest
+++ b/x11-plugins/wmpinboard/Manifest
@@ -1,6 +1,6 @@
AUX wmpinboard-1.0-segfault.patch 320 BLAKE2B 16061622af33f12fb19f027a003a2f7a05c203005a101603bed4cda2112d7a9fd3b9c9a95c1ea9d79075256890abd9c7ac82ff769ff6aaa2de2e52436e4008a0 SHA512 2dffff646c53dce2815bfd145434b393c1735c66bf5abf9e8c7a476b4adc99143dd02cfff835c232ef549882499793b92ebd5bdc2a76f388478111d791c6bfea
DIST wmpinboard-1.0.1.tar.gz 195782 BLAKE2B f88368b61645c91958d81161e9f5e8523d09b7ef825476afebb2b4318c8cf04f11319b3eaf9b152fe97a4dea2dac6147e9b70eb70cd9cddbc1f45960df6529e5 SHA512 5728aa8a040ba81a814a0851f5bed2d5fbf933b400bdafd2b92deef8eb35d62a050293bdb98d71c6a8db058223e5ae64de932dcf971fd244aea8f48f8832aa36
DIST wmpinboard-1.0.tar.gz 133290 BLAKE2B 06ed6c09d12556adf8af9a69c86ae6e60450cc6dfd3e9d0b45bf8650c057fdf54434280b36822965d5f0c0586956a84098285aa0a976090a83fd9077ada481a0 SHA512 486509e50e58c14866932a89706d98ebc4391af608acd95670b190eebe9069d254e11834e291ee2bc3c9e3e77e75ece7ab3f73dc7f097dfba5ca25fc888773fd
-EBUILD wmpinboard-1.0.1.ebuild 495 BLAKE2B 5579b7f84e09907042027e7bf810a3cf34bdd589d405026755373fb58878aa30ca51835210c4744a71c2d35e5dc5316fe65187ffda4c389f16b18fd28727609a SHA512 7419e448c4174f5d82063663f10aabfa7a0ffb39888d2a34b3cc3f2a6c8a5a1716a41b8841c644a04b44b7f7f8ca61e8f17e451144831adcc04c805aed57562d
-EBUILD wmpinboard-1.0.ebuild 677 BLAKE2B e6065f657cbe19c6312ad19bb83f0dc5956211684b6581579cc67e79b34a1173388e8dda688f7e76aa6b8d0a47abcce5d6455c0f6a3270de3a28d8c596fde341 SHA512 d45a7dac400bd7e831df134fefc15109d1dd8c18f29558555ac79e7dac0e0782b4d7404c0d5125512d13d7ed02e52e7503cd5f6fd1d7ac6c16e8b2fcdb2bf637
+EBUILD wmpinboard-1.0.1.ebuild 498 BLAKE2B ba86d851aa9dfff50fcacb63df5bef6b71bed2b760afcd76b9c21d44d76634b247d38f5ff6718ff7b004abc68fcbec9e33ae95e1346a0dee9ff4c20bc6664c3a SHA512 b847fd98ec77427b296e3929bd48b7acc9bba016e904769cd8edf429ea31eb0322c50218fd5766a14e6661cd56692d42dafb6c97662eacb6f9732b60cd588d2d
+EBUILD wmpinboard-1.0.ebuild 659 BLAKE2B 4f06ef3ebb05fe25a36bd42d50c73eea6ee9c7bc3d63933cfd60b4a9a78382888ef65028911ffe9837b6d9f9e8eccd347bde5ec21bceb5a3e72ae520d3183634 SHA512 7d8ba3dd2cc36716a729f37373ff0a5152ffc5588ca842c7e84c6e24f217ff816ce55ae4ee3babec5e3e393bb72cc3b84985bbcf023bc64926b37ffdf2670c78
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
index 884ccdd4b4cc..9e6f56ea7cbf 100644
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.1.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
@@ -16,4 +16,4 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
index 8354198a3b43..f7fbc6a43a8d 100644
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
@@ -14,8 +14,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
SLOT="0"
LICENSE="GPL-2"
diff --git a/x11-plugins/wmping/Manifest b/x11-plugins/wmping/Manifest
index 8c034e45efa1..5112858712f5 100644
--- a/x11-plugins/wmping/Manifest
+++ b/x11-plugins/wmping/Manifest
@@ -1,4 +1,4 @@
AUX wmping-0.2.1-format-security.patch 1195 BLAKE2B 0ce0a5fe956142f944932a0e1cb217dafdc322a0a42f5f1ae875dda7916aa05e9585325216ecd33d7e40660dd06c41a4aa1d463f311d3f4a7eacc7ca1c5d608b SHA512 78aa196f01cbf121f8a90319835754a7d7f929bbf95cb82d42d7885aff829cd4487cc812182818b22fa1602a0757b8d3eae8660386dafeaef33993633bf94940
DIST wmping-0.2.1.tar.gz 100059 BLAKE2B ce6ec83cb93b2c7ee7412eb7c30388fe0d5adc4bb4021e1632e889886034336209cc3ffc2dd36a02a7bc73326e097272675bb48b255be7373aab3c4dedb44c13 SHA512 c13a4906810d7513fe3e1e88a77846a5b0a299180f858f755a2fe602eaab802e77062d29e767e4d5c28e45bc6ce1431418cc71ee26c3c8fc5521280999bb9351
-EBUILD wmping-0.2.1.ebuild 795 BLAKE2B f422a3706ee69b08c7a9920b710bd5c3ace643afc03050ce99b255c3e9e42724d003751014607d0a42ef1b99ed63f276b5039d5969e8171245ddcf81780f3b32 SHA512 cf7d72d9fd577a14e5c95e16d66f0c816708ce674748a05bcdaf2d3a88591895b1d7764a18aa1004faf7dd96a1578586c84e1143b621614024df741a94ad88d1
+EBUILD wmping-0.2.1.ebuild 777 BLAKE2B 175595116f3b6eea64eb7d9f7a63bb08fb994d878d441f94c8b32b58aace99f82137478944df749285ef84a460c191473983084f09005705b7fa157264187b82 SHA512 62f53d040de93ffa8e0e5a914bd55cfe259866b61a38deb65197999e4cdc3c8035e7dfbb16efd2130197f69d97bd44ef691421dd470275075672c5961bc9f26f
MISC metadata.xml 328 BLAKE2B 95705f767c81c46a91331188dc71b26053dc6d5609d09ccbb66ed9ad323745058205019f187363ac944999d8ed0c0269044bc42d619934d58f23d262f6f85be1 SHA512 72ccd52965da37da3846f3fb915addf58cebb1066f1a08c38e6b96ea734aa01502a153b716ab731d0d1f7df73a5d230f4674d96c8b1e464180a097a42bbd7b5b
diff --git a/x11-plugins/wmping/wmping-0.2.1.ebuild b/x11-plugins/wmping/wmping-0.2.1.ebuild
index 4b44c98b1243..3c7b7a00eadb 100644
--- a/x11-plugins/wmping/wmping-0.2.1.ebuild
+++ b/x11-plugins/wmping/wmping-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
x11-libs/libICE
x11-libs/libXt"
diff --git a/x11-plugins/wmpower/Manifest b/x11-plugins/wmpower/Manifest
index 0991532d6186..33aeb0e995b9 100644
--- a/x11-plugins/wmpower/Manifest
+++ b/x11-plugins/wmpower/Manifest
@@ -1,3 +1,3 @@
DIST wmpower-0.4.3.tar.bz2 99178 BLAKE2B 191c562d0b3a2d738d826030323b17db049868bef988ac49250af3e0c32b0c531bb1d819526de609fae3da8bd74b2bc78d724c58999f5fae5e6655e0c1aaa5a1 SHA512 90d96949472497e39760f76b33f4363751863d3f824b1cb22ab9ff333f496b1f329db5fda1a2353c871f87b9f9f09781c410b51907cf13c617cdd3af2c2c84e9
-EBUILD wmpower-0.4.3.ebuild 812 BLAKE2B 2ce15348d0db8222020b152e79ddbc640d7ce2024732f4688a11bfd9a19c46e965fae24dee3895242560eb3b37d5b0c9ff9effc8e15a9614c214b7d6c509ec7d SHA512 b92bf0b1e72a5636ab413d2a431a41dbd9891c18f858c00c892fefac6a4c1917f1268a299fd7835b08ef56d887d9c9146c7e0ffe0abdbf2ca98a390ca3d3a201
+EBUILD wmpower-0.4.3.ebuild 794 BLAKE2B 2202e428661db4cf9a36e1577a8753d982648c007e49ff3946b25277432ae0e9773afc6e4ba6e24ac6c0ed608485955041308576247917f8f813deb2f2fc716c SHA512 d9e451190d5d54f647f18a986255378999a68b5bc84666e31d8d149f371edd503a18e5073ffe9dfe250a41871607fd50f147d370c56098eb782d7b7df0f8510b
MISC metadata.xml 684 BLAKE2B 3d50ae0a0c2d8c358b709fd5a2c0b86906aa1cddeeeed3f9f62a31d3aa56d533331d0254d1b74df833f0ab80a745b59c67ddad74875ba9677cdfc40a43945275 SHA512 56eff68c510d855dcfb617977cf9d837741441d1a8ec40e9c984c306b104c573f880d126dc61a8016b80351e6a77f9564e50288a3392e26dd32bf0fe2525403e
diff --git a/x11-plugins/wmpower/wmpower-0.4.3.ebuild b/x11-plugins/wmpower/wmpower-0.4.3.ebuild
index b5e73a0ae6cc..3235f25cf635 100644
--- a/x11-plugins/wmpower/wmpower-0.4.3.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.3.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_compile() {
# override wmpower self-calculated cflags
diff --git a/x11-plugins/wmrack/Manifest b/x11-plugins/wmrack/Manifest
index 8ec1a3934a42..c991a353e832 100644
--- a/x11-plugins/wmrack/Manifest
+++ b/x11-plugins/wmrack/Manifest
@@ -1,5 +1,5 @@
DIST wmrack-1.3.tar.gz 61120 BLAKE2B 7eb745224f829145af77fba8dd477ed8d9c529dbe2ff206c2af2b4fb90735ec5dd5bc7b11500a5047d41329eaeecea61dee83e512844be336e1e24b568cfa156 SHA512 b9d01fc15cb2e15192f66487e80422ce3e319e160ee6961b5ed1ce0341fd2ddb74063261bce209b83bfda9af76a445b018320514f48402a56fd9aa2a6566e62f
DIST wmrack-1.4.tar.gz 124243 BLAKE2B a1d8581b9ebc252429abe4c04aebbe9774d8a84048511b6dc5af02b8495f9c6c50d23e3fa26dd68f31d2d155ddae28e19c37d81082ed4378d269d19fd6888ae6 SHA512 27ed399a56f7f37e494005f02e74a09ad22c448ac288a3d2123987488ce65460f4c80841e8ff0fe3ff20db156130bc9e4894b42280181a1af58e06c1f8320a1e
-EBUILD wmrack-1.3.ebuild 931 BLAKE2B 25f16d19d7869fa05b3c169e41570e2dae666f5880d328671fde6a93586ddd7595fdf83ceed5c102fa0eec41ddf154a302cd3f0c6edaf1aa1e8da64fd1172cbf SHA512 9bc55acede7d76056426a8c58ed8d6c604125902f45d29dad371ff79bbcea6f9d234811441772bcf97251cc44006c66ea8560c6f989a72f74c91ad45f7df12c3
-EBUILD wmrack-1.4.ebuild 751 BLAKE2B 50b47a72b31d19c659141548186707da889f6057620becbec8b70a81b741f9eb52d8e5ac281176f4c8619c67d81777103add5cb5acfaa426c07fc70277e2eca6 SHA512 6bd4482fb0f75e8c88331f98274afe02f09fe27983aec762365f951996f71e8f999f14c7db01e6c278f9d3c3ab1486d968468d8bcc5549eba2d84823a9623764
+EBUILD wmrack-1.3.ebuild 931 BLAKE2B 61b8c2aa37ca547524072f8405adfbcf4fa2b853b4f3fa33e9e5651eb0516a40dab5ddd310f042d9016a0c51eaab0f8e68948116207bdd5e3a26830e7557c9a0 SHA512 eb32d1cf5da96edc5f57d830908db3150651b66ee4b076d5778ada50c9617980705917247a07f67c5b82058aeceb678dd3e0f9615b51d86d71f4c9d0ab1a8346
+EBUILD wmrack-1.4.ebuild 751 BLAKE2B b5954ba225d5f5b60ea0d81f7d76ff12066a66bf870597266964c8044fda061f17dd77ebc0fc41355212a6e6f64117e0694ce71e1e42262189397665c2625324 SHA512 78cce9cb526afae39684de9665995f08c0605ec5ea8d67669521511d9933e12fabd9d60557c26a6b8c10c431036d1633cf324c5e634ddb5148dd7481f1289693
MISC metadata.xml 328 BLAKE2B fb57fc8b43f72d8e54e6e88585df0ca16b8a26f837802c69a7354fdafc753b64ab7fb6f72227b3a599f321ff675b0a5ac24cfa24f1393f230f3c22c4dee814d5 SHA512 018084bb8f2170e74252a2e310fda1f787512576c41f96ec93b1dd4b50017f17b2d35a73acc0713a6e4292424fdabf018f6034ccfa2a88a3e0293415a52faa7f
diff --git a/x11-plugins/wmrack/wmrack-1.3.ebuild b/x11-plugins/wmrack/wmrack-1.3.ebuild
index d167626d1349..52fa77442a2c 100644
--- a/x11-plugins/wmrack/wmrack-1.3.ebuild
+++ b/x11-plugins/wmrack/wmrack-1.3.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_unpack() {
unpack ${A}
diff --git a/x11-plugins/wmrack/wmrack-1.4.ebuild b/x11-plugins/wmrack/wmrack-1.4.ebuild
index b1b4763a9dab..2b0d6930da55 100644
--- a/x11-plugins/wmrack/wmrack-1.4.ebuild
+++ b/x11-plugins/wmrack/wmrack-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_prepare() {
sed -i -e 's:gcc:$(CC):' "${S}"/Makefile.in
diff --git a/x11-plugins/wmrecord/Manifest b/x11-plugins/wmrecord/Manifest
index 0a44991e7bc4..a87803ab79bb 100644
--- a/x11-plugins/wmrecord/Manifest
+++ b/x11-plugins/wmrecord/Manifest
@@ -1,4 +1,4 @@
AUX wmrecord.desktop 201 BLAKE2B ac13a893dc87c2fe0c26f8ffb3b9f1a19cf1d80a1a0894d6a69f63aa703e80ae31346fe2e9e3e147675546b7656d5a797250b55eb02305e17f024e47e0b009c3 SHA512 47b075d64bdf027bef79e4737845aca32677676f5dcf81826064c16a2516bd6089c839fc3292a34b5005eac2bb5ed7ce66916c6646474819a384e36604df7c7b
DIST wmrecord-1.0.5_20040218_0029.tgz 38594 BLAKE2B d1cc41a7de5c45a19ea364c9c007382c9220bdf0b4a6d69e09f2169cfc879e51d53afd33fd434f28ad6ea4e20b05760b06afbbf8a5560abc63b6edea9114bab7 SHA512 4a0c9f58d22a72a83f9e7922b5806528cc412576d55b9c24f45b7d93a5594f380f51581addbb41b65c18c9b5f0ac1cbc8e3881268a75386545f5024f55836154
-EBUILD wmrecord-1.0.5.3-r1.ebuild 1236 BLAKE2B 397d8ff4304c983f79dc95aa23e4e945784f180e9683955acfb35064f60afa1f82267663cb92d571370dfd1945200e70f1eda2836ef0d000ec29b0ca70bc0ad2 SHA512 c2a6aa66edde39d5e3834a48bbd6b54867bb5ef7b3f0603f3a6eac51a87243c16892890d7302d6817f07f0a1c3fa9e5e915dfb24205a05a594a811eeca1d4b35
+EBUILD wmrecord-1.0.5.3-r1.ebuild 1211 BLAKE2B 168c954e664df2da1d2469ca5b0e0fe5616f3716126b73223b296bfbdaa47cacf121688e71bb620ed41d7ef4cffa1c99481e44e4659bd2e379bfd3d1764fdc6c SHA512 6a061571f646cd915e8846d4998973d4dcdbb68b7db2fe85d12153b35d49380353fa56770f8447c6d7b5dd88c2372c3608dc2b5da4e0e3ca30c72d5eb66e139c
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
index b0ac99ee9486..7323122856a0 100644
--- a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
+++ b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
@@ -14,8 +14,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- >=sys-apps/sed-4.1.5-r1"
+ x11-base/xorg-proto"
SLOT="0"
LICENSE="GPL-2"
diff --git a/x11-plugins/wmsmixer/Manifest b/x11-plugins/wmsmixer/Manifest
index 8c551cab368a..06415168060f 100644
--- a/x11-plugins/wmsmixer/Manifest
+++ b/x11-plugins/wmsmixer/Manifest
@@ -1,3 +1,3 @@
DIST wmsmixer-0.5.1.tar.gz 33350 BLAKE2B 9f80e0680834b0c8537baececa1a80708ef249db3b58cd77d8d5ab2d13a96959d55f016b38bc5975f8c3decf7569a3a356e5c09cb27c2b5a662dc2fe00766962 SHA512 2731645addb9888b30cbfcaa1f9609c036855d3ee864628535fc5a0dd4c005d01b111bac3dd7f9d11f4794f55f22be65564ccafe598f098b13abdfa9277da299
-EBUILD wmsmixer-0.5.1.ebuild 782 BLAKE2B 757b553ca1549b144b6e46c5afb6db79daa7ead3666c4ecaf65b930102556a11eb7a7b8e83466038111f28255062e44cce302a19626fdbe41e4aaf08929696b8 SHA512 5e17edc1d26b5d089e7b20458935df8c0059352b7c3c4eb41b8dca97c360ad41680219ff1b2185e5eca7484821e5cb3cac86e4893282cd8362236b65e327f147
+EBUILD wmsmixer-0.5.1.ebuild 764 BLAKE2B 9e65a6bd913bb36c8e099ce047ab575d0e10256a0317560ec6ed74f8a27b967b4b7b5ebd7d716d031fc1dc16be67361a669618f33f9ea42ac4e302ac64fdcd15 SHA512 d970a4a4be6ab39de3eee8849c8541210ef8e487298369e7a0d9de6171c56855f96638ec522676b73ddf88a6aad8478dfa9a1127d281b3bf4fe423b9c04b0494
MISC metadata.xml 464 BLAKE2B cda6cb18a92e65299fcbd76d3cb5c22755d17c16d4d634db82dbee0a7421c0023159ac479369e9bd7c448b1e72b53d3b28ec393190c92d09856ff86c7f2fc3cd SHA512 ff0c18c9f0dd4c316c9e82b22a18d15a08d68b58e63420d96da5ae0e70872e2946e0c767f8b5c80951aedce5057a5e8bacafacdcff84416e7eb529c8746c186d
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
index 043175cd149c..7e01b194131d 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libXpm
x11-libs/libXext
x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
src_compile() {
g++ ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest
index 0024dbdef5ae..903f7c6615c4 100644
--- a/x11-plugins/wmswallow/Manifest
+++ b/x11-plugins/wmswallow/Manifest
@@ -1,4 +1,4 @@
AUX wmswallow-0.6.1-format-security.patch 498 BLAKE2B 3b53142b9664c567ebb4abc8d530b88912643e8cb169650b2f08c2d10da31853ffb6515d0b7f7311c8a181a780002e035da5bdde124db57192470f0c9ac25553 SHA512 9690c74b0f86ddc71ea4f7b190af8ec4d7634454a867654cae8cf2cc48560ab3182e8e3ce312db9eb6b858ef4ec0b9eb63f4c11e962cd17a3638d6d38fcf86cb
DIST wmswallow.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc
-EBUILD wmswallow-0.6.1-r1.ebuild 799 BLAKE2B 5c11da85555da76e4a23d3c5d5b64fd0575ac56334133e8d5528588d1ebcf6a285ddf312ef16f52e50a8762bc5df303d39796062d03fa1bc1d5238799f59787c SHA512 470176893e7e768a0a0ce021e740914a25ef61c72db3e4e0ae036d4444e9b903ed963aa3395110b6387db32b332a2804877b45ebec0e0c4febeb040b91ec1551
+EBUILD wmswallow-0.6.1-r1.ebuild 802 BLAKE2B bcc1c2a86066fe51c2892e94bdc20344b37ce80669f0daf8b802606afff4919c956f05feacd0b4a05c9f326459c29782bc065fad0889c3bebb4fd49de183b7b5 SHA512 6f329d967e4ff425ae5a15fcc594620629e4e173a32b6d688ccd6e386d3acb7358db97ff17820e08380fbb3a000f3cd9e3acf2b106f6490e808b23acee6b9c71
MISC metadata.xml 644 BLAKE2B 28bbab4a2d177905c74f92f8c57bbe7d046ebcfafff891856d7361ae8c2982271d9f146b5cf5306070e48958eb110aa6855d0187051bb6d33ae4fb0798cbf967 SHA512 fc8f033978bedc4b9d080bc5d99dcd4200988b9751946fb855f182279a16913999c7372f6acb445818fb7fe336176dccd971b3709ee83a691966f6a35643de34
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
index e4cc74eca71e..d5ab7c82a729 100644
--- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/wmswallow
diff --git a/x11-plugins/wmtime/Manifest b/x11-plugins/wmtime/Manifest
index 8a86081d1b1e..b219c3f36995 100644
--- a/x11-plugins/wmtime/Manifest
+++ b/x11-plugins/wmtime/Manifest
@@ -1,3 +1,3 @@
DIST wmtime-1.4.tar.gz 19200 BLAKE2B 453668828ee512979e840b66473c7acc52558965ad00d9ab750aba93d22447dcab13c424c2d5ad07baf3ef7c8e2d6c785c1ad5ccbe44d42aed867bdb7a10e679 SHA512 46e35ffe41aaa55a651fa2a4002ab83fd45f901dc12ce1e0ed981666b9b620aa11666920f595fc3a782c54cc036491e0c676fb760a38cd6f6b24e264723b87fb
-EBUILD wmtime-1.4.ebuild 706 BLAKE2B 24eaadcf0355cfa79596a811c7108f3500e47b890d8397e4685c7b682f69c77beb76a4e0068dcc3bf27fc062c53f72b2d9ac4e43ea422e2f7f55f598329202e0 SHA512 de747bd553b5bdc8d2eb34fcf098155cb074975139504ca9f44b1d47350452838ef0ee0665118e2e5cf2f44d73c65376e49d8262230a92847816c3e08d182da4
+EBUILD wmtime-1.4.ebuild 709 BLAKE2B 2938503529e33fb7c5b691e8a68db142168fe3c336b1dc730ad2d9d44c0795460758a28250d0ec6f4297a54ab0b97aa8d8dea9b4ad43fe6fa4b9c43e983d75e8 SHA512 5af8a73d9269e9e497091dbd42b23654de873d291eb310ca71dc5a3719e25f9ebcb08155f4b5e6b2e0572778e3a11ceb5db4c3ac665082901de5680110a55ce1
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmtime/wmtime-1.4.ebuild b/x11-plugins/wmtime/wmtime-1.4.ebuild
index 2da6f1f1bfcc..54dbafbab8c4 100644
--- a/x11-plugins/wmtime/wmtime-1.4.ebuild
+++ b/x11-plugins/wmtime/wmtime-1.4.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
x11-libs/libXdmcp
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/x11-plugins/wmtop/Manifest b/x11-plugins/wmtop/Manifest
index 2d94dde97660..0381dd18702f 100644
--- a/x11-plugins/wmtop/Manifest
+++ b/x11-plugins/wmtop/Manifest
@@ -1,3 +1,3 @@
DIST wmtop-0.85.tar.gz 21165 BLAKE2B d114391a987395ae2defcfe03bc4dc022b8d9e4163b310cb4294e34097d8b950fff44c09035265ed152a1a86d2aadd67dcca7a50cd1230c0cf5c49d2b2cb49c1 SHA512 0a251b1ae32fe8c9a09ed1aeb19315d2eab42a7b2264d637de57f2ca946af69f68fec43d921a21ea0cb25b5fa6e24206bf1321ce59dd0ed6c187a5327c7ec70a
-EBUILD wmtop-0.85.ebuild 620 BLAKE2B a3aa2d76c41189ec8dc68add1755a8a89e3d51a31c65c47e58c32682d629e49a34becb6277471a1b02d56eb8277a86ffa02a9dd2ddff341de55bbc47b0eee089 SHA512 7a4d2c9f3f63c2d566d98e3f07ea59706e9d1e462e4d77569ba1815c22a72e395413c742b48dae6887a2a8fac8396608e73e9858c8d464f9d86ae247aabfc805
+EBUILD wmtop-0.85.ebuild 623 BLAKE2B efa1bf1d27c7a77ae904b322ce64ca848085e74f6f81d05027fba49bf817b75b5fafa5bd052545aa3df40271609ea80d203e4effb3c2d472335ed929d0117be1 SHA512 3a793866ac21aa939cc85210aa99f9de0c05ffbda35f30e86dcb6e7a94c6bb4f2424d4187a444bae03abfbab4ac7cc77c358b50e8972abef1ed616682b120096
MISC metadata.xml 639 BLAKE2B 898fced3d3ae4a34468493471dc8ba5e470e2599a564c8273f5bdb6ba8757a76e20008be9d26411a89ef234d5e82fb663b593f0aa608ef62fd1ff25923ab4b0b SHA512 d902e2cbd1b3809ff8b89b896acbe611191f6c6ae2e7299c4b41b0e60364fc7c4de4f548b30f1091f163cfab4178af1c716387ffe12a2392002dbfa4bfd20154
diff --git a/x11-plugins/wmtop/wmtop-0.85.ebuild b/x11-plugins/wmtop/wmtop-0.85.ebuild
index 43f1dbde59c0..63b85df2a302 100644
--- a/x11-plugins/wmtop/wmtop-0.85.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.85.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
x11-libs/libXpm
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
# Incorrect path in this tarball version
S=${WORKDIR}/dockapps-be3f170
diff --git a/x11-plugins/wmweather/Manifest b/x11-plugins/wmweather/Manifest
index 5af00ce6b5a0..ba9e63f3ade6 100644
--- a/x11-plugins/wmweather/Manifest
+++ b/x11-plugins/wmweather/Manifest
@@ -1,7 +1,7 @@
DIST wmweather_2.4.4.orig.tar.gz 84773 BLAKE2B 511eecfe859b5795ad8037f299109014b72b66bd68770245311d4554565d7f687a3b5e39d34f5cf81c7b109b858d6b141ccbd524567526190b231d902e7d7ce3 SHA512 8c9d2bc6333e4e69020122f5acff42b1ebc11544ae503510920990253c0138b13fe216eb65407346bc92ac84e012d3d09888bc5dce189fe12625b380597bd4da
DIST wmweather_2.4.5.orig.tar.gz 85128 BLAKE2B 3f02cd3ea87cbd8815ad845728bd804660660c006a2db413daeb760d6e2411572428cca30bf1bc60e737408f77a1d53a4a59af29d81f03ad535201d2c6e36306 SHA512 eb62a6d03875c087e306e83ec2010916da702f942b22b130c327d890daf29803bf01f52fe0e03b962656d0dd9a329696e8fc19238eedc32f5ce72d8929eab87b
DIST wmweather_2.4.6.orig.tar.gz 86672 BLAKE2B 8b63c4aad9c6d7fbbe4f132471abeeda08c247c43217e0429039bf65d20647bfea170a6ff598e11245182a90cc9cd9a1271b7f5903df3ce431260becf6560124 SHA512 7713975207a3427aeeeb3560f0d83354ebfe28c0564acf08f0a64fa405f138283f45ca4cf0301117bc46a169ac950a0c59c457c4cdf6b949525d60118da162ef
-EBUILD wmweather-2.4.4.ebuild 684 BLAKE2B 6621b8b9a68b2414abeeb1b28adb47810eef61f8074d8f5c92e66fa0d4dc6542a58b824cc7d2086738152cd4a75d5c6dd8038f20315b210716bc1d0245c8e4a1 SHA512 11d31d42bc6682f182429d41e9e00b67d2680422052bfcd9b7b5410ea682510f5ac0e3b42935b0cb1b94b1484265627cbe8dc9c1bf560df3895418551d377356
-EBUILD wmweather-2.4.5.ebuild 657 BLAKE2B 66fc582de60623121e284049469c40caa22f02bec59e72519fc7ab43aa79a46c294191aa844a7bd475d042c9fe3a01f947a1253734cf4aa19d3902cfc2b5bf17 SHA512 9dd356fc86323b4dde58f8246bdc1f5ff8cb1f0d74eb4547603ce8089cf7f7d85b0c5a209fb9afb607a564abc26d0218e4ef664b6922a5fd4fc23e484399fd8b
-EBUILD wmweather-2.4.6.ebuild 646 BLAKE2B 3f7a20bd3dc1d54e5e98434a6028cc9e2ed9553ffa97a49e4738824bc5fb77be501779621f42e398a08a3c3c61ed44d0bf929609d06bd07ed19820bcfd3760ef SHA512 b36b3d345c00a3c8738d085a0fe1457647c4f1a7d746f7d5c208cfbbf1d11d99d4141877b9d03e0f458b6a50cf29ccc77be66fcecc70146670e074cc65212b68
+EBUILD wmweather-2.4.4.ebuild 684 BLAKE2B 439188b80742349cabd7c1737f2cad185ddc542003ace61e782519e65335873c5e0016d82b165986bbcd943540db884d4502ce69c6d9921567f35801e2a142b9 SHA512 0a2394b6a949ea51441d9f6ab66641c4dd31f13c4c2a30a896b21a72a3211cc4430ddf48f2327676eeb49a14322689089d9d752cf5bb9e7340d70558212f3135
+EBUILD wmweather-2.4.5.ebuild 657 BLAKE2B 4ee39fa76415ba5e7c7b896ad39d1eab1040ccfeec06e976ba39bb2191b7017d1e9f05e94d8ba6120a6fff3641a2a516ae01c72ac9ffea4371163ac7c4cfe422 SHA512 447fc5489ef762899c28e50f13ed82401d06121d099d46e03a97058577bc519d4bf92f5c420803ca8f5efd9305d7fa480210508de0ce2e338f0e10372af55f4a
+EBUILD wmweather-2.4.6.ebuild 646 BLAKE2B 36494bde360c88bbabf4d9b7c587b3f243969723e9c65bbca6c65fca061197069cfdd31d3794a8260c7a36853eba34d497ff3fdec9b482676184a40b0e53f4a8 SHA512 21e9a7edfc2b406aefae3b2850c20832b1250577afc94ee3013797104fff26569eeb8139b14fac568af16a7a6cd2925bb40cba4c10310f84801eef24c249150e
MISC metadata.xml 624 BLAKE2B 749ad41f486ac2c7dda230ecb730bd4ed85f8ae0af9c255a5d0a9ef73b10aacd4bc6d22287c4be755a441294fc7e986dfaba26d02fea1ca43e1380e5793c40a6 SHA512 67438cee5e0e29f3519357fff49a638a78782c854b78fa10a9a5b2f1b079ae08d053963b49033187655a4830c63d38bdb5682bebdb3f1de15a640be15f8a0e92
diff --git a/x11-plugins/wmweather/wmweather-2.4.4.ebuild b/x11-plugins/wmweather/wmweather-2.4.4.ebuild
index 413d431c5fc1..dd51b110b97b 100644
--- a/x11-plugins/wmweather/wmweather-2.4.4.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.4.ebuild
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libX11
x11-apps/xmessage
net-misc/curl"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P}/src
diff --git a/x11-plugins/wmweather/wmweather-2.4.5.ebuild b/x11-plugins/wmweather/wmweather-2.4.5.ebuild
index 672b5595b974..44c2c24cfab1 100644
--- a/x11-plugins/wmweather/wmweather-2.4.5.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-apps/xmessage
net-misc/curl"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P}/src
diff --git a/x11-plugins/wmweather/wmweather-2.4.6.ebuild b/x11-plugins/wmweather/wmweather-2.4.6.ebuild
index 451ba034bb93..125790de1114 100644
--- a/x11-plugins/wmweather/wmweather-2.4.6.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libX11
x11-apps/xmessage
net-misc/curl"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P}/src
diff --git a/x11-plugins/wmwifi/Manifest b/x11-plugins/wmwifi/Manifest
index de07e76aa208..6a9b03c70629 100644
--- a/x11-plugins/wmwifi/Manifest
+++ b/x11-plugins/wmwifi/Manifest
@@ -1,3 +1,3 @@
DIST wmwifi-0.6.tar.gz 150482 BLAKE2B 213f56897527b57ea2fd6123d9147c8d4547323104e940b632c2290fc6941478a9ee5d0aefbe5a06e2b20bd524b84eebd9d75bedc83054066975459b770fbc56 SHA512 ae0a66b68f991907b7e8434a872cc8b1fd9219d633260183a6917e1d34dd4ddc7be91dd71b6cb0ed20781ca4eaa6a0cfc2adcb7a838b734050264a5fae4cadd0
-EBUILD wmwifi-0.6.ebuild 738 BLAKE2B 41bde624a2db7693a8dfe160c84670302737d5114d6f2d7c886808a1c432b56875f1dc399a2083b4e72929dce72553acb00385662385ed9258ab2750e66d1ade SHA512 6333ef91ac2446b567803cae74ae155e2ed0b034dea107121ebe7dec5d6a08c4b3148d665c96b1b3870cd81c19cae1844c082bc260bda91c0215c2a905d9e073
+EBUILD wmwifi-0.6.ebuild 720 BLAKE2B 98b09446d485b797bed2645f90a0507f5e61086e38dec925ea070547f31587eae25c42a1ade2e7e3bc54716f86ec1000dd527473d30c09a1f84725bb237bac03 SHA512 f76c4c81dd63bdae6c725154065f308bb2bba43dc63646f774708f1b9b0c65bfd1f22af58890d9f1ceda4a6a17890a8801303ff55dcd74e23cad7b4cb356aaa5
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmwifi/wmwifi-0.6.ebuild b/x11-plugins/wmwifi/wmwifi-0.6.ebuild
index 0c2e17e0086d..45fc88ee8bef 100644
--- a/x11-plugins/wmwifi/wmwifi-0.6.ebuild
+++ b/x11-plugins/wmwifi/wmwifi-0.6.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_compile()
{
diff --git a/x11-plugins/wmwork/Manifest b/x11-plugins/wmwork/Manifest
index 54d5ea650e5c..08da369da949 100644
--- a/x11-plugins/wmwork/Manifest
+++ b/x11-plugins/wmwork/Manifest
@@ -1,3 +1,3 @@
DIST wmwork-0.2.5.tar.gz 62044 BLAKE2B e2990e84aa4be3c025f681e52948a9a729a6e06cb2032cd2502c7eb484c2a99aa0cfeede0bd727d22a70d9ca372cf0ee4afaabf2af8d0c659fb7c29977dcc08a SHA512 ffbc1b7e3a1bdd0e76c2c3b01088ee8cf1a9c615b4925ea8af514b6a4096f5192900a6c6633b2d60fd941d3515a6cb80396ca17d81104b7cdcacb5e46050e864
-EBUILD wmwork-0.2.5.ebuild 620 BLAKE2B aa207ea5de0225c42db1b37447fd35793f66241ed26f623d5bf3751c04e3c1102e4eae8b4fe2cb902c914fdb2fa671fa077baca39b88a278ea983325642b828e SHA512 b27ea8c6ded7affdccc8d2e799edddeafb45d8813c0948dba24cfaffa1a6723109569413f39bf288e519eccf327c8c8c0fc987bc1f24118131e13ea6975b1d5f
+EBUILD wmwork-0.2.5.ebuild 620 BLAKE2B 13ea2797520a2d8480f1e47ea6819e96ee14b303792850c6bb8f4a57896f16a73b69c9fe87d4456025f9f98709422df4c54637585f9a3c32d2cfbefeb879eb58 SHA512 26c28e46f022d1db70d971b42c02c18b084d7cddcd6d813500bda64f539aa4a6db769696eca299e27f6266d33f4240366e581cdc6736fad5df17714d1b18db74
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmwork/wmwork-0.2.5.ebuild b/x11-plugins/wmwork/wmwork-0.2.5.ebuild
index c9dd6314ab14..3b4840f0b94f 100644
--- a/x11-plugins/wmwork/wmwork-0.2.5.ebuild
+++ b/x11-plugins/wmwork/wmwork-0.2.5.ebuild
@@ -16,7 +16,7 @@ RDEPEND=">=x11-libs/libXext-1.0.3
>=x11-libs/libX11-1.1.1-r1
>=x11-libs/libXpm-3.5.6"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P}/src
diff --git a/x11-plugins/wmxkb/Manifest b/x11-plugins/wmxkb/Manifest
index e91e488ba908..206eb8a1d3f7 100644
--- a/x11-plugins/wmxkb/Manifest
+++ b/x11-plugins/wmxkb/Manifest
@@ -1,3 +1,3 @@
DIST wmxkb-1.2.2.tar.gz 196726 BLAKE2B df0ae8275c82c4fb8965ef6761c82831edfccaf074fdc907ca4bf6b37fb853f6ccb31a05a76c0c392c8b9604a2f03af3bb1e7ed6918c2da09c2757ff93f8965d SHA512 4439c532cc2e0dbcbfd04664420fbdfdf65db47961d2b3374049bb78e20589478c2d3e07d01f1936ce7ace24f5da553546597fa7805c27bba45ac1dfc26d8f54
-EBUILD wmxkb-1.2.2.ebuild 837 BLAKE2B 6ee6c7d2cf72066c1ec83df5b3961bc60b058d317ae9ade2763a4d2d3d33caa46bc96494bf3d174290187313257e09720a946d5d91abc620b83e5688869262b7 SHA512 f0ea8900240e7664846a640289478450e9346eb586eb91d0403beed6ae8bd97c7f94f342079b9177a9acf90a51c44340de4b9e2ea8f5a8b04fc66c881ed2bd70
+EBUILD wmxkb-1.2.2.ebuild 797 BLAKE2B 97d008bd4d7e0966355b410d0d8e9d34511d6fe0c6228bd37bf51598f7e464b4d1f40cdb10888af6228c04fd82300f230e9cc860e640d7d6c8c96a297fa98da9 SHA512 52cdb40ed0da03faf7fc581a5c6aeb4775b6868548733087d1e0cf5b992f5c3a991eeffadc68b27f884066ff8e687bd9782985b0dedba3bcd199c9aef3859450
MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
index af99220d04e8..37bfd003969e 100644
--- a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
+++ b/x11-plugins/wmxkb/wmxkb-1.2.2.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=2
@@ -18,9 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto
- x11-proto/inputproto"
+ x11-base/xorg-proto"
src_prepare() {
sed -i -e 's:$(LD) -o:$(CC) $(LDFLAGS) -o:' Makefile.in || die #336528
diff --git a/x11-plugins/wmxres/Manifest b/x11-plugins/wmxres/Manifest
index 7910d5d5a709..173492a296c6 100644
--- a/x11-plugins/wmxres/Manifest
+++ b/x11-plugins/wmxres/Manifest
@@ -1,4 +1,4 @@
AUX wmxres-debian-1.1-1.2.patch 1699 BLAKE2B a07ed3bc2c26d9bc73d4340d658ff9754eb9109fbd5bd0ffe973d90af32bf0b5e8e9edc6a03ee822c41d89a934e5270ad81774f35c0d62867f6b788071ea0fca SHA512 d2043b9ff22415f03ec7a3c46770562b7d6ee0180d1048dbd447f27c49149b405faca3c2e863a91abc71c766ce461464f6c4fdea54d2b5916c88a85e8f2d8051
DIST wmxres-1.1-0.tar.gz 9948 BLAKE2B e9d0952a0cba30733f0b28ab0b1f37e7b0215ba71abda255646321ee673a09f8510384466919dd27679a6b91c68f7a31fe3ff646c7eb453193c9de29b46c5710 SHA512 e7b5bfb061822fb827da50b24287ab9c6b14d3ddf9a89ff6cd5e1bb61939905c901b4a0ff7a6492e0ccce3b39b8bb4d8ffb13cbf7978075a73a30080e25c18ad
-EBUILD wmxres-1.2.ebuild 903 BLAKE2B 8455b827403797c397c2161da011ad2fc4df4d31dd6b3a56dbc5a29bc672587450fde475341837ee3bc2d78192faee6754094d79773d013c4f63e35374848d2f SHA512 a172f3c77ee2ceab2da6c406d5b01aa220ca0407f65f9485eeada968f9d8d373a98f174f25b095681ef3b85acd1dc222a8c8d7723eeffe48e527ff44ba308401
+EBUILD wmxres-1.2.ebuild 875 BLAKE2B 275175f1dc0385cf99249e8ebec69121b1d5da4933075e930104ab509adb112695a58d40d35505f0de7d645cf4b3da4e78d5db56c6d419af7908606f5cd41853 SHA512 caacacc4f8b394913af287b6d559f51986b46a4c66bc43f5ae90f5d8e0235d950bb62fd80756a7b2b8d871054ab970f3a9a746565cf63c322640209a1867e9b0
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmxres/wmxres-1.2.ebuild b/x11-plugins/wmxres/wmxres-1.2.ebuild
index bc0f29ab3149..793229458363 100644
--- a/x11-plugins/wmxres/wmxres-1.2.ebuild
+++ b/x11-plugins/wmxres/wmxres-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -18,9 +18,8 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm
x11-libs/libXxf86vm"
DEPEND="${RDEPEND}
- x11-libs/libXxf86dga
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto"
+ x11-base/xorg-proto
+ x11-libs/libXxf86dga"
S=${WORKDIR}/${PN}.app