summaryrefslogtreecommitdiff
path: root/x11-misc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-05-22 14:00:47 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-05-22 14:00:47 +0100
commit91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 (patch)
treef4c7f54d0aeb344c21de9b9d1a3f1e9826d7a64c /x11-misc
parent2bacbb3374587799c77a999f56352233a353b19e (diff)
gentoo resync : 22.05.2018
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild5
-rw-r--r--x11-misc/3ddesktop/Manifest2
-rw-r--r--x11-misc/Manifest.gzbin48242 -> 48267 bytes
-rw-r--r--x11-misc/alock/Manifest2
-rw-r--r--x11-misc/alock/alock-1.0.0.ebuild2
-rw-r--r--x11-misc/autocutsel/Manifest2
-rw-r--r--x11-misc/autocutsel/autocutsel-0.10.0.ebuild4
-rw-r--r--x11-misc/bbmail/Manifest2
-rw-r--r--x11-misc/bbmail/bbmail-0.9.3-r1.ebuild4
-rw-r--r--x11-misc/chgres/Manifest2
-rw-r--r--x11-misc/chgres/chgres-0.1-r2.ebuild5
-rw-r--r--x11-misc/compton/Manifest4
-rw-r--r--x11-misc/compton/compton-0.1_beta2.ebuild4
-rw-r--r--x11-misc/compton/compton-9999.ebuild4
-rw-r--r--x11-misc/devilspie2/Manifest2
-rw-r--r--x11-misc/devilspie2/devilspie2-0.42.ebuild4
-rw-r--r--x11-misc/dmenu/Manifest8
-rw-r--r--x11-misc/dmenu/dmenu-4.6.ebuild5
-rw-r--r--x11-misc/dmenu/dmenu-4.7-r1.ebuild5
-rw-r--r--x11-misc/dmenu/dmenu-4.8.ebuild3
-rw-r--r--x11-misc/dmenu/dmenu-9999.ebuild3
-rw-r--r--x11-misc/dxpc/Manifest2
-rw-r--r--x11-misc/dxpc/dxpc-3.9.2-r2.ebuild4
-rw-r--r--x11-misc/dzen/Manifest2
-rw-r--r--x11-misc/dzen/dzen-0.9.5-r1.ebuild5
-rw-r--r--x11-misc/fbdesk/Manifest2
-rw-r--r--x11-misc/fbdesk/fbdesk-1.4.1.ebuild4
-rw-r--r--x11-misc/fbpanel/Manifest2
-rw-r--r--x11-misc/fbpanel/fbpanel-7.0.ebuild4
-rw-r--r--x11-misc/gccmakedep/Manifest2
-rw-r--r--x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild4
-rw-r--r--x11-misc/grabc/Manifest2
-rw-r--r--x11-misc/grabc/grabc-1.1-r2.ebuild4
-rw-r--r--x11-misc/habak/Manifest2
-rw-r--r--x11-misc/habak/habak-0.2.5-r2.ebuild4
-rw-r--r--x11-misc/hsetroot/Manifest4
-rw-r--r--x11-misc/hsetroot/hsetroot-1.0.2.ebuild4
-rw-r--r--x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild4
-rw-r--r--x11-misc/imake/Manifest2
-rw-r--r--x11-misc/imake/imake-1.0.7.ebuild4
-rw-r--r--x11-misc/imwheel/Manifest4
-rw-r--r--x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild4
-rw-r--r--x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild6
-rw-r--r--x11-misc/lineak-defaultplugin/Manifest2
-rw-r--r--x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild4
-rw-r--r--x11-misc/lineakd/Manifest4
-rw-r--r--x11-misc/lineakd/lineakd-0.9.0-r1.ebuild6
-rw-r--r--x11-misc/lineakd/lineakd-0.9.0-r2.ebuild4
-rw-r--r--x11-misc/lndir/Manifest2
-rw-r--r--x11-misc/lndir/lndir-1.0.3-r1.ebuild4
-rw-r--r--x11-misc/lsw/Manifest2
-rw-r--r--x11-misc/lsw/lsw-0.3.ebuild4
-rw-r--r--x11-misc/makedepend/Manifest2
-rw-r--r--x11-misc/makedepend/makedepend-1.0.5.ebuild4
-rw-r--r--x11-misc/mixer_app/Manifest2
-rw-r--r--x11-misc/mixer_app/mixer_app-1.8.0.ebuild4
-rw-r--r--x11-misc/netwmpager/Manifest2
-rw-r--r--x11-misc/netwmpager/netwmpager-2.05.ebuild4
-rw-r--r--x11-misc/nitrogen/Manifest2
-rw-r--r--x11-misc/nitrogen/nitrogen-1.6.1.ebuild2
-rw-r--r--x11-misc/notify-osd/Manifest2
-rw-r--r--x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild2
-rw-r--r--x11-misc/numlockx/Manifest2
-rw-r--r--x11-misc/numlockx/numlockx-1.2.ebuild5
-rw-r--r--x11-misc/oroborus-deskmenu/Manifest2
-rw-r--r--x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r1.ebuild4
-rw-r--r--x11-misc/oroborus-keylaunch/Manifest2
-rw-r--r--x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r1.ebuild4
-rw-r--r--x11-misc/py3status/Manifest4
-rw-r--r--x11-misc/py3status/py3status-3.10.ebuild (renamed from x11-misc/py3status/py3status-3.9.ebuild)0
-rw-r--r--x11-misc/qterm/Manifest2
-rw-r--r--x11-misc/qterm/qterm-0.7.1.ebuild4
-rw-r--r--x11-misc/redshift/Manifest2
-rw-r--r--x11-misc/redshift/redshift-1.12.ebuild86
-rw-r--r--x11-misc/rofi/Manifest6
-rw-r--r--x11-misc/rofi/rofi-1.3.1.ebuild5
-rw-r--r--x11-misc/rofi/rofi-1.5.0.ebuild3
-rw-r--r--x11-misc/rofi/rofi-1.5.1.ebuild3
-rw-r--r--x11-misc/rss-glx/Manifest4
-rw-r--r--x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild2
-rw-r--r--x11-misc/rss-glx/rss-glx-0.9.1.ebuild4
-rw-r--r--x11-misc/sisctrl/Manifest2
-rw-r--r--x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild4
-rw-r--r--x11-misc/skippy/Manifest2
-rw-r--r--x11-misc/skippy/skippy-0.5.0-r1.ebuild5
-rw-r--r--x11-misc/slim/Manifest4
-rw-r--r--x11-misc/slim/slim-1.3.6-r5.ebuild4
-rw-r--r--x11-misc/slim/slim-9999.ebuild4
-rw-r--r--x11-misc/slock/Manifest2
-rw-r--r--x11-misc/slock/slock-1.4.ebuild5
-rw-r--r--x11-misc/sprop/Manifest2
-rw-r--r--x11-misc/sprop/sprop-0.1-r1.ebuild4
-rw-r--r--x11-misc/stalonetray/Manifest2
-rw-r--r--x11-misc/stalonetray/stalonetray-0.8.3.ebuild4
-rw-r--r--x11-misc/synergy/Manifest4
-rw-r--r--x11-misc/synergy/synergy-1.9.1.ebuild6
-rw-r--r--x11-misc/synergy/synergy-2.0.0.ebuild6
-rw-r--r--x11-misc/tabbed/Manifest2
-rw-r--r--x11-misc/tabbed/tabbed-0.6.ebuild4
-rw-r--r--x11-misc/unclutter/Manifest2
-rw-r--r--x11-misc/unclutter/unclutter-8-r4.ebuild4
-rw-r--r--x11-misc/vdpauinfo/Manifest2
-rw-r--r--x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild4
-rw-r--r--x11-misc/vnc2swf/Manifest2
-rw-r--r--x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild3
-rw-r--r--x11-misc/wayv/Manifest2
-rw-r--r--x11-misc/wayv/wayv-0.3-r2.ebuild5
-rw-r--r--x11-misc/wmctrl/Manifest2
-rw-r--r--x11-misc/wmctrl/wmctrl-1.07-r2.ebuild4
-rw-r--r--x11-misc/x11vnc/Manifest2
-rw-r--r--x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild11
-rw-r--r--x11-misc/x2vnc/Manifest2
-rw-r--r--x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild4
-rw-r--r--x11-misc/x2x/Manifest2
-rw-r--r--x11-misc/x2x/x2x-1.27-r3.ebuild5
-rw-r--r--x11-misc/xaos/Manifest2
-rw-r--r--x11-misc/xaos/xaos-3.6.ebuild7
-rw-r--r--x11-misc/xautolock/Manifest2
-rw-r--r--x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild4
-rw-r--r--x11-misc/xautomation/Manifest2
-rw-r--r--x11-misc/xautomation/xautomation-1.09-r1.ebuild4
-rw-r--r--x11-misc/xbatt/Manifest4
-rw-r--r--x11-misc/xbatt/xbatt-1.2.1-r1.ebuild4
-rw-r--r--x11-misc/xbatt/xbatt-1.3_rc1.ebuild2
-rw-r--r--x11-misc/xbindkeys/Manifest2
-rw-r--r--x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild4
-rw-r--r--x11-misc/xcalendar/Manifest2
-rw-r--r--x11-misc/xcalendar/xcalendar-4.0-r2.ebuild4
-rw-r--r--x11-misc/xcalib/Manifest2
-rw-r--r--x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild4
-rw-r--r--x11-misc/xcb/Manifest2
-rw-r--r--x11-misc/xcb/xcb-2.4-r1.ebuild4
-rw-r--r--x11-misc/xdaliclock/Manifest2
-rw-r--r--x11-misc/xdaliclock/xdaliclock-2.43.ebuild5
-rw-r--r--x11-misc/xdesktopwaves/Manifest2
-rw-r--r--x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild4
-rw-r--r--x11-misc/xdotool/Manifest2
-rw-r--r--x11-misc/xdotool/xdotool-3.20160805.1.ebuild3
-rw-r--r--x11-misc/xearth/Manifest2
-rw-r--r--x11-misc/xearth/xearth-1.1-r1.ebuild4
-rw-r--r--x11-misc/xfishtank/Manifest2
-rw-r--r--x11-misc/xfishtank/xfishtank-2.1-r2.ebuild4
-rw-r--r--x11-misc/xgestures/Manifest2
-rw-r--r--x11-misc/xgestures/xgestures-0.4.ebuild5
-rw-r--r--x11-misc/xhkeys/Manifest2
-rw-r--r--x11-misc/xhkeys/xhkeys-2.2.1.ebuild5
-rw-r--r--x11-misc/xkbd/Manifest2
-rw-r--r--x11-misc/xkbd/xkbd-0.8.16-r1.ebuild5
-rw-r--r--x11-misc/xkeyboard-config/Manifest9
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.20.ebuild40
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.21.ebuild40
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.22.ebuild40
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild2
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.23.1.ebuild40
-rw-r--r--x11-misc/xkeycaps/Manifest2
-rw-r--r--x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild4
-rw-r--r--x11-misc/xlockmore/Manifest6
-rw-r--r--x11-misc/xlockmore/xlockmore-5.50.ebuild4
-rw-r--r--x11-misc/xlockmore/xlockmore-5.54.ebuild4
-rw-r--r--x11-misc/xlockmore/xlockmore-5.55.ebuild4
-rw-r--r--x11-misc/xmountains/Manifest2
-rw-r--r--x11-misc/xmountains/xmountains-2.9-r1.ebuild4
-rw-r--r--x11-misc/xnee/Manifest2
-rw-r--r--x11-misc/xnee/xnee-3.19-r1.ebuild4
-rw-r--r--x11-misc/xnots/Manifest6
-rw-r--r--x11-misc/xnots/xnots-0.2.1-r1.ebuild6
-rw-r--r--x11-misc/xnots/xnots-0.2.1-r2.ebuild6
-rw-r--r--x11-misc/xnots/xnots-9999.ebuild6
-rw-r--r--x11-misc/xosview/Manifest2
-rw-r--r--x11-misc/xosview/xosview-1.20-r1.ebuild2
-rw-r--r--x11-misc/xplanet/Manifest2
-rw-r--r--x11-misc/xplanet/xplanet-1.3.1-r1.ebuild7
-rw-r--r--x11-misc/xrestop/Manifest2
-rw-r--r--x11-misc/xrestop/xrestop-0.4.ebuild4
-rw-r--r--x11-misc/xrootconsole/Manifest2
-rw-r--r--x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild4
-rw-r--r--x11-misc/xscreensaver-app/Manifest2
-rw-r--r--x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild4
-rw-r--r--x11-misc/xscreensaver/Manifest8
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.36.ebuild9
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.37.ebuild9
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.38.ebuild7
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.39.ebuild7
-rw-r--r--x11-misc/xsel/Manifest4
-rw-r--r--x11-misc/xsel/xsel-1.2.0-r1.ebuild4
-rw-r--r--x11-misc/xsel/xsel-9999.ebuild4
-rw-r--r--x11-misc/xsetleds/Manifest4
-rw-r--r--x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild6
-rw-r--r--x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild6
-rw-r--r--x11-misc/xsnap/Manifest2
-rw-r--r--x11-misc/xsnap/xsnap-1.5.15-r1.ebuild4
-rw-r--r--x11-misc/xsnow/Manifest2
-rw-r--r--x11-misc/xsnow/xsnow-1.42-r2.ebuild5
-rw-r--r--x11-misc/xssstate/Manifest2
-rw-r--r--x11-misc/xssstate/xssstate-1.1.ebuild5
-rw-r--r--x11-misc/xstroke/Manifest2
-rw-r--r--x11-misc/xstroke/xstroke-0.6-r1.ebuild6
-rw-r--r--x11-misc/xtoolwait/Manifest2
-rw-r--r--x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild6
-rw-r--r--x11-misc/xtrlock/Manifest2
-rw-r--r--x11-misc/xtrlock/xtrlock-2.8.ebuild4
-rw-r--r--x11-misc/xvkbd/Manifest6
-rw-r--r--x11-misc/xvkbd/xvkbd-3.7.ebuild4
-rw-r--r--x11-misc/xvkbd/xvkbd-3.8.ebuild4
-rw-r--r--x11-misc/xvkbd/xvkbd-3.9.ebuild4
-rw-r--r--x11-misc/xwit/Manifest2
-rw-r--r--x11-misc/xwit/xwit-3.4_p15.ebuild4
-rw-r--r--x11-misc/xwrits/Manifest2
-rw-r--r--x11-misc/xwrits/xwrits-2.26-r1.ebuild5
209 files changed, 404 insertions, 576 deletions
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
index ad64f92fe636..9751760d13b8 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-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
@@ -25,8 +25,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xf86vidmodeproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers )
diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest
index 3dbf9ecb6779..b387673ce609 100644
--- a/x11-misc/3ddesktop/Manifest
+++ b/x11-misc/3ddesktop/Manifest
@@ -3,5 +3,5 @@ AUX 3ddesktop-0.2.9-gcc4.patch 371 BLAKE2B 1932eda1b8881af868df28855b5ef9a6d6bb9
AUX 3ddesktop-0.2.9-gl_init.patch 526 BLAKE2B 0a03e6e04fccc4f2f534ce893ccfe1fdbc12af45029636a45a489405b31f18ccde44d03b91ed7df896b60a143ba24a588119d003fb3094b15227200340dfaf1c SHA512 2f7ffdf022ec2eeb1b06933e09922de6856bfc4a4ee0fdb0a4ec2ba2623a8a50a0adaaa87cfec9f90ad24a1436051fdbcf340664f6458be26f119c4d05d4ce7e
AUX 3ddesktop-0.2.9-missing-include.patch 189 BLAKE2B 7f03939469403fb175a998846707cf8b16fce8300ac4ecf764fbf9e91f647d8af882ddf5eec2e4c6f4420c719f43719c5c7c654f81a57a2f55e2091827c77cc7 SHA512 6ba19f2a760de39a38ad774b9a932d1fa1bca1193707bef5e269c16353df9b8a25cf6d6d3e39e2d3b354125f266a6bf553695b8a9f8475ee3ad247b3e60a4fde
DIST 3ddesktop-0.2.9.tar.gz 182278 BLAKE2B fb963a8bbfcea97da13cbc28890d74ac9d29655e298d76a485ceed5b67ac3557a8e731988e30d5a3009b774d66f8bfb270b0464ed6ffdf27070797ca8440d3d9 SHA512 87de83561bc1614e4dde623197b04e482e04ad363ba88adf4e4e9950a942a5725d2a7199406949981c1a4aeba5d71fb9a1693f99aefa21ed7b83e083bb902686
-EBUILD 3ddesktop-0.2.9-r1.ebuild 1384 BLAKE2B e6b1ed9fea72b84e0db4eea995583e1e3cbe0dc0cba3510c76d68d7c3a9419baa6736bd688e8b35a422f5c5066a1ef3597c234bc08817b33596175fa798e6fe4 SHA512 e852fee84fafe424d96a0c62d932b756a43ae290c9c1fbc42f395a3f99ef0c2a0fc37fe0e137c830283c7569acd722845286c210fe9aa854a4baaad0d20ff6b6
+EBUILD 3ddesktop-0.2.9-r1.ebuild 1359 BLAKE2B 50e780748cadd67bba16f589fea32f3a63cfb5ca66821273b84006031a3c7bb23e137dd89b425486738e3fcd049043270d86bd7c69b4ac44a1355e889a6179d8 SHA512 63e1b416fc25c76b972cf17bfa943ef964239a57c3dcad8e3d26067e2b00843b9a99c13fd5a80c97297206bf97cc942bd10b90c035b473786cc7a5c9f3b878e2
MISC metadata.xml 624 BLAKE2B 84edac86cf43f84b298a8c2e74734f38abad81331971a1e343794f2fbc6111b74f3868bc5b489702cc09133d2408fb0c618b731296dcf4ec0b07f491cdcb1842 SHA512 d59884e855a755ca70d9800007b2c73d32f6607bda8bb9f56c12b0008e5f2bcd58f77580da039db6a1c4f43458922b0e7324c0459c8e8eb2fca8634f054a95b3
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index cb56df181a18..48b5be8f1d5d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
Binary files differ
diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
index 32b264ea1ca8..7db1b31e16ed 100644
--- a/x11-misc/alock/Manifest
+++ b/x11-misc/alock/Manifest
@@ -4,5 +4,5 @@ AUX implicit_pointer_conversion_fix_amd64.patch 440 BLAKE2B 604de647696dc0bd518d
AUX no-xf86misc.patch 3220 BLAKE2B 1588866bdb372b5bfae031569a981e1fc0be716ec2b96cc46aa4118cd8db3e500760fb90a9394abbf792872d7cf65963daaf47c46a5db87249fd172370396711 SHA512 a27a7dff601c35ad5b41170be0aa3b2453c2b46c679f76ad4ae0b229731aa0d1e13e3c3dfeffbe690e119048a51c76ae091fa3673db8ceecb2f82f81d3857488
AUX tidy-printf.patch 801 BLAKE2B 3015b266465ac1da7127cbc2c871daa729c22ce97c8bf9e88dff5ec3228192bc81bbc0fc31239add4256b8a0d44a852eb543079fbdecb909db41ac57f43ec070 SHA512 253f731e5be75676ef56ab320ee52625bee17a0a8f2bbb025efb8b9ac8a49da7330e5123bb0070eaa9c01f3cd66fadb85ead65c75c9412e6503744705402e9c4
DIST alock-1.0.0.tar.gz 71497 BLAKE2B e61a5fd9fb9a5bcc23a535fcc81da7ae2006300c636a6103132125e0c84c18977690e0f44f489788bf8228f0af900638066ab8706ef731fdf32604dc013684e9 SHA512 7f2515410919ef1324019cd8d218650f54537f9fddf1d74bebd255c7572eff9433ded92f2d1f4ee5f352151dd15f4a7f53f7b639f82d4e6f936f831262d508a5
-EBUILD alock-1.0.0.ebuild 1609 BLAKE2B 316289871bd8a91d8e3d8266c04ebd6082d9d60de516841414743f6ca29681d86592c658611005a0ed8154b869b5000363de3b0bbe88bc282bf8447389d82a84 SHA512 cd87ee3ba71b607f0fa41bd941b78fb858f86df6ed83ff58e8e082c4131dbb07cce749a5e3e526d9daf2a586e37ace40fd9a79d0c20c5f1d3551e08e034918c9
+EBUILD alock-1.0.0.ebuild 1610 BLAKE2B 56c877e764ddb6ca65c70f74b3b6564142e566f52572ae4edf52022289e14ae6264c000129a69f9bc1a757dd4d083d53ed8faa2226be3429c796cb054c6a5897 SHA512 27e25e8264bc7d6e82a0e859a451bc0d949f79d16314384d0d14ec8685b185669e6deac4f15225ca592d813c3838b47acda8b77a473355bf254e9418869b568c
MISC metadata.xml 602 BLAKE2B 4afdc04e15531b1ebc4312f67e1c3afca07841f4fc0053994b95ea0e1758b6ab6e146ad1d4e67cd816ee01212f02ff6a1ca9ddb25b8085db17e128c724a72bb8 SHA512 6c78760e2037a294560a54f09469b7fd2840379c7d2cdf417c72f7953e18df437fa327e61efbff1346a0ced4eb443f2e23376a247a24e0286ea186eca636fbb6
diff --git a/x11-misc/alock/alock-1.0.0.ebuild b/x11-misc/alock/alock-1.0.0.ebuild
index a0e77239d2d5..92f0dc70f0e2 100644
--- a/x11-misc/alock/alock-1.0.0.ebuild
+++ b/x11-misc/alock/alock-1.0.0.ebuild
@@ -6,7 +6,7 @@ inherit eutils toolchain-funcs
# we need this since there are no tagged releases yet
DESCRIPTION="locks the local X display until a password is entered"
-HOMEPAGE="http://darkshed.net/projects/alock
+HOMEPAGE="https://darkshed.net/projects/alock
https://github.com/mgumz/alock"
SRC_URI="https://github.com/mgumz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/x11-misc/autocutsel/Manifest b/x11-misc/autocutsel/Manifest
index 2e495c9b93df..b998213e724d 100644
--- a/x11-misc/autocutsel/Manifest
+++ b/x11-misc/autocutsel/Manifest
@@ -1,3 +1,3 @@
DIST autocutsel-0.10.0.tar.gz 329527 BLAKE2B 1ab17fec1dde40fae6a98a9cc079f7080add2a30b3384e7a4cfbe7e85ca13a7394ce96ba1dd32a9d147f123ce44fc4ff7fbbf77a02eacd2301b91fafc3096232 SHA512 2d9b7114fde67ee217ceee673e32b407eef5b266a9d457a83b35d1c6227e5873cc7928aa10f7d84ce5e8c78d4940ee29985696f49b4015269584f1559f6b6d1d
-EBUILD autocutsel-0.10.0.ebuild 557 BLAKE2B 1b2e979e4035fb7865b7593139dee2b5f224e890b4fb72e0716a46b0456b1a03f793176e093733eb0ed63a2665eccc217ed8f090c7b8c5941b07c1c1c48b7989 SHA512 8ce1131dead9359d0b4da3da537b11df55c99d727eab84814a5ba548e26519523b61cfb48a61f8336a840d13b93903aabccc60b2914816b77d0171bba3625c96
+EBUILD autocutsel-0.10.0.ebuild 560 BLAKE2B 5d57760c665817d9db399f69abbb197366ed9d8d6e5d1fd2a6f0049fa1a2bf7c22b4b796ae211ebbb3cae352bae7629b0579c2d15d8d9f9ad6add4612d064fa6 SHA512 479f2f5731d11912373e86a8a266d738f1169bb1dd08625404439134e4b97dcbac41dad4b4d2dc4fb197bdf359a0679abe2dfbf70f89355036ee281a6b192c12
MISC metadata.xml 534 BLAKE2B c950a34e7afae11752f68c5cd82d09d7e9ce80ef42bbb0fa4b05b43f38d495726f4318e65c4cbc11382699e08f411644c2aeef7153e04c6df0c68c070b33f63c SHA512 cce46c479474f4f65e62088f8f9f294be994deb6ce0d25f4d8e87c743d9204780c0be9e67887c60de201193761e121dde7df19fea8532d2d977eb9f7b354a7ff
diff --git a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild b/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
index c69e5ccadd2c..f7dec4fbc608 100644
--- a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
+++ b/x11-misc/autocutsel/autocutsel-0.10.0.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,5 +20,5 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
"
diff --git a/x11-misc/bbmail/Manifest b/x11-misc/bbmail/Manifest
index 3dadd37f689b..39d83c591fb8 100644
--- a/x11-misc/bbmail/Manifest
+++ b/x11-misc/bbmail/Manifest
@@ -2,5 +2,5 @@ AUX bbmail-0.9.3-gcc4.3.patch 1419 BLAKE2B 393a9b16060991d3ef047687b9149072754ea
AUX bbmail-0.9.3-gcc4.4.patch 2776 BLAKE2B b65b33d0f6d841a58e7032460deb85a57f1fb6522c01701e1c51eb0a8e834e05ef3435b97517a9815f8dcbf90cf73327e50af623ca109337a3c72c5e856d5414 SHA512 b9e822b518df2f2dab6fd734ece1fdb51f2c3b9c36d6d358f6e1e6709df06c2947923aef963047c809b8d1d9d0e5ef8b4e36fde700a5395183a54c55424eece1
AUX bbmail-0.9.3-shebang.patch 276 BLAKE2B e6d685f91e5faf598cb9df8494b305de986b8d493b3b1edf1cd053b672f625c121b84ee908dff296161e63cfe4c010ab3f6df86c7e3cff187e588d4f3bea6d55 SHA512 3d84c579f461e97f542a1e21fe365c4fa86731dd9af0e4cdfcbe9bfa83c8b0e10f3a18b67515e35046f218c3b704838115d4695b84c8f2b879a90c89d97d8752
DIST bbmail-0.9.3.tar.gz 186433 BLAKE2B 9fa31bc3495fc9f4c0fddbf38645c7fd8a3c50ebf364cf487d8d4e01e160e34151e741472f86c2edfa26869f7077051919456c00ba566815346d66edb161c0c5 SHA512 2c0e22092e08d247edf170e22054b6d108ebf84d3f606ab8e9f1af28154bf4bff26828b5ca55622563eb2cb468d88046d5859b79c0f272895c8785becd69c860
-EBUILD bbmail-0.9.3-r1.ebuild 680 BLAKE2B 178bb8f36e828475c5abc2a829a6306f6e68e86e30989219b69be9a2898b855a79fe517321026f84adce638c501ee9dd84665626ef35a8a2aefc7d756290a767 SHA512 c42902719949b4748db7fb10ffc67c8d82fe2ad568e73908dfdab8e2b62a8c53df40bf36b254b81c12f7ab70c13978c30c4cc695983e959f8d645f0645bb9121
+EBUILD bbmail-0.9.3-r1.ebuild 683 BLAKE2B d85a58fad5ae58defd7a1569cf5a608ceeab6273ab045308b734f8d4d58ec59930955bd54e81d68d961afd8039c64938fc69c5cc50390564ea38d6a94261ff29 SHA512 6702f73f87db60b8615362a3c27eead80c759606477287ce47ce9691a7a08a03349d9c29e0a60758446ab4bd7b923e186c32234d399b2fb7a839499039043688
MISC metadata.xml 324 BLAKE2B 04cbb4f74c577a1a780d1a11507a6e9ba64f23b0f12ed887e68fb27afdfc42ff57f21e3c8173344fa64145e8f3f92e29da34a790fad4a1c8fa6ca508b958d13f SHA512 a22b46d17d0c950a42a5fa84a7e8fbae3530f4f9f9a14be3a016284254e5cc35026863843fb165e408130e9a3adc66083e44be9aa239b9f02eefb9098824ba3e
diff --git a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild b/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
index effec90b00f1..6acd544ba6b4 100644
--- a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
+++ b/x11-misc/bbmail/bbmail-0.9.3-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
@@ -20,7 +20,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
PATCHES=(
"${FILESDIR}"/${P}-gcc4.3.patch
diff --git a/x11-misc/chgres/Manifest b/x11-misc/chgres/Manifest
index d34927c5e90c..2941a5adf437 100644
--- a/x11-misc/chgres/Manifest
+++ b/x11-misc/chgres/Manifest
@@ -1,5 +1,5 @@
AUX chgres-0.1-flags.patch 611 BLAKE2B 9b7b69bc826857c54401c7aa6b6d00bef4948af89edb79db09b11f1bec0185600c6e48fc262c6dcef3ff585223a901acdb1681dc6e656062cfc08a41f21fda2a SHA512 7b0ac6dfd7f1b4ab2a40183b68362b52ee8ef94c852fbc5dc34e84048345b564247d188460ec3bd742b7e007cb4ff0add9c49ec084ca0557e219e8cf80773a40
AUX chgres-0.1-includes.patch 387 BLAKE2B 03973c4373fa86877cfbcd81ecc3e109493f622fe3b76f2574f80ba7bef3ed08946ec836b8c7492664b2120714b5ab473137c73deccb0d44290272a78f3e24f6 SHA512 71eea147b53c035fecf5b33f2f7f00065d52e2c07d6b5ccd6cc424cef4f41a3e0e0cd7c71cf5e5106bbcf4efb2810b31c47cac6ab91826a92c03b1075a953709
DIST chgres-0.1.tar.gz 9219 BLAKE2B 17fd2704f1c7dc44b20323209a3c93e3b56382d0a56633f97f93372aaf6a9fcfdc6dde58ca5f10d498f406fbf2f90324ccc03cfa43645fd0b60b1777fba6a6af SHA512 f7dc698d7606a7a24e8b63b4addfe7e83549d358a49d282d7ee4c1c160f1b79be87f0ed40d830c047b31b41409818dd9fe5b8e0ff165fed226de210aa3701c96
-EBUILD chgres-0.1-r2.ebuild 681 BLAKE2B d87b09287546c69dc5e495603ca35f30792c20fca186be9ad68691cddba5cb78cc91eb2a80e7cf63195b77ccc70ea80993d68354c889725851e5b7df647e0606 SHA512 0aa3776068c330c09edb305d8c1d4f22f44989d77175136baafda149fccbf348a57594a176ca2d793c04cca099f2e1f31dba130051800e8120e402fdbb46e5d5
+EBUILD chgres-0.1-r2.ebuild 650 BLAKE2B 016f470b40297e89e3a100eb101571dae2ead0ce426240165c7b6e696621a871ba30d6ab28b7dfd0300393d55a487475aa7e2b76b060b2cc31dbf8aa039d1636 SHA512 ce1392eae99d1b8b6d48e0c5044616f0e59e2e32cde989f50c1695bc844a8a273a69584ca2edded9d688d707e0486a5bb3d9ddd86f71b7a1bced20bcfd550bdf
MISC metadata.xml 563 BLAKE2B 1e9f15ef09695743d4fb71fdd7ca9e9cab4e41a52d450bda15bef0f6ce1aadd10a21b6be694016e1f8831fcda2f9e66d005e9afea4d67ca0fac20769ee86b22e SHA512 c17e646616de465dad0aa571a2d11508e501a69e7cd897e68f695b7abfaed8c1a74f67ceb649090e717aaa22016ee4969d0c68a30afae46e9bdc448dfac6406e
diff --git a/x11-misc/chgres/chgres-0.1-r2.ebuild b/x11-misc/chgres/chgres-0.1-r2.ebuild
index c88e4dd3ba1e..af5228d50ea5 100644
--- a/x11-misc/chgres/chgres-0.1-r2.ebuild
+++ b/x11-misc/chgres/chgres-0.1-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,8 +19,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXxf86vm"
DEPEND="${RDEPEND}
- x11-proto/xf86vidmodeproto
- x11-proto/xf86dgaproto"
+ x11-base/xorg-proto"
PATCHES=( "${FILESDIR}"/${P}-{flags,includes}.patch )
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index 53ef4ce61183..2d600587469f 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,4 +1,4 @@
DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535
-EBUILD compton-0.1_beta2.ebuild 1613 BLAKE2B 68c4cbbdf847505310de9018b4383c711c1eb9b39c75786724b86d28b66b604f52a202aaa000826caf5c72a97b8c0e111bae60e096f10c30fc772bcd0ea3fc3b SHA512 e6611bb4267c2841d6c462ea9854ed7b2506033100b9a11251397e6be6fb692d4ea152961c12dd38d2fcca0b9ffbf8ada99dc9391437309132c689741c0e3597
-EBUILD compton-9999.ebuild 1534 BLAKE2B 70497934cf7bf0455d42c94064c596a46c5a01f02d6d68adbf581d1fda89af1ff076132827c98c70eff34e1de3192e9f7e72c59b2d984ee2812d651fb744ed04 SHA512 44fc20ce9affc160dd4d5e7eabeef12c59d1fee1bb85ca8759140b56b5d70aaf6fc01d88877aede589e1a8940e1061e3a89697c912f31451f1f6ab2db9535f3f
+EBUILD compton-0.1_beta2.ebuild 1616 BLAKE2B 0318edda3df5b9aafd34e683f3f6bccb23748d5512131d22bbbaa9a40bacaca31aa531489b71f7749903b2fcfaa618f1ecad9fa0f68ebdabab7052ab6836de0a SHA512 8bf2b00a9d1404a03e7f268325b938c0acc50e665cbb9380d935c8445cff14ded66ecf81e851a949efe75f9049a357e0790fadb4d2d12b4c1b5a85f932a298a0
+EBUILD compton-9999.ebuild 1537 BLAKE2B 2e7c807a0ddfe672a3946394ed3bc16288ec72a050a2f0f0c30829d2283737e39ebb3bbdcf047c71ef478d23e7f2566372ff17f07fc41822f3ce5ee25156a678 SHA512 8b8aa77c5357b2d2c6627223d3a942388c22245646c035fff599b33e1b6df6494dfd1ee4d9cd0d9ecd5c1681510f30602f028e436104cd752762bb02b23c43c2
MISC metadata.xml 417 BLAKE2B 4d9c38f837302c887a12fbd6a283c4bd7a75dee9a73096b08f53913398d22a67b0e975db1266341125b149ae2c490de2e7d96077fc1817f28405af27ad2f2a67 SHA512 3220e8f0f2d71f507df50bdd8a7837042ba8ad98ae9c06b3834ba72be6e346d3af614016e657313a55b7c93351a36669c4bb5b35edadb0284a71076192ea53c2
diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild
index a12b639f15df..c0e2472a6353 100644
--- a/x11-misc/compton/compton-0.1_beta2.ebuild
+++ b/x11-misc/compton/compton-0.1_beta2.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
@@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
app-text/asciidoc
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
drm? ( x11-libs/libdrm )"
nobuildit() { use $1 || echo yes ; }
diff --git a/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild
index 5b77b9aa14c6..3837f2f126b9 100644
--- a/x11-misc/compton/compton-9999.ebuild
+++ b/x11-misc/compton/compton-9999.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
@@ -37,7 +37,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
app-text/asciidoc
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
drm? ( x11-libs/libdrm )"
nobuildit() { use $1 || echo yes ; }
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index 352d2b9fe186..f9c1d92845a2 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -1,3 +1,3 @@
DIST devilspie2_0.42-src.tar.gz 48663 BLAKE2B a2340f64191ba31d554aaab8c1ce74ba2252ac4f1524446c88eb674d9bc49225298eaa64c9df649410cb8a07993e891491f7d885af0d917810143ecdb8916bbc SHA512 796b95ded542a76343ffcff25d7838ee3bc25f37d9a02d06785a71aeb7c0da3ef05279f9b88216124c5c9c64754fde59973445a954b0f446f5b4ebe6a25f3055
-EBUILD devilspie2-0.42.ebuild 1126 BLAKE2B 54101fe9189f5df40d562607fc2edfa2edc495b6b41609b902a9701e8e3fccfd3c5f961043a771a2452fc0b10c6eb90ee61a320fba11454887540b51b611a247 SHA512 76fd0514fdefc6e3a0a882db1ece87c5ff3e5058c4419c6ba314297acfa662e993c4f44244c03a2e302bc22cfbde99ac73a22357d9e4821d2b778560be344f0e
+EBUILD devilspie2-0.42.ebuild 1129 BLAKE2B ed9f2c0946576ced8219323c36800af1daba83c8b90a0c23db364984fe3036d76bcac3a1f4152c1fd9855a1c044c46d8b74cb46746391ec7e206834a3731ff53 SHA512 64079ce5e5920d1f8a6f7e87674e8aefc139e29be7bb512c491f78ae9a0d53a95e7f68c0bb903e9860ca7afa834d6ec5b51c2797f471caa3f862b506760ed12c
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/devilspie2/devilspie2-0.42.ebuild b/x11-misc/devilspie2/devilspie2-0.42.ebuild
index ad543d5081a1..5d8bea8c26cb 100644
--- a/x11-misc/devilspie2/devilspie2-0.42.ebuild
+++ b/x11-misc/devilspie2/devilspie2-0.42.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
@@ -27,7 +27,7 @@ DEPEND="
${RDEPEND}
sys-devel/gettext
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 968d285f1c9a..a661bb43477c 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -4,8 +4,8 @@ AUX dmenu-9999-gentoo.patch 564 BLAKE2B bd1d71e7e234c00a6d8b2f099b50e04fa6ba848c
DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
DIST dmenu-4.7.tar.gz 15597 BLAKE2B d942c541a0e76d7287c85073324b0107224256d944a87f575e02238a10f16eb62d1eee06182da91242c049e3b17fa4068be72ffd1c70f6a7bbf5a0596fe62162 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c
DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
-EBUILD dmenu-4.6.ebuild 1304 BLAKE2B 3ee7a6e77913cb0f56cc993a53a2e0aa6db9e672492fdcba04c3a0ae37156325f4a7a872a52fd038f8065586abb6cfc41b6f0128965c48394ea7d167ced7d1a8 SHA512 7f18e03b71c1624a8e12d3afaac86471d45fbd1112474d13c3e09f32d05f08aa70104e694e467b98f22ea7174396c682e2febefa78d4104a16dc063c421a5e3f
-EBUILD dmenu-4.7-r1.ebuild 1363 BLAKE2B 50df42df0d21c21e021dc65b00e6631f9bd5929ac91cc456e041346dfd62c829e277a1eaf8258596d3ae42dfc2ebf86898429c1a6a2dffcf976c523efb759554 SHA512 ce758035973b61c24c01d23e96cae27e519698a2230ebd5366daf8126a7e065bbc3bc300467264c6f658042834f1fa4d46839894593c2bbd6caf3054f3fc15ac
-EBUILD dmenu-4.8.ebuild 1363 BLAKE2B 327c0395748865b5f653bd983aa24a4f8ae2c4938644149f3517d700c29c8187c55abb57b104202859291bfca2b878cd3db8e7d96ed6367341a4d3acd89ead41 SHA512 ef85769d84e91bcf8ebeff02b9c58d913ba6294fca1690d536cfc1f2529b66068b887a059b3b0b9c0f512be8b45e8174bcebb88a7919b9c2a8b32375da723fc4
-EBUILD dmenu-9999.ebuild 1187 BLAKE2B 43bb2a12438cd4e0b025807cae79940d6af7b1b92ec23ec742d8a81b09c32a6907e1647fe2723924ceaeeae79250151a317e215c39bd58da4f85b249bb829e12 SHA512 90a387bb053d733ee3616d23e227e0620750fa6140e587eee2ad7516f8e97276b4660782c175cf94e23f7d06dc51a14ddcf9b0253a35b76e3a57688f04d66c03
+EBUILD dmenu-4.6.ebuild 1268 BLAKE2B 525a04d499b2b5f6cf2f3b4abede52af3c7cf637185cff3174841b2c833468887b16a54614c7ce97f5a74a924031bc971706a0b79b427197878087fabc6105cf SHA512 6950b25d07543312738ee66bd8031d6a12fa3b19aa9323f1a1847bcbdf79c18e5f23f813b40784b649f4543b64816d5c019b8e5c87c275ea1cf91e468cafd98d
+EBUILD dmenu-4.7-r1.ebuild 1327 BLAKE2B 0646edee514a726203e4c30bfb62ec930f363824759b6d83f6afb42e4f573e0ab781e3c8305229f698209fbcc84a056f2ffb5456f36d6e804545a29974e967e4 SHA512 3262456f61e12f996bcecfcdebf2cf963bff0a3682b25b6881955c875c09586800f0c4acd43963798ab81f30cf6631c990a14a0dcaa8d0a53f1183d78491ee54
+EBUILD dmenu-4.8.ebuild 1327 BLAKE2B 0646edee514a726203e4c30bfb62ec930f363824759b6d83f6afb42e4f573e0ab781e3c8305229f698209fbcc84a056f2ffb5456f36d6e804545a29974e967e4 SHA512 3262456f61e12f996bcecfcdebf2cf963bff0a3682b25b6881955c875c09586800f0c4acd43963798ab81f30cf6631c990a14a0dcaa8d0a53f1183d78491ee54
+EBUILD dmenu-9999.ebuild 1151 BLAKE2B 9c85ecf080068cbac6b58ef558ae99747a854fdd34372e9d5d53513e66af64cbc73dc3b56cdea4428eb2c3ba632cb909e2c87db011d4fa3079cc36c1a0a0922d SHA512 3f5ce19b865487b2ab20e35d05086818c81fc0e315fe4b7e1f8b840ab2e3bb87b0dde735e3a73d7af270e96e73ba70174a25ec35ff4ccbd5dc0de1f776108163
MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index dbf358fff497..5d02c8d814f9 100644
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -21,8 +21,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/dmenu/dmenu-4.7-r1.ebuild b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
index 05dc375cb2ba..1bf43050b79d 100644
--- a/x11-misc/dmenu/dmenu-4.7-r1.ebuild
+++ b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,8 +21,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xproto
+ x11-base/xorg-proto
"
PATCHES=(
"${FILESDIR}"/${PN}-4.7-gentoo.patch
diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index 8740afefa1f1..1bf43050b79d 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -21,8 +21,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xproto
+ x11-base/xorg-proto
"
PATCHES=(
"${FILESDIR}"/${PN}-4.7-gentoo.patch
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index 5cb15906696b..f2222c4d6bc8 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -21,8 +21,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xproto
+ x11-base/xorg-proto
"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
diff --git a/x11-misc/dxpc/Manifest b/x11-misc/dxpc/Manifest
index fc3ead0c4e0e..58b182307360 100644
--- a/x11-misc/dxpc/Manifest
+++ b/x11-misc/dxpc/Manifest
@@ -1,3 +1,3 @@
DIST dxpc-3.9.2.tgz 199267 BLAKE2B 99780b35827ce29bdb0a3bb0b1268aea6d03a1b91528023de887820cfea37326f2962c7103c3c079943109a1628fc693039a3b834eee771a7f386d57508d534a SHA512 7dd31f024ca9eae763ec82c424483b4dd4ff667ae70666f3de298e5acb75a5028134914f9c58ab07c16a68de53e170ace455653d83ffe6db290b952ca82fad38
-EBUILD dxpc-3.9.2-r2.ebuild 523 BLAKE2B 6a683331e7b2060be6a65c4b22f45c69834e3607508e124fb4af50512bea61beca4331968e08826c3e358e1d4f3a8e310474b57443a6993c7e9460a44240ae3e SHA512 20acad908b6e8df7084f497da9b4513d797f19951e41b579b3c6d95b3a1281cad6388ce9b0ed5361b7839af3282d799f1323cc81746bda1938985a9e534a9285
+EBUILD dxpc-3.9.2-r2.ebuild 526 BLAKE2B c298f10d41c9298c19db31f7479caf503d88e37eda12f49307fc40ed913093470d742f22277adca9aee1599f487f739e8810d388af0c13ec54355470a0c3631e SHA512 64c80f3163ae1c687d3d3460c860fc7af7d2f987cd92fd43235799a570ff36c0a420e4fe01b46c22adbe7e3288ef9629d678b8a0479e8fcef2b347d1c89052e5
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild b/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild
index b1761c0c8b91..14d7f61a1526 100644
--- a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild
+++ b/x11-misc/dxpc/dxpc-3.9.2-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
@@ -15,7 +15,7 @@ IUSE=""
RDEPEND="x11-libs/libXt
>=dev-libs/lzo-2"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( CHANGES README TODO )
diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index e2986d2a844a..63ac7020a529 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -1,5 +1,5 @@
AUX dzen-0.9.5-config-default.patch 2649 BLAKE2B 1069b1d94482fd471387ceca9c727eaf65f9ecde401015a114e73498874d7d04e3c4ec2e7062e245bcfd26a2feb8db5d4b39e072e64899eedca34d3033813102 SHA512 4884455ff03197d718e5700106b4b5250343a69b11cdd6190580f89e70306d97a1dde8154baabc79a909ed571806a992fa643d7380830257331bec477e46c54d
AUX dzen-0.9.5-off-by-one.patch 188 BLAKE2B edd3b393c3b4cfb3091cc7fe3ca156b06fd178e53a24ec08967765c90d60005415109f9c85e67680f735c037abe4150cf162b184bbd47f108ac37b26ec2618c8 SHA512 1a82875ee296af37d559b14da4cadef40f2cd6842d67cf6d761d0c65acd1bdb51b0d8096282f1172f109178ecd3f3c1debef809373a0e6ab04fb161d57e20f8d
DIST dzen-0.9.5.tar.gz 38167 BLAKE2B 92297cceca2215d812aa4536bd7421ab992a372667ca832de70a2bf43faea4b5e7beb147a454d7ced5be4e53085f4eaf15d752888ee019d799cd3bb8fcbdb6ba SHA512 ed4eb5d657d8f3822d8fbf224da5c2d415852c340959840051ec9cfc63f90361e09b9d36cb8221cf046ae66af02b9fab67f4f16c834c5895e801d452e4f8a916
-EBUILD dzen-0.9.5-r1.ebuild 1614 BLAKE2B 6d4776d8858e785538256c5362f5b6e1090dedb372feeb3cd7162fcf3d6500263c5502a038bd1f300d84559e24a0b4e9d809907fe80e707ca081df2a2da81983 SHA512 699247cd6b41c947de2157b937482baff926bd02339cb06b06195bc234d464857ab333ec911ca7d7ec0224ce378102e6d7a3cfc0e097c1dc17d8f931ea061884
+EBUILD dzen-0.9.5-r1.ebuild 1578 BLAKE2B d67c414c9ecfa47316f9f8df899928f2c0c0cf5eaa34898b2445be7c1923bc74c7896425969b96ee13b173efce4653e04a11016a8b97cf11bb38ee584b097925 SHA512 e5f07cb9df6dd14af89441659de778470924cc4c681feaa176e9282a05f03186e0e7d14b7782d4fe2334471f19995658c80a11411240fa06a9d80f1a455a513c
MISC metadata.xml 642 BLAKE2B 28355993f6f8edc43e8af4717523ae4dc0b249f88ee5a85bc20e23d4942084dfc29d43a71c9163f2a3bfa4555dca5648bd7682429527124502be4f2eef10288d SHA512 3f7b850582bdc314f4bbf795a3171f27ac8e9c41eeb56221106cb70f039ce37e62b43b2a09c21862cb6efe50e22ddfa45b711c809ba8347c52010188c2207e81
diff --git a/x11-misc/dzen/dzen-0.9.5-r1.ebuild b/x11-misc/dzen/dzen-0.9.5-r1.ebuild
index 12498cc73da3..9addccdf4bb7 100644
--- a/x11-misc/dzen/dzen-0.9.5-r1.ebuild
+++ b/x11-misc/dzen/dzen-0.9.5-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
@@ -24,8 +24,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
- xinerama? ( x11-proto/xineramaproto )
+ x11-base/xorg-proto
"
DOCS=( README )
diff --git a/x11-misc/fbdesk/Manifest b/x11-misc/fbdesk/Manifest
index f4bb1697a69c..e72e0693eed6 100644
--- a/x11-misc/fbdesk/Manifest
+++ b/x11-misc/fbdesk/Manifest
@@ -3,5 +3,5 @@ AUX fbdesk-1.4.1-gcc-4.3.patch 2703 BLAKE2B b18c8e47816715c9b48d34d2457649ca22a1
AUX fbdesk-1.4.1-libpng14.patch 264 BLAKE2B 8a1a00adb1dda5800616f41ba1b983cfa1ac8b41177a1e26cda3cc8f98ed6d69288a923602cdde0b2cfd95d6be0d2ad03b78d26fbcee75c9e4f2f3a9394925ea SHA512 64ec6f394b63461955489ae44dd63a10a76050261ecda7e121bc62c65aa938c0db18911969520c2836d347b6bc765c3f1004085b42cea1c61900db49a0501cf2
AUX fbdesk-1.4.1-libpng15.patch 5827 BLAKE2B 8a9b6bb10c50de3fee5f86d7a02710a8bca70cc937b29808386a4ce8a4cab9a2cd564fe1f2c6ae9850a41b4e2d5d048f1b9d7f0e97254f8c08323eacfbda2b0f SHA512 4d46b5acb6998069e9a2eac30c1765b315e2c8f03a7b52b1b99e3ebdb9fa35040ed0937347d92b7df2b7aec101e0bf7bfa38cb77ee28dcaa2f755fc6347bf25b
DIST fbdesk-1.4.1.tar.gz 426550 BLAKE2B cb83e81c3a25df5f608cb6112552bc11f9b51539ce60b488b35f0eb618482a325e0613965393e417d85f25bbc2a4c11d1a09207b89a08fbb2140f427ee246186 SHA512 0a99ae062442f85a9d4018db0f2815c0e537488999e71aef18eb3df09526e2b9c931e5caf30bb0cf484ddce28c3fc3672773fbf576e3f932f30ee48c89b346a0
-EBUILD fbdesk-1.4.1.ebuild 792 BLAKE2B 1887e50e82b1189c67c3cfa04a5823d9ca268bea52ec1563cf65ee3874384505491823b406de0cd3344ef810ef7397df341feb59bbd3bfeda12997b8ef3be47a SHA512 454f92172ee244f0a77e93780f365958dc73b7e1fbd9cbf2d09b4d7a89c6a64aa32053fcb5d4893bc2fb9eeed6267480c4830a3bb346d715bf488f5b1e6ea8f1
+EBUILD fbdesk-1.4.1.ebuild 795 BLAKE2B ca3b39d4a234980bb72b5c9d3145c75cc2fe7009d13d47a22aac5b555716ae32915a2df011f4d7f687254df140cac5e3aba36526bb25f8650e8714241c88122c SHA512 64ae9ce835181a877bf93772753657befdd339c2cf8ef41417011260e94e34cab1a045e407d6bbc2fd93d2dad61605e2c03a51dac4244ec32c1cbbf825447d1a
MISC metadata.xml 244 BLAKE2B c29b82b69ee832a577a8f60b3bed7a54ad4cfa9102913a2c29816b7d79ea3814ec51349fe77f7e87c5ce4635a69856309f7ef521dcad844d162c511d85f2f3b5 SHA512 f73008962558d828dfc4cb3bb24c36e1c28cfa47a679117b292cf378eb73f8750bb7f345928e9d149a648ba708f721ebc6ff2369405e842bb27194aa7a775e9c
diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
index 2fac809fbe2f..6f6b0d17eab1 100644
--- a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.4.1.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,7 +20,7 @@ RDEPEND="x11-libs/libX11
media-libs/imlib2[X]
png? ( media-libs/libpng:0= )"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
PATCHES=(
"${FILESDIR}/${P}-gcc-4.3.patch"
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index 8918fd4558c3..591de2214661 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -2,5 +2,5 @@ AUX fbpanel-6.1-underlinking.patch 789 BLAKE2B f0995b59f54eb5da7a7b74d470604abae
AUX fbpanel-7.0-clang.patch 2596 BLAKE2B cb9e42fb7afaf007d49c54270ee6e09a551ee5c538d82b4cf4eb1c79663b6bc517e3d4da0117c4fbc5030df0c907289ef843cf59ca3dec69ba8f5ad3e8a1aab5 SHA512 78dfea33f3a29b857768b64bc6ea61404dee3cb75587500e98e17aeecf92a310abf1796577d433e13aab4a5524ce2400906d0e6ce2ab468a488dbae03857902f
AUX fbpanel-7.0-shebangs.patch 2348 BLAKE2B 8a68eb84f0d4c28e23483724c2600e10375e6bd96bbe640f6d1ff4ef47c17ae140873229e95322de2fd825cf5dd54d6eca6a08a4058e70d3b185f4f8b1d3440f SHA512 547367bc298548b0936e4b83e8ddccc9c9e689f5aac8a7aac1ef5e09050ce33936dba4c39d971c4f3ff5065daa55bc28989588cb08e8277ca9e201ca6994eec7
DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
-EBUILD fbpanel-7.0.ebuild 1335 BLAKE2B b3d522495d98e5005fb001a3f1bf4807b0a03fcc01af9ed98e23c625019dac4e4589d7dd53640630c0a5b4899ccd9bcf9cd633e1d837a33670649740da31392b SHA512 32bcca23691bc8478b35c4bf93e05980fe64c2551decec1cb9cf4f08dd80d5eaceadacd403fe1a8db006dc0c7d27bf9ae72d8a4ebcdbe343f059825e44fb679e
+EBUILD fbpanel-7.0.ebuild 1338 BLAKE2B 04c909c0eddf4b032751e16e259fc90899f42d6b086515ebda1400722ce63ba66e0fb08bbafe19038fb0ac3e191e42d89272e046b7e30d16af97fc4b483b767e SHA512 114809d18d273bc6c69e951ebb537d3fe0e5addee25d7fdce480d019a08b2951a93caf4aaf141882e1a28f626048dd105ac3d42f7d1c9e3b34bb5ccd1d50c0db
MISC metadata.xml 421 BLAKE2B bec71cdd70517d1087d289c1124ed74c9540601d34de83aef4e2d45c0c3c1d3c6f6cef080edd7dd6641f146752c81a12a5c34658f8f097b940bf67ea9c024a96 SHA512 6e50dcf1443603726214701d8187864db64227db01b5c19f630d703864faec0d4692a5967a6286bd5fcd0b4762997a2bcb8ad6d4742ae5b2dc33bfe38d808fbe
diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild
index 8a3a05f7abd3..60b62d30aa6f 100644
--- a/x11-misc/fbpanel/fbpanel-7.0.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0.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
@@ -26,7 +26,7 @@ DEPEND="
${RDEPEND}
${PYTHON_DEPS}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
PATCHES=(
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index 29d4cc9eb8bf..9795ddaac73f 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,3 +1,3 @@
DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
-EBUILD gccmakedep-1.0.3.ebuild 443 BLAKE2B b0fc0dfbc81f268f87cf625cc5e776f582f1f2d67a1460bce7a52f4cb733c8606345c2e7cdc7a1563c3f64cecc1d49a07e428da5b019fb9ecd1a02f7b7749662 SHA512 65dcb22feafe14c659ac5ddf25159839f2ecfc14427019940b74f1e2e9173404faba88911948e465849def07267db400900d24cba47ed722c5ef0ec877f6d24e
+EBUILD gccmakedep-1.0.3.ebuild 446 BLAKE2B 60c78ce3d332150270cb83248adb545db77fc07e6bcbd77e5b4a5ac3d0544498f5876c791f47da69dd1d4e8be3292c145aec05f123d93bbaf000966c837fa609 SHA512 0218532ade41810ea98f91b057818c8a3b9767f5230102bc80e1d056e662a921e29561e683950466a79e14244519e08892befd439e732ba47aaf8f0c53726e58
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
index b2ee97f05ca5..d834582a08e0 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-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
@@ -9,4 +9,4 @@ DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-DEPEND="x11-proto/xproto"
+DEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/grabc/Manifest b/x11-misc/grabc/Manifest
index 849ba40b0792..906eae6a98b1 100644
--- a/x11-misc/grabc/Manifest
+++ b/x11-misc/grabc/Manifest
@@ -1,4 +1,4 @@
AUX grabc-1.1-makefile.patch 893 BLAKE2B 0a7738ada49d77f9907c61570cd7e2c1ec33c690e6d0dadd3bb48d8552a4d9d4cc1bd73b0416b35a3b553f27a11bd6606808750a1d0483d46a6540110f149398 SHA512 dabd881ff69c44550337ba75b1ea42490777cb6f5d7759da095e5445d68c3abab1b02601e64064d4b558c1136f7e777d7966e17ca37d9ec2f8257199416c559e
DIST grabc1.1.tar.gz 2983 BLAKE2B 751d70fd1789e7b0cab8c8a9ac185c3f918de0a948f5514514dc0fe489cce0feb3fb9b17656cafb911735c84f5d8c990af571ed0ba454fb6021d4b6cd8a4aeee SHA512 9a2416fd0cda7bd6fb65092572e6ba932eeac33a8534efe53be8f4bac3576884003dd50075363acd2d8466a406ba8799a0cef51086700269728894913a748aeb
-EBUILD grabc-1.1-r2.ebuild 662 BLAKE2B 2ac8e9a8aa95c0fe12aa04e667d5b2ccda6682cdaeac313a0182952147cd337c3a15423ec810c60d1930153f3098f0f85625972b4124c82df453d8c104280c6f SHA512 1116c337c9fd81c5ed4dbbe534d1b9ed1253d3e97c21b2c4c4f1aa73f4aa15c1f66141e0ddfe07a88e137fdaf530d477485eb0a71c0d0976053287bab3c515d1
+EBUILD grabc-1.1-r2.ebuild 665 BLAKE2B 6cbbc1831c03c80be33f9c0154903c70bb30dffee84464c280a177fbff6c3700c1bbfdb37525235d06965174fcb44377f800683284c9e8e6c98896f9ba32fb85 SHA512 afeea8b62d56e187c19c9b2301b5114e7ee4f1119229e961b8e8bae00e95523a509ab198fad74f242903819b3f826ef22a4b20a6ab77d695a96c125ac9450998
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/grabc/grabc-1.1-r2.ebuild b/x11-misc/grabc/grabc-1.1-r2.ebuild
index fc963dc09905..236e8510f814 100644
--- a/x11-misc/grabc/grabc-1.1-r2.ebuild
+++ b/x11-misc/grabc/grabc-1.1-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
@@ -15,7 +15,7 @@ IUSE=""
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${PN}${PV}"
PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest
index 670e9bf8bb02..ae2f22e35e00 100644
--- a/x11-misc/habak/Manifest
+++ b/x11-misc/habak/Manifest
@@ -1,4 +1,4 @@
AUX README.en 6729 BLAKE2B e7c97c01b774d6813bb87373b8634000b71094ad6668e6402805d8fd5ee6ec1cea523bd4239f0ae1b7d4f53fecfc7545c4990a172b87a13a8a0615d53b81ecc8 SHA512 2857284f10734223fc03c57150f796bad07ecdcf9fd687893155f16b3633903df322d397be7f5e51f2c5ac87ae27d246549dd098b36e061ffa2d2dd3ae610e58
DIST habak-0.2.5.tar.bz2 22657 BLAKE2B 10b3c4808251b255bcf26935974514a2df5946520bd4bc080b9bdc551c727925c8b9a7485124013303654769b9daacff42d54fc0e5d567b26d99c5a75a0a50c2 SHA512 256ac24a3b322397b6cdbd2ca8add5938c77d166092a783234baa6186c3b4e01aeffd0b890749c7ac14aa39961e5fc6326f614ceb04eadfc5e4af282d04b7188
-EBUILD habak-0.2.5-r2.ebuild 962 BLAKE2B d0bd8343e2dbb087b3df59a309f6eeff1ddfdb848da5c84c90984e0ca3b45397b8df5d533eb4a7c516417481800d542313201d387b81df7e4131924402c55b9c SHA512 04097126743449ba3129359018aac672cf80a7c1a059dc294af9d8ad92dcb5429468e0566773f2a7ebb1586f972c421a8116fdb74e42abf00c56f44afcfe27ea
+EBUILD habak-0.2.5-r2.ebuild 965 BLAKE2B 578a45e00020f338579dc8bcbe1964bccae314300f89682b6a5df9209a7319d6061b0a3ea60840a9bec06c33668bd7a2e52ab616b6489f04583cf4a682120b73 SHA512 ddd4d9f6714cb4b15c7e14d0dc557e5a6b23db5dc34248b48a35cfc35ade02b0fc97051bf6b68939d5cee34039bf6800a778777ba49e791e5b7cbfa9a0dea67c
MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/habak/habak-0.2.5-r2.ebuild b/x11-misc/habak/habak-0.2.5-r2.ebuild
index 31cb75d3256d..d7fbf4a80f4f 100644
--- a/x11-misc/habak/habak-0.2.5-r2.ebuild
+++ b/x11-misc/habak/habak-0.2.5-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
@@ -17,7 +17,7 @@ IUSE=""
RDEPEND="media-libs/imlib2[X]
x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
# Skip into the src directory so we avoid a recursive make call that
# is going to break parallel make.
diff --git a/x11-misc/hsetroot/Manifest b/x11-misc/hsetroot/Manifest
index a9e0ea23731d..e4e8d359165b 100644
--- a/x11-misc/hsetroot/Manifest
+++ b/x11-misc/hsetroot/Manifest
@@ -2,6 +2,6 @@ AUX hsetroot-1.0.2-underlinking.patch 500 BLAKE2B 62758446bca47b8e8ff8b58d3e370a
DIST hsetroot-1.0.2.tar.gz 125535 BLAKE2B 351c022e11e3d82118db451eb6d64ff765018a09fe1ac9cc3b437f7a351d575fca66619fde9671d297b346af7c7f265442d18115388d984554bf1f9af9fbe82d SHA512 51788a6b579b82368ef5e11255ff56e2db978a02f7ad752ba64ec33c56ae5f27c1f0ef3452725d1c7bdb9d97b8a3a5b64422031c9c75a7279c407b8772d5edc3
DIST hsetroot_1.0.2-5.debian.tar.xz 4384 BLAKE2B 5ea72b6017a90bdf36030334c021cef1000ca29370f359f2596feea69365ebe5bd6b58286b109ca63a16dc953aea1f873ee4a7eadd50432655093d2dd7e6249d SHA512 5f1dbb00daebf6b8c9db77a51dbc463ea92b4564e0d7a2dac1ea9c316dd2e2126fb8c6454f4d1eddfd19533297e29651444987a7eacb7c0080e26c14383c827d
DIST hsetroot_1.0.2.orig.tar.gz 125621 BLAKE2B 932acda46653d2211c528008dad14c8877b0b6ace0888da19e1316af58a39b0cde0464f5dd058b752d7d95dd6d69deefc254a0a445e37077c4b177ddedf74809 SHA512 cac98cc602fd8825dbfce27d289dc4ba47805c99c78de804e95c539e83ffae6984601a535cdb90658536a007a5f17c71e27e4c31af562ade6610f11f0d0d2ca5
-EBUILD hsetroot-1.0.2.ebuild 738 BLAKE2B 311094e04c01e2a93dc58ebb647a1d057a121429c55aaea968117c2fd2cade3bbea2f4b4b69a3740d1bc575ade835aa3795eaab3cdde878d87a9f1de571b01d9 SHA512 712623b880a2bcb0aa253d5b6aec8daf5b6ec6af3c6258dd04e5d50b59ff18aca02acfe4ee5c821344344bfeb53c5ae11d04315954a4faa3ba2e2c5781145f16
-EBUILD hsetroot-1.0.2_p5.ebuild 972 BLAKE2B 11fb174b5f9460ad0525e5bc01c0fc7c5a567c6864bef913002d57842b5ded4b1e77300ae4a85b276914128002395a7208fc773d9a8aafc3f68d4771c88e3890 SHA512 39357441726d43072d1fb426d95b42a70c63f9cbac7d1ed28c4986a938eab731be2f144cf61938cbcc24e4b5dc1ac0799c015a0c99eb7e123891fce23d029a1c
+EBUILD hsetroot-1.0.2.ebuild 741 BLAKE2B ef440b29711e148c34e1f067d7269005afd3ab326c470c9f181d06719c699092219c93737e0f13b2dad111544169f3b6bf280a81b0fb2ba925f934a54d62ea84 SHA512 d46a6a728b029768ff522fbc39067c8f267bd5f27228ef944c82aca9102c5901c56390d2554b709b21e3a007d7ab5f5eb25e860209abd84159e91eaa307acd47
+EBUILD hsetroot-1.0.2_p5.ebuild 975 BLAKE2B afbd38010572cefa7f952d823e90e7e51b826992ef755885c597c1565022a1367793a138e146afbfd62944282cb6fda8f77dc1a532a20d34e47489727fb15539 SHA512 d479998a4d0fbf213aef85fa806fb60dd73f4a6aefad21c887025e08019752886262922c88ccbc5828e0bc06c878720dd2d99ce5d7bbb274564df209b2964ad4
MISC metadata.xml 1187 BLAKE2B 68310d07fff41e0af94b70fe62f253de23b966e0689bb33ffb699b6cea3e06cebb137556e9c8d871dd92a261e4db979ac590de0233e86862c3dc2c545c6e63f1 SHA512 30bd381778a254be23fc5b4554b42cd846229ba6c67914fa173c8d429f2ffd3f7a9de5497d5205cf0e1a455d2d0bdfe1a368352d0e25bcb2a173f7b7b76bc3c8
diff --git a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
index d6a05f1442fa..b5f7777a34b9 100644
--- a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.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=5
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
>=media-libs/imlib2-1.0.6.2003[X]"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild
index 0879e20f060b..691121fea2e5 100644
--- a/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.0.2_p5.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
@@ -22,7 +22,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 14fb44344a99..d3afd99eed09 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,3 @@
DIST imake-1.0.7.tar.bz2 156543 BLAKE2B 63e7f2fcd907ba5508e9e592602bd455d66ce134f82a3387ae9cee66a6b65190e38a0207980df62c2603d060acb5f380446dc6f117c75edc9c5c6f611d98dbe2 SHA512 b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
-EBUILD imake-1.0.7.ebuild 704 BLAKE2B 7065199c13731e07a88ff9385d4dd8b4a088bd95d39057b2ff52cf657f0518b9b2aa93d3d3ed5217fc898ab5eadc1cc67d161de68ee64b88deed406dfa7b26f4 SHA512 bd9ebcfe0809c7772bf8188a866cbb03cb808be35d577f2d14e3a8f7e6acb6a342784c96e246b7dd55c3a5ef834e12cc82b5dd6119165df06d38ee13edc6f3af
+EBUILD imake-1.0.7.ebuild 707 BLAKE2B 007be78843bda68b2065d9fa0756b3f7747887e344d420c307c11463582d93d363c5540ebbf9490878fce202af7e96cfebdd2d96cf83f1da71d7a2ca0bc8d972 SHA512 155fac28847bfc82fe28f0af99b902fd423a55d8712a65f59e1e57b0b36064b83a9103b0e1f9be0dac21273bb38cfd4bfc9cd2b67e3e7dc1392c3dcd0027ee25
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.7.ebuild b/x11-misc/imake/imake-1.0.7.ebuild
index 7c067f92b0ae..3c873f2e98cb 100644
--- a/x11-misc/imake/imake-1.0.7.ebuild
+++ b/x11-misc/imake/imake-1.0.7.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
@@ -12,7 +12,7 @@ IUSE=""
RDEPEND="x11-misc/xorg-cf-files"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_prepare() {
# don't use Sun compilers on Solaris, we want GCC from prefix
diff --git a/x11-misc/imwheel/Manifest b/x11-misc/imwheel/Manifest
index dc0a1bfa40b9..189aef6eb055 100644
--- a/x11-misc/imwheel/Manifest
+++ b/x11-misc/imwheel/Manifest
@@ -1,5 +1,5 @@
DIST imwheel-1.0.0_pre13_p20100827.tar.bz2 125776 BLAKE2B eda41d2d3ce7f057dd71fbbfb4304064134fe37068788182880fcfc6727c12f5748bac40f3115e8be0093c027373689b7375c58487fe8c5a97d0b1e9c297431e SHA512 3b5ae23a1762122f6fe86610da6ad65118e8e743a88f370d6f6cdd084b4aa5f08d3089fccf3fca3a69b06560d7c2d7cfecfde1375154af9f519c0d4fe996080c
DIST imwheel-1.0.0pre12.tar.gz 186424 BLAKE2B a13dc0df0d9c580eeb08e0c51deb9127ff29ad86826e941e15fadc60c41a00ac2e82cfcf11b020ce5a37b431a90c8c081b7fda30f8c7f161ab1f8623a2739bbe SHA512 4781f8c05e81f931452fb74745a93c907c695ed8b8b25442411db3a91ce4d3834e9f2a0789c950d7e515ad89aca28017844250affa5033988e79e5f7ff33f112
-EBUILD imwheel-1.0.0_pre12.ebuild 1069 BLAKE2B 467130a3b9b3867e03ecc6703d60f786357856887622a3b2d43b51c49aa3f7e71daeae7a3c06a064d6650a08f64503f08fe63a4b025abd2dd2f583aebdae259c SHA512 c22eb3d58c9a83e727698aeac49aa88843e7f5199868638f74d26662040f0a94d8fcb4905206c31bf69a15a310fcca53bcf562447bf629e3c3588852c8fef936
-EBUILD imwheel-1.0.0_pre13_p20100827.ebuild 933 BLAKE2B c112008acae8c2dfb662eef4510de6b1e13ddbf2bea1000fba787e1f0c76890f1e81e320cde21441659bd59a0ae5a218894881ed55a38eb7f832238e2121854c SHA512 6f48187164fbf3f9586f9f09e92e912eb4669346d78af8d8f9fe7f30cd03111acbb78c8f847974704fb83443c432c617db5fe4684efc3695a18dcdb5219eecdf
+EBUILD imwheel-1.0.0_pre12.ebuild 1029 BLAKE2B d5c7adee30bb17af0109798c90b5abda0ebad41a8fa05058dd6a1c26d8c2d350cde729336eefebe3ba8df0396b249cd29657f22745050e16432f5113de94447d SHA512 2303e8e95ef50f8c0ed191417de66a2e21ed841632df5162d4de2928b9abdf34f87ee443d0f1aa31604edd0ea63307fd348f1eef9716fcfb3af1e2438e37881a
+EBUILD imwheel-1.0.0_pre13_p20100827.ebuild 893 BLAKE2B 0cc267f0cc008ced219e159f616aac401ff82c4dfff658655379631e974d3f3da251063bb7768b67a1ece3f7f47c97c8047d7b8f47a66ca58db4a571e767872c SHA512 18df2f540b43500e65ac284116a9fccbb50d32afe748bbc563811cdd00245eaf1e36c2ea5a5a76f5d14ec2038cf6eaa46f8cd4c4c37aeda703cf89a5e2c4a3c0
MISC metadata.xml 353 BLAKE2B 4d6fa01905f2aa762571614af6aa45f09e2972d06af9e6d4b09b4be4844e4ad42fa1c9010995a53f1365ec53e7fa712dc385406b8b607e5ca07a2e174af7a48f SHA512 2cf1e0e8cf35f3aa5b0e543a694ab9869f28ed457dbd7294463bdbe96960cbd63709fc8557f7e1c8ef0d2c77e1a6ffebf4d39ed6a5e52a3683d8d6f336d76ef5
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
index b6f4e06ea860..116f0bcb67a4 100644
--- a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
@@ -21,9 +21,7 @@ RDEPEND="x11-libs/libXtst
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
>=sys-apps/sed-4"
S=${WORKDIR}/${P/_/}
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
index 001734201dfb..bef62cd2ef71 100644
--- a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
@@ -21,9 +21,7 @@ RDEPEND="x11-libs/libXtst
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
>=sys-apps/sed-4"
src_prepare() {
diff --git a/x11-misc/lineak-defaultplugin/Manifest b/x11-misc/lineak-defaultplugin/Manifest
index c174b1b7ee4a..62c39cfad01f 100644
--- a/x11-misc/lineak-defaultplugin/Manifest
+++ b/x11-misc/lineak-defaultplugin/Manifest
@@ -1,5 +1,5 @@
AUX lineak-defaultplugin-0.9.0-gcc43.patch 242 BLAKE2B f630601afabd50b5d2da06660bae845835d4ffe4ffd2fcc2e51d95b4d36f41779eabf875c72abff4c036da241b3441d635ef6dbefda4652f195f68821938487e SHA512 897f29bfe02405f7881d6dfd4b4d91448943f917c3afee43b50b36449c0d84e0a76bc8b7867649c7728f0c22e58b6a9f951b81a1f05cb4df36fc51524affa5a4
AUX lineak-defaultplugin-0.9.0-gcc47.patch 274 BLAKE2B d3446b668eed70721e87b43c0b10217e4d2520ae8b910df0086c93b5d8020fecc76d79164ec9567a61ae1e76362213aedcd6ca2069c5dfd1c5bb449a7f095d66 SHA512 1644ec0fe4c3546f427381359d65f25e1e6ad036b99d6909ac4cde11e95d4c97ded30109c751a652905e2f7299605ddcff29779e22f8b2b541fde1d7f9688cc0
DIST lineak-defaultplugin-0.9.tar.gz 840704 BLAKE2B 37b060ea5b026b1a06992b7986a56a942d1d468d85e82444a4bb1a273e656ff80fddfbf4d53c6d3eddde9bf268f413dc0ce3eaa7a44a62534f533a286e67cf22 SHA512 f110eb42f8711b9fbd38652462d9b44f6f6851c4dc5cdb466b63bd09b8d3320e35d7de82626f2c9409bbf0f96d4f1e4ab2e9a82932452e50b403d343fca1ce4b
-EBUILD lineak-defaultplugin-0.9.0-r1.ebuild 855 BLAKE2B d183dda8fc96bb8e614e0bdbbfcb9eb0e69fc9dcbbd4798a91492c7e4330392b0118882c25c72cb878851c42ad1c7f43f152efa6124065ba175138bff1d73dcd SHA512 7b87b19f6e8c8f5e20d3f7b5d39ecf4d5ac561ba1ea4a9c5171094fdb7e7b883b5260cd37a92b51eda7d7c7530058956dac83e97bd77b1f5f3d6eedc37e1394b
+EBUILD lineak-defaultplugin-0.9.0-r1.ebuild 854 BLAKE2B b22ef55d67d0a96d306b47ccdd324db2e6c0c2680d6e216e453f604a8d5512d8e95bc7d67d12f19273fe0cd4e35c4d64ee3f8c4314ec34899f6a85bd271f7ed3 SHA512 2427e1ecd75011f2c3a408f5f19eac5f928c3c031a2d431a407841fd4ddd91889eed891e914f8a048d6dc430f03bbb6dcda08c2926590ab3e83f75d7d919278e
MISC metadata.xml 362 BLAKE2B 44ba7b6226e667f7980e291c2d547eecafa1cb02386e46980327c416c6b1139619bbb7dfeda83b2cc7761022ccf0b1fdd55cb75aa9ec5db614267c1b99d826db SHA512 a33c009438013270e90019cafb29f493fc54c64afe810c873f6c1767b543f08cc741a3d6ed83833ead57d8dbb2ea8b78188c4f5d0962709b8625bb053c19be82
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
index 20dfb499c5a4..454c50ad61e5 100644
--- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 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="
"
DEPEND="
${RDEPEND}
- x11-proto/inputproto
+ x11-base/xorg-proto
"
S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/lineakd/Manifest b/x11-misc/lineakd/Manifest
index 617ea52e71bd..54a2d905d713 100644
--- a/x11-misc/lineakd/Manifest
+++ b/x11-misc/lineakd/Manifest
@@ -1,6 +1,6 @@
AUX lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch 795 BLAKE2B ebf8e451208c38cd77ba39c3241ef3f9957946c6e1b7c91e29a1cfb346721a2b59d8e2b87e58dd52bde6fe4c6d3fbc70d8c5b02d62bb96f6d82c64f11aac3e5b SHA512 d38a7bc6ddb05eda357ffd487a494302cb08746389e65a7f7b30aaa3ebbbf5206f60cb59b07a6cea285976604b91328a002e893ef0833dfc67e9639b260da0ee
AUX lineakd-0.9.0-gcc43.patch 772 BLAKE2B 48346e5d1a3978be0964dd6844991c58da30a036fdb12bec9b1970c3aac9d130f81891e69ed59ef772ca4b6dbfbd71effdc2556b800f6008505322c8aaa67c91 SHA512 0ade361637b26db613c5a3915d8b364cf14eda14eb744618c03440ead5f0774f853dba7c0518432ae4f872e201d5bb0503fa7e4b5eadd71d049adf5b654c8407
DIST lineakd-0.9.tar.gz 991376 BLAKE2B 70c19d446b814562a4d9efa90b4492cc5a3fa63c8d252e6e2bcd418c1fee177924e61ec7ebfb0471fdd18eee5f7f3e4ed0fda17bff5b216cad9caffd06d68783 SHA512 e30a2e111832e3f08bbff858647536aaeb75d20008618b8c7555836104fd5a66d8e3173d0f9da76906caf13e9c9753c9140cd22dbb96fde464ed5d5f254d721e
-EBUILD lineakd-0.9.0-r1.ebuild 1214 BLAKE2B 0ade68aaddb816c872e231e168da1658388943d8ba5a1edee81eaeb1bc890322d831d48cd62d91aa19b7a2124ad39b389efffce0597275a4fa88813e3c61ab71 SHA512 7d4192a6fbe53f4f4e94d4a8902b6bcc82afc7324f9ceb7ea7d73b9a9d47fb7b7ae36bcbe9708f829074ee29770bca9f5f0c22cce838a12d7fdf44d4dc22fa18
-EBUILD lineakd-0.9.0-r2.ebuild 1097 BLAKE2B ce2dd5cb3897fb3ac96dd239d7569fc28d62ca52694c81dd0e6ebb7468b5b1f024b260bbeeaf66bdb22ed2ce7a376c7d063ddaa4bb0eca4bd57004b931cceb77 SHA512 2a3fdfff3c775ad1d3efacc744725d92ad3c2261ffcc055b232083528978cb8b7148365410c66d34a19f99c7279e62bc0432303d3f2f605fc0a5fcec8b46f0d0
+EBUILD lineakd-0.9.0-r1.ebuild 1174 BLAKE2B b020defba8ce6a0233e15e8aa763333a75dee41162629996339306468cab16a40d64f84b4d3f3b4de6f724fabafd619a75d4cdacfc19b8ba4a0e5aa31ff16c77 SHA512 0601941d689633369f9721a55d59b76f82ac8e8bfb8259455d823f58527c2017e98b58fef421bc837daf1627a2fd592ee9443af1f764c8c7800bdfdb62e9b3be
+EBUILD lineakd-0.9.0-r2.ebuild 1057 BLAKE2B b138bb15380921ff73d41b87519c9ab55486f62c96212979a8915b1c45010bf7ea39bea17dd25243c8ab23d8b9125f722f8cb5d99e8296bbbe75923f0ea91f91 SHA512 bde81b54941d865c7ecaf657ea31a1ad22f2675686d3836298d3d6a4e5e323bc13adbc81f0c1c9138880f0c4095e3d5faccd5cea30c047b76a5912ced41a79b1
MISC metadata.xml 352 BLAKE2B 4110d9b5e116df93d0d52f464d392dc4b55d95615b20db7c92e8792ff684e60c84ed9c9703272eb7ce70688de54ce1943c99d90b2f6d81ed8342898fbe710346 SHA512 1abdaf434e7034702a0dfceff233083abc0bdaea90e215687ace13b6d005502da7193794cdc7beda708e741c5562313b93fd41677fa07d4f68bf8ef7cfa81939
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
index 45b5b54d2ab1..a2967bdf38c2 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r1.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
@@ -20,11 +20,9 @@ RDEPEND="x11-libs/libICE
x11-libs/libX11
x11-libs/libXext"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
x11-libs/libxkbfile
x11-libs/libXt
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
x11-libs/libXtst"
S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
index 2d09ca519372..2ff6da09dbc1 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
@@ -23,11 +23,9 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
+ x11-base/xorg-proto
x11-libs/libxkbfile
x11-libs/libXt
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
x11-libs/libXtst
"
diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest
index b8cfea03749d..fa6afab68fec 100644
--- a/x11-misc/lndir/Manifest
+++ b/x11-misc/lndir/Manifest
@@ -1,3 +1,3 @@
DIST lndir-1.0.3.tar.bz2 114392 BLAKE2B 2e9feb3057f1508a118c4dd6212305e626ba25dd32296d35a553b5c42cb441e494d386d4c9afe15f150a9a8da2b7fac0ae7a128948544c4545ea740d7e7e21a6 SHA512 c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
-EBUILD lndir-1.0.3-r1.ebuild 326 BLAKE2B 499f5f8308dc4704fb1c4bd91ec70a6e3705d8325ebffd0e9caf32d43a0ecc79e87f490f2f15f1f398936524d8bb0911f3fbbb7e2a01786353b881ed102e35b2 SHA512 c20e7dbf785120625791cc3fbd7b15f61fa4b01e0494a4c906c81b0646846e56c04e349ac53783d1d0fbe4ac3c53cc81c7e139d838dd5ca8ca083729e983c83c
+EBUILD lndir-1.0.3-r1.ebuild 329 BLAKE2B 9db3fce24ee36408c424c6aca65d16e8e56a7db7dad4d9733363b09183b8e7eb7b49f6a846fd4731bc212aee653d96fed30af6033cf3adf05d6236961c638152 SHA512 c5696fbfa2394fac512f6a2ab005af434570b3cc8fa2689d5aa61bd17dcf491cde2d894d9bb12e7b68bc166bb0f27f4001d8c5e4d7f619be59eee3fbd04446ec
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/lndir/lndir-1.0.3-r1.ebuild b/x11-misc/lndir/lndir-1.0.3-r1.ebuild
index cb471e37cfe8..074102cb4eb0 100644
--- a/x11-misc/lndir/lndir-1.0.3-r1.ebuild
+++ b/x11-misc/lndir/lndir-1.0.3-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
@@ -12,4 +12,4 @@ IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
diff --git a/x11-misc/lsw/Manifest b/x11-misc/lsw/Manifest
index 708022207381..47b47da7881d 100644
--- a/x11-misc/lsw/Manifest
+++ b/x11-misc/lsw/Manifest
@@ -1,3 +1,3 @@
DIST lsw-0.3.tar.gz 2723 BLAKE2B f906efdbd8d2dd3781207b2112f0358d4d64a0134548364b7b65e06cf0e140337f70f3f06fdbf3a11545f34c6ce8094866635e52ccd088507f3a89c61494fb90 SHA512 54f5aeb6d17fe23a2e65fbbf4a7622c194e776261a6f0c04ece54fbf212588ec749d5bf5939a6084997f36468339f5373169234c671211a2b7712c408cf883d8
-EBUILD lsw-0.3.ebuild 670 BLAKE2B 4f55c3bfde051b53dff7debbcf5d5bf6abc6efb3c0f9791f112a40c517638b2b82c8e3fd63602ee674818a3510570d8959650354488ef3bdb71a265c79d04bc7 SHA512 18c666ba57fc9490670ba0d191ea4be5b0f6162af1a51fdfe41211d93d7f15364b3e0a99e41e13011ce660e52d2a78eb15c391abd7598b6acf02dd17a65f155c
+EBUILD lsw-0.3.ebuild 673 BLAKE2B 2ea068db44a7eb1be6c2e94777260cfcf5bd19e58c9dd02a430807b2b72c0bea06f6e981df21373ae430308d8caf0ca9478c0b8cc509788d9cdf417198deea0e SHA512 18805f44432a2d02c76d40514504b36ca468fceeb095f338cabe5fd2bc25fcc7049369741e380b88e4b266108d52dbcf955416463cc5ac47c94fc8c1f5919e5c
MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/lsw/lsw-0.3.ebuild b/x11-misc/lsw/lsw-0.3.ebuild
index 09db83b1ff03..8d3f62603016 100644
--- a/x11-misc/lsw/lsw-0.3.ebuild
+++ b/x11-misc/lsw/lsw-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
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~x86"
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_prepare() {
sed -i config.mk \
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 04e0f20d9e1d..7c49a8e1fb66 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
DIST makedepend-1.0.5.tar.bz2 143498 BLAKE2B 78a7911e1a433bd2839c2d1372883928dc018a2576781cc8e01ffea3d06ecaab494c11a9eb36045b36091f51c6363d4a903562431256abbab26dfbe7b3fb8289 SHA512 e28d71c3ce4f74ca6479771fcdd123c19ab18e3f2aa690a7798237f21f13fca4c4d66d7b7b1d708c2c214b8e17f8fe37e6cf5b75a4d2b88514c50addea2600cb
-EBUILD makedepend-1.0.5.ebuild 448 BLAKE2B 8a77d8e8e2a2eda8e971fbbd0c54a57a5a3dfcc274e9b17f02149eadb91529842ceca1f144c99ad7e83c0ab5464a7740d8071155f38717e49f9c4d210f00dc17 SHA512 7b02050b663ec5c11c82a5ce09d50fcb5cbfc5deab9295c58ec4325954e1e6c9ec4942dd6d211096cef382248aa47a2e7440a418479d7b1a5edc180dbdc77f09
+EBUILD makedepend-1.0.5.ebuild 451 BLAKE2B 88672029cf2ca0e9c48744ebe371c2e88c7f97722c676a08f5cf3773095eaab501c2189e7db607a80a41f491d933b984ecb21c1c32c44198e246c5b8ee3314d3 SHA512 423364cde322cc2a09639d692ddd6c51b4035d3078cd0fcf6e4494aa831b24c76c6e098522e707ff45da07e4c20251d0a13b56c4c1f212584155598a79c5fae9
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.5.ebuild b/x11-misc/makedepend/makedepend-1.0.5.ebuild
index c0d6990d325f..de8260303eaa 100644
--- a/x11-misc/makedepend/makedepend-1.0.5.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.5.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
@@ -11,4 +11,4 @@ IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
diff --git a/x11-misc/mixer_app/Manifest b/x11-misc/mixer_app/Manifest
index bf4482dc3466..e7b15828bb85 100644
--- a/x11-misc/mixer_app/Manifest
+++ b/x11-misc/mixer_app/Manifest
@@ -1,4 +1,4 @@
AUX mixer_app-1.8.0-build.patch 1018 BLAKE2B 612ba11eea272c120dfb499a9324c427612463c057ef4593010aa9bdd9799dab05d9052c6a4add45b780b423f0123b62c4c76bbd4721d495425b08b6652e6c8a SHA512 3d0146efd88070b803b14434c93baaa635f54f10324155cdfcf08555cac11f655d40b257bde6e25f83f04d96a63da66895d8460d4bc6b9211c1cb9956b199602
DIST Mixer.app-1.8.0.tar.gz 37884 BLAKE2B 53c44947e59fa2b4f975a70a33cae76c1f721f3408021ffdbaa37750f26b67e2dc71457b5b08e7b29ea60dbafe34ed3a6ba0c22d7414c8f3bd0c5186207f62f0 SHA512 2b965cefda7ae93d8588b717becf25430f3dc5d1d6c3e38d24eac711999ced9c671cfdc76a0601022cf1fc7298d179b5780ce7a3bcf33291ac4d8ea215cd53f1
-EBUILD mixer_app-1.8.0.ebuild 706 BLAKE2B c83d8bbdac2e17ccb52067d4b88b252c953d230cbf6831200b1265bfa54c51842bd01d5f36baf13c43bf3ae2c99aef750a74ca19980395afae62c07806010971 SHA512 5ffc5d61fb5086e97a7cac5abb42125961a6e9256bee86675f205a896d58da3ef4c6337b37c5816665b2dfb2d883cf9a520767e80f5d7f9616cfdc957fd0938d
+EBUILD mixer_app-1.8.0.ebuild 706 BLAKE2B 84630771fd74ad20e4ff028ba8c59c2fee8f8e33bb09ea2051ff1d424a17a3daf88e0f27f8bb0a35202648ec35875e5aeae71b21dad6adc298a49a0d27a9d70f SHA512 34521e19c17ceb74270e767ddd56d87653e061383ff87e181de7605f22bfed5269f8c50b2b82f21a767655dc9a7caef00d7f1725347024e16f893bd1e720a34c
MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
index 293a46855a05..76b25db57a18 100644
--- a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
+++ b/x11-misc/mixer_app/mixer_app-1.8.0.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
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXpm"
DEPEND="${RDEPEND}
virtual/os-headers
- x11-proto/xextproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/netwmpager/Manifest b/x11-misc/netwmpager/Manifest
index 1b21c187bd56..477a65664fa7 100644
--- a/x11-misc/netwmpager/Manifest
+++ b/x11-misc/netwmpager/Manifest
@@ -1,3 +1,3 @@
DIST netwmpager-2.05.tar.bz2 176877 BLAKE2B eac2386fd88ebfaa4c690b845151ac022f9573bd882adfa82f14bc5c271365a962829e9c579883b3d76afe4578e5ddc405b089af1a96129711a3beae005ee712 SHA512 246c8f0a1d1eee9a9576c66ac338a03d2f391a413ac82f5a0140142582df93c4cad1908ea1124c9149445051c877feb552d889e78022f95f9773d910f9f171ad
-EBUILD netwmpager-2.05.ebuild 756 BLAKE2B a64539dfaf8b5c9c2814b1487597a2b2dc1413657fedd7b52b9eef5510f92d57f8a68efe50ccacd3735be8ab31ade6b460f96756fc9e0bdb4fbbb50c522f611a SHA512 b0fcc644d259c7b9bf2364b597c9b040b71a1b4d94ba10e69abfd14ff0e925b2db9401900937efd62d7479aa2baa662b0b33203337a764b1ac617d3c68d46941
+EBUILD netwmpager-2.05.ebuild 759 BLAKE2B 24b2f657de29b9a483f75f490b129e517f17ca80b31e0285707c5a90d9c19d8c9ef7866ede4dffba451eb4511be20bd720c5a6f6aabde62f666fe354d857abac SHA512 ca3eb20e179c93165fc1d1d8be99c87e7b5f9331ecfa6565fa0494d2f368d0e0af8bf6b1d77c6e1a0b2f90db690d0db50548b334ae2f1d4748c4bb291f8b10bf
MISC metadata.xml 246 BLAKE2B fdb264ea0fcdffe3b15f288ef6958a743a7c88bc85f82e13d20af443e93182007ffcf8ccfd62071b57660a668f9c25753c12baa7a409c9d42a408293c21f482c SHA512 be42da502b805b08126629fdde43bd1473535fc5588faf7c65c05e923736fb18f0249fe61ac5c18c4de1619bd52e4865449d1f02ec19f2c2581f6c2e23a5ed4c
diff --git a/x11-misc/netwmpager/netwmpager-2.05.ebuild b/x11-misc/netwmpager/netwmpager-2.05.ebuild
index db30db2314e1..88a563c5bce6 100644
--- a/x11-misc/netwmpager/netwmpager-2.05.ebuild
+++ b/x11-misc/netwmpager/netwmpager-2.05.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
@@ -22,7 +22,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_configure() {
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index 43fde9746cf8..ee7dddb9a767 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,3 +1,3 @@
DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
-EBUILD nitrogen-1.6.1.ebuild 929 BLAKE2B 3b4dfadefc8b4295606c18139fa382d08cc2c072461c65462acbc662ef133474bf78f0dff765a36d04a049c459ecde73a655c093506c0a4b61655d48308b3686 SHA512 68783cccd548d4640b80a7d8f9ce1239ffc2eef4bff1fe83e1e2a99b82d30e1728c87e3f0b7bad8b7eae9986446a24bf46b0f14ce7cb1324dea6f97fe82aac89
+EBUILD nitrogen-1.6.1.ebuild 925 BLAKE2B fd49794f48f03265a8f304af08d87151b370838b591591f653d8fdd01bfacf8d88a6ea4269c23e868695cba4444b6e13514fddf1914c5b87cfe1621b64a4cf58 SHA512 cf87618030b411868e8cda395bc540d0dcf7a0f74b413e0ead50693336d3198a9460574eff287e33b741ca33091147c8e990a3c5bd9e0877c275639f96173e4f
MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
index 39089968c1c3..90955390f26a 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
@@ -24,7 +24,7 @@ DEPEND="
${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )
- xinerama? ( x11-proto/xineramaproto )
+ xinerama? ( x11-base/xorg-proto )
"
src_prepare() {
diff --git a/x11-misc/notify-osd/Manifest b/x11-misc/notify-osd/Manifest
index e6645843682d..9fb87c91a293 100644
--- a/x11-misc/notify-osd/Manifest
+++ b/x11-misc/notify-osd/Manifest
@@ -1,3 +1,3 @@
DIST notify-osd-0.9.34.tar.gz 635387 BLAKE2B 469369f9fde562c605c131608b56eb54ea2a5f3d16f530e5b383d04fd8de2fbd531b58ed43caceeaeef65840cb00917484c02f8af0d7a0fc464ab131c1193853 SHA512 60ca63c2041f129d5139537242c2260908cedef633df977a608e19dcb01b75b2280ec80abe2b6da5eff76621107ee9d294742abfae301bc24eaa3aa855c56ce1
-EBUILD notify-osd-0.9.34-r1.ebuild 1482 BLAKE2B 9ddb836069999b6f5fa0319a31ed63e79f036b23f48eef1a91a26dcb446d1a3d278a729cf691e37343c06d41a346f1d66686c9f3e6716eb335635e5c09425e04 SHA512 81a7ace69f169b2ef2b3e68be5403a9058db3cba5ce0b47de3902bfcccb8571a6f231539060057f39f28966509ab5e27cc52f0da3e028974f917851f10136edb
+EBUILD notify-osd-0.9.34-r1.ebuild 1485 BLAKE2B 718cf2009f2f6d4831037a8d222eb3330ace30b4bd07311f204a6335a269d49199d6b668fd10d9caee1d3b3758a92e0c5f89547422644342da3d99ef8603f8fe SHA512 1c7d9067cfb61eb8627a47bd8a0be03c30e031e1f946a7757183cc6d51652dc22ca7502a548b4f21a363f0131bb2ecbe9e51ea0f4809ec347eba126fc3aa90ea
MISC metadata.xml 250 BLAKE2B 138c4f4c717e9e24abf19f3d4cb9a8a8b49761ac301ac26b527c86802bbc509a4afd2678adb71bc3a9ef3d0ea17438d57d03211627bcf6ace221f08f39151f56 SHA512 0bed48908552a27396c77549264bbb7516677909afdecd967cce446529ea944c8f9ddf167241a033ca790123be27f8e3a4c503954100f9ea076f40b8ef5b0209
diff --git a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
index 95bd82cc0720..d94dd9b86c08 100644
--- a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
+++ b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
gnome-base/gnome-common
- x11-proto/xproto
+ x11-base/xorg-proto
"
RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules
diff --git a/x11-misc/numlockx/Manifest b/x11-misc/numlockx/Manifest
index 11b3582c8fe5..6073b7d65fc8 100644
--- a/x11-misc/numlockx/Manifest
+++ b/x11-misc/numlockx/Manifest
@@ -1,3 +1,3 @@
DIST numlockx-1.2.tar.gz 82703 BLAKE2B e874671fca1991c541022859bae6606d550fed66b4f40ffdd1bc2cbd74ce65f8148845014d7290db7fe7a333aad526ec186197cca989bac2b519915aa374214f SHA512 efaaa67e8b2723cb1e8461dde664f1f8e9b21f34edfe2e1135a6b756fa2843aed1a386f2f9d70bd62ddae9aedfeeff856a18da8b542f2cff440f93b38e5a853e
-EBUILD numlockx-1.2.ebuild 699 BLAKE2B de45b5a3e540d49ebcf51c1739770dcad73d4eb437a1614132770007556ffa2fa46d8b9456a7e548bb35c5f732ffb6045a570aef48589a9f818a874ea540d6ed SHA512 e041e26350318ac7e9d0f5a8d4e86a7492a3d141fadac510740d1947f410db1182256147b1a8852dba38359daa8cc2a917b791464ebb86dbd309ad4873572128
+EBUILD numlockx-1.2.ebuild 681 BLAKE2B 9f83ee3c064dd8dd3bec5b5ce8459117bc5debe9159b7951e36c70a29cda44b272131ac792bb3e080a3403defc6d0c3cc71e455bfa0905404b686896e9a0ae47 SHA512 ef109217e4f607ddc7886f0c74dde604f6ce6a7ba462ae7866de6fdd29f8f9014e88dfeea3d7f943798830e239ee98713e4e762244f942f8711d0fc6088d0b50
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/numlockx/numlockx-1.2.ebuild b/x11-misc/numlockx/numlockx-1.2.ebuild
index d2799cdefcc8..68050e42c963 100644
--- a/x11-misc/numlockx/numlockx-1.2.ebuild
+++ b/x11-misc/numlockx/numlockx-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -20,8 +20,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/oroborus-deskmenu/Manifest b/x11-misc/oroborus-deskmenu/Manifest
index 3941d2983cb5..f77259912e16 100644
--- a/x11-misc/oroborus-deskmenu/Manifest
+++ b/x11-misc/oroborus-deskmenu/Manifest
@@ -1,3 +1,3 @@
DIST deskmenu_1.4.5.tar.gz 127599 BLAKE2B 220c91cd016befaf4a97790b4e98d53e1ca1b4bf6fecac54ff0ba699bb2d8a170df7d6d7193edb4684afc8cacc2393afe056e4d5319f5b0f268a5c3254ad53d5 SHA512 a14ed2a346327be7eb8f80fecf808fa1a2abc8be13cae6d3948b29312120ef807be63776cbb6f8b6428bd84ac944fc2848daba30eaec51690f330fc7a2e0ed78
-EBUILD oroborus-deskmenu-1.4.5-r1.ebuild 525 BLAKE2B 726feb3ff2210300ef4d6b91a0b8521bce455ebf424c1cbf96e87430d25148762a34597f37b93c1c3dfaa0d7cd7c3f9a92495aa8600684d5603029e2c47cfcb1 SHA512 f415b72cdbc2e306e259bce7922171811ba9093a126ead2cfcd3f2cec25dea074671f1384a9cc382264fa784a65bfa01288f77979ef24899355835a12e2d8fb7
+EBUILD oroborus-deskmenu-1.4.5-r1.ebuild 526 BLAKE2B 83e84700114a79f8a249c2faafd56e77e13325dfb17f2444ec5d7daf8501caaa0038d82a8d3973f8b717f90c7b8418910f4f9d39263446656bc4c07068ab6033 SHA512 21cd0e845fbd8629d713ac7a80205f40eed823fc820669f1c1cc4cae731d09e10859453efc5a5816c5ac0093432cc861e2db5ffcb47ed0100406d8c4bea6e5ab
MISC metadata.xml 442 BLAKE2B 3ae5647d6680d525809500572b8705cc579307c783aec28c0a71e8f738f38fac63a27f497239ecbff815289673548add051899c3f104ab339fa504b91302270f SHA512 3f004533a8c435ff70952071c88562528f4730c77d5cdb37948f368775b0e4bc71c165207dc66969fd99a8df0c78a79a3c91c272fbdd9657a090638449b8804b
diff --git a/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r1.ebuild b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r1.ebuild
index 460d8d55f097..69756f240669 100644
--- a/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r1.ebuild
+++ b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-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
@@ -6,7 +6,7 @@ EAPI=6
MY_PN=${PN/oroborus-//}
DESCRIPTION="root menu program for Oroborus"
-HOMEPAGE="http://www.oroborus.org"
+HOMEPAGE="https://www.oroborus.org"
SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_PN}_${PV}.tar.gz"
LICENSE="GPL-2"
diff --git a/x11-misc/oroborus-keylaunch/Manifest b/x11-misc/oroborus-keylaunch/Manifest
index f261b4712f1f..778143c2ac30 100644
--- a/x11-misc/oroborus-keylaunch/Manifest
+++ b/x11-misc/oroborus-keylaunch/Manifest
@@ -1,3 +1,3 @@
DIST keylaunch_1.3.9.tar.gz 80286 BLAKE2B b91df64c6efa3b49039cfbc561d0ad512ebd71c3f74797f55be9acf4a3642f61fc6a3a6b4115e311005719b141e1df7098756e555a319ded2a4b984b9e8a5c1a SHA512 9955bb913dec9c39aa4be86410229b2952738fca2c7a77f7d61d2750c880e4cbd59fd82979c441780b3a5aa5ce12b3a9863526f610feec5c5b30c65476c50c10
-EBUILD oroborus-keylaunch-1.3.9-r1.ebuild 658 BLAKE2B a364c55a71dd3bcb685820886f3ddcb619d7743d980b7ae5d69dcb0e7dfe47255f450d2b8911cbf65bf1aeb02e7b67f62f91b1291fa1f71efd1e61f9ee857d5c SHA512 7e9d4ba391342fe9e9265cf25c513590209a272028d50c0863a68479e24c471e2d1269b999c1a457e02bf8c00401e00ea6de7a3a1d8fa24244fea29d6cc4c0b7
+EBUILD oroborus-keylaunch-1.3.9-r1.ebuild 659 BLAKE2B 7c34a3d8cf5dc58c9864af004bdf64fdb290df5bceeb9155ef97c2a12ef44f2e916ef07648e2f72a7b35f8052c11b36425f511bdcd79e42575c7154ad1a5dc2e SHA512 7746badf1c9c52addb26f906db5e673b18232f53d1ce808611ca9dd1284ce3097986ed29e8775a21fb30d32d98c4100d463fb3a6fcb4a5239de9bbd811d9125b
MISC metadata.xml 408 BLAKE2B 8301b07a740e41438b3c9ec51cf908cfdb13f80275906ebc912c5e9c45bbb5dce4b480e4306d5a415aae96c3797e2128912e232a848f1b4fb905b6e9cfd2a140 SHA512 bb0f7d45a092d98e41860581daefc433d3d89e80acaf96c04240d6ee96288572a051f9deadcfad1d4d4c8ad0bbace7571ea59b57597ef68a542f9f08198a0aa0
diff --git a/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r1.ebuild b/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r1.ebuild
index b4f28a884834..aade3f2ad749 100644
--- a/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r1.ebuild
+++ b/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-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
@@ -6,7 +6,7 @@ EAPI=6
MY_PN=${PN/oroborus-//}
DESCRIPTION="utility for binding keys in Oroborus"
-HOMEPAGE="http://www.oroborus.org"
+HOMEPAGE="https://www.oroborus.org"
SRC_URI="mirror://debian/pool/main/k/${MY_PN}/${MY_PN}_${PV}.tar.gz"
LICENSE="GPL-2"
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 5ccc4ef66226..39291ec5c0eb 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.9.tar.gz 268942 BLAKE2B 980264974fbcd74faab59fae6f54210691aa01077910a69a854b8f635b25883a07e088d4f4b842e39b4264b244b94a4adae9f904897bf919eeba7cb02eb770a9 SHA512 cd4b896d2b919afd9c18fcfc44de23c5b3528705925785bb15303711b89e51abc6b6fce14ea8d4c09201f8143239e246c41d0d19577acc58c662f2be7ba24052
-EBUILD py3status-3.9.ebuild 602 BLAKE2B c374db1feeb7d074f65a8010d5efd29a559cb6b3ed1df755a7bbb73060a667f7c3fc2749dd66ba08f7da1705507c63915ab58c89db815acf24be00d875375780 SHA512 66046211220702cc421d3e16facc2d88732fc79e2ed5fbd54d70fe3fbaad0af5bbe7f618eb0ca6ea5c374ea4ced8565e44869a8d472b94a119b0e5b99ce67624
+DIST py3status-3.10.tar.gz 268960 BLAKE2B a9f6a851a14f2deb17d8fce10821053c680bd7f4251bf54fceae092d53bda136ee461b8f9e2849957db1183cdd89841c0173785fff7dfeb94ffdd415f044802a SHA512 96cf90117a6ef49a1cf1b1528d45fd8c9f6c124ad1d8840e519e56a913689cf1e216d09f4e890a0d557d261342d88e751d563aae55bf0c5f940280d9df885e67
+EBUILD py3status-3.10.ebuild 602 BLAKE2B c374db1feeb7d074f65a8010d5efd29a559cb6b3ed1df755a7bbb73060a667f7c3fc2749dd66ba08f7da1705507c63915ab58c89db815acf24be00d875375780 SHA512 66046211220702cc421d3e16facc2d88732fc79e2ed5fbd54d70fe3fbaad0af5bbe7f618eb0ca6ea5c374ea4ced8565e44869a8d472b94a119b0e5b99ce67624
MISC metadata.xml 491 BLAKE2B 867cd38781b9fedfbeca476c0905193823ce4a1ff99b259fa53a098dbb67ff6f1a0cd29aa19e5c6752052bd3a0a8fc96a8764e9868017d4d5ef14d4d765ca212 SHA512 24fdcee0d026225e8965b62bfc5d1c1be0f0d4618e0bb9f5ad58dcb5ffdf372696ebe035d15f5208bc310c969ef93b89d9d643a6bc9abc0f6103810abff26bae
diff --git a/x11-misc/py3status/py3status-3.9.ebuild b/x11-misc/py3status/py3status-3.10.ebuild
index b555901801d3..b555901801d3 100644
--- a/x11-misc/py3status/py3status-3.9.ebuild
+++ b/x11-misc/py3status/py3status-3.10.ebuild
diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
index 4a3cebf67072..44eae4529091 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -1,3 +1,3 @@
DIST qterm-0.7.1.tar.gz 901169 BLAKE2B ab5337680f49e5f5f0d173585a9b9bc9a8606f086faf03405e2eb7efbf73cc3d9808fa6868deae3fe82e00d0ed2c0ec2d461d3085303b51ee1026bda672d8ddc SHA512 94f4c3f7974572c29eabf98c45e962b9232a4b0fbd6710c7725e0d23e6ecc91456f52a8c112779cd3b4732cb2e4302629419f7365b2d359ccbf39578e6e67cdd
-EBUILD qterm-0.7.1.ebuild 1214 BLAKE2B 4a388827206938e17bdc07ac4b6e50602de6da5c53934569899a99ceaf18e0cb8a9977b7f7c11734383341803b54d528d3ec838589690e64d004d1bd4328fc06 SHA512 26a0e6d47ba3785843cbf7c5e3f072398d0a3fd7222b4403c0aa3f77e12f86f58633a868cf7f61b259cb36e06cb685245fc503b2b097350ab16e726359695da9
+EBUILD qterm-0.7.1.ebuild 1217 BLAKE2B 13349e94221931887261b341881bde0f7cd07a109224d12c4e5ec8242473a262a7c4f16c3838b92e13cd8a2601b4030f4d0ad956e9cd82e3c813332389f06c5c SHA512 724404d1803f734d5bfa6ccdf4ce825751a89d3b363dcd2eaafc4089942bc7d9fa389b41513e3594caaf6aa08cc57787f84e95a3765b3a3e7b2f77679bfcbc53
MISC metadata.xml 360 BLAKE2B cba279bdcffd2c960f7dded51892476b2f087b5ff54eb1f39b2e1251e1e2accf41b42185efa57b03a357a6d2ac5ae84673f77ad78504290741b9000f58d129e9 SHA512 ccdcf09d604e38d3059829a1cab9415900bc39ef126bb5d5825781713512eff75e99046a8133ad74bfe2407fae51ab4013ea5600efa0a65a70666ef98a1013ac
diff --git a/x11-misc/qterm/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild
index 50c09addf91f..9196ecbc57cb 100644
--- a/x11-misc/qterm/qterm-0.7.1.ebuild
+++ b/x11-misc/qterm/qterm-0.7.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
@@ -30,7 +30,7 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
dev-qt/qthelp:5
- x11-proto/xproto
+ x11-base/xorg-proto
"
DOCS=( README.rst RELEASE_NOTES TODO )
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index 0c8787d1532d..ddbed4f462cb 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,3 +1,5 @@
DIST redshift-1.11.tar.gz 543804 BLAKE2B 9921ed703555fda60c06df9425bf4423ce3891db60f41a1c4c4b4897e2506b8ad79e44f765e49b08db5549406008e12c412c6ecb2a07316cdec4b123fd11ef11 SHA512 bcdb4c120efec3955f4f91f1290db0679e987e25d6610bd90ee8540a96bb11338e36b10680736490ea0b7e9eca5bc195b51767a5badf0b80495dc3da44c4ed8c
+DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
EBUILD redshift-1.11-r1.ebuild 1929 BLAKE2B deb30ec58329ba856afbd6176126da5002a49ff62187156788bad54d72f2ec08e410b066992e56be7e86ab6eb3ec704c46fefc0cd9285246bfac050cf68345d8 SHA512 bb1431c1b5fdb038024b9e99f83b49e3336161b6f6a26875f2c1fdd43dde30607fbdbbefbcd56b1eb614080268af8fbccb156a1ae303683f39d620e809a0c6ca
+EBUILD redshift-1.12.ebuild 1932 BLAKE2B 52f33b9630f4d82963c5399a3b3ec4f8d0b978731e2b30df3bebff41c521a490a12b0c41b8c0defc9f6180e70231286a8eeb1c76e448f8543b891e5cda5dd10d SHA512 a6882157a309e4f06917b0c2ecfa80bf810dd1312e06b9c08ab746e7041e257700a94b51b94d3f9b4dafc8e3a45a52585b87ce6322628543ec9751b0f6272060
MISC metadata.xml 545 BLAKE2B db060df8f3a667a05c9517ed4181b722e4c2f987d7f5aa0085e3d8adf8a0d652fee0ca6901fcab4e75344f3337df4eb1ea15c7555fa2034709c185049155cd06 SHA512 5eb06d120a80deb3d70b3007a4bc8983b276cfb87a5471ca062675770e1e575e29e5b28562e53521976c9ba7c4cd6c95aee7fffb56aa2b1faaed098de42a2bc3
diff --git a/x11-misc/redshift/redshift-1.12.ebuild b/x11-misc/redshift/redshift-1.12.ebuild
new file mode 100644
index 000000000000..e7b003af9f8a
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.12.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit systemd autotools eutils gnome2-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="ayatana geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+ x11-libs/libXxf86vm
+ x11-libs/libxcb
+ x11-libs/libdrm
+ geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+ gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+ gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ nls? ( sys-devel/gettext )
+ ayatana? ( dev-libs/libappindicator:3 )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ use gtk && python_setup
+
+ econf \
+ --disable-silent-rules \
+ $(use_enable nls) \
+ --enable-drm \
+ --enable-randr \
+ --enable-vidmode \
+ --disable-wingdi \
+ \
+ --disable-corelocation \
+ $(use_enable geoclue geoclue2) \
+ \
+ $(use_enable gtk gui) \
+ --with-systemduserunitdir="$(systemd_get_userunitdir)" \
+ --disable-apparmor \
+ --disable-quartz \
+ --disable-ubuntu
+}
+
+_impl_specific_src_install() {
+ emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+ -C src/redshift-gtk install
+}
+
+src_install() {
+ emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+ if use gtk; then
+ python_foreach_impl _impl_specific_src_install
+ python_replicate_script "${D}"/usr/bin/redshift-gtk
+ dosym redshift-gtk /usr/bin/gtk-redshift
+ fi
+}
+
+pkg_preinst() {
+ use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 5575e218cd2f..ff545db718b5 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -3,7 +3,7 @@ AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9
DIST rofi-1.3.1.tar.xz 211732 BLAKE2B 60a217a47c547b1e59632356f4ddcb37144364a990974cbc013c53b21eae04e9568cc39e2ba6d2ea681501582910fb685bcb865cf011be0b2f00d986f4317c3e SHA512 a96c53ad268883277c4ff0ee3267ff7fab4d4a93a982019ce19ea82771b65c32d56216d777494853bffd18481400af72ed777f88cce4b26d7d1b8980a997f6c6
DIST rofi-1.5.0.tar.xz 354232 BLAKE2B 2478902542b994ba06c4d436fa9436659366e2416e1a7a3ddd9a48e84d397faff963a4ac0c1bb1011a5f8a8440d1fc257377d28f556a60dc264b29eadadf5c7e SHA512 f24f93224f38e009307912dec19182a04b36a9ac88b26a8657d853cc040e1a59837a56a3e8ff08aa34143f455b5030c73fc28ced96123f3bc7e3943582aee81c
DIST rofi-1.5.1.tar.xz 355912 BLAKE2B 710a35ab82bf960b331431be3cc3acfb5cc27b42d7fa8b02e8c070918679b90612d89f600a6e58215bc0a08dcb60087ea37a5498fa8c4ac39d246d5967f0b314 SHA512 32074e931199ff1529ebab8fef53d339eab09843888f862953b7d661323484ebe66d820feecc42604a16bd683a5af1ec4d1a2e7f097f408efed6cfe91c4eb5ff
-EBUILD rofi-1.3.1.ebuild 978 BLAKE2B a89ed4a7c0ab31f1014db24375ee7abae94dbe386b00aaa1951408e3c7af4916519133c8bb99c199cc1001d28f8b8d2cd81bb42f6f84d3007de5c5d823ecd9bc SHA512 60e25a23f36fd83e33c7652cab9ca00c77bbc0f0b5956fdf8658f48e94591d32d34f4c33774bdf7f9565caa8345aaf3cdd6e8139b4e0ed7d8a6e92dee38fe74c
-EBUILD rofi-1.5.0.ebuild 1165 BLAKE2B f17bce1f35e0cfadca8299ed4ca4b42ba5f7daa198cbacf6a5b8366d71f8031e66dcbef53a96560be41a6b17ee654694d6ad0d9c6b781c3ed33b761603c3de50 SHA512 de57b23c7697a5947c6325d3672d5ee78d7f50d55cf5aaddbdff3ca8488370a0450f316c39b6b91a731b428566aa25bfbd6bce5a402f48b246d162d8c09b0f05
-EBUILD rofi-1.5.1.ebuild 1165 BLAKE2B f17bce1f35e0cfadca8299ed4ca4b42ba5f7daa198cbacf6a5b8366d71f8031e66dcbef53a96560be41a6b17ee654694d6ad0d9c6b781c3ed33b761603c3de50 SHA512 de57b23c7697a5947c6325d3672d5ee78d7f50d55cf5aaddbdff3ca8488370a0450f316c39b6b91a731b428566aa25bfbd6bce5a402f48b246d162d8c09b0f05
+EBUILD rofi-1.3.1.ebuild 956 BLAKE2B 5d895c9370bf82c6e5470ffcfd15909a79a67e55a20ab33bb39407312832658e604a823e90e3922a9bf7a25dd3d73dc7f31cb1b8d8993f7797303fdfe52f3807 SHA512 d78be7b3ee5cf1b19e2761a746b0286185bc9f1b7c19526d2234cc33b0f6d1dcbec269be43eef672c77fd6a1a3b11d9b049fdf2ff38b2bddfe8c805c19d5b3bd
+EBUILD rofi-1.5.0.ebuild 1143 BLAKE2B 0c2bf36ffb4cfbcbfa4e815558ab64452f642e12fff1307559b3b7d13cc82f5c332db11de061709d066e8d06379a0a9d2fa11db28143c67d5ec808c211ac2d90 SHA512 c6b8ab4ea5ac3c6dd0db8f182e49e55a1660fb7b5b79ddf1bb2e04161d4415afb0a5f21b90de5a3627cd4ad5fa1797fca8dc9fcf36a5b800574a46646df6d319
+EBUILD rofi-1.5.1.ebuild 1143 BLAKE2B 0c2bf36ffb4cfbcbfa4e815558ab64452f642e12fff1307559b3b7d13cc82f5c332db11de061709d066e8d06379a0a9d2fa11db28143c67d5ec808c211ac2d90 SHA512 c6b8ab4ea5ac3c6dd0db8f182e49e55a1660fb7b5b79ddf1bb2e04161d4415afb0a5f21b90de5a3627cd4ad5fa1797fca8dc9fcf36a5b800574a46646df6d319
MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
diff --git a/x11-misc/rofi/rofi-1.3.1.ebuild b/x11-misc/rofi/rofi-1.3.1.ebuild
index 510e5d7b52f2..6d2181a39178 100644
--- a/x11-misc/rofi/rofi-1.3.1.ebuild
+++ b/x11-misc/rofi/rofi-1.3.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
@@ -31,8 +31,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xineramaproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
PATCHES=(
"${FILESDIR}"/${PN}-0.15.12-Werror.patch
diff --git a/x11-misc/rofi/rofi-1.5.0.ebuild b/x11-misc/rofi/rofi-1.5.0.ebuild
index b0ce40db61f1..dc85085b3148 100644
--- a/x11-misc/rofi/rofi-1.5.0.ebuild
+++ b/x11-misc/rofi/rofi-1.5.0.ebuild
@@ -31,8 +31,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xineramaproto
- x11-proto/xproto
+ x11-base/xorg-proto
test? ( >=dev-libs/check-0.11 )
"
PATCHES=(
diff --git a/x11-misc/rofi/rofi-1.5.1.ebuild b/x11-misc/rofi/rofi-1.5.1.ebuild
index b0ce40db61f1..dc85085b3148 100644
--- a/x11-misc/rofi/rofi-1.5.1.ebuild
+++ b/x11-misc/rofi/rofi-1.5.1.ebuild
@@ -31,8 +31,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xineramaproto
- x11-proto/xproto
+ x11-base/xorg-proto
test? ( >=dev-libs/check-0.11 )
"
PATCHES=(
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 13c80acf529d..e28e3e80263f 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -2,6 +2,6 @@ AUX rss-glx-0.9.1-asneeded.patch 263 BLAKE2B 281738a113dc81bd661f75982ef48d5b629
AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71afed34bcb09243ef0f8a60d46ea63fb2286e3b467e27165d2f7bbff7d2eb04849cbe10c889351f428b882b1e6d828fb45195 SHA512 706bc00bd5904c78bfc2858e7b6718b7288b401837ef9abf092ec7669eaf7f81def42e0684f28f3d9195abf00c5ec1ef0df617d2bcb0f55987f79e1914284b5d
AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
-EBUILD rss-glx-0.9.1-r1.ebuild 3728 BLAKE2B fdf0d3f7cb619a135b7e5e2eebcd37f4ece04107419ddc45e0634af3ad7094407731acfb5c9b85caee95608fb09a55cc592fd0b6e7c74502b83d7c507bde0789 SHA512 8022e6537187f3681fd6a9c2a9a5fd4cafd6efae41443cedf26476dc8abe11ffef29596634e224a407779cf30cb348f049e75b052e1adc25001614f82a02c772
-EBUILD rss-glx-0.9.1.ebuild 3690 BLAKE2B bb05b3c263d432177615ff555779e2c2574bb07a1cc2f0eef404d1cb220d32fbd1a135b3d0b2d6c0867c5c662c889fb3d94f4d5af252c5ada40eb3a806ffc3b4 SHA512 99a9d14a3c659ef635000df7cb67440a40ef6f5a73dbe1636c11a7bf1d3a23dcd0f637c09635c998d110fdaf07c3f5091e9fcc462f62e3dea33786459b389959
+EBUILD rss-glx-0.9.1-r1.ebuild 3728 BLAKE2B e955979aab325e5bc073a572214bd8539d203a8eaf199a4074efdc17495a26b120ff7ccdc71c1c680ce0f471711c2375df40bc53d67fce0ac0ed72f805fa6ef6 SHA512 a0f7436e6b476d47c5abf71edd481478a106ec1e83752c1073f2129d83ed01193cb684983fa388624c4af24a58a1979feac50cb670fe295f11bdd1460facc96d
+EBUILD rss-glx-0.9.1.ebuild 3690 BLAKE2B 582a7fb11166b5a06024ce0993e45e8fa8c2c6028d26215df84cf82dfd3822abd897d519d1e860467f5022b0e74f68a3e18a15ce2b5d7ca3cf2dc5b0fa607b1b SHA512 0ed2be0bd6d23d9093beae568cab1f312a9dd140816f726ca84e8d5e145775c10b6c7ab359a0c303e3449f999ba7db9771c73621baf10abc2acae373c8c28fc4
MISC metadata.xml 444 BLAKE2B efed936fd7e5f9ec41b4944de689f03be14cc92c75759f91cb0f488599beb09b6fbed538df863a38909a674c4da4aebfc93b190765c9194280c62ee1b42bf9b8 SHA512 05849c2a8dbfed55c72261d2d977ece92058ddfe14565eeb22edb7d57ba2fab707bf8d97948fcbafe6f53a0880dcb651a6f8b4caf8fcc6935415c94de9443e8d
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
index 4c1fd136e3d4..f9ae27770ea4 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
virtual/pkgconfig
sys-apps/sed
"
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
index 59f0d1afaf19..33678d15e886 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -25,7 +25,7 @@ RDEPEND="x11-libs/libX11
openal? ( >=media-libs/freealut-1.1.0-r1 )
quesoglc? ( media-libs/quesoglc )"
DEPEND="${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
virtual/pkgconfig
sys-apps/sed"
diff --git a/x11-misc/sisctrl/Manifest b/x11-misc/sisctrl/Manifest
index acd00b982154..c340123ce1cf 100644
--- a/x11-misc/sisctrl/Manifest
+++ b/x11-misc/sisctrl/Manifest
@@ -1,4 +1,4 @@
AUX sisctrl-0.0.20051202-no-xv.patch 301 BLAKE2B 14166dac99420663ee9912647b9ca0bdb9e80f91aa129b4dc3645c94f37530431159e9066b3bee638dbc2d37755bbe6f820c0865b13e7000995e65fb83ca450f SHA512 494efc2f8505a3af3b829e9f7b653ca674b3d7668fdf68fc5b587cf83421755303041bc9fc881226839bce39e324147516e06106bc2730aab43de9c559b61c96
DIST sisctrl-0.0.20051202.tar.gz 666749 BLAKE2B 8e99581cd9708a17ed3d01934c3a70e660213df91cbbac71816eb16dd5c41da725d92fc66d336fdc88b61704d9e7259f77b3da2becf2d2ab901d72e71f1e8c9c SHA512 26fe6561c2c14ff6cf952b89b8089b4fbdbc0c142bbcbf1358afe610b219a05dcf4d0bc835365cd0cf13558fed142b8aa2a0aa91c4fec8f40f0fc82590feabd1
-EBUILD sisctrl-0.0.20051202.ebuild 712 BLAKE2B 06778fb6359f38e1f3cff78471ff99867ec84335c2de2a1190f1fdc26e28b6fedbae90b617e452d839d1c5f1aab1e1e397a68638d02bc5426b2b4fcb1a8a0699 SHA512 c8e32564b6263dafb8628692f84e3d6d5460b6e9a6219d379100209a20dfcbd1b8495f89e290368b3edc2c678aeac9a227f835bd10524056a5b5616216561a78
+EBUILD sisctrl-0.0.20051202.ebuild 705 BLAKE2B c04e42d978bc4ad353f70a75008040425fa52b426ae64bbce79f4047d46e0efdb271397ff15f4f4f80c782ff982b777952473cde3152b8a6ef431fd2febae399 SHA512 c5eeb8bd504b7d78ca45b9b559c4f0810c15968cc9dc957db37e72d7cafe956c06a5509e5cdc2f746e7b7b30082dab8549d5ced84cfdef85cd3b055bac793c04
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
index 8382ae2c2094..c6a8cc504965 100644
--- a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
+++ b/x11-misc/sisctrl/sisctrl-0.0.20051202.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="dev-libs/glib:2
x11-libs/libXxf86vm"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xf86vidmodeproto"
+ x11-base/xorg-proto"
DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-misc/skippy/Manifest b/x11-misc/skippy/Manifest
index 5302d4ec3f93..1ba7e12efe82 100644
--- a/x11-misc/skippy/Manifest
+++ b/x11-misc/skippy/Manifest
@@ -1,5 +1,5 @@
AUX skippy-0.5.0-Makefile.patch 972 BLAKE2B 7e596feb633fc5fdd65340cdcfb497e5909a5a08fc7006ec8c2a6afa60ed4e71db95e6e509ca640db61ab0686f9e5570b72069fce9cd74c104c4326150f7f1af SHA512 c94db12a8b21016923968ac179d43b6d57cc1a9cfc1fa45e3c2432aa7f8fa223a1aae41467b1756c309a209280667190c4b26c512430f5398e36e8af6d5b7150
AUX skippy-pointer-size.patch 208 BLAKE2B 5fa1ad3bcae18c18e4ae06835694ddc5ec41f1c6e4002a225ea1ea79f52bec69083281bec20e36eb08261897f17e28c63bd996afc882fe5b9ddd34e6ab2e5beb SHA512 b922e816ec7f2ba672cc528a3ca5adfbb8af9ca8744deb6a2f6bfd40928a62e0937c4f453f046a87e23bc34f5a67ca9109cc46076c12454ab7097591059c847e
DIST skippy-0.5.0.tar.bz2 23722 BLAKE2B 087ad99a0d7e074532a7ed9999f6c4ba792d25ea33bfbb43af351ecbf904a5fb77a4e5a5935bcffc62b8d70539692f37b2b3b89ad3c16a91a39266bec4990af5 SHA512 516e648e23a6a92e37f4d712b36f65ad640e299bd18677e30d4aa565929629c7749e64124b97da590d947daaa4e0de819cdcc3aec99c524833dea4c7955a7770
-EBUILD skippy-0.5.0-r1.ebuild 967 BLAKE2B af54e170dd520d47169e36a7fd50eeaef0b3880e7673d12f6680a29f2d2d2848c3d663083734ffd51f33a64a07cae9c9c76a0e08d75ae081d68acc9683b5f934 SHA512 6da59ce10da775b110400061efae103396790abe0aaea28633a61a4a3a01312906022916f85e61672c284b7b8fbc490471945cc0e291579057134a64edcde742
+EBUILD skippy-0.5.0-r1.ebuild 945 BLAKE2B 4ccc2ea3eeca81df5b544c4ed9f579957f0992e6f27f2662f363aab059f6e8870c6ff04eb89034184e80f1e39c159ff140b9b045938231a387a0c7af6d6855b4 SHA512 73240b9c790b7430fd47c64153b102f9a99c2393cc1c5430faf8bd27d1c4fa45891d768a0ff40676fedb181d5a3384b8d098f017b063b743d61546d008538dc6
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/skippy/skippy-0.5.0-r1.ebuild b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
index e2823f2dfb16..1b63a8fe60e7 100644
--- a/x11-misc/skippy/skippy-0.5.0-r1.ebuild
+++ b/x11-misc/skippy/skippy-0.5.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=6
@@ -20,8 +20,7 @@ RDEPEND="media-libs/imlib2[X]
x11-libs/libXmu
x11-libs/libXft"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xineramaproto
+ x11-base/xorg-proto
virtual/pkgconfig"
PATCHES=( "${FILESDIR}"/${PN}-pointer-size.patch
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index c059851f5704..98a508e65f52 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -14,6 +14,6 @@ AUX slim-1.3.6-systemd-session.patch 820 BLAKE2B 39345e96a1dc2cfc7a94b874d5be4bc
AUX slim-9999-config.diff 2480 BLAKE2B 11dcd073dd0cfb83e49bc545fde0190a2d733104a63b502822a7adb6b1ed21b2e227ab6ab6957e33741a3604852ff4164b106d64be039c779f2be5c23d06bd5e SHA512 6018c5eadd0c63e86b07ad8662ffc046fd1f586c101dc84bc9452295a9a11ed1a82a6a8a228bf8d5e064cc5d17b1bcea8662f957b831c96f8ba21c0f55a0d216
AUX slim.logrotate 102 BLAKE2B 8b41d56746b9889ee7f13f3cef08f80532c0c58505061ce09262aa629af5ec77dc35278ce979c717cd53f6ba586c529201e0dca47a28044231bf2d0b9cd8f317 SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2
DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
-EBUILD slim-1.3.6-r5.ebuild 4182 BLAKE2B 8630776ef429e5c9903c18bcd5f0a5d8923df7f14a5bbbd1b52c076d4bd1eb36572ddd61929386cc0bd8dab6f66c0eae268c781ca1ae7052bf4765eac94ca3ae SHA512 c81b6e112a3b657763b376a5da461a9fcb48d14d3d8b2af7ecd1b17add81c8f06bc6322ae1a48f54267a33b7bbddf5fcb5f4541e97374d8651e00b129464485b
-EBUILD slim-9999.ebuild 4055 BLAKE2B 74bababa96882b850a2cc2f67301d417a0db40b07650a6e91b4cc46646d8c47300cb94d4576150ed17d6098e892166ed7d0747871896a79f6b628e23571aae80 SHA512 9027bc73ccb70c95b1000545bfbd8b1314f1a08d9833389b25887b929323e8379f7442182a0a802ea4ece764447f1a2dbbabd2fae31bc64e99b39afea4d04803
+EBUILD slim-1.3.6-r5.ebuild 4185 BLAKE2B b6caa9a24635afef43ef751a50bbe02f5b6e168cf3c6e48bd9a8227932870d96d2f96e1357d1cc4398520147a3c365dcc16686c0d45132ad972323589f052301 SHA512 5e753674aa49797f8c264b8d21aa35f12f725df368c3da7a8fb9332f57216a903d3c5c011f11bc76492c8d3ec65551f43b677c40058731f2d02dda2e4233dd76
+EBUILD slim-9999.ebuild 4058 BLAKE2B 3f7544ac2bb799284f879214ce52ec2e67aa826dca0ae19fe5797508c35f839c7efbc7b5a7158c603a8b3e3eeceef48c49f2a87ba31babf86a16e5b16a543284 SHA512 0527243f7f00b129ff8423c30e6703f90bdd6f1ba27da0f220b29c97dfde0b75fecddfe9ff9ee8b397873f176683689fb11497c2f8d6891ecfad1dfab7b46b27
MISC metadata.xml 514 BLAKE2B 30f0fae6144c9bed109df03b4b77c25ddc0b2e8a69b8cecf08eb14ac3ecfa364d206d2b6832892e74986b28e293d51f51f6ae7102348d81f8a0f5594f8f95c94 SHA512 28f99f92bda5c50f97a164aa53915ecc458dfd84e6c3dbfb9dbfd6e64d0a98b7de9bfc202949506b2af91cb716a8b681f1db07b974d3d3776f15e2cdf5129950
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 3a0c714df65d..79f4540da207 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.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
@@ -29,7 +29,7 @@ RDEPEND="x11-libs/libXmu
!x11-misc/slimlock )"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
PATCHES=(
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 7b08d5e831de..263d58016abb 100644
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-9999.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
@@ -35,7 +35,7 @@ RDEPEND="x11-libs/libXmu
!x11-misc/slimlock )"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
PATCHES=(
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index b19fbf01bd39..5961d0935d2e 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,3 +1,3 @@
DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f
-EBUILD slock-1.4.ebuild 1183 BLAKE2B d4b6b720a4504fe2befd390a7498b71c8cf262e691917d85c6b6f1b7b1ffcdd7667008414436c2082070d18c68a768c0e9bff4d6ba394bd948441828c27cf289 SHA512 75842d5f76b851b2e28e9eebbf770e0b8cf444fbf49461127b71638b8e9aa3a4d7eb74953f22227ab05ebdb388dbad53cd465cfebe5b4607af2d7de85aa3f39c
+EBUILD slock-1.4.ebuild 1164 BLAKE2B ab005c6260ad0c46173e1562f3140363a1a0e5b5b527efe65cc2cfad5dc5149217ce62f12ab0bfa327444a48b8a7414f0bd08b36f5bb2018f198ebaa0cd58392 SHA512 0c1529248944bfbe903397b2c56d87cda8359efa6e068c24fdb0ace21153fdf18090b5d9ba1aee9e40ed368f20ea6b8e5f364e3b57fd6d99ee27ecc40568e02d
MISC metadata.xml 347 BLAKE2B 1f37fe6210fecce67b02a14defcc2510c14189876257d2a5419a50c00c237100dbc37dfff653434245e0b78daf7389121e34fe76aeaf7119280dc154f5dfc95f SHA512 5939bd8c1055a98efc2987fce141841116bb531301b8666d85c7018ff8fd0bcdb21d5fa8eb5d39ccb384666a3c53834700cfa442262624714a4633aa0ac49545
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index b6a698a98bc6..8f6a2d972ac3 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.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="
"
DEPEND="
${RDEPEND}
- x11-proto/randrproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/sprop/Manifest b/x11-misc/sprop/Manifest
index 3a0d846a9f7c..cf28c4909a27 100644
--- a/x11-misc/sprop/Manifest
+++ b/x11-misc/sprop/Manifest
@@ -1,3 +1,3 @@
DIST sprop-0.1.tar.gz 2750 BLAKE2B 623a8668c49ef2e60398113bd49e036377bdd670a00c6bb5374fd106cd2757532ee2ce46f3d51e0ffef380d70c121733aa5df5a72db6abbdb6b202d9d10e2192 SHA512 74f918b2bbf627e269a674cabd8c4c26192ba67a7240061c0f0f6ddc8e86c32aff83352f2b2f4a2c6b2fcf7245cb1293ae98a2e7bd6189d632e20aa603764ddb
-EBUILD sprop-0.1-r1.ebuild 744 BLAKE2B 1d620e3551d428f121853b54fc453990d1b4ee87a4eeabef9ca9ce722162038e8e587c26b44ba2c795c60a82af922fc15a4581eba54ef06c0697f66245e0c832 SHA512 eb310475899f814cafd69dc2b3324e75b01c607fa9ee88bcec53661591d812becc179ab54cc60aba95c25194e94a9531b8ed62c74f4595f68696bfb40d5bdbcc
+EBUILD sprop-0.1-r1.ebuild 747 BLAKE2B 7bd1059bba3bd735ee1d64a0e8d0c5b324887f123df48da1d18028a6cc9e308c8c56aa9c607c11c96ca400472cf77e22b3d9bbe60b58386ff5261d53aa1f8c34 SHA512 859e3476c5119df6edccf2d420bb6308238deb3b34fda3a1f67e6336a1a0dbd96513c7072184f0b102f880b3775efd908f28221ed3da5efdb014a578a5ca07e8
MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/x11-misc/sprop/sprop-0.1-r1.ebuild b/x11-misc/sprop/sprop-0.1-r1.ebuild
index 7c0084b7b4e9..c0cee8850f7d 100644
--- a/x11-misc/sprop/sprop-0.1-r1.ebuild
+++ b/x11-misc/sprop/sprop-0.1-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
@@ -17,7 +17,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
sed -i \
diff --git a/x11-misc/stalonetray/Manifest b/x11-misc/stalonetray/Manifest
index 185d36a6594b..95e4376c7414 100644
--- a/x11-misc/stalonetray/Manifest
+++ b/x11-misc/stalonetray/Manifest
@@ -1,3 +1,3 @@
DIST stalonetray-0.8.3.tar.bz2 155276 BLAKE2B 68041239df7d3441f9abd279cec55ff11deb0ef73eb984be8ad2f0348285164c112918c9e850e5fd2a994144a0c84429164e9f46a0baf81a29ed763b750ffce7 SHA512 b1c50d844b6497b586c1ad56b721675690ea305a4e3a2601ab5305af0e208c215825eefa8fa374ae0c392252156a8dffd5882992c943344f5b6a674fe6553942
-EBUILD stalonetray-0.8.3.ebuild 736 BLAKE2B 493bf61b0261ddef52e152c488dcfa9711423a377016294eb8ec61086e87b25adfdd9fa88969a5ebe18ed3143455ecf28c7a0a8360d2a382abd591f64f4e07e1 SHA512 300549373d5e5d5666f75147b58c519cc74bd042f78ee05293c08954abb31e6a7a054872554bb616ea90869b53ade3fa688dc727078e9a91c19b433dd27b11ac
+EBUILD stalonetray-0.8.3.ebuild 739 BLAKE2B 365dcb844b7dc3c4ef8c1f08820ffe8f053e85e571a9c8623846fa8d2d4c992fdc98363990662f4cb80e2a44a2272c53f016669c1df97b874a0fe4cadbcf6603 SHA512 f73ad0d89b6510e46aea2fa3c4bf2a65ca1ccfc099d2542badd7e313a0619a1558956bc006c6f7c02846ed20ca079b3ac0c215a7aa14c5c33071812ac7959a91
MISC metadata.xml 349 BLAKE2B a976992a09bcdc6d1f77a622bf627ba6732f771c4bb24f40c86b7f2c116edd28ca16401972cf91e39f3295dc5b22196cab2d91b0b61068e0ee2c0b02173cc8a4 SHA512 7bab253de4f5d8b158baa40e02594ffea15297c6431f838aca05a05c6adbf310ea21f9b2629e014530b78fef89f848240beb701e61de770db704ad85ac0be4e9
diff --git a/x11-misc/stalonetray/stalonetray-0.8.3.ebuild b/x11-misc/stalonetray/stalonetray-0.8.3.ebuild
index c415409cc447..2cff1037b9f0 100644
--- a/x11-misc/stalonetray/stalonetray-0.8.3.ebuild
+++ b/x11-misc/stalonetray/stalonetray-0.8.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
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libSM
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_configure() {
econf $(use_enable debug) \
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index ac03b4d8b8ee..1258a30266b9 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -6,6 +6,6 @@ AUX synergy-1.9.1-qt-5.11.patch 1211 BLAKE2B f457b5d8afa5c9fe0d750a5d80a6baa44ed
DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe
DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
-EBUILD synergy-1.9.1.ebuild 2217 BLAKE2B efbfc6e59d47df62028babcf15b94b32a3e6f84df361cea69896e865f0789adbe6915ed5e40586aba7946b980229f457ee3d1dc87f2a66db11722d1c3d03a8de SHA512 18d0f1cbbcb443a61cdb2da3c1285f7e714cd3bb9039e0d197bf8ac37f3d63d18a11dbedf6a3d3edf8a4768e430716e1d5f5e06061ac54d63f040dc3d3c2fb75
-EBUILD synergy-2.0.0.ebuild 1525 BLAKE2B 350eab710ba71bf5ae7f1c25d4a9830c6eeb5500ef306fae6628c9fefb02e441b3f54ae0afc815025c8ac4b5389aca56db55309d5409a2ca4fd001c1bd7c021d SHA512 312e7107eccf03ad4022c9e6d28bb2b6c75ec4594e8585cf1bd27badf52d496fd9096a97fde4f5104486f5abe7aeed7c2bd3eaa1b4c52294a7f4510de3115038
+EBUILD synergy-1.9.1.ebuild 2133 BLAKE2B acccde0866c6a542c5169e2e2e8868960ab31e1b6330397fabbf51be14d39ed08a612bad8ab058f61d238500acbd3523e7458d3c0448f9ec567aee86fa6bf47b SHA512 59f325779128796cd9b51b85a254ebf72ab6344631501d07cc2f1ad88b2744ca208d40ce7b770c42317e17d9202f782ecea3ac8c5de695b4b6d3288afcf144bd
+EBUILD synergy-2.0.0.ebuild 1441 BLAKE2B 5afebfa5d2fd77f30c81d7b219db60c4b51707ca365b663d5a60fa363070697f9462dfd466798eab585ca9125df74ea49baa6531776a2f73d7bd088d8ed7c479 SHA512 da82c2b5b2f21b4d94be8c8ed57309a956636eef45722c97adee6e31e8d3b2c8999d0c3dfbd641bdd3993bfe7b1314f7f7be3b4a6cacb47d0286a652aff9310a
MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7
diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild
index dda9e9c3a8d1..0484cd37832e 100644
--- a/x11-misc/synergy/synergy-1.9.1.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1.ebuild
@@ -42,11 +42,7 @@ COMMON_DEPEND="
"
DEPEND="
${COMMON_DEPEND}
- x11-proto/kbproto
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
RDEPEND="
${COMMON_DEPEND}
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
index e39361604e42..c6741a4ca9d8 100644
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ b/x11-misc/synergy/synergy-2.0.0.ebuild
@@ -32,11 +32,7 @@ COMMON_DEPEND="
"
DEPEND="
${COMMON_DEPEND}
- x11-proto/kbproto
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
RDEPEND="
${COMMON_DEPEND}
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
index 28121b71b9d5..c7961fc7db87 100644
--- a/x11-misc/tabbed/Manifest
+++ b/x11-misc/tabbed/Manifest
@@ -1,3 +1,3 @@
DIST tabbed-0.6.tar.gz 12926 BLAKE2B e92e2c7132f7a760286c61c99faa0b26e411326e172c231f3354e61f8151f561babd4a35998bc06cb7fd87dc962334ef0ddac78ba284cd3090bb1c2dcfa159be SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553
-EBUILD tabbed-0.6.ebuild 948 BLAKE2B fae0f5669f68e68f2b8e073577da4b980913156a204b71d047fd073fe0040c5b86dc3875e568edf75c3f1c616a66c049947432c5457aa7780d92566b1f440f37 SHA512 a60cbcd48d8c79c5fb9b22c0bd7e7baaa3ca730c5f08e9e957e87e7c4852bb6286c7709952440ec6fe5711cc7720a1c9f5de40b01748d19a222099ceb78c82d5
+EBUILD tabbed-0.6.ebuild 951 BLAKE2B 167bd1473eb06e409dfef30a16cba6e3ff710f2b277a649ff28db7b22ae5c0ca8fc539814663383d7b49a604ff71807cc24369520937069c07f0290b5cdcf82b SHA512 b46557e4ddee419d7b7229861984e77fdbabe7041d970401a176da572f5477cf0cafc6c2eefcb1659f45cb80835058081c30ba2c6e0b667f332fc0eee5023664
MISC metadata.xml 369 BLAKE2B 229857fc781778834cf45f22a8a170e76bc50c7aa24caca6ed93e4f1510bb577b8153ed419821ce78edc0049b97d677ed8371ba2517c9f60759812e087a15886 SHA512 9c2113536cbda45e66eb5697ac4c173ff301a7692c7f3bafead7e5bc7e30778535dbd9dc8ee494ced840a2f17e6b1674c95418772fbffda61eb11848ef368b9d
diff --git a/x11-misc/tabbed/tabbed-0.6.ebuild b/x11-misc/tabbed/tabbed-0.6.ebuild
index 62c051535985..2848e538dacb 100644
--- a/x11-misc/tabbed/tabbed-0.6.ebuild
+++ b/x11-misc/tabbed/tabbed-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,7 +15,7 @@ IUSE=""
RDEPEND="x11-libs/libX11"
DEPEND="
- x11-proto/xproto
+ x11-base/xorg-proto
${RDEPEND}
"
diff --git a/x11-misc/unclutter/Manifest b/x11-misc/unclutter/Manifest
index fe9e122703ea..dcb4f6d0f4a4 100644
--- a/x11-misc/unclutter/Manifest
+++ b/x11-misc/unclutter/Manifest
@@ -1,5 +1,5 @@
AUX unclutter-8-FocusOut.patch 525 BLAKE2B 4e1c89a6d7bd91483a91683d1ad1f0cc8c873e778673a2c72b7632c833f28bd97b7b4e6fafdca0eb3ff503ce96134198c43ea5ac54a6a9691c2c80d2328b403f SHA512 4ab3cab96574a545595a643e79dca102ace5bb4b853f514bc8a34457a14a4ee68bc89f5c8171d23b7f4e29cd951a60cdb47cc07901327984bdd39ef33f57877e
AUX unclutter-8-include.patch 183 BLAKE2B bdbab7861a4baad3fcebdbec9082242398385186b9098cdf37f90c7b5c657407b225722711fbab1ab26d42331af18dbdb0c33f9ec922225e5fdc0e7ed88bf600 SHA512 726437d5cb6e813930b661bb47d2f15f3e37fc050f670a2125cc330f29b0ebcb97325886af21bab788d17e264e9e7c20d2c087d5b184730d3c06409304317bfa
DIST unclutter-8.tar.Z 12344 BLAKE2B 10090ec2f3772c17d00cbcb27f416fb528b75641b7d57eeb36ab7e19af2510ebc5901a0394c0ee590a38afb8bf64d4b2b2ed069b0b1a44edcb9b37701f89c9b5 SHA512 9a64e6eceae685cf34b1ea85818735f8f85514ba1eea262476653886d74e469cfd6b9a39edbd098b138a5c89e6b97b42cf251bee59272c76cbeba190979744b4
-EBUILD unclutter-8-r4.ebuild 758 BLAKE2B c8cb2a54418c5b22ad7dfe4403c5eee71064a52202b8a3a24fd35fcf5a43f8f7e94662e102809141490f84e65601b472edba8656e741a0c6c11774d0b998a7ed SHA512 a1728855857ad15697f9602cdf71d965f129c388924f86f8e78d8b4a27435ece0eef37b65639d07772eaed80ddc8974b2729ff355c33b96df82bb0dbd3b6d16d
+EBUILD unclutter-8-r4.ebuild 761 BLAKE2B f6f9045e9d717a1cf65cc3719cde5f6226981784afc51a4609821b6ea9e2d7be7402bd4354a1f2f66c375088b39f6e9b953f475722c41d5013dfc600626e0a8e SHA512 9291f8885fea05d314d12763ae0dd5c0278b9da02fd6544ae4aa5d06df58b2fa8064ecfd258b2f28541f9bdc7c30dbef0bfa2c93885a83134cef7bd3b4b1e6b8
MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/unclutter/unclutter-8-r4.ebuild b/x11-misc/unclutter/unclutter-8-r4.ebuild
index d73744fa9e89..55f953d0b10c 100644
--- a/x11-misc/unclutter/unclutter-8-r4.ebuild
+++ b/x11-misc/unclutter/unclutter-8-r4.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
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86"
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${PN}
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 04eaee056e7b..e76a2209d4e6 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,3 +1,3 @@
DIST vdpauinfo-1.0.tar.gz 88567 BLAKE2B 6f0834bf6a8fb83204b70858ac529010ab69c55de4b2c6b8b8864ea33aed385bb9125ad12a82a28086dac43f39f06c2b757718142d800b5de2263513e9c5f02e SHA512 54c177424bdae65374a13c0546ecda0e25e7357f9e779fb48dc018a9c11593039f87715ea18b320684dca22455df9b41a4eea6b0f977956efb6ab85b8b99297e
-EBUILD vdpauinfo-1.0.ebuild 465 BLAKE2B 1555ddd4b8f2a6275783943173e66281167ca670907de0ce950cafc884e5b07c5cf513f72e1056dd3ae82a7597de48444a334f566254c20f3f7ef2884b894f02 SHA512 05999e0ae2e0f2dcf2b28b40fdd5f6d905724a156ce1576cfc5e4f78712ae5f7c7a81a3f63d6a93797ff28cf9e1b412a54c31771b9ac5ebf2394d0d99551b0ee
+EBUILD vdpauinfo-1.0.ebuild 468 BLAKE2B c05da34e957445e60eb712db339defb72093fd0ce39fcb56c93dee9d67002d9d57507da439e54aed3fb9b89db7f8555fb9e67e63e90aa940a6bbcb8ea84f0d88 SHA512 5e6c58eb2a50a1a7040ed6355016730443dcfddb3a76da8efb38e235974466fa31d8fcbfb12cfc9f9fff7fe175a7651cadc8df3a44a01aaf8cfe71ef936e5bdf
MISC metadata.xml 247 BLAKE2B ff88597c9ef60254f0818903a632dc7b1e85ca9193202e9001308c597430343283a13ba66f6b32e838bb904207e30d440f1bb95d65c0d663b58e1e6288e708d6 SHA512 e0b9dd88835de51f48aa42521b6540a1f2c7c7b4c419875eda099049cd0793352ced1717851e190a13fc10d2572963e10ccc3a8bae97a8b22190f9c3ab4401e6
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild
index d3dbaaac30c2..eec56d67179c 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.0.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
@@ -18,5 +18,5 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
diff --git a/x11-misc/vnc2swf/Manifest b/x11-misc/vnc2swf/Manifest
index f61918c46eee..3574f811bfcb 100644
--- a/x11-misc/vnc2swf/Manifest
+++ b/x11-misc/vnc2swf/Manifest
@@ -1,3 +1,3 @@
DIST vnc2swf-0.5.0.tar.gz 438058 BLAKE2B bb0effab90934746451efbe23610b3534de31ca1f5f8331dfc1f907b9733f69e78d960bd8d27cc6d75cb0ef688045b019b9b984dcd0e6207819e0590b35fa183 SHA512 f1551015eaafb7810b5d6367b73605f97bc5c0d4d3449dfe1a98af90f743133c0534c8988ee72ce2fc8599926a5f3ed5a785bf18788522b4a7c3cb8bc0529913
-EBUILD vnc2swf-0.5.0-r1.ebuild 1064 BLAKE2B 434bdd8841178d0beefe74e6952b9c1ca764cd329ada5d34671e92ced4ce4983191dfa78b07d9dfa6eb7bc79b7681767b9f60e1db59e75982026a7a69317370c SHA512 d7df7deeea0ea78734da032b12b8fa61f99cb087176950e459a22122d1c081c30211efa1b2920d2bcce1308e118aaac38869bd717e3cebd47dda501c4b525f52
+EBUILD vnc2swf-0.5.0-r1.ebuild 1046 BLAKE2B 611a1ffeb42228b42ff03cf3f9058bc7d57cc95c0878c4916357d0604126e8f21e3b751ad2023dbe5102ed6247e60c1b79fa932fce9d371c8347fcfff85b7208 SHA512 4b39e10662fe6438fe630b63836555406e13a6ab78a6b7fe60c9d77b0ae3ae5244da0929cdc865ad0c06eb5ace685bcb57d88491bf4cbedc77f7dd7b2e6f4f65
MISC metadata.xml 595 BLAKE2B e5cb40382a69ca1f5d8df0825ad2fe0b1df483f25f6f460694de69d3ecb52206436e0b283a6d647f58ceab872df857a50b106a2af52abe91b1ae343dea354463 SHA512 6704b8f85e5439e662e490d581adcfe3b822bfd75e78b91a4074e5cf23267b1e180b91d18cf098c5745587c4e31829d4469bbbee3741fc1535eefe6d737f9732
diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
index 66b55e518508..8f9e37b5c918 100644
--- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+++ b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
@@ -20,8 +20,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXmu
x11-libs/libXt"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
sys-apps/sed
sys-libs/zlib
x11vnc? ( x11-misc/x11vnc )"
diff --git a/x11-misc/wayv/Manifest b/x11-misc/wayv/Manifest
index 6eeaf25540ae..0e2b172f9573 100644
--- a/x11-misc/wayv/Manifest
+++ b/x11-misc/wayv/Manifest
@@ -1,3 +1,3 @@
DIST wayv-0.3.tar.gz 139197 BLAKE2B 88fac982c3647e4fb61fdda7febad3fa57b4a5dd5c0bdb9a2ec85a1a45fd8bff0b9472c161d08b7e9921928f36ead147a9846df12a414f41e28df096bf7361f2 SHA512 dda4dafc63c4393a726175597ae734b321e3c91ab6acd1b4b0ecae5861fa7c87ce83b68ae4a8bb92be9039b22ddb86f7e9ba87559d35095784eb98a5eda14681
-EBUILD wayv-0.3-r2.ebuild 627 BLAKE2B acc037ed2570dfeff56e7f80dcb30306983ee0054d80b5394cf272ab377a86cec26acbfdbb6bd58790cf4714668da68b40da07a9beeea95fa09ce4b7785c7a07 SHA512 af89809050eaea0390ed6b0c1340c59cfedb3397e6b4228781e9312ce269f52875bb8fc5d29b3803fdee485f85ea494f1971946941bac49c221c484f31d14903
+EBUILD wayv-0.3-r2.ebuild 608 BLAKE2B f53094ac474898f1c7ec3b374826aa5fea27687a0cd137d7e36b9e47768d84ca1051bc8a7f9c369cadc0918238aa856337fd7a49a620e7e036fcdb627e9be6b1 SHA512 9b16c9ed56dba7b584080c4e244560e14f5132f4ffa32f18d1a8d55688f67e3d65565de2654c51dece91f06b36f6f31792ea8062580f0f41af3b3b80696ce5bd
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/wayv/wayv-0.3-r2.ebuild b/x11-misc/wayv/wayv-0.3-r2.ebuild
index dd82e5259727..b7763a8fdc81 100644
--- a/x11-misc/wayv/wayv-0.3-r2.ebuild
+++ b/x11-misc/wayv/wayv-0.3-r2.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
@@ -17,8 +17,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/inputproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/wmctrl/Manifest b/x11-misc/wmctrl/Manifest
index f6905f00e33e..95f6a8622ddc 100644
--- a/x11-misc/wmctrl/Manifest
+++ b/x11-misc/wmctrl/Manifest
@@ -1,4 +1,4 @@
AUX amd64-Xlib.patch 1126 BLAKE2B f867b520c9175f0ecef50734ba3a7af78e474ff30b5c40bc88e3df5cd7dd85889a07e0d2f197f23807ae7234c6e407d3562801799c76001e9afa4964026a04f3 SHA512 8db78cf8c267bf2af30e3e91bcd334ea3c6fc8bb5e76afe4a6d9923341631402bf09c7ad55975c8c74f7b54ae288fae7dfdfe737227a72663785b02ec3416f63
DIST wmctrl-1.07.tar.gz 87820 BLAKE2B e1059bef92fd4cf6cca3f539c68bfe3745c95abbefecabe3b1592a7dc3c69d769551f0ea4acc1d1e0c57024ce64e3fa0f0248fcf0f5776617d1ab88d667b662a SHA512 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa
-EBUILD wmctrl-1.07-r2.ebuild 684 BLAKE2B bfd80835f39b4ce065f06123b737d03f7d50e7db95af6a53228a595a42296977d2ca29ae74802a317e866e2f66886eb059fd1cbd559e1689c204a40a5beed005 SHA512 577a50aa034e7e5c7193d47b6ec353fa01f7f4778e35a1d2da557930fa109603934967f31ad81de572be30e2f80fedda5b98ad33df20589d0e049805dec91156
+EBUILD wmctrl-1.07-r2.ebuild 687 BLAKE2B 5f9a0dc862b5c56bffe936c599d7a52d7850dc98c6a102bde7f252e540850fe37f35d194b9bda46d1e9ae8caae3ffb9273e83e86daeb0bddb312240c416f734b SHA512 a773435ed52d33530948ca91853b26e8790b91ecbadfa75dc5233620b1d999632cf44559d99c22c8c18908fef1b2a531cbfa4599f5d55780cee0c7adaa126b0e
MISC metadata.xml 725 BLAKE2B 51248fb91da3dd937aaf5635c0593fd6ad53382f697fafeb12e489ffac96ea397dba3fb72a6ee0d7eefcedcd7af764dd7ab39d5a3bcb6870d928864ed0d71281 SHA512 40ab1356eedf0c9df493bd7647e789b60d38c49cc7d859605ece25743867e9b75e4083f2dbd71ff61422564e6d4172ca9ba02061e35cbef2ea885248abc8fbd6
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
index a34c0ed1edf0..a4def6b97b6a 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-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
@@ -21,7 +21,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
PATCHES=( "${FILESDIR}/amd64-Xlib.patch" )
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 9ad02f2bc4cd..9ad9fdac5cc4 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,5 +1,5 @@
AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
DIST x11vnc-0.9.14_p20161013.tar.gz 1702047 BLAKE2B 3c2487208a2318816af408a3396d4b6cd7cbcd5b3aa7879f0390a1a6e0200cbe0bb2cc0c50581b3e3e4de916dae3fdb4426547de7203ebe95ddc62722e4219eb SHA512 82207e4d721dde633aaa13dbd1e6a18799615f8e3c225c33d4f8b01775fb81fb6b92a817e7d014653ac7b2349b0b31e46be8db25c5fd5e3ecee8fb93ca665b97
-EBUILD x11vnc-0.9.14_p20161013.ebuild 1508 BLAKE2B eca9faf9e2a0d8efbe5a3301f3bacdd1bff019b83bbe247ca5ecff1477a4846ed5eb7c600605b29cd7c7515ad397bd2e769ab6f1920a13c2dcfcd0dd0c59325a SHA512 0431ae53fafdebe04786f9879f12a7e4f8882407f628f75dd01a5922db2b6ce9b43bcfe728c6d759099cf3123747f37118f7c7acee234da1acaadfa2955bdfcc
+EBUILD x11vnc-0.9.14_p20161013.ebuild 1385 BLAKE2B 8ef4cace5db4e0712b9560c4cc82dc380ef72b8a82f06cc6c4a4409a800050bd6152f5290e9e89d7164d473ec39998b6f9d78e27253b7d477e12dcb8bad44538 SHA512 37067d7cf4e403cb298e473b2107728558b35a73e7974050403eee8fe9a1b5552c6a5b0b11718e5f0e88bd807f5b3d9dee54683d6e448ae60649c17edda02999
MISC metadata.xml 694 BLAKE2B c81a1713da2084ad68df6c91b75cba02df7c39950b331916362ffc8dd67b6b72dbf40248c3a906d1f582a8ed5034c4cbebcab7bc4b9db69508a753f44df07102 SHA512 842b0faca49ae6810c42d117ca3f79fc693acfb8a965d3fd2a8c890f475350c29175303f1b56b0c64468dae20e692d2430fc790e7b88165c0f30d65e1bdcb606
diff --git a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
index 820d6f6ac5e6..34d249366e1a 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.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
@@ -28,13 +28,8 @@ RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
zeroconf? ( >=net-dns/avahi-0.6.4 )
"
DEPEND="${RDEPEND}
- x11-libs/libXt
- x11-proto/inputproto
- x11-proto/trapproto
- x11-proto/recordproto
- x11-proto/xproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )"
+ x11-base/xorg-proto
+ x11-libs/libXt"
src_prepare() {
default
diff --git a/x11-misc/x2vnc/Manifest b/x11-misc/x2vnc/Manifest
index 526a4685ea02..e23fad818e51 100644
--- a/x11-misc/x2vnc/Manifest
+++ b/x11-misc/x2vnc/Manifest
@@ -1,4 +1,4 @@
AUX expectk.patch 394 BLAKE2B f04672f857c7098c5509e2b90d88ec69f19115f93340ed832019a35ecc77577ff0ea61d89f1bef563213fa8e16d22204fd26939534397e00fdb9f5b030dafd9d SHA512 d5a2747bbf8beb5ffe49e68b47dbfb75e44486d14d7b21dcaf871d6c53cc502d4fa1e3583acf92da5d653a5bbb6f01838b4457629cfa3008db56500b6094aab7
DIST x2vnc-1.7.2.tar.gz 82258 BLAKE2B 4eebf2f33a38ac3fefc4b5a2a527977ad5dc73d0e3e8c289bffb2c0be1ca01117bbef5c312e186f295c910cbed0c71bea82cba8aaedb2cbbb192795d8eac9133 SHA512 f9bb9f8b95a6172758d1fd8b97f235088f0815afa21f2e11db77e59b36f8b3fe2fa2d8b922b14ccde1c589851d80489c9fd81d9f734ca9b053e4bc4019eade0b
-EBUILD x2vnc-1.7.2-r1.ebuild 798 BLAKE2B 7f014f12540605ecd95916a555f57d63cfcdf1ed1eeb6906c757ad515ca71174926c7e4e98394b3fa55c227b6f96a8f9538d1915c3e595f71b38990a57040c23 SHA512 8d7ea81da337763823e7a856c83a6104f77a4f19bcf3b3fdf67c83f60dedc0f42184ff7cd9ddd47a63b9d237da8673c5d037fc7dfe4c88490b8354f123502b09
+EBUILD x2vnc-1.7.2-r1.ebuild 750 BLAKE2B 658095acbd45f25c8958e447ceda9d9a9b9a2343959a7163952679a28bbdca717b57c64515c4360fbd9495fc8c1a1c4c7c077be794356363204ba446b2064641 SHA512 2a6fef6ca456f0f884899c7520584044ab8c9ce4a2baec1eb9fb385ac813a198a2da9e27c64ee3857e057c5f263bf94b19e1fac6225e53783ecc8105eb74f755
MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
index b4062821bbd2..7a41c7b368d7 100644
--- a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
@@ -19,9 +19,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXinerama"
DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto
- x11-proto/xproto
- x11-proto/xineramaproto
+ x11-base/xorg-proto
tk? ( dev-tcltk/expect )"
src_unpack() {
diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest
index 038fe43a3da4..a75bd8d33e3a 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -3,5 +3,5 @@ DIST x2x-1.27-license.patch.gz 1001 BLAKE2B c63aaa33f669a63073e5ee52c51d47a9c2ca
DIST x2x-1.27.tar.gz 16776 BLAKE2B 8f78d801c1911928b0d5bb37b406bcf5285d3a54daf5067abae40125ad4e4f7fc52b8cc74f4e1c35b99350fc794f80c26120cae48e5076326746ec87d7aee0f3 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131
DIST x2x_1.27-8-initvars.patch.gz 494 BLAKE2B 97d48f4a2e7b65fd6755860c51399e5b6343bd0c7e6c79c7dd311792a899a02ed0ac6991d16495e96ca34913fbcec011b106bac6d0f9798540fb5704ca12f4cf SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01
DIST x2x_1.27-8.diff.gz 13291 BLAKE2B 4a4a0bf34a864596cff2f0722163bfe53968e30892bd0a18ed18ca6c3ef8f5bc763b215381c46792b499839397dbecab033bd9095646fad36613ad11beba1240 SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71
-EBUILD x2x-1.27-r3.ebuild 1560 BLAKE2B 6247837571b2ebaa8b96520a07553da69dcf29cdca8c7fb981138aa28be43f04df655ba84e972022790754b10c359fa5f3068b052b7fcfdfb94af2e3fb3a0c7f SHA512 5074cd5311f417610618873acd8a0543bc64fcf8358f2907c83457a9695435273cd30f69800f3d5bd833c0b031a9d298a1e24c69e2b713a994bbec7b1500963f
+EBUILD x2x-1.27-r3.ebuild 1541 BLAKE2B 35dc25ff56018c7276ae41bcb74d1d2077f48663d0ac2fb5395b3a63ec27b136e5714eb2311bfdf302db3c37b1b31eaedc6421c8e649de722a5c323e908c287e SHA512 3a849ac8b1cdc367c5fa7ab9b3b01d9185c9912a67c5df42b6e96dbad84cf84f1a44cf04a68a96c13ef4ba5f6308ac38dbb3060afaac334255147e546d805aa5
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
index c0c4f247d980..a353108f7c60 100644
--- a/x11-misc/x2x/x2x-1.27-r3.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r3.ebuild
@@ -21,10 +21,9 @@ RDEPEND="x11-libs/libX11
x11-libs/libXtst
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/inputproto
app-text/rman
- x11-misc/imake
- x11-proto/xproto"
+ x11-base/xorg-proto
+ x11-misc/imake"
src_unpack() {
unpack ${A}
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index 8960462ccd55..3c6f782d0083 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -5,5 +5,5 @@ AUX xaos-3.6-locale-dir.patch 346 BLAKE2B 9a025116efe60d643748e020bf0cc8801ccec9
AUX xaos-3.6-no-auto-strip.patch 1025 BLAKE2B 87256eb029905c6c9aed7080452c15677e0b98535252b1a6ddf344b7866980c27039c721ab711f462383ed4ecd7d07e55e122b34728822c289958ff0e812a9eb SHA512 6a89bb992e2e503576f18a069c6f67b42a92a3f88b958f4b8b54d6ffc309ff30914cbf36b73400449306cd2ce1f646e9745820206c0be5ca39d26bbc4e469c8c
DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878ff69f0ffe34f2455290381dc01dc4de98efeadfbe02c55671c4d2a0de601a6b8673ced81b72bfb5158548 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1
DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262
-EBUILD xaos-3.6.ebuild 2211 BLAKE2B 0d66ebe28314075fea5d9e074da061173050566c55c022aeb4aed21521dfe4d409c35e9052e1e5dfb697ba5fef6b3d214039c8893d37573221a556947972abe3 SHA512 9bf9e5ccb2e07ab5f1e2bcbe78b5efbb745db8f01fa16491450650acc4c499bc1294ba95e66e042545390184d858ec72d6d3a0f8add560f03806166aed54eb6d
+EBUILD xaos-3.6.ebuild 2161 BLAKE2B 7b8c33d496f869658a0c80c40dece6b1691e8aa363d281e9307593d1bdcf2f8bbca7ca15bb57aac791d0323f1dde9c37bee49aa82a1969a7781e3d6362b6b4a2 SHA512 68c1dc78483baafbffeec1cdf0268cc0b6bc0baf8e600b3efe1dafa49fd34c7caefef20922c9655b1c4595c96d36918b5555014c3c86c7e177cde90b2e8bcd98
MISC metadata.xml 766 BLAKE2B ca6be3fc4134359d4c6ea3eb8498b5235c87694bb76981747651c78b1fe00fa2d7d1c736910d3144101762fad9b26819df46af0270a4db5b0b39e623bef5eca5 SHA512 8e3ff6323fadbb15a6144c80bbbe33056072758dabb6e96e8b331f3327ea7e99b2a2c9b87b3532e70a1bd331b9d0e59be8b22c2fcad262eacf317c5b33647519
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
index f6eee716fe67..8f8963c98d1b 100644
--- a/x11-misc/xaos/xaos-3.6.ebuild
+++ b/x11-misc/xaos/xaos-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -32,10 +32,7 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( virtual/texi2dvi )
- X? (
- x11-proto/xf86vidmodeproto
- x11-proto/xextproto
- x11-proto/xproto )"
+ X? ( x11-base/xorg-proto )"
PATCHES=(
"${FILESDIR}"/${PN}-3.4-png.patch
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index f1048dcc2a5d..07d1042fb42b 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -1,4 +1,4 @@
DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04
DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59
-EBUILD xautolock-2.2_p5_p1.ebuild 1382 BLAKE2B e0844d9a41a129effd92bedfcd0748474e608fe826618f4b8c1f6354e68f430527c23550b7c0b4b4ab64963255d38138d0673515017223efd4d5855429c2bf51 SHA512 5f83774fec75f53de7c5ea8e496f7abaa1ba2d857b3c1630704031da8b60bc1e896f4a3333d112080946692c23aa12512c930b9c02a2ee5a244362ed1b8932f0
+EBUILD xautolock-2.2_p5_p1.ebuild 1377 BLAKE2B 57065aa8645601ef4047d84633226029a324fbfe057ca231db535169c8726c74ad47dacdf894bfba558d374c209b55c5eea51eddd0448cedead839a280ec8099 SHA512 4f2acd15acfb25139ae95d12e5755909364a0b6c60e83d1c7266ba46406f64ad19d03db775b9890dd5b786545db9c0871c98ac05c4f678c1bac06dd7817eb11e
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
index 7192ed11358a..4367a147b013 100644
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,8 +32,8 @@ RDEPEND="
DEPEND="
${RDEPEND}
app-text/rman
+ x11-base/xorg-proto
x11-misc/imake
- x11-proto/scrnsaverproto
"
S=${WORKDIR}/${P/_p*}
diff --git a/x11-misc/xautomation/Manifest b/x11-misc/xautomation/Manifest
index 4260f40c1808..8eec7fcbca8f 100644
--- a/x11-misc/xautomation/Manifest
+++ b/x11-misc/xautomation/Manifest
@@ -1,3 +1,3 @@
DIST xautomation-1.09.tar.gz 123995 BLAKE2B fb26c3d7c1ff7bc37412e02eaad9165fc81a908508da5da364e1d44eeb89b7e8cc3b25d9d7cd7dd18467b6abb5ec4e9ad4214e1f49d1ee133906ba0514c4b7f3 SHA512 60de78ef9e4bd605ff2cdf1cd34771940d043a2ba0498a053d54dad82476aa123afe91690e7f57d2f346845d4b1313bc0e4d3df524815265c817961978ef4ad8
-EBUILD xautomation-1.09-r1.ebuild 532 BLAKE2B 28dc6ebc7a808346c96ff37e05763e7caf149a50bc671deaca5d7d899a94907f78863a76875111c6b6307c8e2c98b04f7a42b9433ccf23141b44202d88288842 SHA512 cb830ef0727ecc2a2c82245775902772e9cdb6ecd9d314d09d413d643ad29f7f651f50cd87455888a59f3a3b64dc3d22bca1191c03eabef7dd492cc6286fb4b9
+EBUILD xautomation-1.09-r1.ebuild 492 BLAKE2B 2d508c8697606ab91f2ae6727ddaac5ca86541f7fa99ba46b6b638fd2b223bdbedd94c0dfb09517b99a9aaff11d81a26f7a27769600d849745a18920f59ce56c SHA512 8718346d3335b4c12982820f6762eb26d2a8b23af903f8db72687ec993595d4f2efb06b213a3384dea0a0f96b8f7e1e5a52d53479df6433154019e7d4d5cdd32
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xautomation/xautomation-1.09-r1.ebuild b/x11-misc/xautomation/xautomation-1.09-r1.ebuild
index 7d90eaa218a8..d78715f36b68 100644
--- a/x11-misc/xautomation/xautomation-1.09-r1.ebuild
+++ b/x11-misc/xautomation/xautomation-1.09-r1.ebuild
@@ -19,7 +19,5 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
diff --git a/x11-misc/xbatt/Manifest b/x11-misc/xbatt/Manifest
index 121a5970acef..f583ae5e5370 100644
--- a/x11-misc/xbatt/Manifest
+++ b/x11-misc/xbatt/Manifest
@@ -1,6 +1,6 @@
AUX xbatt-1.2.1-implicits.patch 301 BLAKE2B 9e7a8b0f2a88ed56857a9f2836f4ac2b916323625e748f6d980d334dd958e6c0c8b442103af5312b1176d386c802d524c1e1b5f0012a18acfc73eb163c247e7f SHA512 defdd56e8a52147afc3f924a1e462bdce4c6200a7300f442a46cc1a4eaaa7ffdc0e52c70683f23774e20e6480c91e094db4f834073c71b1c30a3f4d24c145353
DIST xbatt-1.2.1.tar.gz 12779 BLAKE2B d93d13125d482ebd5b2979033f09ba74526ae8f11d5f4bc88a3ccb0129e3e0ca61e8ca4389c45d789e440389de59939319dd1ef3e03e8e9ca78a61d25b3fc83d SHA512 db96f89e3abecd23532305069806ac094d5a31797f6f730d0f0d5345ac3f339286a5e3bcfc73d42a44a666bcbc768c955b9c3d8ca2fd28bd8239dfa109fe7020
DIST xbatt-1.3pr1.tar.gz 14412 BLAKE2B 7dc44305ac966c41cee8e62a8bcaa0ea991b13b3f126d09c5e80e60bfd4d2becbf57a657d41ee0db36c8a5d9a0366e255c5c893895fd253eb39dcd60a9227b51 SHA512 f6022a2d464e22a31c8246f20c4dcab2be381ec63a02fb9ac1d3e28dc9bdf26a949735b2eba800941f5dfde371913ea7a560413191197c44a0c156a58a60d41d
-EBUILD xbatt-1.2.1-r1.ebuild 813 BLAKE2B 3d7d54e9bf03f9e541180657b20c46131079cab8c1b89aa9f9c223274c83b7818c31c4366de71c09a4820e85863a23cbd772debd5e8ad67d6c987c67bd9e41d2 SHA512 8e624ad0a2c1ab2d04b04aea873e43e0de259d4ed78c7b70cc85a10f2378e2c98c7a38437709a102f087f410dbd814efdd10bf72635e93a3ddee6abe9ae014f5
-EBUILD xbatt-1.3_rc1.ebuild 886 BLAKE2B 6afda908181c801810ef0e2d12b4722090dc337d84caf2d43db84115c78171651a1ffd88ba238830824bfc4cfee0885d7ee0e25fe77111d65eab49005391afe4 SHA512 b87b1609eea09b05e0c8f6f6e979a4416dca070001213dff38adde546932f9b332f7f9bd0c8cd01974022809f0db63017b0d365ddc8967f2d3820de7e739363d
+EBUILD xbatt-1.2.1-r1.ebuild 813 BLAKE2B 9cfed25400cfb29c5e6872ca44ea82ca8471147e254ca7416fbbb234820080960127fe6a3b23c5c136e2e50481da0be50366d855e7081f719af7de8931fda28c SHA512 3809f6987afd72c29d175fea3230b0cfe22ddc88ae8e4fb825692aaeef77671b1306b493f043b08346bceb6587fb2c50541b802c95d787864ee56624370bda39
+EBUILD xbatt-1.3_rc1.ebuild 886 BLAKE2B 49b5c1d602e2974f0e123bc74a7d77d3cbd0a353b914cf601aac15f954d99d2e685216c48cadd8dc9287650047cca12ab7581e82cbaa7066e172f46212184646 SHA512 cab2e0ac45c409672c2c30c9bf29d811f245944304317cfe7418a3d8cf43c2d656f4bc75c1c8da3d66a2187a1c749631bd4754cb15bdfe08773a6e97a37f7022
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
index 2030809b7733..49c4acc7577b 100644
--- a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=2
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libxkbfile
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-misc/imake"
src_prepare(){
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index f291714e25c9..c7c8c3949274 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-misc/imake
"
PATCHES=(
diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest
index 048d68f2cd60..b45054f13409 100644
--- a/x11-misc/xbindkeys/Manifest
+++ b/x11-misc/xbindkeys/Manifest
@@ -1,3 +1,3 @@
DIST xbindkeys-1.8.6.tar.gz 151941 BLAKE2B f5eafb8f3655cbfa1ae7d7c5ed0bcdac97d4105df8df7a0aeecc267e08fbae8297713fc14c3e36871493e23959b624d5a88ba45cbef715a79df7de1f0927152f SHA512 3c77541eae9f87d2020c2272984c221094276dae2a8690c5cec9fe1b23c0139229b8f56876170da70684aeaa128642349b6835c375d473186cbf8123517173ba
-EBUILD xbindkeys-1.8.6.ebuild 634 BLAKE2B bcc16424edb722260850f2d4e3b392b0cd6d8653e97745978078a08571b725dede24db31c757e4e80ec200c4be9c7993ffe60c44177e9d55130c322b667f59a6 SHA512 32c781e1c959179ae6949806f79a7a275a6f590a19bfab1f81fccf8d1bddffb315f5d1f28bf1057649a3e5944d322b5d0c2bd508b56d814d6373a15a31de1b44
+EBUILD xbindkeys-1.8.6.ebuild 637 BLAKE2B e067705ed0369f9c8ee72d7ba18d00616b52a8c5a094ddbd753b918ffd5be1ec49ac6c79f3fcbe6c7939ead8da050da0d37c96129047b306f19e1a7d84e08f3a SHA512 a73e7b558aa3a27fc432bbb48651cf1c9a63c55471476526fb6d672f40758debe7541a8c69bba511a12afaffe5f4f5a46ab6f8ec9939b65047740cd8bd70d617
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
index b1814ef74740..4283d2e664b0 100644
--- a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.6.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"
@@ -16,7 +16,7 @@ RDEPEND="x11-libs/libX11
guile? ( >=dev-scheme/guile-1.8.4[deprecated] )
tk? ( dev-lang/tk )"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_configure() {
econf \
diff --git a/x11-misc/xcalendar/Manifest b/x11-misc/xcalendar/Manifest
index efcf4888ca7c..0af57851a24a 100644
--- a/x11-misc/xcalendar/Manifest
+++ b/x11-misc/xcalendar/Manifest
@@ -1,5 +1,5 @@
AUX xcalendar-4.0-implicits.patch 381 BLAKE2B ea6ad6617227900cf7cfd67957109d28b5e820ae87c0796367808c2442865cc94dee718ac91550f392947b77a52bca1f952e9faac14178da4b0b90cf1ede6e63 SHA512 56c68560d2f2d75b5e7427e870189771f85994e934f7d813eaa89e34002d769b9aa1e24ab49a84a395d1535963802a249171e423e47c5d0e741e1a6e9a07fbc2
AUX xcalendar-4.0-motif-gentoo.diff 1104 BLAKE2B 3176c538d92a776faef7fbaa02985964a64609eb5e3d79edd97d095309c2fec3e6cc0f621cadc97a09ed3e10fbeb35e627214c9f7ad758486125f1d61bef3fd1 SHA512 b6f15a68e2698a1d3f8dca2be8cc0751dae447268c6bca76aeccaa5a919dc31d3675fbb8d49d7d0d3293c50835b2628346f1ea5f7eb1da6152bb1ac73282ad59
DIST xcalendar-4.0+i18n.tar.gz 48635 BLAKE2B 939880d749dc36973d69d6ed6f1d2c36dfeccea6d17a9ce77bde122af8c3a19bdf683b0c1838ba11a769ef4a8977a93cc1e67c40dacac4c87d2cb7a565e3ba60 SHA512 c9b3756bf857e4956360cb3efa1e185bdc09d6053e1b8db040822c73320589ef825330184fa3a8b949f94a89a6ef56438927886b3740922a4bca7dbab9285a4d
-EBUILD xcalendar-4.0-r2.ebuild 1269 BLAKE2B 9c783118d0b7eb69a089e152296fa21c1d9c9455c9c19bdfefad44cac0da0c8d3567879dfa867e2c589300cf57490c7fad4cefb532c5efc66dd114396bfb554b SHA512 a51be4c83036c5ba6f867626576c9d0abd1508b679c66135561ebc4a3f1f914242a0d6da185c39b7593b613142bc6a6d3c23e7acf713fc6e316f9f6fb39bb3fc
+EBUILD xcalendar-4.0-r2.ebuild 1272 BLAKE2B a867e1eadf886f85de761328d052dbbaed91f5c35394d8f7b1e29c59001de5af0c7685c3d5e465b8d962f1f5d975b9ac854bc6cbdcfec75b154e37eaac327bf5 SHA512 f1220124c644eb410c8852961696a9da1b053db4656d580dd4c52a56ea858063b45971da7279c92e2cb61b18744173523f5347bdcbdb2e0a7e1e8957536c5845
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
index 13ec7c00d2c3..cce03ac2a410 100644
--- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.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
@@ -19,8 +19,8 @@ RDEPEND="x11-libs/libX11
x11-libs/libXaw
x11-libs/libXext"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
x11-misc/imake
- x11-proto/xproto
x11-misc/gccmakedep
motif? ( >=x11-libs/motif-2.3:0 )"
diff --git a/x11-misc/xcalib/Manifest b/x11-misc/xcalib/Manifest
index ae1f8b118a27..e9ef3bb6d12c 100644
--- a/x11-misc/xcalib/Manifest
+++ b/x11-misc/xcalib/Manifest
@@ -1,3 +1,3 @@
DIST xcalib-0.9.0_p20161210.tar.gz 36687 BLAKE2B 7b1634a4390ba1aa90b246176e928d2bdc7f8478771744628dd454eab43ea9b42d479950c5748baadb8d081462ddc036a34f30653bc8f7871ed09e05441ad2c3 SHA512 31d9159a67082cd0c63d6ed0e34872cd776adbaf14dca754a6ae2355d24a972a6db5811a3d7e69e24c88534c7f63e8d1285304272bd293e3a93c35c240d99907
-EBUILD xcalib-0.9.0_p20161210.ebuild 584 BLAKE2B 20c8dbcc14f0b4b288096b403667dec39dd99f1529086ce573f0213817595615e2dff380be13e351c228be75e8370002e1b6f472a6d507ba760c672a0b8e1015 SHA512 fbc739ba04d6ba757d3216f71c264a956b2f3fc850a0683a6fa813a1de650547249de778bfb0e001b865bbf173925ded2279cdd2cefc6107dcb6d3b120602d51
+EBUILD xcalib-0.9.0_p20161210.ebuild 577 BLAKE2B 8f87f0c41a836b38dea605c9f15c8e214fbb275b1ce187220af46e47d894e4387c19ac184f25f32137e02b06dc27b8ed09b1ca47907ba3b4333331d3a9e8d7ef SHA512 14d32b7327e2e9d20647fc2883f4363ff7165c65d61dd340a8d96507d769e5fda139a11872587e8497ca5b008adbe037b617443c2902bfaf22a3c26161c363b0
MISC metadata.xml 261 BLAKE2B 42a18dafa16eda94e27fadafc73f3f15f247cc12ba0073ea96d0f1abd24860b2c2ad943174178d4ff96b8e05300570eae7550ae33f4048b8587e58e876479f85 SHA512 998e9c0c2f1a166088ec7e42ad68edc520448dcaf96eeac2eeaf329e5064ae216d025a483be6dfd9b22bb434e8675fe93a4e49beb745ef5b673a3670686caa28
diff --git a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild b/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
index 52da368b475d..3a3511979e2a 100644
--- a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
+++ b/x11-misc/xcalib/xcalib-0.9.0_p20161210.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
@@ -21,8 +21,8 @@ RDEPEND="
x11-libs/libXxf86vm
"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
x11-libs/libXext
- x11-proto/xf86vidmodeproto
"
S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/x11-misc/xcb/Manifest b/x11-misc/xcb/Manifest
index 8021c546dfed..5b67f90a6d5b 100644
--- a/x11-misc/xcb/Manifest
+++ b/x11-misc/xcb/Manifest
@@ -1,3 +1,3 @@
DIST xcb-2.4.tar.gz 19830 BLAKE2B 7808021c2781421e4d609c27516f8a45195999bd75c82935c84048852f08e2656d6693abd3993e919b9740b11252da5cb15dcbe73602d715390839391ca75cb4 SHA512 cc612231cd61507a1af1a12fab7684b074ec99ec87e82bcba13dba215d4569c0605d3861f40d858f87da9b027c440a02f03b18a968c1d73ab08b8ee41e644948
-EBUILD xcb-2.4-r1.ebuild 966 BLAKE2B 705d9f7ef8d8a8a19bb28f855610df8fb81a886669c61c5093635ea401a33025c0ac04fcb4d84e7bb8bcf7b0a00d5241c21e82a842d7a2d5af44de217db5e222 SHA512 375e27ebc8e5191bd86be66ed39e4a3f85ce848a7c7bbf47e8a6032973bdf94e9d44ff3c43cbd667e8e2cfde5e96e09142f185584127a1ca41fa8b805d475c85
+EBUILD xcb-2.4-r1.ebuild 969 BLAKE2B 538b68f416ec6ce40b4bd3293e4f786db3ab36f862df874b1095063239486e7f8e10b82631b7d129f1969d7b16d9acebc4241ef44847a92572f060d1c469e8d2 SHA512 33d562d5692e38d837b79e6cd0e8250c42d4b52243bedb25a1248351ecaec0736ca5d27da34a7c7d9fc8e2a3569b8890134ff6505f48ab4781a1be13aed0a73f
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r1.ebuild
index f6d054fdf6be..5813bf01dd29 100644
--- a/x11-misc/xcb/xcb-2.4-r1.ebuild
+++ b/x11-misc/xcb/xcb-2.4-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=6
@@ -21,7 +21,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
motif? ( >=x11-libs/motif-2.3:0 )
"
diff --git a/x11-misc/xdaliclock/Manifest b/x11-misc/xdaliclock/Manifest
index f4570e07d647..3ddc5d82957b 100644
--- a/x11-misc/xdaliclock/Manifest
+++ b/x11-misc/xdaliclock/Manifest
@@ -1,3 +1,3 @@
DIST xdaliclock-2.43.tar.gz 2300886 BLAKE2B 91b5f6ad0eff544ffde213d575c84a9b6c05b62c6bd26332eefb28b0d064ac8b5314a60e70fa82ebf6270e022b079ce4e86197ee5e8a713c34d84227c00dd94f SHA512 4906632148599254d9b29b032d846fcea1a568de8156cfe9556aa1603e063015d7e3422ba9ce4f47c2877f144837a660964456584a643f274b78422c12c0c923
-EBUILD xdaliclock-2.43.ebuild 596 BLAKE2B 407459b3adf83a25cabf0d28209ce3bd6714fd0a4ebe4673b28c52fb35b51d1a36ece6ec3501f4f428088fc7fac8be055ff93ad65163c0f6a55279674be7a455 SHA512 9b3fd6333baacc3d4f62b3382b9be3d5ff10bfd1e6d6dc1336f4756b7d6194b057f46ea0e3905131e09d07e0940a11fcef8eecbb4a242a0661977258fbeddd14
+EBUILD xdaliclock-2.43.ebuild 578 BLAKE2B a6de3c54051122c4d5ee0f7abed385250665718722d1914e09aed1c7a5beb1e9a7b34848ea5157d76b452573ffa8a5546adb71305a4700e63a9287cfd78aba45 SHA512 05e7757307de829ee80ca39296ee619a140ca92c0e01b9326eb9424c9a8f4a16a8bca30e128646bb05cd2a68139985a243b14ca9624a0437e9e1f24b561d59cf
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
index 634b4c586c7e..b10623d13aa6 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.43.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,8 +19,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
S=${WORKDIR}/${P}/X11
diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest
index 81982d49e6e1..a223d7c525c6 100644
--- a/x11-misc/xdesktopwaves/Manifest
+++ b/x11-misc/xdesktopwaves/Manifest
@@ -1,4 +1,4 @@
AUX xdesktopwaves-1.3-gentoo.patch 1166 BLAKE2B bf494fccc21a446f3b767e40fdc53ad87a6cd5be2b7f3743b02a9570a66b56ffaa93ff7555d42a20e2a9311bf12b2ce73bbf0f61a1e86e6055f54ad429b5aa3d SHA512 03543f5244d6c22da32d845546db6ca36cf5f9c59dde9d248ef160d2824556055efb57f4becd84541b16ac82ae1bd661272fc92e8c0ac096deb32764cc849f05
DIST xdesktopwaves-1.3.tar.gz 49302 BLAKE2B 96348d80ba71a179df09afbaa8f2fb79725e049203e9644769e5a41b7fa8a9cae06ef2002ac3062f317f84419ae2ef739e7a90142b9b06118f51754d295e70ed SHA512 7dd3eb4f3a9291e9afab7aab7385cc271af2754adecde85ef3a2dfbc6a0bd96bab440cdb9f34cabb9e7c6d9ee25cdc64bf57ba7edc4df03f344b5b10404cd52e
-EBUILD xdesktopwaves-1.3-r2.ebuild 952 BLAKE2B cbbf909d3c1cdececb15e6acbdbe5a346d3d997562fdd8850e6b6e08a3066d2ed10714c9edf3c8413ec5243a146e1a8a81e3fa92494fd181a07ada86a9c91d27 SHA512 b3ee7de6c95039ce2f8b7b08d766c4e4964667a108566647b926a7a217ccbc042a50ebea2e493adb942c376274db718aaa01e8e62bf0f54198c22eb5db9cf892
+EBUILD xdesktopwaves-1.3-r2.ebuild 952 BLAKE2B 37fd7a122bf3c4af5336c7827b9e1533992e766d7c3e9ff44a52e40865b9fb108c61f0c6fbfe30d0ce5deb92023bb322c4f4b7bb34f99502f44e1d174e1aaa34 SHA512 d1d6dacc91cf72b1a3ab091376c477e2b48a99ee7a67d57348ce6adb2f9618fe5e7c48635f5b279cab4ed36df10a7af4337dcbcd3e1489624bf978cdf8c1f316
MISC metadata.xml 663 BLAKE2B 67655f76c1b276f5eceb77901fb479938a5ee591461f0f1e4a67315f8cc16fab52b52df5fdf4fcefdec0e277dbdf10cfc2d6ada8e740f69ce41fed05299c0d11 SHA512 e070ee728003491fe3537f9c8da175c576e3f21ddf42dea6c0476a849f1b0b93b30fe4407ec2a7dbe6df04219e90c0da2624ce9f709585d43517297223f2e202
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
index cf84faf3f802..2104e57383da 100644
--- a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-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
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
SLOT="0"
RDEPEND="x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xextproto"
+ x11-base/xorg-proto"
KEYWORDS="amd64 ppc x86"
IUSE=""
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 6e553ae38be9..3ce495067549 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,5 @@
DIST xdotool-3.20150503.1.tar.gz 102125 BLAKE2B 3b34b69ab7843d49a5cc76129dca96664b8e548abd01acda03399d06b1a146169c78dff302932000fe72c578be60bc774e3e503980b408cab4bf17d71630151c SHA512 d8eb411490d2f4936d63cd459e3319f76faf6dd415a3c2c68446b5a98d24290794dbffd22fbccfef5acc7d8aec6ce92b2135ecb3e1178607fc7d5b1e1767ede1
DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
EBUILD xdotool-3.20150503.1-r1.ebuild 1298 BLAKE2B f2167214cce8182e0074d2a80670aa6b37ceb66dc612016e12b0d6abdd0d7d22913757ad7cdd5ddf05969e0fa6a1ce6806d25e89675efade5fd1440fbaec1859 SHA512 37ea78350290a4bdfdac0c238b491ec464484e8bdb4bd8f64b2688a9f56728a93ffed84f913a098d0aed6ed5a3323a68b3bc353cf6299dc76f596226afee230b
-EBUILD xdotool-3.20160805.1.ebuild 1372 BLAKE2B d4e158eebb713c6320fa01334013357d0220525c746d54af59b0c062dc3a85dfa36568d46c23caaa80fa4e7b0df3242bcd3be436ca686ada90817d48b734cbed SHA512 a95c1ae8864b983ac86ddda95571bf9a43de193eaa26bbd2e1f22e3e500081aa2cee63bd417315ce0fe8aa68913a7088978fd0960d8e9556f2f955d223927985
+EBUILD xdotool-3.20160805.1.ebuild 1350 BLAKE2B 7158f607d9d5bfbc7675dddfbea15f2ac7a95d4f508a9ac8de7dd08a4f137661280806134bf44e169970f215678126bf4a48b3c95a29cb655fef31b1af8e2fa6 SHA512 9185bae08b03520b46b366a71bfc5351673ef7c78ece9b1cbe2043445ca3f534c66d0ac9d11f10a1e0d63e2429cac4c4dbf31e872075f97b9b150dfb6776e914
MISC metadata.xml 583 BLAKE2B 72181c8dfd9d575229c2e86ad0041311325f9103715be568d45915c3a69bc44ef30919146fcae3f74ea2dbf844cd62d94dc7fe5e0ef1969b84a764b4ccd30cc1 SHA512 7c09064d2334d1f6b4d488bd9aaf091e0b27a7e674f151c62bea6e988d58c71996cf20f5d63587e14903a80b5f93e77305d493b94fe03a68ab24fbf1a438df76
diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
index 5fbc2ab8e123..5a726ac8063b 100644
--- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -22,8 +22,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xineramaproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
# The test wants to manualy start Xvfb, wont use VirtualX and it tries
diff --git a/x11-misc/xearth/Manifest b/x11-misc/xearth/Manifest
index 204c1fe913bc..df57e37bb66e 100644
--- a/x11-misc/xearth/Manifest
+++ b/x11-misc/xearth/Manifest
@@ -1,4 +1,4 @@
AUX xearth-1.1-include.patch 231 BLAKE2B 803cdd036a1018ab85bd3acc30a6f6168a3596c04dd7de7196983b6c53b10e443d2ed043f61faa35b1ab87f28496f5865f128008b604efed41a74af3effc0d0e SHA512 9e4fd1d44eeda5c79ab22ceeb20fd005cab71869bcadd17adcb1cee10157c35145e7c7aa6d3c62f3da1be83cc79763b9ad77cfaddd4021dbcb56c8efcbccadb7
DIST xearth-1.1.tar.gz 157887 BLAKE2B 2dfc43b1a8fadeb7d30a4234496f44171cd138975e84b295e60d0f9855c1f3b011340b2b3aecb98d75fde2a71fdddb4e959ba84e89204f246915b7cd1a76efc1 SHA512 ab1c146385a0e61f6208a0218cabc8a10902f52feb50f328a330cdbddc5d2eff2c3efdf6719b625bcc07171ed2fd6201230ad8a71cd77a451ad9c81383bfd46e
-EBUILD xearth-1.1-r1.ebuild 871 BLAKE2B 697f29cee55154529f5b8888bcdc767ccee7a0d399c1d4c8ff9f15efbf141fa9e362ad0dd7b0b5d08fd4ed40d0884d5303a0ab421c3b2fc1ed73b9c380780dbf SHA512 2e98183e2e0afdaed4f8ed20abefda0e502ebc458f71f5ef2c6781613882931870376af66d66a73091c6b04ce9be7dffe21d186f1a8c95d16b1036419bfda45d
+EBUILD xearth-1.1-r1.ebuild 874 BLAKE2B 158de12d2947d146352adbde232d6288b5254828f19de4aba72797d1a6c02819a0dd7f6da45f8bace07f1ff68c80bd53f12359875ffa652dc5c8cade2536a595 SHA512 fedc6d408dfe111d4fc3960f3cec61e1c76bb10f3b80fae64f1e0a6049bd2d78dacf4258114cee766542a2051e43e003d6f37b91a284b1b41af5b62aa88e9575
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
index 97ec7ce03faa..be7b038c09fe 100644
--- a/x11-misc/xearth/xearth-1.1-r1.ebuild
+++ b/x11-misc/xearth/xearth-1.1-r1.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
@@ -21,9 +21,9 @@ RDEPEND="
x11-libs/libXt
"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
x11-misc/imake
app-text/rman
- x11-proto/xproto
"
src_prepare() {
diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest
index fec6a10e0bff..85141c4a68d4 100644
--- a/x11-misc/xfishtank/Manifest
+++ b/x11-misc/xfishtank/Manifest
@@ -1,4 +1,4 @@
AUX xfishtank-2.1-implicits.patch 1446 BLAKE2B 6da3d446e7855cf26a84ed143dd4b63ab45fc2d9205f1a64cdec5c23fab1700e64800474b7a3066019fe055e2b4a2ee95dae0fea4494a261c6e8e7d905fbc10e SHA512 9c04b8bc38f629a7590500c24a2e22c8c7ffae77f9eb55a174ea8eac75ce90ae762baa3ff550a55b1afd6788d8dcba6eb0b0ef6a70382b6da78936bc747065f0
DIST xfishtank-2.1tp.tar.gz 187513 BLAKE2B e2acec91ef52776bee82ea1b4df347b7fe509377687e74422d6dff81d7fce8a4009e4d0f45327a8401e4ae9782440d9f6478d1dd501c6e4e7d595d94b2d40b1a SHA512 641efa1104685d94589c2d9d365108308cb1b0dd238dbba6dc333c5922bda371536c0e26a63645351ac245a18f2386e4c47b4a1fc2a7f4b0400d37db846976a1
-EBUILD xfishtank-2.1-r2.ebuild 720 BLAKE2B 3a3e187a1482eee0af87d091a5c26ab463da6467ca60bb87510c98dce111392a3388ce77711efd38f77f06cafed8eb93123f636438b4281a088f845743e1bb79 SHA512 2bb4cea27f4e3a8d42372fee3dac2e821fc4189e1f2f8f82ff0b5d4742c34d4caac112c13f765bbd2f5de2b7ea8f1cafca0fe48218a4f96aa4b82dd7a48cf789
+EBUILD xfishtank-2.1-r2.ebuild 723 BLAKE2B 2b7ed6c8a590f24229ba01f491c4297bc029d2268ec906f07e683d45304b8fd0741e949ec90fc754f7dd90deea90d1f0fe761c239c1fe144cefa7b30f86b3bd9 SHA512 35e2c231645b79c5172bd41922686a14b1e38a7647dfbf5e6a56196ca93bc5c94d85262d44478e7356fba7507cd0f10a359b4f10b99be8bd40a555e8d223db48
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild b/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
index dbd26fe73cc3..3e5fbb14c7ea 100644
--- a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.1-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-libs/libX11
x11-libs/libXt
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
x11-misc/imake"
S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/xgestures/Manifest b/x11-misc/xgestures/Manifest
index 91238507b467..38866963cb6b 100644
--- a/x11-misc/xgestures/Manifest
+++ b/x11-misc/xgestures/Manifest
@@ -1,3 +1,3 @@
DIST xgestures-0.4.tar.bz2 77902 BLAKE2B ef0d3c6cd0bef6a2dd78b4932f40c5324ffdf16f3899aa20b216b6817db45c0cc2cd7aef6b903dc9c1259721de0ceb7d859a546ede5d784444b05b7f23727716 SHA512 c61108e609fb0f28affb5d5cc4002a7f840f123bb96b79265a47e74a541b1ca8deee016f90fc801fa682e61b9df008c0323d36482abaa83f8f6d4a5c73137abf
-EBUILD xgestures-0.4.ebuild 692 BLAKE2B bc53137593c26a120061e61916933bfd3c288e1900268f8c11f2a3b8eb03cf7f778efedd6b9d80aad650c1db904074f80a5f8d42c7a400b548b3a35e7ad3af6f SHA512 01f722e74aa795d58445adc810f1373b541a1a918e24bf9e37dca4476a69b033fc04069ccc69babbed2f3f10f06c2b407181b8137c33423f0b944cdd882fae86
+EBUILD xgestures-0.4.ebuild 674 BLAKE2B 858f88386bf5808d88b099aab4bb9ba0ced474c1926fd91f524970eaac1f681f980b085e3d7d9bc894feb1edfa2fe6cc6505ecb9c7cbafa70dea462e3045caaa SHA512 23e35552fe29f4c678baaf484953752d03e66c7ad3ccc8d48ee376a6bf7ad4226aecf20146636ffd9e50fac4a7ee14644af087478ec37944ecdce0898d28b175
MISC metadata.xml 326 BLAKE2B 5e2c905c8216b17297feefd7f88c25696a08fa697a542da9dc8f300cacb613529d778a05dfe1c72427d584873362598908b1d6d8954c1a1cca98667a3a13ae73 SHA512 24d5688cdf1063860034793a509a9d26f1a38397264ee7d1bdea1dd5c74ef29f850861871af4a04771bfa6a9cbc16303d4386b893c9cac2e7806f624addfbcf8
diff --git a/x11-misc/xgestures/xgestures-0.4.ebuild b/x11-misc/xgestures/xgestures-0.4.ebuild
index a9921db7a5d5..4e72115627db 100644
--- a/x11-misc/xgestures/xgestures-0.4.ebuild
+++ b/x11-misc/xgestures/xgestures-0.4.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
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libXmu
x11-libs/libXtst
x11-libs/libXt"
DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/x11-misc/xhkeys/Manifest b/x11-misc/xhkeys/Manifest
index 895ee04391ff..70d3b031be9b 100644
--- a/x11-misc/xhkeys/Manifest
+++ b/x11-misc/xhkeys/Manifest
@@ -2,5 +2,5 @@ AUX xhkeys 337 BLAKE2B 68ed839aa15e460bc93a200ecd6449807ddf42aa43ed0496d789d9156
AUX xhkeys-2.2.1-CC.patch 578 BLAKE2B f77dd03d3de60abf8408dac43e5070f783309bb40b534c4f1995e2f4db7c3f44e9dc5d679cde39a1b7771187cbed94e0ad15924c1ee2f60f0bab2d8371c1d88f SHA512 65ef3acc6767d0bb599612b05a6224e01cb4e30e7208cc269bdda75af2bd18495afba83feec9f0fcfbd5772fe3289156f83c1a3c184ec2b2ac07b6cb4ed2f81e
AUX xhkeys-2.2.1-linux_headers.patch 261 BLAKE2B b6b185f90923d5d1345eb27fa987a5a8b4c2aa2118ac91f639676527ed53ba6dbbe3015a05a0bea81a7a2a1f9d403964152d1e258cd5e477c06d78f851055210 SHA512 e03973df62353cec87fa814cd6e8094d12827f20c41b09e92219d76d0e68494496b55bf52cc600fb0fa5df27f9871dcc4fa3f2f384057ec411fc7906f2b55180
DIST xhkeys-2.2.1.tar.gz 146338 BLAKE2B cc94ce97abea9f3ec9d994b1ee353511acb5dcd9dfeedcb4b76b0d41bae0e6bf17fa9ac7045d44bd813d8b03646f7da844b22370662c91b1d24de4a256acd086 SHA512 8bf0e33d69e6685c6e0ade500e1c1d3b5f574de6906cc3535d3b95db5bfde0fead842921b6642f18f0bc1c8efd980ed5a4180108416315c09f65418e542c1f66
-EBUILD xhkeys-2.2.1.ebuild 599 BLAKE2B 1e72973b3daab86ef3ea8169a1206a7ec596f18bf17d28f797b0cfdc5bff126a37c655ef53b7470758258324e8603491148f3b607b16913bd8f2c83fa6afeba6 SHA512 f3d5e26dc8c231801ff6286eb17ceec775e9c6d037a01bb6ed291be0ddec3225050ed6707cc6f8df2c984963a369547757aa85b2d7e684fc9ef42f4cb55fef10
+EBUILD xhkeys-2.2.1.ebuild 581 BLAKE2B beb25e0ca8708db4ff92c69609e9353a58b4ba4697ff8a55707a77ce3584c2b58ff9de08e53abc2d6a8829a737efb23e69c05e0491e11380dbc8cfb436ef25dc SHA512 7cc54a8381d9d695c915b7899eb3d282c25961e0c2d027a680a298f4cd3b6364a4de78ef03023d3b3951f62addaf27138ed7e58fec5b1638549e7e4d92003f13
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
index e4c4db3ec3a4..8aa761d9e7da 100644
--- a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
+++ b/x11-misc/xhkeys/xhkeys-2.2.1.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,8 +19,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
PATCHES=(
diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
index 4f7feea170ca..5780e5a82dd9 100644
--- a/x11-misc/xkbd/Manifest
+++ b/x11-misc/xkbd/Manifest
@@ -3,5 +3,5 @@ AUX xkbd-0.8.15-increase-delay.patch 770 BLAKE2B 1c96d074ba584cb74718a3ed80751b3
AUX xkbd-0.8.16-desktop.patch 1172 BLAKE2B 994a60ce696aa09a8a8d5f61e39366ef0dd12970ab1ef8b5bf48a18a731a90713ea20335d7a4715d390e1ae865a99a4f02f4dca87a46d6794db6f49069327edc SHA512 26d4281cfc15a8aaadb0bd9ffc70df7c63b31abc54fd45ec0055abe37d7f960ac4d05056dabaca14bb33f19d34c5e293b4b0b45fe96b7d0078b73897d9ac388e
AUX xkbd-0.8.16-fix-geometry.patch 1081 BLAKE2B bc0906cc6aa06256cd6c22a288cac1d51ca658871b8d2c014b3efa3fe4f3b2c99be38ee0503a37663a6fdf7d17b71d39e82490c6b84e6e3251990c265e02a9b7 SHA512 03c2fcc4a2d731ea3dc3bb9c596e9d867b01e09713c65f5614f37eb86c2e41edacd16ee67b67a01fb7fab9e2e9e936cfa9ab5bee214f3427710a88829a538899
DIST xkbd-0.8.16.tar.gz 347616 BLAKE2B a7ee906d6ae3328d5366b88ebe960b6fdf84a5cad1c1db4b1a0056fc5842196699dfa749c3c0398054bc54073b422798c0efaf57c8116d05b6754c84d6abae03 SHA512 8410f722cb93069eea26f9d1ed6b9fea76ed5222b8586c2f78ccc1a0f040a964e165df0611ce72c108dbc7adeec31515595c81be3867e68c0cadd8846d985d4a
-EBUILD xkbd-0.8.16-r1.ebuild 829 BLAKE2B 7dd344bffe7e7f098e1e50b2df8822c09915bdb2d7d92ae7d2f36510efc46d5a92eebc35825c8e3a599117e22f0820ecd77ac6189531591e4f89cf6347478acf SHA512 d9abaf8907763bb7c18c67396fe559959e2706773cee453498defecd03d9879c9a1a892eba827f78b7c8bbb375e5a4d6f3c3e8cc72256f8159e6d9a00a7cf875
+EBUILD xkbd-0.8.16-r1.ebuild 811 BLAKE2B bd7732d840d253dea3899b3f3d33232c4cf74a2dfd87d25bbf4c00f7850239219903536697a2dc42ad4f9e050e7ade739de3af26b3d81dd9f111b2ee4e479498 SHA512 1f24a011cf05e651ca3e550e8fc693a8ab6e1bd2bc67740c9070bc20092dc3c11ac2acfeee7b1735583010b970fd1af30a61ad299790851ab7997e27387a85df
MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
index 986dae594ba3..d3c9125a799e 100644
--- a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
+++ b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,8 +21,7 @@ RDEPEND="x11-libs/libXrender
dev-libs/expat
sys-libs/zlib"
DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
+ x11-base/xorg-proto"
DOCS=( AUTHORS )
PATCHES=(
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 8842642bd17e..816811cd6b27 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,11 +1,4 @@
AUX xkeyboard-config-2.23.1_fix_typo_in_polish.patch 609 BLAKE2B cf0dd9cabb3195fc7edf09996ec2de854c37893fbe0dca935ec0cedc8f80778c8c45088f7e6952073b34c854635212a79d068dd3c7c6c15a101ddf86aa856193 SHA512 7cd6193496ee9da7867d5121d995e360a3e2c31210794496b62338fae1eb0cf434712db11dfc2f25fd6eebffb92243589bddba98286c189757923bff39cd16bd
-DIST xkeyboard-config-2.20.tar.bz2 978275 BLAKE2B 5d24adb829057f9600c7de0dd028af067d23a9138de87438fcc03936e48c1908fc4740f41c8f87be90ec0edbadd20735859a7fe184f5c4704ee819a1c248a091 SHA512 29584096874cf8f1444ed00374150fb186e9a74221b384d779bcf01c0762977f8a6a1b3dfa37acd560667a79cc80d4c0d39729b7dc21809520a7254026439db4
-DIST xkeyboard-config-2.21.tar.bz2 994972 BLAKE2B d6810fce00cad5fc296bd744831a13e797d8e03dada40445cf4a81b328470517f0ced8d9d0e734d9d8d35da4727ac9ff74488e118a8b7fe8c2e9cd6d364854f0 SHA512 c8c3da9d78365878b051bcfecc7c51e89c5aa15e6e3ba5e8c84612eaca4ca7741702c023f9571ac04c865f2951a7ca33f4fbbedb3baf6c76441ebf59c4e41068
-DIST xkeyboard-config-2.22.tar.bz2 1046333 BLAKE2B 5a869154be04a84c57bd93896e0ada5598b1aa788a10952e5432820d5511c3d9fb101f995248115affb4c3270754b05757af4c91c4273f16299eaba6db5fb285 SHA512 1697cc1a49625eb608d8ab1f54f9f37e37facc482fc8bae5ebff9e3336efdd2f57e0ed95db0a9745d49f1bc21e2cfa792d0849f4057745d8be8f7abac4893f97
DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
-EBUILD xkeyboard-config-2.20.ebuild 1086 BLAKE2B c54d81bea0488c185ef3816207923e7aa32ccd0372b79d97a584a90b4526f48953785ec49317fb22cd32bf2620b31c221d8f0613d00994c5807f9fadf9bd2f4b SHA512 047047ca71e89b11bf602c965a487d28571fd3bd68f3648970be46cd9ea9b23ee9b696333615bb8d4d2413cdb2bb209b4bf7411f8b45433899ae47c8db142d08
-EBUILD xkeyboard-config-2.21.ebuild 1095 BLAKE2B 40ebc90c93bc8f8b5ca681ba8ae6ee5dc3524031bd13ffc63c550fb7036623c2e4dcd24899d92f9cba0c2066cd486c640bb36a753f343a6d0354c8518f195cd3 SHA512 63c9db467b36f66ce54248f7eb5c8dc6528242a3d2844a70905bd8f006233678de67003f0cd81f092a0fa2db2a4570d15e63f6a2c97a42a26eda5fdd52b1c364
-EBUILD xkeyboard-config-2.22.ebuild 1095 BLAKE2B 40ebc90c93bc8f8b5ca681ba8ae6ee5dc3524031bd13ffc63c550fb7036623c2e4dcd24899d92f9cba0c2066cd486c640bb36a753f343a6d0354c8518f195cd3 SHA512 63c9db467b36f66ce54248f7eb5c8dc6528242a3d2844a70905bd8f006233678de67003f0cd81f092a0fa2db2a4570d15e63f6a2c97a42a26eda5fdd52b1c364
-EBUILD xkeyboard-config-2.23.1-r1.ebuild 1144 BLAKE2B aa5831d9d8f761f00174e1667432e8abce97b1fa94f2d614abd07309598c2cf241bceea3a13a3bfceda760b2f0e1b7c00962cdbd9ad3254b184ae4baabfdb658 SHA512 1dbf80c027a36e085eb01740ab8cab5d4fa8543843b3b532607b0fbd208f8d9a21025aac9bbf622fad87db3d564aac2ffb507a352d0840fd3df264a9f856f4a8
-EBUILD xkeyboard-config-2.23.1.ebuild 1095 BLAKE2B 5ff0f206560806df10edf855cf7d81bb94bca1e13d779219f3564d315aa557772054de31ed1f661c89b8793ec44bce2d02304f9ff2f270b7ca1274688a16d5a5 SHA512 f7bdf5f231a033420eac29903ae03936fcc11568bbfd92fd01c803ca5bcf7d4c9cd947a371b6634e78c437108200d7bce8ef7b953a82d8b3ec20f7551683da70
+EBUILD xkeyboard-config-2.23.1-r1.ebuild 1143 BLAKE2B aa3ff040bb72dc32bf836bc6b9411ecf5584de9bf3b7a2e25648a774fee753ad0a8773410219519ba41bab934852afc9b430829c2a664281c9038fec515c3cd0 SHA512 178632a8720598205c048a08d7936fd45bc3c3151c9563ba74df8453c0316f873615f3c97ec52592db091c154f4e3d331badd092602671f14a1706fa0a46155e
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.20.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.20.ebuild
deleted file mode 100644
index c301928f46af..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.20.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="!<x11-apps/xkbcomp-1.2.3
- !<x11-libs/libX11-1.4.3"
-DEPEND="
- sys-devel/gettext
- dev-util/intltool"
-
-XORG_CONFIGURE_OPTIONS=(
- --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
- --enable-compat-rules
- # do not check for runtime deps
- --disable-runtime-deps
- --with-xkb-rules-symlink=xorg
-)
-
-src_prepare() {
- xorg-2_src_prepare
- if [[ ${XORG_EAUTORECONF} != no ]]; then
- intltoolize --copy --automake || die
- fi
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.21.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.21.ebuild
deleted file mode 100644
index 4dede12071f8..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.21.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="!<x11-apps/xkbcomp-1.2.3
- !<x11-libs/libX11-1.4.3"
-DEPEND="
- sys-devel/gettext
- dev-util/intltool"
-
-XORG_CONFIGURE_OPTIONS=(
- --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
- --enable-compat-rules
- # do not check for runtime deps
- --disable-runtime-deps
- --with-xkb-rules-symlink=xorg
-)
-
-src_prepare() {
- xorg-2_src_prepare
- if [[ ${XORG_EAUTORECONF} != no ]]; then
- intltoolize --copy --automake || die
- fi
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.22.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.22.ebuild
deleted file mode 100644
index 4dede12071f8..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.22.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="!<x11-apps/xkbcomp-1.2.3
- !<x11-libs/libX11-1.4.3"
-DEPEND="
- sys-devel/gettext
- dev-util/intltool"
-
-XORG_CONFIGURE_OPTIONS=(
- --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
- --enable-compat-rules
- # do not check for runtime deps
- --disable-runtime-deps
- --with-xkb-rules-symlink=xorg
-)
-
-src_prepare() {
- xorg-2_src_prepare
- if [[ ${XORG_EAUTORECONF} != no ]]; then
- intltoolize --copy --automake || die
- fi
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
index ac4f25d9738b..f69fd4b0d123 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="X keyboard configuration database"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1.ebuild
deleted file mode 100644
index 40b72722a506..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="!<x11-apps/xkbcomp-1.2.3
- !<x11-libs/libX11-1.4.3"
-DEPEND="
- sys-devel/gettext
- dev-util/intltool"
-
-XORG_CONFIGURE_OPTIONS=(
- --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
- --enable-compat-rules
- # do not check for runtime deps
- --disable-runtime-deps
- --with-xkb-rules-symlink=xorg
-)
-
-src_prepare() {
- xorg-2_src_prepare
- if [[ ${XORG_EAUTORECONF} != no ]]; then
- intltoolize --copy --automake || die
- fi
-}
diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index c4f4cb74b703..219f386dbf95 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -1,5 +1,5 @@
AUX xkeycaps-2.47-Imakefile.patch 758 BLAKE2B c8f06c0c61f3c57f29c818d2ea139538e14fbcf654bfb9d099bf680cfff38e2c870694afc026f20a8b45b8f6274f0530c84def8a4d36b6ff0f37f055cf18a573 SHA512 f3bef8615e6a040ab05fc71cf45323515f752ffc8cc1914098b1a8433a77c91c0f9aaba11e73bc984c808d1e5421f94c5dab4562e5f442a8558d2987145928a5
AUX xkeycaps-2.47-man.patch 639 BLAKE2B 4c554a83d65598544d2fb2853c523503b4be9a52d56a6a488aec933600fa39d2e050028ed907d0ea19bf1bf2898113a6c68c2b965c43840abd2dd905ccdfcd8e SHA512 6eab220c2c5c274ae5bfdc5bcf9c028409a3f0ee1b764aaaae81b2b7496fea48e64ea6fbcba0bf175ee10bcc81309ddcaeed3c4b9b831b9f8d8341df20a9c950
DIST xkeycaps_2.47.orig.tar.gz 351418 BLAKE2B 0dfd53e6b7af6c14057e56071b70edf3479a55ab4e6ed9651cd5acec68c1db8096264dc8d5b578ccb62b331ad6f14ec8f1b8d0363b614d14b0ba9ce60492b55b SHA512 f5f5ecdf83c2bd86eb3d8b8a28b26af25a2dc9ff0a9c44091d8eb154d617b4373191a2e4479bb0e3025c023d6e5d785a088c64bc269c1c43431a3d2fc91c1a7e
-EBUILD xkeycaps-2.47-r2.ebuild 942 BLAKE2B ac45f57a3578133279aea88a20aa44a91e40014e67e571ee590ae7cd3c792d3f4491109279f78e25d07edbf8963d4ea923104a4d09126de78c9ad809d6c78680 SHA512 4832deeb6537f5de4717176cdcc60dea67399cb7d33560fddf922aa12e9c03c20259ad74d79a8ae00fad966cfd94d816becf7f464efc1d9b4823cfb60bbc7cdb
+EBUILD xkeycaps-2.47-r2.ebuild 945 BLAKE2B eaff6b3515acdb863da736e3f0e3ec5491542004c4331cdbdb63515544e827ae809f95ebd1cec0b194d1bc0ce7263aec2a0c26101cc868d5cce038bc9f382ada SHA512 0a441513d785a471094849d2f9cc1c60702f5c15301790a309d66fc516db8d738679105520dce617c76c820242d30904411704d95f6f40b2fc0a9bb4ba63de07
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
index 504fde9935bc..9031ec51246d 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-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
@@ -21,7 +21,7 @@ RDEPEND="x11-misc/xbitmaps
x11-libs/libXaw
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
x11-misc/imake
>=sys-apps/sed-4"
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 4f8ed424b687..18810154b630 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -5,7 +5,7 @@ AUX xlockmore-5.55-soundpath.patch 877 BLAKE2B ede21934cdf23055c6177d6441bef5fb3
DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
DIST xlockmore-5.54.tar.xz 1647652 BLAKE2B 2d949adab766d0509cf6af7a44fdc25db58aa38973ceb00faf82bb6694a1a4848a6e88c93297ac8eb18ee5b8e0448e1d70853edf4585fb758445052c36ed6b0a SHA512 027a750d8fb9d17619441a8f76456614e0b91b4963a80810e24d4aff46a8c3217464347b0910c00ce54c25ab6678159dec3c3ea60ee61f7624015950590d7f5d
DIST xlockmore-5.55.tar.xz 1650116 BLAKE2B 4c50f9a0f4f4c5d02c002363e75eef22b19f52cb05db305f013bb105d47f3981b00f65ee66937c9bb7d971772cda90e2565345fff25fb8c593cdeefa0cf10ca7 SHA512 b6d322bbfbf5710c0fb94da6ee894902fe6c2c87f949c80a27f7924c26a20ede5a3bc40a085c00d4a41dae450c862edaa4d50f716bf3041668d89c7c1d8b4902
-EBUILD xlockmore-5.50.ebuild 2169 BLAKE2B 428696632946a97126481c717350d87d3ce6cb73cc1c3e2ab6fd8cd64c67c4172e4889adaeb29001dda63fd4fe3ff9d44f2bed4ecd8f46f6e1ce86b14e25674f SHA512 4ac9d8f19cdca22d137bebfa97b4739214065b8ec9037f1ebafca1f4f9e62a07569fdec9195d0c1f67a4279da57b777da935abdc5bb0f5371ceecc9d1547d515
-EBUILD xlockmore-5.54.ebuild 2176 BLAKE2B 682794c14940a58cdd6ebdadb6b010735f6543f5217b0a67c0fed5002a4c6c055e23e59c6a6302a2d78939ef7f4f7d896f29f15604d334b14303f4fafc9d9852 SHA512 f2ac190a0ef5421cf4faeeca936663bf7b134fae212cbf0fa597e9feaceaee91475965dd9d0cfd4d2180d7e2fb80776f1b4ab581fcfffcfee7641f70e43d0ab3
-EBUILD xlockmore-5.55.ebuild 2262 BLAKE2B 48aacb3f5c34af746d94fb33d11f285ffde94fc54dbfdde757289cf48887a722ba803a58be9a93551c47da4cd02f61ee76bcb6ab2e494071775925a9618af472 SHA512 1226e039c666d53ec09a89b7b895602d53cd838c7c79b6342769c739365fb811e4a74ed8b75099b679cca1a1eb3bfd0903f692e1c57a10d38d85667b7e439865
+EBUILD xlockmore-5.50.ebuild 2165 BLAKE2B feadf465ae112ad5d4b482a0a4fda8293eef90f2daf76076d37175182dfcd2491f7fde83af37298e35eedb65f7c27b3915e3f3ef60b4c3ec1ee6145dad125ee5 SHA512 982a26f33a14d5ccfee07f190cf4a4391c2f767b000e8ebdbe46a6f71650bb4beb9d1758fdf947f801b27bc3f331eac5c9e95d6cd779ebdb5d81e1cedf81c673
+EBUILD xlockmore-5.54.ebuild 2172 BLAKE2B f9adf509e391b0a2ecb2307aa495cfca563137018b6b3cb4154e14379a59547866df9a65bba07ccb40c25188f4477c076caf8dec8706e8b6f2086ee5116314cd SHA512 df476dffef2b870481f0f521d58e4d1fad11e57b0249d6949195a99f61213ed51d28f83637127e5d354cf21850f8d970e972270452581d2569795b9dabd800a0
+EBUILD xlockmore-5.55.ebuild 2258 BLAKE2B ce8dd6eadcd5cd3b30e9d7868f5ad3031df3d8c7bbbfca6f6c564fd9f6b2fd396f824f3845f68691516feabc1f8b4859d6a4d348fd7ef2d10a758fa6288fef23 SHA512 dea44c4c0da3706b6ee64997d5a0078bef7045ba365215f8bded41c3f8bfcd69027e3771fcc328aae73933a42dd8fcba8e4e5df1941a2a603d76d12af950d7c0
MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50.ebuild
index 529559f87230..39ac85126845 100644
--- a/x11-misc/xlockmore/xlockmore-5.50.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.50.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
@@ -40,7 +40,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xineramaproto
+ x11-base/xorg-proto
"
PATCHES=(
diff --git a/x11-misc/xlockmore/xlockmore-5.54.ebuild b/x11-misc/xlockmore/xlockmore-5.54.ebuild
index c5181b227ac2..f0e831cad9c0 100644
--- a/x11-misc/xlockmore/xlockmore-5.54.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.54.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
@@ -40,7 +40,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xineramaproto
+ x11-base/xorg-proto
"
PATCHES=(
diff --git a/x11-misc/xlockmore/xlockmore-5.55.ebuild b/x11-misc/xlockmore/xlockmore-5.55.ebuild
index 8277ee4c2f00..71f04c0a70fd 100644
--- a/x11-misc/xlockmore/xlockmore-5.55.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.55.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
@@ -40,7 +40,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xineramaproto
+ x11-base/xorg-proto
"
PATCHES=(
diff --git a/x11-misc/xmountains/Manifest b/x11-misc/xmountains/Manifest
index 1e9368accc91..8c91c2c7d262 100644
--- a/x11-misc/xmountains/Manifest
+++ b/x11-misc/xmountains/Manifest
@@ -1,3 +1,3 @@
DIST xmountains_2.9.tar.gz 27951 BLAKE2B f540196fab487dd7e73c3b39dd5233807fdc0f9c9409e6f68c56cabb26e0cc9287865ab497b08dbdc56661a3bcc0f6df03eed87b80f8ded56b2b9e4bd5cc9287 SHA512 635fe9ae6a53996bcc5c537499d3c74d8fef9a6d2a422fa7469637a6a20fb52de9fb20e265becc0d2dae3a1d1793a7fa7f33c9d4de62837639142b37b431b898
-EBUILD xmountains-2.9-r1.ebuild 927 BLAKE2B 8fc57616c150be77a38a109e7241789d297fe624f38cd7f1270935a32ce2639d71ec913c5ea6a25941a218cb12f01bb8e9b03e44be98a22cb4f044e11276e3df SHA512 b11d0d6edd118a2b9cd546244ab90621a907ab2505ce1fae6f9972f7fd6324fff0777eac3fa36f28beeb9e03c0cd57bc67f72adc3002e5cb8a1e6ea27f8244b8
+EBUILD xmountains-2.9-r1.ebuild 930 BLAKE2B 78006debc06463eb163bdcbd5547b70f569c7cdff589ecb9700ecaa848e5b3327d5158a2c6ea2b71e8a864008e34abc958210742213cb664998ecaccfa5956fb SHA512 b466a6ce4a23b1347cca19364689a038a2013f1d6b9ecf1c1c0e81c7979024df3b944f45a03d8c66442cf3149c0676d9ccd41e7c47a35f2ef7f353cdf3b45216
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
index b3e18f2cd2bb..a77dfe86d278 100644
--- a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
+++ b/x11-misc/xmountains/xmountains-2.9-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
@@ -20,7 +20,7 @@ RDEPEND="
x11-libs/libX11
x11-misc/xbitmaps"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}
diff --git a/x11-misc/xnee/Manifest b/x11-misc/xnee/Manifest
index 9e738e6306b0..18cfe706c8ea 100644
--- a/x11-misc/xnee/Manifest
+++ b/x11-misc/xnee/Manifest
@@ -1,4 +1,4 @@
AUX xnee-3.18-linker.patch 273 BLAKE2B 11c8552d2543879edf599dc0d9b820d5283abeba0edbc850079f268a92e95a26c28f90b119dff4f461d181b18dbad7493751b6964d20a9e1dcff6ba7d6ae8601 SHA512 2223bcd952b828d0704b3e3a0f3d55742a9837753187e4a8df84b6fa40a272174506de9341894b56024d9ac81ab1fff326012c13a3dedd0921dc7802e36761f0
DIST xnee-3.19.tar.gz 1893109 BLAKE2B 17f416d06dac092c79d4c9838e0f69219e617d695d7c56bee8c84cdf6a5de7e3f02eb1dc9f9f278e78ebf4090893557ede30b2cd5039acafcd743cff11e5602b SHA512 a4a82839a4597b0d7f5b65ad76092f03eb5c665d36298505a320475daacbf66f30b022c04284ce8795360e4481fdfb1d9138f0b8b173b66d23b7f1542d0acbe8
-EBUILD xnee-3.19-r1.ebuild 1449 BLAKE2B ff713f697563a8a35c3b5aa162ef058de0e1ffd77f55b743b60735a4e575ab68b48ada95487aba09d50f70b8d694abfbf6da9c46f5f6617c3f3aa10c899cc6ed SHA512 4c35fa40096eb16b35cdde8813a5278b684b0c1d926618c64e4d19ab174b0ccaedddda88560b5436d5be2c06386fe18beac516c4f5afc87f7dbf3afb54ff81d4
+EBUILD xnee-3.19-r1.ebuild 1448 BLAKE2B 5818a26e18da1a3e8788d1574013077d505fcb38cef0f93ea190f5f29abfe9d49fed0734fa8e8d545eb80fcd59608b32ee8ce12b0556ca6490800ae8e35afc3d SHA512 5a0c1f17656e8edd3f907e7f70709430dc0e6f69bb0e1148dcc646f78a9dd4989a5a0548f7e3eb05b4136361a757a4686e4edbbb9c0bd1f8f78c19e74ff75184
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xnee/xnee-3.19-r1.ebuild b/x11-misc/xnee/xnee-3.19-r1.ebuild
index c4eab6452b7f..9e2f128b15f3 100644
--- a/x11-misc/xnee/xnee-3.19-r1.ebuild
+++ b/x11-misc/xnee/xnee-3.19-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
@@ -28,7 +28,7 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- x11-proto/inputproto
+ x11-base/xorg-proto
virtual/pkgconfig
sys-devel/gettext
gnome? ( virtual/imagemagick-tools[jpeg,png] )
diff --git a/x11-misc/xnots/Manifest b/x11-misc/xnots/Manifest
index d42ffb960eda..95752a549820 100644
--- a/x11-misc/xnots/Manifest
+++ b/x11-misc/xnots/Manifest
@@ -1,6 +1,6 @@
AUX xnots-0.2.1-gcc6.patch 1341 BLAKE2B 0dd960662c8cd114d29c2f3b60850a884c6e909fc2055ad8f3e671269d4e90f26565046dacfa0bad1ad0ca7229297d377a2f5b8293a5de9d0962543b4728abf9 SHA512 3d7e976f93e1a67234bcaa55dfbfe980e9e5ba95f2d8c43c29ce9ef003bf93f7924218cee45892292f11db6e6af51879e37f4aeb4a20f946fb0c73dd8d95ded7
DIST xnots-0.2.1.tar.gz 41442 BLAKE2B 26579cfb5508ed1e956b027c769c9c0924870867428cdf5b569e571fce57777267f0523a9ceebabe7f2c705c7b6a34549a122d162cb547e44d8489708fb9e83c SHA512 bb1a334150aac932839c8d9e04d8c9f1c419f5221a218fbbe3523060fbb8d62e616f89ec06a8237fa290de37db103e98a560953ef820ef016f35dd5c844eb65c
-EBUILD xnots-0.2.1-r1.ebuild 990 BLAKE2B 78043419b753a16a7798dee29d49eb2cb7dbbe580c289ffa632a2df4f3c91c71c593da5a644c439324bf70ad42bcd580d7c0167cc5a227e3e55f7d24be0204c1 SHA512 a58f070c30634ef0b3fc69be8169473e08754aff16f36385ab061878658479f1ebd9beb7db85ff452d74f9cf21ae22f313c529d6f39a2f607c434e5accf51a4b
-EBUILD xnots-0.2.1-r2.ebuild 1053 BLAKE2B bd90281dcac66cf7713587bba0faeadffccef667f298f179a34d0c9717bbdd13717b78cbe8767ec4b6b8bff8a78a69bc25666392798ed256467ee81d41827fa7 SHA512 ece90ba2e795ba8ee57121e889a55b1fecd4b3ff1574ecc0f5f98fbe509d613c8e2f0fa2327e68416e620294caea25a0f129c920e6f681c64f4209bf44cc2ba8
-EBUILD xnots-9999.ebuild 993 BLAKE2B b42a97f492b92eceee4c787171cf236b0fe3663d356b7f5906b64aa2aa2ff5f2eac5676718c74c392fb97b90c55c4f866b1a577fb7fc3fccdef08522e7f543fd SHA512 ab2fd8880e59ff5ec8dcb31348c80da1d4a38d409e547b42b81c700348a90fa9d521e483d785d2b6ffd93d268592430c59555260e892cfd29130c50f40d194f6
+EBUILD xnots-0.2.1-r1.ebuild 945 BLAKE2B 3a6de3e865466f62b90fbf36c890dc4cdc267055116ab66cc2db11b7baefb62e417835a8a34a1c8b9e3d52409a8dd6e275c39aced90e7e984fee1e7fd69e9e9c SHA512 a09ada148a66adf4b9c2e74d520e9023f99e1a3202e478bb95b2d55ae2326de9d459a47605970a6026d38f2ae4fa177a032c24e218a9866dadcec6c76bc169a9
+EBUILD xnots-0.2.1-r2.ebuild 1008 BLAKE2B f8c1a01680373e647401a5f227db0bca49470054d18da55527bbbe93cd3506361e55d16b19e5aaf4db13f2c9b5bfccf3c5d0b227bc131ac952806ff55aa09467 SHA512 8f9a0bf4dea5c2c63ae1424cc61d0a857da9e538a2465936c45ed4f94ac6893a1483fdcf4c037be794c0d8f05ec7d4641cc38d349eafff4215d7fbc29e7412ce
+EBUILD xnots-9999.ebuild 948 BLAKE2B 7a7183891ab4b05a031b395ceb60e853eaa13d3235ebd0fdee2d4a6dacdf0d8dfdff10319278954fda63031872ca8e37c1b7e485fb7115cb9e2432986c495aaf SHA512 854cfbd3b99291da2fecc789f3f07f37cdc56b2e367020fac9367c1c843f5087db9bac2c71c15dab520815f24988b90af0063f830849a667fbd7f15854ac76c5
MISC metadata.xml 410 BLAKE2B 1cfb5af15dcb1f596fc9eff076b7e4bce5af2d328f1f1040167117162b0ddfa4b1aca2a6bc30fdd54732f998ffebe6f51dd042f04e8a6e211bd115d3d3325bdd SHA512 fc75f0e956d59b3231440882242a1c9ef59f3e694c3c0ed16673cdb99aa92b58d94679d6b3385c373e8aa7bbf7b1ced73ed50ca26be76ebf54a72341c284bdbf
diff --git a/x11-misc/xnots/xnots-0.2.1-r1.ebuild b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
index 0438e287b2d9..f177612e4c75 100644
--- a/x11-misc/xnots/xnots-0.2.1-r1.ebuild
+++ b/x11-misc/xnots/xnots-0.2.1-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
@@ -24,9 +24,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/randrproto
- x11-proto/renderproto
- x11-proto/xextproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/xnots/xnots-0.2.1-r2.ebuild b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
index 15752d347787..c92abc690cd7 100644
--- a/x11-misc/xnots/xnots-0.2.1-r2.ebuild
+++ b/x11-misc/xnots/xnots-0.2.1-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
@@ -24,9 +24,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/randrproto
- x11-proto/renderproto
- x11-proto/xextproto
+ x11-base/xorg-proto
"
PATCHES=(
"${FILESDIR}"/${PN}-0.2.1-gcc6.patch
diff --git a/x11-misc/xnots/xnots-9999.ebuild b/x11-misc/xnots/xnots-9999.ebuild
index 4574a53d43aa..3f81446e468c 100644
--- a/x11-misc/xnots/xnots-9999.ebuild
+++ b/x11-misc/xnots/xnots-9999.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
@@ -23,9 +23,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/randrproto
- x11-proto/renderproto
- x11-proto/xextproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index ef71b95d0a63..c7c5589c178f 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,3 +1,3 @@
DIST xosview-1.20.tar.gz 146373 BLAKE2B 7d53b5f2f8ce463917a1cfa65eedb60c835c6d530a19ede6bba6bfe295a01582861ca3fb7513b9a8590d9fe5111779a38db8723a2e38c911f002bce88bfc95f6 SHA512 25cd6a8cdaaff9121f0e8de7a1799d4c2706c5eb1111f3b3f8427b16e45a333fb4c675a1dec2ef6b40773e83124ff27eacc82f2b9eb6c836855930cbbf08957a
-EBUILD xosview-1.20-r1.ebuild 1206 BLAKE2B 4484c09bf19171e46e2868b3e0adbc71b32da5505caa293fead36b33528d2a8f7411e6941c74e8f1259dfe1c964995d238f52e9f98b4234cfe20a85edcb1b8ce SHA512 f5ff457177c8ab2f900ce45ecd81bdccbabbefa40b2ad2c18d729bffcca3cc74249285bd80dcf889bba4141394154a546c4d7e34c5d8e82ccff33bf77d545ae5
+EBUILD xosview-1.20-r1.ebuild 1209 BLAKE2B 4dd8a3dc63cd238022db4952abc2970b15de99e3d833221255de4c3c604eba709ed1bc81c398a06ab58fd1170fc9840322ae2d2d337296765230760ca3d97fbb SHA512 e0a95ad65e44bb364b7eaf3f767bc08a4f41f3483e9e5fd9fe67e7d870125bd664b88ef34a91ca9a1ef55410c5a18af40e5fa415b1f3ce85ea3eac40c062d286
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xosview/xosview-1.20-r1.ebuild b/x11-misc/xosview/xosview-1.20-r1.ebuild
index 5cc53ca93dbe..e06a58bfd2c2 100644
--- a/x11-misc/xosview/xosview-1.20-r1.ebuild
+++ b/x11-misc/xosview/xosview-1.20-r1.ebuild
@@ -20,7 +20,7 @@ COMMON_DEPS="x11-libs/libX11
RDEPEND="${COMMON_DEPS}
media-fonts/font-misc-misc"
DEPEND="${COMMON_DEPS}
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( CHANGES README.linux TODO )
diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
index ab7a2304e2aa..351939c0663d 100644
--- a/x11-misc/xplanet/Manifest
+++ b/x11-misc/xplanet/Manifest
@@ -1,5 +1,5 @@
AUX xplanet-1.3.1-giflib.patch 1232 BLAKE2B 6f7e5a1c9388ed1d9cb13e6ec38ee53b0b5a1d2e3aeddab414cb24322582cab457850bfa75c2ef4d7575d9166be2a8f2303a7fb674d155d6ea00786575d471ff SHA512 56547a679361b7adf47191dfa5c011f93f1de288857f93a981c1bcdab6b4bc78c81b568748586f41fe0c49b634e5d7373875c579c0dfc05a5e256200889d7384
AUX xplanet-1.3.1-remove-null-comparison.patch 6773 BLAKE2B 580f2275f40e9c182bcd201906565debd644843ea592f23c62283fb9c9f974ea1bf11e94c793dce24c042b048843165392f065cee37bcea2353527026b29de17 SHA512 a3ac916070eadd2b0dbd33fbe584f5d5d2f621556389f8d0542d591d5b384eb75bfd9e9bd7411b335bfa1e530f638c1c348063a90ebf5ae62ae65995ccb3949d
DIST xplanet-1.3.1.tar.gz 1236035 BLAKE2B 71a5f856476e11333f5b97b4f7829c4376c570a44433b5a5ba1cfdf7cc425b1c9b89588cac3e0763e0c641a8b93c43bfc5f724fc3b9e3b5b418cabfa7193e0da SHA512 06ce3187fbd364f4ccee768fceca559690c905c870e2fb25ca32453ce09c564ba3455ec539f1e3da177de23a0611f767b375efe2e10b601d09313c0d068e35e0
-EBUILD xplanet-1.3.1-r1.ebuild 1654 BLAKE2B 890caa16be3365f92417f6a5e0d7213a217b74d172c9421b6627904d60af4bc186b4041f156b15baecbcca286c78a767d8682bfa9f2ddb945d8c54bf03e3af4d SHA512 545671717ecd4f1ae42b85989f24d6738ca455c2df81e58c933b98d8d3abd7830c9ec3cf8ae4b2148b981c8b80b77c906255acbf89e4e5e3da86c008c54ece65
+EBUILD xplanet-1.3.1-r1.ebuild 1627 BLAKE2B 2b292c51a77114b277a83e9a774f328a9712de229f0e0164aa99f7358bc4053649ce92a17c335190939705ab641451ff7e0247b4b87aa11b25cdd0c55bca22f1 SHA512 92e275404aedb5a28c77e415040bd05d84337e34062f781a8d54ffa89ef2884305dd0e9c273db4fe29e051c6a767f627085053fe07ea15bdc25f42a412aafdb6
MISC metadata.xml 353 BLAKE2B 1e7bb77841f92a9d562780b7279e9eacbd9c1462fddfc0542cc4a90451e155cc8754d54f17e2320790319fdebf3ca800d8d4006e02938a89c16dc8ca79dd41f3 SHA512 ec6c412d7af2d2e5541e26d007fd5244c07aae866242eed9c57e6bdd3a05c05958b69989b14f1d8d9054a70abac7344872265eb1bf96e32310f1a444a7463e6e
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
index c469ef0208a8..7fd20ea87c28 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-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
@@ -35,10 +35,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
truetype? ( virtual/pkgconfig )
- X? (
- x11-proto/scrnsaverproto
- x11-proto/xproto
- )
+ X? ( x11-base/xorg-proto )
"
PATCHES=(
diff --git a/x11-misc/xrestop/Manifest b/x11-misc/xrestop/Manifest
index a7b5bcdd0dcf..ad0b96b3e232 100644
--- a/x11-misc/xrestop/Manifest
+++ b/x11-misc/xrestop/Manifest
@@ -1,4 +1,4 @@
AUX xrestop-0.4-tinfo.patch 291 BLAKE2B b96d892c87a8133987baa94e5cb4917bc5d743c24ec11a2ec67afafc7206654b88c17f54377f2d1bf0c9fb92df8de16c99e4d0f9a15ff80a9417da2de31bc6fa SHA512 21993ada033d4ec744b55faa71afd736a99423f12071a64e1445958de979631ce42a908e14ef194e819de98766c92a2c2470b2c88d172879ec5fc4c20212566f
DIST xrestop-0.4.tar.gz 92308 BLAKE2B 5bfe6e9ccd49038e7884be8379e79f3de2bc960588dc21fbbe40d2acb89c6505efd78a9415e0ba8feb24986f11f066ce641b9c933f241776bbc1b3e59fd520f0 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6
-EBUILD xrestop-0.4.ebuild 664 BLAKE2B a5dcfe1994b1cb191ba6500de9f5d4a2fdad7f54d879ac884e13fdd31ad3afc9d3d8ab8aa120478e4ee84e3cc8bc3e1b4f0a79ca1b3a966c017d02c8de496332 SHA512 7484fc5c3eeaebf020f056b40e1b1f68b15f7a8c70f7c20eac3db89997b56ea6f1dbc5a0038eea569bcf5a1b850e19e36a85d423d0e11f583250603d5a3ebb80
+EBUILD xrestop-0.4.ebuild 667 BLAKE2B 240129b1dd013052037d3d3c376f0f5e3b295a83d684a5f6577ef9fe5c3b19e43572e8043285e08622d7a03ab3c0bbd0e645537c6070203efcfcdb95d872475f SHA512 0f9ea41042f43e620d4938a15fbd461a8b2bea2ed50b61b0ab1481e9ae965f2774a8e29f7c5fdb7c69a01385f0408ca4c6acee1011b21b55bc773cbbcff28fc6
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild
index 4ddbab73daf2..3cf2f929a6e2 100644
--- a/x11-misc/xrestop/xrestop-0.4.ebuild
+++ b/x11-misc/xrestop/xrestop-0.4.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
@@ -19,8 +19,8 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xproto
virtual/pkgconfig
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/xrootconsole/Manifest b/x11-misc/xrootconsole/Manifest
index 3005a95573f1..7234b9e731fe 100644
--- a/x11-misc/xrootconsole/Manifest
+++ b/x11-misc/xrootconsole/Manifest
@@ -2,5 +2,5 @@ AUX xrootconsole-0.6.makefile.patch 915 BLAKE2B a3c3972128397f2a0d3a96464b310329
AUX xrootconsole-0.6.manpage.patch 1038 BLAKE2B df8fdc45f1167ce4e8dd948bba549e88908552282ab1d9b41c0a3faeb465c047a7add98b9620a67e86b4646e148b2fa88541a6c1d67407eb651fd137c067b816 SHA512 88b8f68892646f3ca375ee0166336bb3972c5addbe1e515bdd9d7c4fc47517472051d59ac81fb0ec95a8852ab385e0544ec54fe0f9eefe39946dcbe1c222a33f
AUX xrootconsole-0.6.noversion.patch 1780 BLAKE2B 203dca249d2dd8d6ac675cd617615ba551ab3bc6e14dfede9b133840bf9779be186b423f03a1ca04b262ac31593511d34c8a82c05b06cc1f6d68ed5390fa08c1 SHA512 d75228770d31deb969e1f05f99eb0df2839564d9f9db7d5cb9efb00737e1df5632e14c0d5071ef0a5ff57054e62e1c112bd27074b60ac47220ec50f02a170c45
DIST xrootconsole-0.6.tar.gz 15951 BLAKE2B b11035742c08d7f989b131a22e64338874fa609fe09852ada76779c7d850c9cc16a86baf29785fb86edb9fa9aad2d33fd90392f50e134c74dd1ab4765776a8e8 SHA512 9e773eac96f9bb0103880cce8a3bc24211c50b369c4c389bd020c774a4f643947b634ebc5e7b266b28f75f57887d8edc72d8d582e8535c7320f56292194ed7f9
-EBUILD xrootconsole-0.6-r1.ebuild 769 BLAKE2B e043a46eb5516049a573298afb29d33db23350ffb524cafb34c8749d10b2c3417ed674db654f8d390bee5d0fcb24b2676aa3a1da3ef12288fa377e19aa2e04df SHA512 19fa76dbe0bd938a83745462e1e918ba6b72d21bfb09bc1ec35f57d12d640f48e1a4bd0ea02d10d75c77fd6773c031896bd16560b0a7a0bbaa0703393765266e
+EBUILD xrootconsole-0.6-r1.ebuild 772 BLAKE2B 6281345cf7abc6250acab20f288b151c9e2dd4f756b08ad3674b91cdc4c26b50688629c4a60b9bab5c93f470d75ae87c2ec36856f4b465cbdd461dda88fa8306 SHA512 bd933e5811847cb90be5f1223674b468134ee961c890bd05b35b50aadbdbdeb7528f27a681df3318078f20fa5db5c08cc72b85c15ebf6dac74bf194cbc16d6f2
MISC metadata.xml 358 BLAKE2B 8df043b8124f8b3f28ce0d015d7f4fccb026cab47d6d7ed940281932aecd7879196c740ea9e53b806e266a58eae5b280069ee210ca3ae9b4dac35f7e38af9b43 SHA512 9e5d37dff356a43145f02067c1e587bdd55bd02573cfab81205ffff49ccc3c32c0a969ecdf7a356eebbb91008291a06c4935295005d376af08c4a6669db74400
diff --git a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild
index 111832c3752d..58f43f33c854 100644
--- a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild
+++ b/x11-misc/xrootconsole/xrootconsole-0.6-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
@@ -18,7 +18,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
PATCHES=(
"${FILESDIR}/${P}.noversion.patch"
diff --git a/x11-misc/xscreensaver-app/Manifest b/x11-misc/xscreensaver-app/Manifest
index b1be64d66bbe..90818072a7b7 100644
--- a/x11-misc/xscreensaver-app/Manifest
+++ b/x11-misc/xscreensaver-app/Manifest
@@ -1,4 +1,4 @@
AUX xscreensaver-app-2.3-configure.ac 484 BLAKE2B 3bc48e99a411b9742d3241a6d8007382367987c64b6f7358b3f021c390aab1f3c3f7958169a6e2c2d947a2fcc9312da75998dc66bf7b820a60ce734e0903b5ff SHA512 4093fb62a68f0831cf16ed69e2fd64434c0dc5381299d52743702e6992baf016a3161a7d120ddd5b3a7859f30c2e75e0e0b88d725e519b3a69130178ac0eb60d
DIST XScreenSaver.App-2.3.tar.gz 47566 BLAKE2B 8ba867b8bd64885f7c0ed6b86adb52b2886f5b7f99c06b3993c2eca9d9ee09bf9edeaf04fe4eebe1d3d4d175acc6c00034cf3caad8c8d2318a6f671831f92a30 SHA512 eb65cd14f70e6f152fced9f073dbc7737c855f27787472d0e7e9c4caaaf59026c0977c0f27ebd55b13391ab29491f4a96878236b78716b1f15dd9b772091f290
-EBUILD xscreensaver-app-2.3-r3.ebuild 852 BLAKE2B 91d8cdb495bd4240b6ec62ca2ed9a14c42ff237bcf8852703ac76485043c54685854b9d061d5ab0279a38041c54eda08e646a9ee76815532c9341cff240e828f SHA512 22a97e1cafe6f83c81d6b0cb56e4c427f4d13646613c0b304adfc0e575629077677d8e8025ffd163981bdff2c15c27a57dda41c6b944be3aeb6b461d8fec5b64
+EBUILD xscreensaver-app-2.3-r3.ebuild 855 BLAKE2B 32c20f91e7766bfa891b9871f53135c042b30a6dbe9ed558dc4f13392b370c28b80126731c1e341b03863e55008c0cd0e9aa95420e97760fd478d55a11753f49 SHA512 d0d37f62648a09521f0e5e994f18cff63b821ad4bbf0eaeac15eac7b75dc88a4de379f94a641331e4b950aa3b1aef0bc54f49d7ca9c2c31262b3060d8f150b67
MISC metadata.xml 371 BLAKE2B 5f7abb08f7add4875f3976d7ca48d0dd3523a8ad25238c38ef8ccd1a0b40855a4b12292d077726de6ef5c6dccbcb128f653e461c0878ad6faf55184bd8f2a031 SHA512 86572bcaec2a3d22274e9b4cbadfbaf731082f5be3499b024338da625d29cae3deac7000f42a8582932f9f6791f1deff9c277d590180e5842934df281c289726
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
index 0cb1d531963e..a4de3213fff7 100644
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.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
@@ -22,8 +22,8 @@ CDEPEND="
"
DEPEND="
${CDEPEND}
- x11-proto/xproto
virtual/pkgconfig
+ x11-base/xorg-proto
"
RDEPEND="
${CDEPEND}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 3ea1cec9451d..44a084a56556 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -10,8 +10,8 @@ DIST xscreensaver-5.36.tar.gz 10600872 BLAKE2B 5039722fa3aae2fdb42fb99516685f0c1
DIST xscreensaver-5.37.tar.gz 10598833 BLAKE2B 44462bdf735c0eeb460e400b260340a61e57f343f0ca59f38c7b8d2c7fa03a5b08a5ee424062bba8a4c95da2ec32d89cbcf3cc84cd112fbd67314d3db56bd0ef SHA512 9bef3caf4eb495bebb4c1818ed0bb222be28a7a8d525e2bce70e92d7617bc8cf89750dfaa8cf7a3cd0c489b4831c95f9ff8a0164579cf047aa63681254c8e443
DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
DIST xscreensaver-5.39.tar.gz 12157285 BLAKE2B b33bf64541d07b2f65788160af0bac308d4bea78a6d2e13332ac0e80a1811cc8270e0922467c76a77bd3481b367e4421b6919d017e7a81b656c4bcc85c404741 SHA512 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7
-EBUILD xscreensaver-5.36.ebuild 3521 BLAKE2B 6dcb3156b850b3f9ab210ab0d5c030c355c6ef6f90639c23316f71d20602cda04176bdb598af4b90f41edb3e5e51ce8195803974752ad128b85b395fb9d88d12 SHA512 085ce103e700f04014a8b769ab9e625763b62fda74d38f474c576eda8dce3b1143769a0662252997c9d4f652d2c0bda483af327b15f9798674eb62812dd2c438
-EBUILD xscreensaver-5.37.ebuild 3530 BLAKE2B 08cf24c2252e4965a07ab3f8bc5728a40a82f287bb1343db2bede836de1d77c6b138478dace70bf54d703ce3d4b209d0bd6b018cf62532890ed6d05cf3b10a63 SHA512 fe2fc361b059b944e94f06013a3c99854f9f4b33fd25f7f75e07e249a88f13899f3c74982e7e0dfde43523474b7b48c610ff63dfcdb08f28f6b9164eee3af68e
-EBUILD xscreensaver-5.38.ebuild 3539 BLAKE2B dff8dabd111ca7cfca526b4e213533e57c2724bae5bf1ecd904da9e6e2a771f5f5ac4cd88ffd964089db62d9ede11b2d7086e53a25635ecf1b84ca59c32cbd73 SHA512 d7f40a43343a04b4e6e17206c20f2f610630c94452e80289e24ad29c1e898e2bfc5aae76e53ff537bed13e40288c0340d8d60a93721d5835e8fc7d8f85d91174
-EBUILD xscreensaver-5.39.ebuild 3547 BLAKE2B dee7b483c7739f038d4e7dcab847368942bd3022331bc4f5feddc9afbde7b24b950acb98a954d804d5bd737306340d553e527202a1472f66a9235ec028db5a9c SHA512 8f3d58d58005dd68a764428cd1e3fa62aa2d3d2cddb6ee666dfc808ff8f5724aae17c8eaf716e70045e927aad957d5472f6d8a62c81fb33c0218c51858aa6882
+EBUILD xscreensaver-5.36.ebuild 3380 BLAKE2B f732eda2a852e786bdf1d721157adc22609ca84291918559c55b29ea9760836f68fd7efeb4ce3910e83a27533c5c1669604cd57557d3a3c28cbc45855fecd4c7 SHA512 6778de53fad71267d6186948996bcdc48b893527fbdff71d1bfb20cb263f6ebdcfcefbf5b0b753dff4e8c308ba47f81e0f37814c97bdb3a7c903c8ce7c59afa2
+EBUILD xscreensaver-5.37.ebuild 3389 BLAKE2B 4c80280782af33d10fe2232398caad29dd471f8c388b925e1586f79f46dda82f36f8801f66416a403094510559fc2b60f1ad6362ff60dd1ee81aeb5a85e35e2e SHA512 30d313f2407d02bf682e0ff7b71773d158293b402da052f3e1439db9ad93b29af9705e190655d2858ec283b7306af4246001625b5e062282d4c30ead7bb5c01b
+EBUILD xscreensaver-5.38.ebuild 3398 BLAKE2B e8c00fb88ab4d95db7fe291f536856735af6e1e0207693f3dd4abc7aee5726ad8142c3ff1650086e9e46c16414235b328f5a2e771d6620a77136976141ee42e1 SHA512 5ad9b59077b2722d421bfaa912a6bf2c38ec20bff3bcbcec8a21aab97159904fc68b2c7e10f2d766538e7283a97b82eee37350245ed59f14163005783d8c20ef
+EBUILD xscreensaver-5.39.ebuild 3406 BLAKE2B c584e9332e24aa43d35b80aa9b55114e13f0f3ceb29504034f27e0143594949c419d08188c16d814553c71acb915ac622cb37e0484db8a03b605ea8c0048d45b SHA512 0a721d26c16ff1c6d1f78975894b2ac89930dbf215f9265f834136a0400717dd08906cf4a7b41a33865445d61dae1780c5d35e0818c3373610fa0eabf2b07f64
MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild b/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
index 7b5b69a88e32..1e5f9a6da935 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.36.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
@@ -59,12 +59,7 @@ DEPEND="
sys-devel/bc
sys-devel/gettext
virtual/pkgconfig
- x11-proto/recordproto
- x11-proto/scrnsaverproto
- x11-proto/xextproto
- x11-proto/xf86miscproto
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/xscreensaver/xscreensaver-5.37.ebuild b/x11-misc/xscreensaver/xscreensaver-5.37.ebuild
index 6c8fa54ec6f2..27ea9efb104a 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.37.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.37.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
@@ -59,12 +59,7 @@ DEPEND="
sys-devel/bc
sys-devel/gettext
virtual/pkgconfig
- x11-proto/recordproto
- x11-proto/scrnsaverproto
- x11-proto/xextproto
- x11-proto/xf86miscproto
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index aa05146673b7..7217682cba63 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -60,12 +60,7 @@ DEPEND="
sys-devel/bc
sys-devel/gettext
virtual/pkgconfig
- x11-proto/recordproto
- x11-proto/scrnsaverproto
- x11-proto/xextproto
- x11-proto/xf86miscproto
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild b/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
index 53d05029957a..cc36c3d5c819 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
@@ -60,12 +60,7 @@ DEPEND="
sys-devel/bc
sys-devel/gettext
virtual/pkgconfig
- x11-proto/recordproto
- x11-proto/scrnsaverproto
- x11-proto/xextproto
- x11-proto/xf86miscproto
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/xsel/Manifest b/x11-misc/xsel/Manifest
index b5b058cd0ccc..ca04ca21c206 100644
--- a/x11-misc/xsel/Manifest
+++ b/x11-misc/xsel/Manifest
@@ -1,4 +1,4 @@
DIST xsel-1.2.0.tar.gz 169155 BLAKE2B 59b5c2f03058be1a584f12bd5c129a008ae581545b7aed3a54240f6a0b9c29e857c7425cbf6fa6421ccd577a1907a9a6c1d7213e4ccc43309a5e8933e707847d SHA512 e28623e6cc180f2e2210c20697d21d336633f0a5272ca9b62150a1c535e8de89731acc07230a9977e391e37d3943a9d687f1f967765a15bca5092a6c6d8c4d8f
-EBUILD xsel-1.2.0-r1.ebuild 599 BLAKE2B 4329cdc5ac368c8b8d747716485fe426b201bed256abef3016e6441bf08542dffca8dab7c582bbbf1f41799a9f00c1e09c5a51336682609bc0f7f237f92e6def SHA512 5d7e9f849b7898d369b8d81519a897d7163d340980ef9feb84e4a2db1e920f739f8eb4367234a60760bd06f655e99e30f132f9e71d81f6833a85abca29bcc68b
-EBUILD xsel-9999.ebuild 567 BLAKE2B 92116c0a8edb32e7ace2f19721acd03b2b4d8d8eacb407b254eb147b321b58ac53504a498b0641a911af6b0e2c072999bcf52780bc1ee310ad48fc678d1ebb13 SHA512 13459dbf8659df08828f2cd228b852149eac3902c4abd740a298f13a723f161f8267c3a0592d763c4953231b8a079b5568d6119a758ec067bcfdc868ee0573c7
+EBUILD xsel-1.2.0-r1.ebuild 602 BLAKE2B baf149543d275ad3cc05424845a90d49dcbe727d351286802a3001117b5ca1ea3d9bd44d08e0590546a5e8dd89ed564f016cf2cb3fd3866de20e7d8717ffa9da SHA512 5e35fb26856467005735a0caf3e6953536f714e7a6a52156aa5233f687611f7cd0461ce1aa61fd6f8f16d60d064c1bc065651c7aacb6e63f124c5ad8e1402767
+EBUILD xsel-9999.ebuild 570 BLAKE2B c9764165375cad08000658f418bb16ccafa2790dae30ec3cf0095e6d98a5d14f5956f47878c788281b1f633945b0b8b3efd17d28a76aa77460676c5d93cfc6e6 SHA512 742086512bb37463fe2c51481128befd1e27a82bb1597d1cce294ff310256b59b0ec2a42e9ef08f249426ae7a2d594e78e65f51452f663958c80bf450206c153
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsel/xsel-1.2.0-r1.ebuild b/x11-misc/xsel/xsel-1.2.0-r1.ebuild
index bfc59a723622..cdf297508f71 100644
--- a/x11-misc/xsel/xsel-1.2.0-r1.ebuild
+++ b/x11-misc/xsel/xsel-1.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=6
@@ -15,7 +15,7 @@ IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
x11-libs/libXt"
src_compile() {
diff --git a/x11-misc/xsel/xsel-9999.ebuild b/x11-misc/xsel/xsel-9999.ebuild
index b2971adb4fed..d3edca7a9f74 100644
--- a/x11-misc/xsel/xsel-9999.ebuild
+++ b/x11-misc/xsel/xsel-9999.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="
"
DEPEND="
${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
x11-libs/libXt
"
diff --git a/x11-misc/xsetleds/Manifest b/x11-misc/xsetleds/Manifest
index 66652bf94eee..dba0b11a591c 100644
--- a/x11-misc/xsetleds/Manifest
+++ b/x11-misc/xsetleds/Manifest
@@ -1,6 +1,6 @@
AUX xsetleds-0.1.3-assignment.patch 208 BLAKE2B a1f5d7814e17fac4ca1a3f0e02e17be063d7dd61316bfa7c5899a3d1812d3bae3aaed25b5bd6512c22fd0d36e0ea0f19cca837a7e0ef655fef09ba164d05f57b SHA512 8434fecb410cdfa35de8e1b93b4c3021df0629fa8d44a05b484e0d9ced597811fdbfd740acc70f9900af7e38b6f866eb3c9fc0173664dfa260d5a3ccef5aa2bd
AUX xsetleds-0.1.3-isalpha.patch 236 BLAKE2B 0a4599f5f4f0a56521967c30ceee7d79e65d7321b2f99065e42b77e94baf9cfd53611d192326a3e574c57f7de1df3a459ddd0905bb37c8013de21c65068d6ad6 SHA512 5191fc8ed447d921dfd0a47514de03e03dc744f17b22a1ac3973b1c91104c015c7881cc156c4e2e073f3ba18e17187b34b5db80359489ffc372a07c1e6bcbb10
DIST xsetleds-0.1.3.tar.gz 221399 BLAKE2B 11311f972abc0f0c83ec47dbfe2743d4220daa4fe445c4c0f4a5d7c827d690549611bd373577882d1ac75b853e468ce36d3a6a447873a523a530676528bbd011 SHA512 7fe6baa77b4b2c8f57dfc331776bb457520facdb2f54a5c101764c590d7c5556cd00477e56d36e64cb7264a8de28698422b99ec4852798069189fbe6c1c19f72
-EBUILD xsetleds-0.1.3-r1.ebuild 728 BLAKE2B 111ef2f2382fcbaa6f4cde4e72dbf029cf0927afb8d34f21b735fcefa1d2d3f1d4667aacca8f0fd1fc1a394ccde63a4145fc448e3f09c9a6ebf6f4c75ab51b19 SHA512 449fe65e54062a86dc0db390c2d4e07f27b4b6ac40f1dd602dd35176126fbaae885f16e0ae3afe6fe924e8abd11241acd60809ab8b5ea27a36361830a1cbcafb
-EBUILD xsetleds-0.1.3-r2.ebuild 770 BLAKE2B 030c21b5468386787eb2ff2d6dc3028542a5174083ce0d01dd5040a1c712c7ae85a172d05290afbdad39147104106e88bfdf25e520330c54e2ff089d1c679b2e SHA512 58d8c7914d85c30edb9a1a995a645d45b30857bc6fccbca5aac2ef71b9c54b7378c49672ea7db173cc282a272ce4c425674c4fd48694396e03ff8ba5497f9c5b
+EBUILD xsetleds-0.1.3-r1.ebuild 688 BLAKE2B 0d81343f13eb7cc5151418894eec1b91f6b2cee998682b8f85412551a7d7a18434daf18851da9aa44058ecb9a32ccc979a6dfbdc4a7a15c41801eaa27deb6a4f SHA512 145f655da2102532b30482390bda38756d3551b265bb520de9ac84f18de8409ed6715098e72f6e8ef2287d97dbe342319dc10c3c957d0955371d98de02720e84
+EBUILD xsetleds-0.1.3-r2.ebuild 730 BLAKE2B ee81de0d3ce760f04eefd6fa5ba60f585b4f31fd07ade86df7b4b2f19b9a3fbf5803690f91d7b8e3c2b988960abf8281f9db96ca287d16896c08f30e3a803c01 SHA512 cea531f0016ac1b2e760bf5f5f4a34dca858a08af9940794eea18bc49efa8c58cc30bd180e68c61d3760836be1da5eb5e7f6460e3076371de2b85cef0103bd4e
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
index d9d5530b4c5d..d0105b2c7f9f 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-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
@@ -18,9 +18,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
index a7fea73b665d..cd140527393c 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-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
@@ -21,9 +21,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
PATCHES=(
"${FILESDIR}"/${P}-assignment.patch
diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest
index 4eedf2e8c822..1eb8a31b7599 100644
--- a/x11-misc/xsnap/Manifest
+++ b/x11-misc/xsnap/Manifest
@@ -1,4 +1,4 @@
AUX xsnap-1.5.15-root_name.patch 228 BLAKE2B 5a05da8ed5f708811a1792162bbc2dc1ea01a3666391c861296fb05706d3d1a4998764d3cd98c2847cd36573f0841966d0c16bb6fb22531055ec01fcc3d49354 SHA512 965a26474cdbe809a26559ac431aa9acdbc20ff5469e58f8b95b9da0eb58e278040f233bdc42fd54aea6f556fa2a801f6f0ca610a2ed4caa100172cb9ead4ed1
DIST xsnap-1.5.15.tar.bz2 46574 BLAKE2B 4d0f67adea6f456bd92031752a307293d736b9ce14aa35435359ed7bdb9d774827130e95f526f363bc7f0bb3c8e3e637c3e4abdf7f9c157f15f7559bae3eba99 SHA512 898914dd0bfec93b641815cc07522d4ea6168266a7f5efe75715cf68555e8959a72b40b0a02e75244348afc6aa77d267fbe7ee60670da5f33e6db2f6c4476dac
-EBUILD xsnap-1.5.15-r1.ebuild 1328 BLAKE2B 7b9e016d5f4bb3c2e10ba5100c14f6d3be61f4cff348fd1b420769a91ffd3f00b1507e3b2760c764c9b27473c4b3b6a223eca99d8d701ad9629f63c87481a696 SHA512 71c222f510732eaef1b1a550cb57c52fa2d32c3e98521b55685be305fc5dcc956b0366354bfe19d4f763801371ce9cdd66c4e4c588d7a29258186d5c9c0a487d
+EBUILD xsnap-1.5.15-r1.ebuild 1331 BLAKE2B c56655e4177ab76e08cd59d11b7e20625a9f980e5282d1d2934e7566e488afeb6a8050a270415d955e55cab4f8184cd276fe128ce912aaf1c91041807fe430c1 SHA512 b7030789a07943202a3e376b1b2b3fe4aca968b54c3c13dcee98334186b693dd18c229eaef49ee35fb4b8086050f25dbb73560be9b4074863d2344a67f20c48b
MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild
index 98310014da85..f8f3dd11c404 100644
--- a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.15-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
@@ -28,8 +28,8 @@ DEPEND="
${COMMON_DEPEND}
app-text/rman
dev-lang/perl
+ x11-base/xorg-proto
x11-misc/imake
- x11-proto/xproto
"
DOCS=( AUTHORS Changelog README )
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index 86aa94d9e654..667d9430403f 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -1,3 +1,3 @@
DIST xsnow-1.42.tar.gz 56752 BLAKE2B b6feefa4aabc464097b099a0e48d27b9bd5d1b82bc02ca187ffd8ab810f3562c1d11ad01f18f79994699e1fb1fa520269976a35634388fbab2838e2e2bb122bd SHA512 7833f3c1834d64944a578dc71bbf09966d47a1b4878fb826cf121606e76c69544d96d73665572b45c47e0e017dd0cb0bf49f76799aeb859c1dc72348da4ff257
-EBUILD xsnow-1.42-r2.ebuild 844 BLAKE2B 57be0e7fc8533a270d846b8fcc6dd7fe9c66b83ef98c4f39b6b18c16a16a727014570d76ba571e70aed1fdf3fd0584223996cea634574faa3336eb7e59134e32 SHA512 3b4a09f98c01dbb03b228b37cc4d4ae8c4c254441aa7aecf3821ed4dcbd43a2351b4d228ddd8d082c0e5d7bab7ceb9b5dce4aa44ac181dc2c0fe789e7b00b5d1
+EBUILD xsnow-1.42-r2.ebuild 826 BLAKE2B 55e68c6336615a263a0b7f8421623433c36b41a475acbd8d3cdc5af5d3a4b11349814d82ceabc04aee3cc16fa0bb64a9514197e113bebc216d0cffa3de77be2a SHA512 5c49f28acf348efe87043d6cf9f865313771c73135254c98b521aa22890c45b6a1431fe907322a15811596946415ba3b7267db45814183fb37bb22d7d5e45eb0
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsnow/xsnow-1.42-r2.ebuild b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
index 993c4e5a5bd5..e9d9084f1313 100644
--- a/x11-misc/xsnow/xsnow-1.42-r2.ebuild
+++ b/x11-misc/xsnow/xsnow-1.42-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
@@ -21,10 +21,9 @@ RDEPEND="
DEPEND="
${RDEPEND}
app-text/rman
+ x11-base/xorg-proto
x11-misc/imake
x11-misc/gccmakedep
- x11-proto/xextproto
- x11-proto/xproto
"
src_compile() {
diff --git a/x11-misc/xssstate/Manifest b/x11-misc/xssstate/Manifest
index 39c9f5333622..d4cb19d1468c 100644
--- a/x11-misc/xssstate/Manifest
+++ b/x11-misc/xssstate/Manifest
@@ -1,4 +1,4 @@
AUX xssstate-1.0.20130103-gentoo.patch 2528 BLAKE2B 725f2370f3f25af07515f5ab581395061ba19cedfd6d16eed6ef115541f4dd100f8eab312f555fb232796367ca2d377a8a0de1b9c51e162af6e4431a74fd97b2 SHA512 29ed64ee4cd4512cae80c65bce9058498ffccc817a5b0dfd27eede08a6361b332377fdd0bec2430a469a5291579d5a5dd9ba7bd605af567fec07a7a8fc3b3ee1
DIST xssstate-1.1.tar.gz 3725 BLAKE2B d772796048ba1eea89b235dd3e1534c364741a8fce0d013174d1eb1dda3d4bc50c072e0a5af72dc10365690b309229ff717dce2f347613be753bc6e38f0baf2d SHA512 96c59e9cc7b78aec8a95040cd1c4c6aaeb85f092c5a52cf64a62ceeb3fed65bdd3eb6f070b3d66ae8ec2544371a236f32e83e0a5c45e6d21f2bf7791b5c0d519
-EBUILD xssstate-1.1.ebuild 677 BLAKE2B 682ebe216c6c1ec5287ce809ec03dd1c7a6c128bb6d0777adcd29d9a00d821f363156b6c786fabae688eb5747fc5b51ca3b431c9b8c99bab6cb30355f838aba0 SHA512 c02207bc7d9048f139c5e8b6a905d451e5218c6fc53f34ee855516f21f83990f3d34ef37ef93339fc3fe9c0213a987c81d98ec8d4ab80b1bb8c459670b04a351
+EBUILD xssstate-1.1.ebuild 654 BLAKE2B ce63f07bcae53c4f4e992039dc245272720f8bc0090390f4f32ae19f9bf6edc273d2e3c0507e21dcf1394f773ae8c51db176f39ddf11819465933f6e6536dfde SHA512 97bd403b5bc75f80bd6625b08661b96c577da3677ee7ac4674718c7f9386066a4c27585cc42432a40f155054c49ccbd05f2f58656ff880ccfddb38ccce25575f
MISC metadata.xml 369 BLAKE2B 229857fc781778834cf45f22a8a170e76bc50c7aa24caca6ed93e4f1510bb577b8153ed419821ce78edc0049b97d677ed8371ba2517c9f60759812e087a15886 SHA512 9c2113536cbda45e66eb5697ac4c173ff301a7692c7f3bafead7e5bc7e30778535dbd9dc8ee494ced840a2f17e6b1674c95418772fbffda61eb11848ef368b9d
diff --git a/x11-misc/xssstate/xssstate-1.1.ebuild b/x11-misc/xssstate/xssstate-1.1.ebuild
index cda0b3adfc2b..311c55ab00f7 100644
--- a/x11-misc/xssstate/xssstate-1.1.ebuild
+++ b/x11-misc/xssstate/xssstate-1.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=5
@@ -19,8 +19,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/scrnsaverproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-misc/xstroke/Manifest b/x11-misc/xstroke/Manifest
index 501ff11007c7..5f5b99077009 100644
--- a/x11-misc/xstroke/Manifest
+++ b/x11-misc/xstroke/Manifest
@@ -1,5 +1,5 @@
AUX xstroke-0.6-sigsegv_sprintf.patch 438 BLAKE2B 2fd171ebaa99bdb4201e04c885f40f848b3d81a5c2f5b131621d6560109afc9994ebfe0dcb8b979eb6ee65fd74c70d4353cb9da30135253540b43d12ba182cd7 SHA512 6ac7fd2b4b64021926c9ec6999df6fd7142b7d42f31012a63ca31ffd6db9848c9687875af508b0f63e7c49dc1cd01057f2073c0bd99409998ec578c44d61f384
AUX xstroke-0.6-underlinking.patch 443 BLAKE2B 2fe878bae0e5081eda6f2c9855c142ccb706860b17961a564d91fbfa534b971a370e2c76cd247f82a9437af40fe03439e3df8fa7f61a6ca77f37294d10579585 SHA512 ef219a2d56bf52df8187cbfee704d1e0dd91f7f742fc2b83c63dd469eb1f6f2297dc8cd09ab2444ad18f94aff5c95bfbff0055084202363426434f3185074c84
DIST xstroke-0.6.tar.bz2 140237 BLAKE2B 0419c0375e8579d758730d129c2d2db0de8ecc2f0c73a026b08db8e18818dc2c4d1c4ffff6e9794c48bd645176decbce2e477e182cf78402fc859234438266a3 SHA512 0fb75f20dfcb8db68bb17d50a9dea2906e17ee1d8675bb7b4dea964189aa69c8bfcc101d7e7fac22209da3f83fc0d0afd569d443d3f585bffa2d62ce11ad772a
-EBUILD xstroke-0.6-r1.ebuild 851 BLAKE2B ef4f37fd6ca9cb989e84ca9b3809b8a1523501239fe261a7bb077e02c12de5638f8c5425bd42e9012ba86d6b2357ee6ea3a1351b091ae395fbf55c8baa128c20 SHA512 1f40a6514bb8a9d4397006562806e626a52e73bed35e34a134da778c027b2438de92906e3ec4e459446f427224413a71f7f461eee2e0516a193558e402dfa88a
+EBUILD xstroke-0.6-r1.ebuild 811 BLAKE2B 7927a47c1914a7c72e5c06c5525066f4bc827c95e9e17204920bca864579de80c757188f44f6318c4e286c85ecbbed2757ecc73d5f6268d1b2dd5fed7d40fdac SHA512 f78c82eaa4790a819f5b4bc59f2debaf913be0b40851bbdd1129b1a07e5e264b06d808f1f0bc83c6498bfd74c58bc52cb6d9ab8087544b9928c81e54a4855626
MISC metadata.xml 351 BLAKE2B 86fcbcc77c2532340f1cf6841caa8328012f5d475cb7acc6d3efd69f7c2d758a4fc8a5053622bc61f7d8183beb4be4897a1c96face70a232b1e50688a71d2c8a SHA512 ad9389409b86bb91a79c9706d3662f0794507ee881b689e310b77cc50fcf8079b32340ff0b4231a5584365e9417b4331bd326c99ad3e514e8b44549072991319
diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
index 8d03a8cf83eb..c797405cf802 100644
--- a/x11-misc/xstroke/xstroke-0.6-r1.ebuild
+++ b/x11-misc/xstroke/xstroke-0.6-r1.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
@@ -28,9 +28,7 @@ DEPEND="
sys-devel/flex
virtual/pkgconfig
virtual/yacc
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
DOCS=( AUTHORS ChangeLog NEWS README TODO )
diff --git a/x11-misc/xtoolwait/Manifest b/x11-misc/xtoolwait/Manifest
index ce49e2d03e6f..cc3653bf0109 100644
--- a/x11-misc/xtoolwait/Manifest
+++ b/x11-misc/xtoolwait/Manifest
@@ -1,3 +1,3 @@
DIST xtoolwait-1.3.tar.gz 14315 BLAKE2B 7ebf1f6713308ae74510430e07c29e638e8c9549eba79f03bc42278dd88ce7036f4ed8c21854dbfd9d4706574c4c0982be87a56d001c71d98920f31401a32408 SHA512 36c8446dd7076c18de8f6c582db45cbdc6b7ddc733993ddb08c8bd5c5045621597ae1b3144b92461feabeb14bd50a759f86023848302436ab915faa8c10ebdaa
-EBUILD xtoolwait-1.3-r2.ebuild 890 BLAKE2B 368dec2aedef273e9bdfdf9d68ab437b5ae8b2b9c97e7fd88c498dc36517495bc29562f3834eb51501eb7abc2608deb522927a2b3dc1f6d9682089f4b1d6cdd2 SHA512 9bdff4367666ab7389dc2bce6fd9d0b84c068b38ea4a2831d03316f59173b1322b211a9ce5b6d9a3b3e82d457cbea4174e39a91c38104a68e7aaa83858b77eb6
+EBUILD xtoolwait-1.3-r2.ebuild 893 BLAKE2B 6e7678d415b2862f2de059b3b3c4a618b52648bc417ffa5f660a216d92c8b04161e4a73fa3e76caefb6875427b44f602ac4f0f93f2d4ec74cbe034eefa5a516b SHA512 b52c40d7cce97b8fc4d35ed5acb00ff439b63399f5977dfe3862f5cfd5442722daadd75a753e9196dacbb46989888798a6bc8f6c6d6b0381243c204b6c204995
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index 574b3c3e28b9..b1878e8d3e44 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.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
@@ -17,8 +17,8 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext"
DEPEND="${RDEPEND}
app-text/rman
- x11-misc/imake
- x11-proto/xproto"
+ x11-base/xorg-proto
+ x11-misc/imake"
src_prepare() {
xmkmf || die
diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest
index 6c21aa9cc8fa..fe5e49103b22 100644
--- a/x11-misc/xtrlock/Manifest
+++ b/x11-misc/xtrlock/Manifest
@@ -1,3 +1,3 @@
DIST xtrlock_2.8.tar.gz 21125 BLAKE2B cd5ec919866b074ad7207756a10a0fdd23bf963e9252ff7afa30a1f1d9af4b015e9010036e9920b15d382993870c6909f4689e231e1b29bfe3d48b6271f20354 SHA512 a1388250430f7cb7bfe875aae938c332098f9e88ab7a17d68634b36726acfa7a459bf40f71e6df3c6b1256fb4574a62b2fc72357c6e779c1bc55f10204634068
-EBUILD xtrlock-2.8.ebuild 712 BLAKE2B 87d9f7d4142b526da3fde5c44ac16cbb8727522461c8c53bcc72bc1835593d2af4da2ed59b4814f0f813f1da4122d0a311ac0f48bbd86a9b0dd9092715f88021 SHA512 fa772270069d731657f3de5492dc18dd6dc365b755657342ff9f1e3bb299409422e1da4c68ba620037f1c1f14b612f35771333fd84d6b49e7dbf7d76ab050312
+EBUILD xtrlock-2.8.ebuild 715 BLAKE2B e0bdebd25639f8c5bd46b1f8f69227de52c6efc2b335a215fc249126f28a04b0adb83c8c0c5c05673919be43cef1d3387b54af35d9ba15157c4abd13a53d7721 SHA512 a2fccecd00eecf617e42b267ca6d7f1a0e6b7dca2f234d5a0804944d8b2dd515aabe866e1379c749da1a320c08099d63477fc70fdcf11d84196afb200f5b9591
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xtrlock/xtrlock-2.8.ebuild b/x11-misc/xtrlock/xtrlock-2.8.ebuild
index 50e34becf41a..b84dce881f7b 100644
--- a/x11-misc/xtrlock/xtrlock-2.8.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.8.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="
"
DEPEND="
${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
x11-misc/imake
"
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index 36be2b66ffae..b8818f7576b6 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -2,7 +2,7 @@ AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471
DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
DIST xvkbd-3.8.tar.gz 88508 BLAKE2B bdaa3b31322ef2393298cb6987e4980536f3a6707df4016acc698a6713f25bff3e92cdecfcbf0c513af5cb8290e9b434fc61108095138c15cbbba9765ba856a1 SHA512 8a1ff96d90d1021bfd60ac6c251e62d68a65e86a1f1ee1fbdbf67344bdd07d7e1929a646e7e80f1da5f3e12e50c655e2be180c9ae4129fa7912f32aa5f40f5f5
DIST xvkbd-3.9.tar.gz 88440 BLAKE2B d024e97c3e134fd4270db07b1eb54c45380b74bdbffb3fbcf7778e839b51ad8a74a7a236e440215eaea38062ae321db866c5344ecb7eaf2ed9ce15d663cbde9a SHA512 f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98
-EBUILD xvkbd-3.7.ebuild 1079 BLAKE2B 95d3b4c8fe766b590e65afba5546df9ceef6575acf8038e7de2615cd4c35382e15b459d09d64c8ae8fa5b1ca14cfdbd9768a86289d99f6f125bba1f9201d42b2 SHA512 620dc18b9769695fd17f6f86b21e7370557fd5dd168cc4e8e46a7789f2f4551b439e18ed3e7ba3cbbdcbbe711311be381124bb7eab8cddf3e28b87ffabc9e493
-EBUILD xvkbd-3.8.ebuild 1047 BLAKE2B 18dfa77c061d685dd57e4fc4125fcd027750b621f08b390063ebe3ff6d357bdc88a6560bf24363fe81026c7a2c1d9808ecc14dbcae6b1bccd6d5080bcab1575e SHA512 27af2ff87194e37174f5c59aea7d0806b052d8a3ca23a5a0694dede46d4ea8eb9c085465c70a34c19385b4e8450c04f870f27123b7c2eab6f3ae0ede2c4aff78
-EBUILD xvkbd-3.9.ebuild 1047 BLAKE2B 18dfa77c061d685dd57e4fc4125fcd027750b621f08b390063ebe3ff6d357bdc88a6560bf24363fe81026c7a2c1d9808ecc14dbcae6b1bccd6d5080bcab1575e SHA512 27af2ff87194e37174f5c59aea7d0806b052d8a3ca23a5a0694dede46d4ea8eb9c085465c70a34c19385b4e8450c04f870f27123b7c2eab6f3ae0ede2c4aff78
+EBUILD xvkbd-3.7.ebuild 1039 BLAKE2B 0e1530b3eb6453dea3da454de2012414831c5108bccc208f69ee6514ff27e66f9d6c8b2a0d0c1cb4e2ad30ddba08921b1e1107643241701bfa1a24623e7e35fa SHA512 a33d41cf74553169337716e060398061397e4d399696234a214a1887efa3326761fe36b0c351d25dfa8e42d1bff6885ff287df91ac587964b5c6d84adea38e15
+EBUILD xvkbd-3.8.ebuild 1007 BLAKE2B 4b2ed2fd51d0c4f569bb3712870e8b1cec359e1da441b5f54a114533bc1dcb489c3bffcbf7697021222512d964224868ae59a9cab3c9d13493f6abd074649782 SHA512 486c7453c758d5374be0c8bfc5e59faf7a8a335de67ed1eee07fabf74c1357d6d569de7d681f37ea8ee0393f24910a8ed41ce2d7bf28272df9178ef5d9f62486
+EBUILD xvkbd-3.9.ebuild 1007 BLAKE2B 4b2ed2fd51d0c4f569bb3712870e8b1cec359e1da441b5f54a114533bc1dcb489c3bffcbf7697021222512d964224868ae59a9cab3c9d13493f6abd074649782 SHA512 486c7453c758d5374be0c8bfc5e59faf7a8a335de67ed1eee07fabf74c1357d6d569de7d681f37ea8ee0393f24910a8ed41ce2d7bf28272df9178ef5d9f62486
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/xvkbd-3.7.ebuild b/x11-misc/xvkbd/xvkbd-3.7.ebuild
index 1277bf4b7f60..777c7043cb89 100644
--- a/x11-misc/xvkbd/xvkbd-3.7.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.7.ebuild
@@ -23,11 +23,9 @@ RDEPEND="
DEPEND="
${RDEPEND}
app-text/rman
+ x11-base/xorg-proto
x11-misc/gccmakedep
x11-misc/imake
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
"
src_prepare() {
diff --git a/x11-misc/xvkbd/xvkbd-3.8.ebuild b/x11-misc/xvkbd/xvkbd-3.8.ebuild
index 04a518b10850..3033ea4d6dd8 100644
--- a/x11-misc/xvkbd/xvkbd-3.8.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.8.ebuild
@@ -23,11 +23,9 @@ RDEPEND="
DEPEND="
${RDEPEND}
app-text/rman
+ x11-base/xorg-proto
x11-misc/gccmakedep
x11-misc/imake
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
"
PATCHES=(
"${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch
diff --git a/x11-misc/xvkbd/xvkbd-3.9.ebuild b/x11-misc/xvkbd/xvkbd-3.9.ebuild
index 04a518b10850..3033ea4d6dd8 100644
--- a/x11-misc/xvkbd/xvkbd-3.9.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.9.ebuild
@@ -23,11 +23,9 @@ RDEPEND="
DEPEND="
${RDEPEND}
app-text/rman
+ x11-base/xorg-proto
x11-misc/gccmakedep
x11-misc/imake
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xproto
"
PATCHES=(
"${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch
diff --git a/x11-misc/xwit/Manifest b/x11-misc/xwit/Manifest
index 612a850d44de..9a53e50c56f7 100644
--- a/x11-misc/xwit/Manifest
+++ b/x11-misc/xwit/Manifest
@@ -1,4 +1,4 @@
DIST xwit_3.4-15.debian.tar.gz 20722 BLAKE2B fcec4b3cdfa0f4d0b90e172f4539bfb622e77c902e351d9423555bbb43706c79e3d2cb15bb83021151a4876cc2c3bdacb62f074d6af50e2896a55b20b31df5e1 SHA512 047e00e5ff0282729495f39c7cb264837306da46d24e4d95e835d6d0060acd0bfa8f8cedff37ab8c503f267d8c5d42e5af0120cba6260e6eb9dd8c9a3a9dab46
DIST xwit_3.4.orig.tar.gz 14557 BLAKE2B d023b89d02c8520421b35a69c3834d0493a1ab771b160c6c0592e9e43684062a7da9ed56491e90ba2948ba51b2d36f7b0c26ededdfa61a684b2a010d71865a56 SHA512 265114f81ede19e477685373e39deed3cf7cd3fd9dbb445362f34ea96dac6d9686d1c55cf882636f7d02598c83f5ee1ca2688fcbd01f6fc7ef34cac75691df94
-EBUILD xwit-3.4_p15.ebuild 782 BLAKE2B f9ee012be0a1ff9c4d0b07185fb96f7a6cd20dcf96d0085408a18af28b1557c4532a34951a2527ee51c7ee024a1fbcb7ce03322552d3b0301aec503e9a4fced4 SHA512 46b1d6f16ada12194bbdc385e2c541dd6cf4b7a97c6bbee2dd5385d994cc19cde0cac3ed10dc2caf40c2dc7fb2229e41a0d9cfcb0214c1c40ec8d8b1798f6a50
+EBUILD xwit-3.4_p15.ebuild 785 BLAKE2B f94c601e4d3eda61e1c743a22f230bcfd30a47536ec962ea31ec07c38af2c69fd340983106bf6adffd807108836b4bfa8fdad1ea13f2526beda02f300ab8d087 SHA512 b5db114caa9cda0568c25653da150d303099bcc403c11886d131d33aa7948c7ca80f7797f4acdb16fb266db5cd158fc161e77b0ccd70fa4fc4282a96df05dc12
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xwit/xwit-3.4_p15.ebuild b/x11-misc/xwit/xwit-3.4_p15.ebuild
index 94f68ee55400..6f20325979dd 100644
--- a/x11-misc/xwit/xwit-3.4_p15.ebuild
+++ b/x11-misc/xwit/xwit-3.4_p15.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 @@ IUSE=""
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${P/_p*/}.orig
diff --git a/x11-misc/xwrits/Manifest b/x11-misc/xwrits/Manifest
index d95a9d0d9001..ca0014e7fdfd 100644
--- a/x11-misc/xwrits/Manifest
+++ b/x11-misc/xwrits/Manifest
@@ -1,3 +1,3 @@
DIST xwrits-2.26.tar.gz 196529 BLAKE2B 4aa3784733dbdcbcf692986a9e7549b96406a8b717082b079c82eaffad11c5c4fc10820c63729da8109850fc1d93ad63fe866092a94a6f62817414069ffe0141 SHA512 c8beeca957e41468d85819a7d6d4475c83a99735ff17d13d724658a421d1d3b9a15191ee8ab903104ab19b869a4832103dbe7d3ec2a9bf89ae95a7899e92f927
-EBUILD xwrits-2.26-r1.ebuild 530 BLAKE2B 314e4bab9c0381943f11f9537dd85327ebf3688a14a5b7006026bf7f28e0e5835ae26e3d61e941efa4efbb3629411b9e9af1c8b832a4fc38d36f74bc581658f5 SHA512 b986d60308c5369655bf49a57e941ca3084083f338b6211302b61af1cee1dbed3d7b550488239eeafa32abe6ee599924039ae9f2c5ae4a84250d6baa52f1697b
+EBUILD xwrits-2.26-r1.ebuild 508 BLAKE2B 3a091451c8ece153fe72ab4c58a0e82021940fe08552def6d1c4161dac7c37b250817d5c1a001e35d437cda34074e32837e7e01b18e26f80a477ff9b5bcf3688 SHA512 15d0d2b68bb2b05e031873142ed7fa5c5338487af4d6b9e040ce65135ddf0c6eed1362e4c038a8946d9fd93ec63bc2fc0b740710dce94534d53b92fb881d1221
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xwrits/xwrits-2.26-r1.ebuild b/x11-misc/xwrits/xwrits-2.26-r1.ebuild
index 2dc0baa2074a..d25703bca7fd 100644
--- a/x11-misc/xwrits/xwrits-2.26-r1.ebuild
+++ b/x11-misc/xwrits/xwrits-2.26-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
@@ -16,7 +16,6 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXinerama"
DEPEND="${RDEPEND}
- x11-proto/xineramaproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( GESTURES NEWS README TODO )