summaryrefslogtreecommitdiff
path: root/x11-libs
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/Manifest.gzbin22129 -> 22149 bytes
-rw-r--r--x11-libs/cairo/Manifest8
-rw-r--r--x11-libs/cairo/cairo-1.14.10.ebuild6
-rw-r--r--x11-libs/cairo/cairo-1.14.12.ebuild4
-rw-r--r--x11-libs/cairo/cairo-1.14.8.ebuild6
-rw-r--r--x11-libs/cairo/cairo-9999.ebuild6
-rw-r--r--x11-libs/dnd/Manifest4
-rw-r--r--x11-libs/dnd/dnd-1.1-r1.ebuild6
-rw-r--r--x11-libs/dnd/dnd-1.1-r3.ebuild (renamed from x11-libs/dnd/dnd-1.1-r2.ebuild)18
-rw-r--r--x11-libs/fltk/Manifest10
-rw-r--r--x11-libs/fltk/fltk-1.3.3-r3.ebuild5
-rw-r--r--x11-libs/fltk/fltk-1.3.3-r5.ebuild5
-rw-r--r--x11-libs/fltk/fltk-1.3.4.ebuild3
-rw-r--r--x11-libs/fltk/fltk-1.3.9999.ebuild3
-rw-r--r--x11-libs/fltk/fltk-1.4.9999.ebuild3
-rw-r--r--x11-libs/fox/Manifest6
-rw-r--r--x11-libs/fox/fox-1.6.49.ebuild4
-rw-r--r--x11-libs/fox/fox-1.6.50.ebuild4
-rw-r--r--x11-libs/fox/fox-1.7.54.ebuild2
-rw-r--r--x11-libs/gtk+/Manifest12
-rw-r--r--x11-libs/gtk+/gtk+-2.24.31-r1.ebuild10
-rw-r--r--x11-libs/gtk+/gtk+-2.24.32.ebuild8
-rw-r--r--x11-libs/gtk+/gtk+-3.22.19.ebuild10
-rw-r--r--x11-libs/gtk+/gtk+-3.22.26.ebuild8
-rw-r--r--x11-libs/gtk+/gtk+-3.22.29.ebuild8
-rw-r--r--x11-libs/gtk+/gtk+-3.22.30.ebuild8
-rw-r--r--x11-libs/libFS/Manifest2
-rw-r--r--x11-libs/libFS/libFS-1.0.7-r1.ebuild (renamed from x11-libs/libFS/libFS-1.0.7.ebuild)7
-rw-r--r--x11-libs/libICE/Manifest2
-rw-r--r--x11-libs/libICE/libICE-1.0.9-r2.ebuild (renamed from x11-libs/libICE/libICE-1.0.9-r1.ebuild)6
-rw-r--r--x11-libs/libSM/Manifest2
-rw-r--r--x11-libs/libSM/libSM-1.2.2-r2.ebuild (renamed from x11-libs/libSM/libSM-1.2.2-r1.ebuild)6
-rw-r--r--x11-libs/libX11/Manifest2
-rw-r--r--x11-libs/libX11/libX11-1.6.5-r1.ebuild (renamed from x11-libs/libX11/libX11-1.6.5.ebuild)12
-rw-r--r--x11-libs/libXScrnSaver/Manifest2
-rw-r--r--x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild (renamed from x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild)8
-rw-r--r--x11-libs/libXTrap/Manifest2
-rw-r--r--x11-libs/libXTrap/libXTrap-1.0.1-r1.ebuild (renamed from x11-libs/libXTrap/libXTrap-1.0.1.ebuild)9
-rw-r--r--x11-libs/libXau/Manifest2
-rw-r--r--x11-libs/libXau/libXau-1.0.8-r1.ebuild (renamed from x11-libs/libXau/libXau-1.0.8.ebuild)4
-rw-r--r--x11-libs/libXaw/Manifest2
-rw-r--r--x11-libs/libXaw/libXaw-1.0.13-r1.ebuild (renamed from x11-libs/libXaw/libXaw-1.0.13.ebuild)9
-rw-r--r--x11-libs/libXaw3d/Manifest2
-rw-r--r--x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild5
-rw-r--r--x11-libs/libXaw3dXft/Manifest4
-rw-r--r--x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild5
-rw-r--r--x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild5
-rw-r--r--x11-libs/libXcomposite/Manifest2
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild (renamed from x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild)9
-rw-r--r--x11-libs/libXdamage/Manifest2
-rw-r--r--x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild (renamed from x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild)9
-rw-r--r--x11-libs/libXdmcp/Manifest2
-rw-r--r--x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild (renamed from x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild)6
-rw-r--r--x11-libs/libXext/Manifest2
-rw-r--r--x11-libs/libXext/libXext-1.3.3-r1.ebuild (renamed from x11-libs/libXext/libXext-1.3.3.ebuild)4
-rw-r--r--x11-libs/libXfixes/Manifest2
-rw-r--r--x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild (renamed from x11-libs/libXfixes/libXfixes-5.0.3.ebuild)8
-rw-r--r--x11-libs/libXfont/Manifest2
-rw-r--r--x11-libs/libXfont/libXfont-1.5.4.ebuild11
-rw-r--r--x11-libs/libXfont2/Manifest4
-rw-r--r--x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild (renamed from x11-libs/libXfont2/libXfont2-2.0.3.ebuild)11
-rw-r--r--x11-libs/libXfont2/libXfont2-9999.ebuild11
-rw-r--r--x11-libs/libXft/Manifest2
-rw-r--r--x11-libs/libXft/libXft-2.3.2-r1.ebuild (renamed from x11-libs/libXft/libXft-2.3.2.ebuild)12
-rw-r--r--x11-libs/libXi/Manifest2
-rw-r--r--x11-libs/libXi/libXi-1.7.9-r1.ebuild (renamed from x11-libs/libXi/libXi-1.7.9.ebuild)10
-rw-r--r--x11-libs/libXinerama/Manifest2
-rw-r--r--x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild (renamed from x11-libs/libXinerama/libXinerama-1.1.3.ebuild)9
-rw-r--r--x11-libs/libXmu/Manifest2
-rw-r--r--x11-libs/libXmu/libXmu-1.1.2-r1.ebuild (renamed from x11-libs/libXmu/libXmu-1.1.2.ebuild)8
-rw-r--r--x11-libs/libXpm/Manifest2
-rw-r--r--x11-libs/libXpm/libXpm-3.5.12-r1.ebuild (renamed from x11-libs/libXpm/libXpm-3.5.12.ebuild)9
-rw-r--r--x11-libs/libXpresent/Manifest2
-rw-r--r--x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild (renamed from x11-libs/libXpresent/libXpresent-1.0.0.ebuild)4
-rw-r--r--x11-libs/libXrandr/Manifest2
-rw-r--r--x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild (renamed from x11-libs/libXrandr/libXrandr-1.5.1.ebuild)10
-rw-r--r--x11-libs/libXrender/Manifest2
-rw-r--r--x11-libs/libXrender/libXrender-0.9.10-r1.ebuild (renamed from x11-libs/libXrender/libXrender-0.9.10.ebuild)7
-rw-r--r--x11-libs/libXres/Manifest4
-rw-r--r--x11-libs/libXres/libXres-1.2.0-r1.ebuild (renamed from x11-libs/libXres/libXres-1.0.7.ebuild)9
-rw-r--r--x11-libs/libXres/libXres-1.2.0.ebuild17
-rw-r--r--x11-libs/libXt/Manifest2
-rw-r--r--x11-libs/libXt/libXt-1.1.5-r1.ebuild (renamed from x11-libs/libXt/libXt-1.1.5.ebuild)7
-rw-r--r--x11-libs/libXtst/Manifest2
-rw-r--r--x11-libs/libXtst/libXtst-1.2.3-r1.ebuild (renamed from x11-libs/libXtst/libXtst-1.2.3.ebuild)10
-rw-r--r--x11-libs/libXv/Manifest2
-rw-r--r--x11-libs/libXv/libXv-1.0.11-r1.ebuild (renamed from x11-libs/libXv/libXv-1.0.11.ebuild)9
-rw-r--r--x11-libs/libXvMC/Manifest2
-rw-r--r--x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild (renamed from x11-libs/libXvMC/libXvMC-1.0.10.ebuild)9
-rw-r--r--x11-libs/libXxf86dga/Manifest2
-rw-r--r--x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild (renamed from x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild)10
-rw-r--r--x11-libs/libXxf86misc/Manifest2
-rw-r--r--x11-libs/libXxf86misc/libXxf86misc-1.0.3-r2.ebuild (renamed from x11-libs/libXxf86misc/libXxf86misc-1.0.3-r1.ebuild)8
-rw-r--r--x11-libs/libXxf86vm/Manifest2
-rw-r--r--x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild (renamed from x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild)10
-rw-r--r--x11-libs/libast/Manifest6
-rw-r--r--x11-libs/libast/libast-0.7-r2.ebuild (renamed from x11-libs/libast/libast-0.7-r1.ebuild)2
-rw-r--r--x11-libs/libast/libast-0.7.ebuild2
-rw-r--r--x11-libs/libast/libast-9999.ebuild2
-rw-r--r--x11-libs/libdmx/Manifest4
-rw-r--r--x11-libs/libdmx/libdmx-1.1.3-r1.ebuild (renamed from x11-libs/libdmx/libdmx-1.1.3.ebuild)9
-rw-r--r--x11-libs/libdmx/libdmx-1.1.4.ebuild6
-rw-r--r--x11-libs/libdockapp/Manifest2
-rw-r--r--x11-libs/libdockapp/libdockapp-0.7.2.ebuild2
-rw-r--r--x11-libs/libfontenc/Manifest2
-rw-r--r--x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild (renamed from x11-libs/libfontenc/libfontenc-1.1.3.ebuild)6
-rw-r--r--x11-libs/libpciaccess/Manifest6
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild34
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.13.5.ebuild34
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.14.ebuild2
-rw-r--r--x11-libs/libvdpau/Manifest2
-rw-r--r--x11-libs/libvdpau/libvdpau-1.1.1.ebuild4
-rw-r--r--x11-libs/libxcb/Manifest6
-rw-r--r--x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch257
-rw-r--r--x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch55
-rw-r--r--x11-libs/libxcb/libxcb-1.12-r2.ebuild57
-rw-r--r--x11-libs/libxcb/libxcb-1.13.ebuild2
-rw-r--r--x11-libs/libxkbcommon/Manifest8
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild38
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild39
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-0.7.2.ebuild39
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild5
-rw-r--r--x11-libs/libxkbfile/Manifest3
-rw-r--r--x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild15
-rw-r--r--x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild (renamed from x11-libs/libxkbfile/libxkbfile-1.0.9.ebuild)7
-rw-r--r--x11-libs/libxkbui/Manifest2
-rw-r--r--x11-libs/libxkbui/libxkbui-1.0.2-r2.ebuild (renamed from x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild)8
-rw-r--r--x11-libs/libxshmfence/Manifest6
-rw-r--r--x11-libs/libxshmfence/libxshmfence-1.1.ebuild15
-rw-r--r--x11-libs/libxshmfence/libxshmfence-1.2.ebuild15
-rw-r--r--x11-libs/libxshmfence/libxshmfence-1.3.ebuild5
-rw-r--r--x11-libs/neXtaw/Manifest4
-rw-r--r--x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild5
-rw-r--r--x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild (renamed from x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild)5
-rw-r--r--x11-libs/pango/Manifest6
-rw-r--r--x11-libs/pango/pango-1.40.12-r1.ebuild2
-rw-r--r--x11-libs/pango/pango-1.40.14-r1.ebuild2
-rw-r--r--x11-libs/pango/pango-1.42.0.ebuild2
-rw-r--r--x11-libs/startup-notification/Manifest2
-rw-r--r--x11-libs/startup-notification/startup-notification-0.12-r1.ebuild4
-rw-r--r--x11-libs/wxGTK/Manifest10
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild8
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild6
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.3.ebuild6
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild6
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.4.ebuild6
-rw-r--r--x11-libs/xcb-util-image/Manifest2
-rw-r--r--x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild (renamed from x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild)8
-rw-r--r--x11-libs/xcb-util-keysyms/Manifest2
-rw-r--r--x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild (renamed from x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild)6
-rw-r--r--x11-libs/xcb-util-renderutil/Manifest2
-rw-r--r--x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild (renamed from x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild)5
-rw-r--r--x11-libs/xcb-util-wm/Manifest2
-rw-r--r--x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild (renamed from x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild)5
-rw-r--r--x11-libs/xcb-util/Manifest2
-rw-r--r--x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild (renamed from x11-libs/xcb-util/xcb-util-0.4.0.ebuild)5
-rw-r--r--x11-libs/xforms/Manifest2
-rw-r--r--x11-libs/xforms/xforms-1.2.4.ebuild4
-rw-r--r--x11-libs/xosd/Manifest6
-rw-r--r--x11-libs/xosd/xosd-2.2.14-r1.ebuild6
-rw-r--r--x11-libs/xosd/xosd-2.2.14-r2.ebuild6
-rw-r--r--x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild8
162 files changed, 318 insertions, 1076 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 03f944ce2c8c..6942d8c7b9cb 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
Binary files differ
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 1e21653752e9..0696c6accb7a 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,8 +3,8 @@ AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0
DIST cairo-1.14.10.tar.xz 36251788 BLAKE2B 2015594f2a263250b7fd924840155aa3f813e4b6f0eaeaa3f3eec6b26935c073590a32f17b6268d99bb297ba516da7debe7e3e0abf16d36e012e761dbc7ecada SHA512 a381d97e6046da0012eb5595118efb95ff02e3e84310682e458b503ebf22d6b2663bcc1391980768bb9cd02ae809b8df2e11d6200b48745dc5ec824c342b5852
DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
DIST cairo-1.14.8.tar.xz 35392464 BLAKE2B d1d8b283bc55bcb8f34a1e1d8dd6384292c128e38589672f404ee1d15b32004398c3b4668737e1ef34a58b841445530603c9105644076cbda289ec576c55a252 SHA512 dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2
-EBUILD cairo-1.14.10.ebuild 3820 BLAKE2B c38924f9d4debbee038b921a580fc301a85cb8883789e585ac6c26ad3cb67a6e5e537bb1f7d01e9da28e8d73b3cef12d5718a82aff3be49dfbafa13c61a91c1f SHA512 ffc989dcbcdaa765f27bde1c515d91ea27abebe70e52bf76fa957747d6e7284bb43ac4dcb32f306bdc8c7abc8b9293103d593ce20309db75a56f931a63fe388a
-EBUILD cairo-1.14.12.ebuild 3810 BLAKE2B 35e3a19697b85b9dc1cfefa4e1602b350db317be4dbc031253f0db49f8fb5e66629c7dedaeeaabeab7bab1195f0082f32caded5d9bd0467f4ff6613a52c4b32f SHA512 38b270e67abe11fbb71e192b1eb52d420c8158db5da1da8cfc3f3804d6fe8e3457084ffa836d1bce63b791c8ea3327e475655548384d87c24dc84343e0f4991f
-EBUILD cairo-1.14.8.ebuild 3841 BLAKE2B 4d27c8093de44a933e7dd6df6c906e5f1420534e16f1a3693fd6c69d31aec4be2e72410db1059f3249713302509453aeb7951a95fae6a7e45311205695d3e890 SHA512 70a4c769defec2e3c02b33fb207c5f76b50831fdeca41536ef4ba44597b4b8b5903d4ddf4967a6320faa6aa31cb85bf2d262f144282f088af103ff30011765c5
-EBUILD cairo-9999.ebuild 3869 BLAKE2B 22870a457ce5d15f3b8a3863d0a8b0065d7e63dc672d6f1b7208f51b316fa626c4ada84ecd2bc5b0ac29e0c7f9ae7a3aea43f2385907102e88e11dc9c9e769a1 SHA512 c5edad1ee9ded398aceee30f58403c60aa5438c992388251c4cf568ab05964e5ff36a155f29597fa168529a255d0381904735da5ba77b92c4072d7e41274f8ee
+EBUILD cairo-1.14.10.ebuild 3783 BLAKE2B 8eaaa3cd18afd19cf043a5afd7f29435343f7e58f14340063bd2bbfce47e3c94a9306fe666c249e10de52653a2bda69df5631d57b3036ebcea9c07ec419702a0 SHA512 e6dfd74fdd175786306906771483584f061359fd8282bff0012035f47dd401aaa07bb457d22961e8d4a68c27f139a8c0ba0b5b1332145cd61b39a9c773d07fae
+EBUILD cairo-1.14.12.ebuild 3773 BLAKE2B 6bcf544febab854fa238c5a19347c04bf024b0f4af32edf5c74b1e1515675bee2ce37b615e7a48371bc70721a10326c96914b5a3d62c4f0e220102bdbf4e27b4 SHA512 39a47678b3726b32b1ef079d43a4cd937d1209e2370953b74734fc371c622d2134ea439dc48c33cd5af10b34cd9de557e253b3f1d49674818240da7fda21b256
+EBUILD cairo-1.14.8.ebuild 3804 BLAKE2B 37d5f8868056799a4d505aa84e39b223c76a42788eaed8f203e7e6ed7df6ef9ac8971c56f18cb5553591db6b9f6abf3dcf1f1f8469d49f89712dfc712911539c SHA512 2324c541c7e43c2291cb701bbcbf3ddc692964d79324259b51fc85950be138c34363e497861b2415996fab84d4c85ce9d8740826cdfb70159ada542443f0bc50
+EBUILD cairo-9999.ebuild 3832 BLAKE2B 98ff7471324d702c7fa74c83bbfb1839b83bff7239fb84645c357d06c92dc1589c2bd1ebae0f804e87fbdfdaa49de9c0fb9e894c1b296553f0f504f959832e42 SHA512 b47bf7d5848cf86c3e398a9937dcbc1ee2651f880ca5f16f131638cd40de69d313053610860029fed0b600c819649b14610f75b464fbc3d1480371383d60bfb6
MISC metadata.xml 821 BLAKE2B 849b86bb474319b9787ec50aa29354fa84a2decdf36074e6618a2a5f1c120c48470c4a54ac7ad8e1c34e9d79b190e1b265f8eaa4f8179c15fb1679d4e35b9ffe SHA512 f15c40e43476dbf8ea426092f80110f10fc3acf3035b57b1d25a94cb4437252cdbee59fca5f054248c62eecf75afe49ab4ba8b12818e8f571217899c2b536ec5
diff --git a/x11-libs/cairo/cairo-1.14.10.ebuild b/x11-libs/cairo/cairo-1.14.10.ebuild
index 5aaa2fe51429..38c7f9c49214 100644
--- a/x11-libs/cairo/cairo-1.14.10.ebuild
+++ b/x11-libs/cairo/cairo-1.14.10.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
@@ -46,9 +46,7 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/libtool-2
- X? (
- >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
- )"
+ X? ( x11-base/xorg-proto )"
#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
# doc? (
# >=dev-util/gtk-doc-1.6
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild b/x11-libs/cairo/cairo-1.14.12.ebuild
index b6e16c5bd43c..93a2b8f96d00 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -46,9 +46,7 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/libtool-2
- X? (
- >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
- )"
+ X? ( x11-base/xorg-proto )"
#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
# doc? (
# >=dev-util/gtk-doc-1.6
diff --git a/x11-libs/cairo/cairo-1.14.8.ebuild b/x11-libs/cairo/cairo-1.14.8.ebuild
index d09ee28f1531..a738d2bae073 100644
--- a/x11-libs/cairo/cairo-1.14.8.ebuild
+++ b/x11-libs/cairo/cairo-1.14.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
@@ -46,9 +46,7 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/libtool-2
- X? (
- >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
- )"
+ X? ( x11-base/xorg-proto )"
#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
# doc? (
# >=dev-util/gtk-doc-1.6
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 278ea13a4cdc..0814ca8fec0c 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-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
@@ -47,9 +47,7 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/libtool-2
- X? (
- >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
- )"
+ X? ( x11-base/xorg-proto )"
#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
# doc? (
# >=dev-util/gtk-doc-1.6
diff --git a/x11-libs/dnd/Manifest b/x11-libs/dnd/Manifest
index 200f14f1b4fe..83fbf5808071 100644
--- a/x11-libs/dnd/Manifest
+++ b/x11-libs/dnd/Manifest
@@ -1,6 +1,6 @@
AUX Makefile-fix.patch 1139 BLAKE2B b8e6a2e3d7c91eaccde9cb47228a7a810d313e5f0e38fe999451a50078ef86ae66e22dc6df8a2430c1d1e6d4c6b84897f2894158bfddb53325c12ebaba6add50 SHA512 57785cec0adfef150f9560be79cad9f6170c0476060b7653705fc8a2e17e81c93996a4ca1cfa11cece609950e8d4afcae113f2169a6b5d622494c3ae36cd6c26
AUX dnd-1.1-gentoo.diff 1532 BLAKE2B 5bc035212d46f712b0f8ad016a0fc649f0b36f19674e8c90eec0b2a54a7a6a8e735bfdcf4d4afc0d5792236623a9c43b34775053704e8ad4916488fe55458edb SHA512 68e3fe2a8c36a1b9b8bfdf57ef4eef1e5abb11debd160633cc0d323cf90b1ba579ee87aad82fa8e29b086cbbcfe19326f2202f6191749059cfe638fa7940ec5f
DIST dnd.1.1.tgz 227598 BLAKE2B 3d6bc4644d492cdfcb9160b87b1c8d2a0f0fa3ae30bfbc948e4327b390f80247c4e4fac562c14972ede2f807e11503d78edc845bac53ad5c5a42ce0439e60c6b SHA512 8644d669ea6553b4e99469f30144286e262fd64379a00b8595d1574d0f4f0e504799ed18979a9036cfc89d74074d325ffca94b4147e350969f3a1c5ff9cf0ff8
-EBUILD dnd-1.1-r1.ebuild 865 BLAKE2B 5ea25c6a1db61a6bc1c527ea9ea1afc6337b9e28f3cfb03a0d88819370c1d926f3815480a6c2b8441403d7fdad8bbb93b36bb151aa56caf3f5df7c6128f4eb2d SHA512 db73e586d903465bf3292b39f3e8a7f0ba63c53ab04f93fbf579b944f7e2f9bb2b5ee9f95ca3764ff14380a2235f104e5a2154076d5e15b755977931416c989e
-EBUILD dnd-1.1-r2.ebuild 737 BLAKE2B 99774e012f60bd84aff2573c45e3ac5868e7954a1b8ce7fe5ecd2c57e63ee1648d46940936a15f7ddb2c804b41a67309177637497cea5d2adf4cb934daeb9e77 SHA512 de16c3c429b38137294c44ef23e6321c586bb8fc7af1f18b9b874ebedce92aad5752d0a21841ad56785b8431f1224ae0f7a3bd39663aa41006505a2b8d8c0795
+EBUILD dnd-1.1-r1.ebuild 860 BLAKE2B d8daa1126f41e6b8374e977814a18af7e58e1b04864dbdf9786e8e23b021361eb71d6b0fc72bb94946973864deebbffd53920e8e54d226fa251f580246dd58b4 SHA512 c86e968a500964f57eb1aa59e920a22d43c97731e210014e1c628457ac87f07af4942b0b78bf75e2104e19f672bef84c5671e407db4ad5646c37a6edfce3cf22
+EBUILD dnd-1.1-r3.ebuild 729 BLAKE2B 810ca2ad74f906da15c1060e57f813a04dd70865149f250a6791f0515ed4d9b5f92066892e46e314f1d12fb2c1c8c2415a434924b759e8814750f76340a9f0a4 SHA512 277fb2f8fce7e1cdfd1dc6c0178c798475b57d4668c676f7da27743f32b1c4304b4279124e308f20516a1335a0ebc605905808428da1bfcbef793699d7f22b87
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/dnd/dnd-1.1-r1.ebuild b/x11-libs/dnd/dnd-1.1-r1.ebuild
index e649cca800d8..e9127cc93025 100644
--- a/x11-libs/dnd/dnd-1.1-r1.ebuild
+++ b/x11-libs/dnd/dnd-1.1-r1.ebuild
@@ -19,9 +19,9 @@ RDEPEND=">=x11-libs/libX11-1.0.0
>=x11-libs/libXt-1.0.0
>=x11-libs/libICE-1.0.0
>=x11-libs/libSM-1.0.0
- >=x11-libs/libXaw-1.0.1
- >=x11-proto/xproto-7.0.4"
-DEPEND="${RDEPEND}"
+ >=x11-libs/libXaw-1.0.1"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
src_unpack() {
unpack ${A}
diff --git a/x11-libs/dnd/dnd-1.1-r2.ebuild b/x11-libs/dnd/dnd-1.1-r3.ebuild
index 1859fa9f7199..db03f5042758 100644
--- a/x11-libs/dnd/dnd-1.1-r2.ebuild
+++ b/x11-libs/dnd/dnd-1.1-r3.ebuild
@@ -3,26 +3,24 @@
EAPI=6
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
DESCRIPTION="OffiX' Drag'n'drop library"
HOMEPAGE="http://leb.net/offix"
SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
-SLOT="0"
+
LICENSE="GPL-2 LGPL-2"
+SLOT="0"
KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
-RDEPEND="
- x11-libs/libXt
+RDEPEND="x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libICE
x11-libs/libXaw
- x11-proto/xproto"
-
-DEPEND="
- ${RDEPEND}"
+ x11-libs/libXmu
+ x11-libs/libXt"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.diff
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index edc3c727b9e7..731a3daaa56e 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -13,9 +13,9 @@ AUX fltk-1.3.4-freetype_pkgconfig.patch 1026 BLAKE2B c45e829acb7a8dd023f323205ba
AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
-EBUILD fltk-1.3.3-r3.ebuild 3803 BLAKE2B fd2812a49fbf0a161e05e9dfc6dd278222d966351547bf1f74ce8e947b9cf5546f5cd6d8873a046c5588c39001186e7dffb0dfbb0e64259ac9a9d60b051d48bb SHA512 ec258a6c44d4f791892c493f21ce315c57c7a55d2120c643c50de72d035c1d34e2c054d6d4384185d0575440b1d160e5035b3c3964fae8347b21b2a383ecb857
-EBUILD fltk-1.3.3-r5.ebuild 4433 BLAKE2B e97a841040f092da5d676cd25356961d78d7c433d30210d2c529ef7c5ce3752c6b46647b315169d501272285610277d793ba36e359905994a7ab47015fe71365 SHA512 c9b5ee046d515e15f6459570c9c730e31202bea50d5405ae39e1ba7cb9ea93b1674f1f919eea0047f20f4c1dcd448f3aefaac563411a8238dffa4a2143d29bb9
-EBUILD fltk-1.3.4.ebuild 4361 BLAKE2B 292833837a11f12aaa266fe963d65b49f61a4107c425991a0f47e86976745ecb3b9ab746f63524aacf5350cda0d184ae48b593319acd85a2dcec6baddaadd9ae SHA512 a94df2610a5478d0910e9066609be20686409345bb3899207c1b01bf233f6838f23af2335f62c3cd0682e0d9a8b3b6035c49707fc6c2998266652829f0e3a802
-EBUILD fltk-1.3.9999.ebuild 4314 BLAKE2B 9bcea612a9961f13de6e1fcc43e79426455abec9ec3bfeb3c1a790857e9ddc1de82a36719a8cad0bdd1422bbd8325e2b0a4e16ad98b4c74a2fd68c7af993c7ad SHA512 1dc8dbfdd3162fe85d64b52d3a02c330a74e175fad117b8650d6153c50dbd31699b48ae27b6cc1d87cca61b16d3bbc2cffd51581a21d3b80cb25ff01fb754b6d
-EBUILD fltk-1.4.9999.ebuild 4267 BLAKE2B fb010316bda38f47c2fc99334e95cd6e702a27e594cc5df0706dae8e6711df3186a1ed3a8b18679f7da37b36478a6bcc43d8034750bab6f39c0defbfa0f6ab21 SHA512 988a881087c14d3ce74ba95ac5fa6ada696cca7848d1321a12df98912521e274cb189d0ab0bb967bdda2c97a3388ee6ffba9fb0239a5a2a3d61a231747b38092
+EBUILD fltk-1.3.3-r3.ebuild 3764 BLAKE2B cce233125a8acb054628bd5010b042a01466e2ab6dc1e517e4a0a134d97b4651d189131c7defaee2854198217744c99f124475b3853b9ff33bc37fa4410af994 SHA512 af7ff591f510a0e8632d6068b04fc7ddfdc1250bdb75e5186964f5794dbccf53d04d67942a75659b4dd4619560304334e8bafe05f5c40477390924452c99c5b1
+EBUILD fltk-1.3.3-r5.ebuild 4394 BLAKE2B 6f8bd3caf45111057a3accf768c4309de717bccf01194bee88b5092c76e9e57fdd744c65f9e7d901a732b6c5eeb2d84752df537d9c93738f4778758f6053187e SHA512 8741f09384adad101f7989a561faa494e6a1c87e95747f34094d2ce14a90d6db09bfd26efe0704a854b62cfe672d5c13e30c10e1551e6e2ae504b4ead64cb36c
+EBUILD fltk-1.3.4.ebuild 4322 BLAKE2B 672541f7904f649927e3d42e1293f08bc6d9b1dc50b7c30407f77ccd052839b0bca9f5e493d6861c6ea34f91c07aacfacc57677d83fb4c27c2066554381b79a2 SHA512 de1a3d347ddebaaa835e6355b4c47136548e1a2853624f95cd1eeed0b868e08b0cf0b60863e715c7dd65cf8a57c92952a3a3b53399842164282da48c71ff3d60
+EBUILD fltk-1.3.9999.ebuild 4275 BLAKE2B 1ee86c64628d8b4aa249a65eb3cf76c6c619a6381bb25b34c955bec956724b06fcfd308f17d06ec2f198c786a486767ff3749e2f2a5bce79ca226fe233feed90 SHA512 51aef9d9cdaea5689699b56ebca4fd1d721fbc673532138abe82c36157195f7d0d86be88ed208240dfe0b45daecfd844c51898d7944171a96c40e10a0da46c19
+EBUILD fltk-1.4.9999.ebuild 4228 BLAKE2B 720c093eb7305f106fbf48f5453d99205592bed757c630f95599554b5d30d75785b4dce3639875739daf5ae1ccba9b2f41823b73f0cbfe1834f6c00cbc7fedf3 SHA512 0c8468affe2ad9a7db2c098640dabeb7ed47b5863721b0a6ea325c8618908046d64dd06ed538c0189724d5148b6d718493d2c9444e12ba91e0a4e6e407449d80
MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 8f4919272d66..93aea9c564ef 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.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
@@ -28,9 +28,8 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
doc? ( app-doc/doxygen )
- xinerama? ( x11-proto/xineramaproto )
"
src_prepare() {
diff --git a/x11-libs/fltk/fltk-1.3.3-r5.ebuild b/x11-libs/fltk/fltk-1.3.3-r5.ebuild
index a548bc7fb1e7..596b790d9751 100644
--- a/x11-libs/fltk/fltk-1.3.3-r5.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r5.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
@@ -33,9 +33,8 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
doc? ( app-doc/doxygen )
- xinerama? ( x11-proto/xineramaproto )
"
DOCS=(
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index d8b4321dcc15..d06a2da1ff68 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -34,9 +34,8 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xextproto
+ x11-base/xorg-proto
doc? ( app-doc/doxygen )
- xinerama? ( x11-proto/xineramaproto )
"
DOCS=(
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index f85727938fd2..cf4958abf3db 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -35,9 +35,8 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
doc? ( app-doc/doxygen )
- xinerama? ( x11-proto/xineramaproto )
"
DOCS=(
diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index 85a0f7d8365b..97500930d118 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -35,9 +35,8 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
doc? ( app-doc/doxygen )
- xinerama? ( x11-proto/xineramaproto )
"
DOCS=(
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 9b3cef54e387..2a0583ab51d2 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,7 +1,7 @@
DIST fox-1.6.49.tar.gz 4383152 BLAKE2B a3d626786086e6b46fc82ce4396bd42d060c234cedf8c182257406de4714c29aae64568bc00a3ad794848eb2faff1a904600f82e4815e9145bcfa87e09390ff2 SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8
DIST fox-1.6.50.tar.gz 4381855 BLAKE2B eef3bd77d6343a65adf4bcc3a59690b1d47d1e92faf81b01a347aa4fdc46053ab17d05ce4016fd147ee64b66c8e582754536c895b87d3c3e073e45435ab9d4ff SHA512 195751d223e9af7d76a3bd3192ae7566a129cfe254f0ba3035b4f7e189c68b43daa8276edad95ebf2b1b403b6212a755000eebf1716a11bb7f06845fde4aceae
DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c646116016eaa1eccc2c0328c5047438e87fb6c2deab0a65e2b34cc91e8458150329a3e574e93608694a2dec SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795
-EBUILD fox-1.6.49.ebuild 998 BLAKE2B 9fc6c79bc84e07b38ee42473ff0f2ddca3c2631204f3f0b4f585fd59efdecdf6c90eb85c014212a5c117db7d9d2bec66f5ee180385dcad5471752c05a2e263fb SHA512 0b5b7c86cdb3c1c78aea52e30544e049e2943c2e985ca33328bdfa5902f35d78e0d1356be9a0c7c72a6f323ab55da02bf77da0c16133d54dbf4df16918424f44
-EBUILD fox-1.6.50.ebuild 1012 BLAKE2B 706548d209af4cd535a954b540b16e12aaa8b6878a8a7125f5fc3338141359a19fce497c5a5146b2aec5cdfcce4fbf85f7934a0f4e2fe8002b2d50ebf15b2ad8 SHA512 26685d23bd3b085e5e8912792b0ffdb5ffa9b9ef23d3be458bfb236e4ac272167ecc9cf330abc4413fb8f5795b710842359fffad41d91d31f8a4834d8731d8fa
-EBUILD fox-1.7.54.ebuild 1296 BLAKE2B baee52a0924caf790447b97da946e76b38aebc9ccc71ae185fb3f4881d8850cfab1eaf9edb5038532d81b5b3f5d4962f303225605c9b7b7f8210e2a0e064c865 SHA512 d6cf0b5e633bda86d8b124fe3446f194e5e4f5c1f40b0fa019d0172f2cff28fc0cca6ec8d800590985e02614a8163ad198227dc6792c30b643f3d26435baa71e
+EBUILD fox-1.6.49.ebuild 998 BLAKE2B 3b0c9e16007f3445c61b5ded6b926cd3f852b2fb6edca03a16324a439ec0ec2f6b71f06b18e1c0169659d1449ee35c5178193bf30d8fdf8eb517d963264447e9 SHA512 e033bf329528cd8a569cef5c3760e5aa92258f62a34cb28ef3c086322c8315fb9c7b300183ddf265257d3d5054d6cd04e05eaf7802a2596ca72213dbc83d9195
+EBUILD fox-1.6.50.ebuild 1012 BLAKE2B 6572846cccff56fecc21b29a0272c75de5e3b9c1378728ebe4ede9d13347e8fc18f187446c4e62c86ea4eaa919bfa58b59084587b14f97c80dff4f56875874ee SHA512 8ed3371abcd6bee69b85759c50f4773a55861d63af3e7212266451c8f28cb51ab70cb0ee3c5b1387a00248de7b22ca3fb79f876dc76eb38c85c9a080f920d0ed
+EBUILD fox-1.7.54.ebuild 1296 BLAKE2B d5a19de333cfa6346b4e18532838c5c24295f443eddbb77810f8a7a7e55b1c59064913f828e61906e5215d5bc1d62e78b534aaca710977975e332cd6e461a3c1 SHA512 a9760a4ef8ff82d60b58592fc648ccb2de4d3c8e3ed3f1320f62eac8cae2a765a2ca7291486a32204ca6502c0345c25779c35e61c8c71afe46e62f68d4fb8785
MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/x11-libs/fox/fox-1.6.49.ebuild b/x11-libs/fox/fox-1.6.49.ebuild
index 40e756906bdc..fde8d32d03a4 100644
--- a/x11-libs/fox/fox-1.6.49.ebuild
+++ b/x11-libs/fox/fox-1.6.49.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"
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/libXrandr
x11-libs/libXft )
zlib? ( >=sys-libs/zlib-1.1.4 )"
DEPEND="${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-libs/libXt"
src_prepare() {
diff --git a/x11-libs/fox/fox-1.6.50.ebuild b/x11-libs/fox/fox-1.6.50.ebuild
index 557b42fffffd..b566273e59cd 100644
--- a/x11-libs/fox/fox-1.6.50.ebuild
+++ b/x11-libs/fox/fox-1.6.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=5
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/libXrandr
x11-libs/libXft )
zlib? ( >=sys-libs/zlib-1.1.4 )"
DEPEND="${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-libs/libXt"
src_prepare() {
diff --git a/x11-libs/fox/fox-1.7.54.ebuild b/x11-libs/fox/fox-1.7.54.ebuild
index 8eb7652d56ee..1d22508a8b86 100644
--- a/x11-libs/fox/fox-1.7.54.ebuild
+++ b/x11-libs/fox/fox-1.7.54.ebuild
@@ -24,7 +24,7 @@ RDEPEND="x11-libs/libXrandr
x11-libs/libXft )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-libs/libXt"
src_configure() {
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 5bf7f286a4a3..40bac4b7bbae 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -12,10 +12,10 @@ DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41
DIST gtk+-3.22.26.tar.xz 18922136 BLAKE2B a1e43be24abe2bda8eb63f3794b191b152abb5717334f8f46fe3158eb7ec92d5413ed3ca0df2a1ad676deacee3e7ce5e737661ec5f5c911609d40d3b9379c4c4 SHA512 2fd3a4175168d37f243359bac5df84722a2830fe5b62f86b914ce39ff500f0361e412843922343dffef8bee8f1205799ff86dd3ae8ac419928f4fe977e0e946f
DIST gtk+-3.22.29.tar.xz 18964852 BLAKE2B a7551d604a1e27cba1d0580f2645bf4afff900908ce40d3d4d05cfb7348afc0620922e9b7939cf4ce2314ff489ffe38386aaf2634f3eff6591dfd0a225f19bc7 SHA512 046fa4458626e81ea7b1ddb753d53ecd91d0f2101af428cfdf77fe866bbe430cb3622203cc5e895b220a9364e35009245cdaf76e0cfa30d32d31095b5fcb42bc
DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
-EBUILD gtk+-2.24.31-r1.ebuild 10104 BLAKE2B 2d9f63b1aaea867dc1bf0267e0e4000590ae10bfc3b4e1f3539cc1d83b55e874383f621db1cb5564283c069f606ed90dcb5c8cc3c45716507bbff31924da0ba3 SHA512 7efbaaa3ffccb8268f50fdf05cc96f0c87a6801a64e89977153368ae334176325ee77822fa663455e808d18008e54faf86c0d5a4cf9b6d5dc995ca8c3d33f61e
-EBUILD gtk+-2.24.32.ebuild 10266 BLAKE2B 7cfebdbcdfd353baa0d5f9c96dbc0bb2e23ea6d3e5f4873162e809e7dbee1fa245dceed33280622fd1fd7c40f5a9f1a8367ffdd58d20de749a2aabbd837a19e4 SHA512 1fe08fbfaf0775e9b7fe8ec12053b9a7d8e07554ae9461b5b520668020a1097756a8b1505c339ea4d29184477016cc838cd09f26bd930995cd47e5d9debcbc87
-EBUILD gtk+-3.22.19.ebuild 6779 BLAKE2B d3116d1930a2f383ada49111144c8371cce1a07c990757d7e8a936e13f65beb90c33385dc87d13deea0022f89755d3c01d632c922e7fd6ad30619a968d70b418 SHA512 8d04280a143b9ace7b9ee2149e6554149e0306a70c90806cad6063f05afd8cacba30d4ba88091f8bc9ec2344f5bead4c4ee8e61d21cbbfccb9656fe8fbd03345
-EBUILD gtk+-3.22.26.ebuild 6961 BLAKE2B f7efd4cd7ea7a91ed82a1eab888a3eb317a72e8c5d71adac4e5d231d69ca51298eb7c997c9da8db631f4c7ba46738e0b14b00d5cc56a3f2d773af95367a31f69 SHA512 8ef4e04588eff83a258b03241a0794c8f962077bd36bf2372f78dc70588ebd0a4d0ba3877338495d3bc977f9ba04d26fa7d24053a6b4368ff22a31704622eed1
-EBUILD gtk+-3.22.29.ebuild 6955 BLAKE2B 446f2898a0aab66329a285d0088c8b9185c8ead45ef1c8271e265d566f437cc8fecbad05369aff9a414a70874192c9bd851f700c5f2f3c4092e50cbf6fb700c3 SHA512 1dbf6ced9aebd8992a24cf34b60100ba46b81db94eba186d373fc10b5d6e576bb52a6b078d5879185124f5fb07abf2798b99a4fa0888fe3f7cad57677b5a9ebd
-EBUILD gtk+-3.22.30.ebuild 6962 BLAKE2B 36157dbaed4d979a57fb0d1525ce2a8a9898b1c7b717d4827a08ade0745efa621a936c408a5498cf658df560b87028a02757023d23dfcc7d876a5d6c856e35b5 SHA512 0cde76a4fcbd9857008a72b48e1f195b45809d8adfecda42c5273fa48316b9a4582a16ed1701ccb3351448bcc7f72ec1af2a1fdc27673e6bcb4008604177c411
+EBUILD gtk+-2.24.31-r1.ebuild 9847 BLAKE2B 8cbe3d26447c8ab931c65275248227ad64acc1031a4fb77145d2c59b538c88710015f2a54ebee0903329685c8a966bb93449914db73d6439312044a319d03e1f SHA512 9dbf16c997fee138a096639b6c259680495c9a8155ba12e6cf8598d46212a32f3542e4c4d04aea9ed42ac9ddd2cbf75cabb6f9677a0d17c69e4214ce966ed74a
+EBUILD gtk+-2.24.32.ebuild 10009 BLAKE2B 1644b14ebe2ef581138d7340705359dfdcde159a2c9419deeea4bec5aa493b181bc287cbe5eaa4020b1b1d7454dc867f16e5127f5ee97b60b326b33d8be83be1 SHA512 88a6c1e7b4101b9bdffa1a3ff2eb31d944ce9c175bbc5f9ab72172d73db182675ffc2f56a5d7f7a8e9dd792edfcfeaaf6de500abc1f819bb5cb1c2b8d495c681
+EBUILD gtk+-3.22.19.ebuild 6570 BLAKE2B 595194b0e88c2812b45d9399214eb7a436d7248572a4cb72bd742bc45e4a81e4b7e1aa8dd7eb548d410d3901bb9a439c98a12159125056084b08bcb10da11c33 SHA512 f94a69a2b44d3238211e63cf7f72e335d425b8d8d8577f963831eed39a893d558648bba9c3bae3c202c2d26278a7d124e61cc426ff4837d3c1933e9d70b99686
+EBUILD gtk+-3.22.26.ebuild 6752 BLAKE2B ad8b163360e8b06de6d14617f602c32280c624b0dcb524d3d8a5b1f130400ac2e99d664c1793c8360fd66438969f8d0b228f35d1a0e57ab1632fea6b8089583b SHA512 13acbfc400ba56edf340c159df6043c34fac8f316e565aa0dc594400a1438e8f8f2f814333d1c5d175ffc67180c8dcdeff6f958314f87841322cd7d4f0225c4d
+EBUILD gtk+-3.22.29.ebuild 6746 BLAKE2B f6df4d4d3aca898c7fb2570327360159b54c49d2beb314f9d5ef73e490935d396a82e7c9e1e5dc77f4327c46f1a1d37827ffe0cffffbf47548cc22eb92ba1170 SHA512 e907096e857787f3bf0490efdfcd8ecb5f5bcc22ac9c514d09216d721314bf3f0cf5dbbb03291910fe1f0539692cce76f3255f282d4b7cb3c21df117d33c56d7
+EBUILD gtk+-3.22.30.ebuild 6753 BLAKE2B ecd00ab275bcf7e8a0a1cde84b156e7667fec065f64ee2ae13aef75604a1b64365a61c8aa67df8b7c6cd01579e941c51817ab521ff3968419fcba1c31e461a3f SHA512 2b7f25b0f4d9585ed592644695e0dba51415c7929ae1b1ddba4b9dedf4741f0e94a628210f2d73f07fe8d79c03e8ad975df2b7c889e1b47d493275d2497994bb
MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
index bb7b00678e4a..cd1dca6f259d 100644
--- a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.31-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
@@ -58,13 +58,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.20
>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- !aqua? (
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
- >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
- )
+ !aqua? ( x11-base/xorg-proto )
test? (
x11-themes/hicolor-icon-theme
media-fonts/font-misc-misc
diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild
index dde87af5e34a..847e511a254a 100644
--- a/x11-libs/gtk+/gtk+-2.24.32.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32.ebuild
@@ -60,13 +60,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.20
>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- !aqua? (
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
- >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
- )
+ !aqua? ( x11-base/xorg-proto )
test? (
x11-themes/hicolor-icon-theme
media-fonts/font-misc-misc
diff --git a/x11-libs/gtk+/gtk+-3.22.19.ebuild b/x11-libs/gtk+/gtk+-3.22.19.ebuild
index 5cfe545d2c1c..6220fd3c590f 100644
--- a/x11-libs/gtk+/gtk+-3.22.19.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.19.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
@@ -69,13 +69,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.20
>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
virtual/pkgconfig[${MULTILIB_USEDEP}]
- X? (
- x11-proto/xextproto[${MULTILIB_USEDEP}]
- x11-proto/xproto[${MULTILIB_USEDEP}]
- x11-proto/inputproto[${MULTILIB_USEDEP}]
- x11-proto/damageproto[${MULTILIB_USEDEP}]
- xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
- )
+ X? ( x11-base/xorg-proto )
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )
diff --git a/x11-libs/gtk+/gtk+-3.22.26.ebuild b/x11-libs/gtk+/gtk+-3.22.26.ebuild
index 0f2ed64289cf..2005ed92274f 100644
--- a/x11-libs/gtk+/gtk+-3.22.26.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.26.ebuild
@@ -69,13 +69,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.20
>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
virtual/pkgconfig[${MULTILIB_USEDEP}]
- X? (
- x11-proto/xextproto[${MULTILIB_USEDEP}]
- x11-proto/xproto[${MULTILIB_USEDEP}]
- x11-proto/inputproto[${MULTILIB_USEDEP}]
- x11-proto/damageproto[${MULTILIB_USEDEP}]
- xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
- )
+ X? ( x11-base/xorg-proto )
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )
diff --git a/x11-libs/gtk+/gtk+-3.22.29.ebuild b/x11-libs/gtk+/gtk+-3.22.29.ebuild
index 6ccbfdb46f85..4ace496e1e8a 100644
--- a/x11-libs/gtk+/gtk+-3.22.29.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.29.ebuild
@@ -69,13 +69,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.20
>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
virtual/pkgconfig[${MULTILIB_USEDEP}]
- X? (
- x11-proto/xextproto[${MULTILIB_USEDEP}]
- x11-proto/xproto[${MULTILIB_USEDEP}]
- x11-proto/inputproto[${MULTILIB_USEDEP}]
- x11-proto/damageproto[${MULTILIB_USEDEP}]
- xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
- )
+ X? ( x11-base/xorg-proto )
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
index 4f99d0d75ca0..7661241aa30e 100644
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.30.ebuild
@@ -69,13 +69,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.20
>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
virtual/pkgconfig[${MULTILIB_USEDEP}]
- X? (
- x11-proto/xextproto[${MULTILIB_USEDEP}]
- x11-proto/xproto[${MULTILIB_USEDEP}]
- x11-proto/inputproto[${MULTILIB_USEDEP}]
- x11-proto/damageproto[${MULTILIB_USEDEP}]
- xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
- )
+ X? ( x11-base/xorg-proto )
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index 524512630e9e..fb14ef5c0efd 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,3 +1,3 @@
DIST libFS-1.0.7.tar.bz2 315569 BLAKE2B ea629c9d935e4e2f159edd6e3513a571d4a145fcd3030605babd2b931aff3377509e8476859e4278bfbbe48cfe94444d9daa85628e9fcdfa384c4ac0a46dc01b SHA512 3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f
-EBUILD libFS-1.0.7.ebuild 438 BLAKE2B 526f44d199e54589168ca0906713375c9086a7a10da0ef9aaa59d70bd38e7ae5593ef49d54e828e8b03135e250f01d29ef5a1fc1a3e09317cc9b2e72d6e41f5f SHA512 43f1c60c813ce2b2d5a7646506016238bbdb3eede6740517b5bb151a48949c5e9f3d07cfb28b3761eaae65d6a7bc974e5db1d17bc625aa03342b7da71157d4df
+EBUILD libFS-1.0.7-r1.ebuild 419 BLAKE2B cb445c4d687e39bd563d8c11250c41f0b0975be0f49255b1b06426e595d960e6c648a3b2d98b4e119c7942dc3cfba403495911975672b25193b4547e67d1c52a SHA512 de2fec0b2fd48a25f47c2813bf28bd2392d5b3a3e37c694911b3bbe81503508799495850ee42d06f3a680bf4d32b638e52f2cce909673c31555c242d0ad07d24
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libFS/libFS-1.0.7.ebuild b/x11-libs/libFS/libFS-1.0.7-r1.ebuild
index b66b91ff3d11..5c4bd97e8112 100644
--- a/x11-libs/libFS/libFS-1.0.7.ebuild
+++ b/x11-libs/libFS/libFS-1.0.7-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
@@ -9,9 +9,8 @@ DESCRIPTION="X.Org FS library"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE="ipv6"
-RDEPEND="x11-libs/xtrans
- x11-proto/xproto
- x11-proto/fontsproto"
+RDEPEND="x11-base/xorg-proto
+ x11-libs/xtrans"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index 4a0d23fb8c00..497b9fec776f 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,3 +1,3 @@
DIST libICE-1.0.9.tar.bz2 384921 BLAKE2B 701122d9ef6bfa9077f63b35131dc4603964dbb0b7f58bd54ca49e25be24265142d39da4e1f7c72fdf4945dfb358f7b061acb848dfb0c1bcac5973c9fc728a26 SHA512 daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7
-EBUILD libICE-1.0.9-r1.ebuild 778 BLAKE2B b41bcae000491cfc2d9b9f95a57ca7af77ea9d764458ac7235e56080968cb19487c08ed98f65c4954ad084a300a8185a132f8f3c477d2d8b5efcea4878f85e13 SHA512 ec9da132d29b3524cc735ce216c70928978210bde761cf2ec83ac38d0883573996439215a9653da03286f72d2feeb124fb504d7cfe4e527d9edad7a85731cd72
+EBUILD libICE-1.0.9-r2.ebuild 752 BLAKE2B 8809067dcda583d12dc859f70977bcabf46ac87fb066c19f99df2d77c2bcb5c0f788a8ac977ca8ab712560b7b4a20f75f07f23b4f88c7cb91c637ed3b18c9b50 SHA512 e6142a74dd12e6d5070a8eba4adb778b33c079d0828bc06d2a890ebb44750a1f71a08550a2c31c35fe83733b978ecb3acaaeef0b0061471b84fb4a474d61b269
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libICE/libICE-1.0.9-r1.ebuild b/x11-libs/libICE/libICE-1.0.9-r2.ebuild
index 0478d6c0f7cb..6aa479cdf05e 100644
--- a/x11-libs/libICE/libICE-1.0.9-r1.ebuild
+++ b/x11-libs/libICE/libICE-1.0.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,9 +12,9 @@ DESCRIPTION="X.Org Inter-Client Exchange library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6"
-RDEPEND="elibc_glibc? ( dev-libs/libbsd )
+RDEPEND="x11-base/xorg-proto
x11-libs/xtrans
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+ elibc_glibc? ( dev-libs/libbsd )"
DEPEND="${RDEPEND}"
pkg_setup() {
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 8c6a2c1218ee..14cb4f249050 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,3 +1,3 @@
DIST libSM-1.2.2.tar.bz2 348908 BLAKE2B f3d6d40bfb3058000fd13e9f5ed8daa6628ef197d737e9186e66a517d4c0d4238fa65d0f922b9e6b2839a6f37344c64a560b126911679315cb3824c814d474c7 SHA512 dfb91dcc7200fce8d0a62953ae4b81fcb00d525674bbcc6dfcaa23ecb35e1213ceb07cc51f590072dce2107909903160d9f3636a0434fe2a605b1e9a9bd0a6ca
-EBUILD libSM-1.2.2-r1.ebuild 1754 BLAKE2B 1a490b56bcebbb33257da6a351f5549591a902e8bc745facca7f0180074ffd3a4c03104c4ed3179540451301b6bd2db5779a158fdb87902d23ed97cf60c123e7 SHA512 a12611c82b7724b7ebfedf74b595a4362b34d874af8a389750240edb87fbfdb2a75ff87d00ca6b7bb8c032fee8c8bf737529e2eff73a764057d5a75f7ec7b15b
+EBUILD libSM-1.2.2-r2.ebuild 1728 BLAKE2B 3543de30f0c07a81724f3d26dc0324ed223abf5fe877c5d69a269ff1dcf1c918e54b1a8929d8f094dde607fda7283a831c010d76fe0e66ba7818cc94a32a44bd SHA512 92e4b5c8f5eda145ced9970af7f529d87bcfe1193dd4cecf0670cef79d9afe223473de8320caa1a112f9ec048ebb9d9461edcd8115f732acb6de6c7b5fb5cca9
MISC metadata.xml 348 BLAKE2B 475822d6499e8c44bda145b3fb4d72b0f462c03ddddf44cdfb8359a2b0a0e44917a0004a53ace75218efa01c25491fd66e52c1bc0c7e392c88ba9cdbbe414e54 SHA512 4fa0439dc05b56a6fc0280c020ccbc52438ba0d22a4a9b8c0e4830844fa50bc6af8096498336b0d9752687b6e30dce581a24b4b67a812d2e7a62783e37af86d5
diff --git a/x11-libs/libSM/libSM-1.2.2-r1.ebuild b/x11-libs/libSM/libSM-1.2.2-r2.ebuild
index 303ae7650ca2..bd0fd69552dd 100644
--- a/x11-libs/libSM/libSM-1.2.2-r1.ebuild
+++ b/x11-libs/libSM/libSM-1.2.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=5
@@ -12,9 +12,9 @@ DESCRIPTION="X.Org Session Management library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc ipv6 +uuid"
-RDEPEND=">=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
x11-libs/xtrans
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
) ) )"
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 594b7372b80e..097f8c61b274 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -2,5 +2,5 @@ AUX libX11-1.1.4-aix-pthread.patch 300 BLAKE2B fbf3b97b3c7e70875b28a6813525435d3
AUX libX11-1.1.5-solaris.patch 246 BLAKE2B 38bdf941f63ff7ca3adb13af2bc26e1248e41bc84ad47b58db88d63a0994ac4a30841c85a1d9471686fae517f95edbf5f514c7af7b90d79203e1ba72d4c8f1ac SHA512 8f6faa51f5d3cb25f32c9a3ac6ce96140748836cc5d101b5a1202d6d68d45d10401d7a4e45bfc11b9e71872acc96616b180795a7a617491058e1d856e7762878
AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf3fcb49f0e3a3acd43e4d0c1b5dcc3fe2e9a6556171f7d55712e37dfa6dc54d1c2463b872f310629ea24a131f945a55bdd SHA512 71f036f88ab45286826bde20fafaa1eea86aade16d21601e4da0ed935e2a937c6570969e3b173967e1860778c594b0ea08eb905e7c47b67e147d65834905c251
DIST libX11-1.6.5.tar.bz2 2361556 BLAKE2B 6001d745cd989dad2586690da69b8d67c68a4f148a4b3f595a7b58d5ed3a054928b302307b73d776a2a707f62c2d6d97453dd1484790ed8f4e9cf36ca4758148 SHA512 63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0
-EBUILD libX11-1.6.5.ebuild 1525 BLAKE2B 9453a00fd2d9f708578128c010c8974d0d4dd6cbda906fc69f00e4bd9476e7051b61e9747e59eb63a047f298f918801038086a16481fa7340164d8460f3319ce SHA512 ed642f422e0ddb0e19bee3f57e627f11c6f14da706c849c016f510475da5413d9217fbe721d6f70de11a3888095146c933dd3cc488e24211fea7c6cda9762b2d
+EBUILD libX11-1.6.5-r1.ebuild 1290 BLAKE2B 1b1e456d69ed35faf3bb7a7df7f6edcfc7bce477d0f05f80d7a2d6a51368de7a9ea24d5568c3b739786232ed092402a9d7022adfdae4e3aa3a375afe19db5193 SHA512 5ae01e03319613935d6dbb2d4d103c76f3a17e4b03185713d4c2e9b459142d2295d08feb5870ab72e37389b901cc3b7c3d6acf324fc7e97f43d250ea2fc803fe
MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.5.ebuild b/x11-libs/libX11/libX11-1.6.5-r1.ebuild
index a3b6aea1896b..b05a688843a2 100644
--- a/x11-libs/libX11/libX11-1.6.5.ebuild
+++ b/x11-libs/libX11/libX11-1.6.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=5
@@ -13,13 +13,9 @@ DESCRIPTION="X.Org X11 library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6 test"
-RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
- x11-libs/xtrans
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/xf86bigfontproto-1.2.0-r1[${MULTILIB_USEDEP}]
- >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
- >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+ x11-libs/xtrans"
DEPEND="${RDEPEND}
test? ( dev-lang/perl )"
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 0ec16e8848b1..c8b82b3533a8 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
DIST libXScrnSaver-1.2.2.tar.bz2 290437 BLAKE2B 051218bdfc249d7dcf3d53b3d6e7136b0215b3b445254aba27515ab4813da6b086d09d7be97e35d3f33ece78ecbc003911e671564f492e47d240e1613de5cda5 SHA512 973aed3ad296c7160b66fccd4fff7375afc4332239acbe0ae1644fed9c453de69040f8174882ba264c731448edba9b499d398d013d556aea72434339399ed29f
-EBUILD libXScrnSaver-1.2.2-r1.ebuild 560 BLAKE2B a13a5061ea50a57cff50dac523b1cf4d008c1a52d986d340bcbd928efa4979c0f3a94dafb18d809537d4d3d667d3bc0c648ed7bcc66959ab1f915016f6aeb4ea SHA512 511501966db866101927f08f0278b5bc332b0c6a3a620987b864a965eefef086309dc3eab9fbcd928134efffcc8839d99ef362b4dd0f6cd108b8f5cbf47eb0e7
+EBUILD libXScrnSaver-1.2.2-r2.ebuild 524 BLAKE2B 7805fc2630257cd0f58b000e6ae9f7d9d664c91b4af6260b757f638fcec34b7de197767f848c6d977ed76d4e0baa30b7d233ee6ae7b3ba9302211ea27e80e7cc SHA512 4f6b5db5a88c3fcfc056b6302f6e9ac97ab3453641107879645fe01d8ce7f9f4fe30eff45455c6d91b1305dc2059fe4fbfbdab9480d6f3794423d53f84c1347e
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild
index 9130a449b440..c4535430c85a 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.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
@@ -10,7 +10,7 @@ DESCRIPTION="X.Org XScrnSaver library"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-proto/scrnsaverproto-1.2.2-r1[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXTrap/Manifest b/x11-libs/libXTrap/Manifest
index 4b62620004fb..0f7a06583628 100644
--- a/x11-libs/libXTrap/Manifest
+++ b/x11-libs/libXTrap/Manifest
@@ -1,3 +1,3 @@
DIST libXTrap-1.0.1.tar.bz2 269484 BLAKE2B 1724a2b9d53499512f8fa114c69e30ff159ec07c58b0aba80da20b1adbdf2a12b70d844ea09b6f72268aca4550815d45990cfd925e949118163bc98d158ff46c SHA512 638f79aeb7a68aaff51839266c74b5e4f875e5bb2b473f01a637ea0dd75e4fbc7350612ff27dc12716142397c824fe16b178003015878f34f439d90d748391f1
-EBUILD libXTrap-1.0.1.ebuild 392 BLAKE2B 074b67bc6a6e8bab7223ca5b8686441acd4432df74fea0d6898a40af8ca2ea3d30bef865f64d7a88a363775ceaa467878c358ac16e07b9caabab74c5d33d4c1d SHA512 e4511db1e511678046b5d95222c0d9611fde004833e4f20c11c5135accf9efee95ed322eb82a69e9041c3dfe8181feed7433d75735bc23a126471891e774ea06
+EBUILD libXTrap-1.0.1-r1.ebuild 371 BLAKE2B b905f314e0081c0b522f377fa2deed68cd9ac13bc1dcb99c4cd9e8be11712fa37c3280f67a38eed1aad49d3c12034704a41f7e627ef0047928c67abc6750da1a SHA512 480abc53e1e40c01d13761a963bc27131cdcd9558e93c67160e748fdd771e2076e391ef95e96e1371919f2b6477f5a487a7652ac70fc2a14071b53174370d51c
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXTrap/libXTrap-1.0.1.ebuild b/x11-libs/libXTrap/libXTrap-1.0.1-r1.ebuild
index 932a23d771a3..8496fcade1c2 100644
--- a/x11-libs/libXTrap/libXTrap-1.0.1.ebuild
+++ b/x11-libs/libXTrap/libXTrap-1.0.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=4
@@ -9,9 +9,8 @@ DESCRIPTION="X.Org XTrap library"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
-RDEPEND="x11-libs/libX11
- x11-libs/libXt
+RDEPEND="x11-base/xorg-proto
+ x11-libs/libX11
x11-libs/libXext
- x11-proto/trapproto
- x11-proto/xextproto"
+ x11-libs/libXt"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index ce9a37384fa4..7813169061ee 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,3 +1,3 @@
DIST libXau-1.0.8.tar.bz2 295297 BLAKE2B 46c0cdf3382a75e197e48d556d44494dc8a91483fa27c86ae1b4264deb63320637232fe94d1286b38ba8f4efa5405f4b5c476266963ee3ee43b934af2e0a0e53 SHA512 9f933d22f8f2411ae770094589cbe170c631a1437d572664e0fa6b9608e6ec39deef752f2dd6408ab45acdf01bf1827ef3ced640a33da787d9cfb546f12397b5
-EBUILD libXau-1.0.8.ebuild 527 BLAKE2B 2957fd7387e66b5e32b304aef067729260299eaa227f4b7f65a449b1cba65c0c4626d83da18d5484182520175d31e4ef73fbd5dd9d3a4f5fa96502033113017c SHA512 0b4fca5acec193a850dec2716d8e88b89cd315aa0b4b737d52ee98a005779703a034b479c417d7e168d2cee2898d22f73a469d8f62145b789b057f331a32dec9
+EBUILD libXau-1.0.8-r1.ebuild 501 BLAKE2B cd2d0a2a10a250886657db760012a381934a3cc6ef855d221a11cc5a8072dd4fe85f448053049e8b3a371d4beb4e2c7f0bc2d3fc270482b61b7c5bd1531f31cb SHA512 bdad25545aa19757abc1b46c77dd2bb702bcf4187a963e68c596bd99acee737546ea4b2946d9e9f1f9677fdc180c054f8d3b2716a041915d640e27baf01ec3cd
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXau/libXau-1.0.8.ebuild b/x11-libs/libXau/libXau-1.0.8-r1.ebuild
index f81794783006..43562b465718 100644
--- a/x11-libs/libXau/libXau-1.0.8.ebuild
+++ b/x11-libs/libXau/libXau-1.0.8-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
@@ -11,5 +11,5 @@ DESCRIPTION="X.Org X authorization library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND=">=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 45f8ee60a39b..1774c46ecedb 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,3 +1,3 @@
DIST libXaw-1.0.13.tar.bz2 674140 BLAKE2B e141a135d1a45edfb71687951542a31d838bf560997a631b3590db0581f94768a8cc77ebd86c7cff60668e9843b1258a9eb60383a4d25b704ce9dc91fc6d0bdf SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f
-EBUILD libXaw-1.0.13.ebuild 981 BLAKE2B 210f0b1fb8c12b2937bc74f86112ed9337c31b04ccfa4c2c71fe69e1ee55e1791627683f3e2f9fb2097a49ae3ba4215a77a277489cedc91ca9bdb6d92ddce0bc SHA512 8bcb3fd9eb65d62bd851952c32422c2250c0bda73005977a85e5bed5222202a9c0a390bd98f0c8c0fab8e6bc0a62061dac013cf0278bf5c444fa015c4cebd670
+EBUILD libXaw-1.0.13-r1.ebuild 903 BLAKE2B fcc9cb3a5cbe6764eef04cae8dbb5706fa6c0f787928ae903f73b392c7b3d6204c6d19f1f2e43cf715f47cc70f4983060668d12c785c96f312998cf4877b8e7c SHA512 a515ed52ae88aea203ba4710eb533221c5439226320990a57e7f680a163d58dd527abecfe6b024b4cfceb6b3700441a3dca3a117c6ebb0499251726b046b48ba
MISC metadata.xml 308 BLAKE2B c8b1bdf11408b82ade3364323648bf367d76ddec0711a46f3662f4fe34aec46918c7acc617a782312725ab0169e82c25d480194a2ff22bc3429f5f3c1d4e434d SHA512 331203494a47823877466669591ec0de413400dc18f51e96c18a06b7bece2fe56a73055cd7f1e4ffcf6cc9cc9bdd488a7a5ce2830def9ce5a6ae187c52dad364
diff --git a/x11-libs/libXaw/libXaw-1.0.13.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
index e6e751e4bb70..30049f1229fa 100644
--- a/x11-libs/libXaw/libXaw-1.0.13.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.13-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,13 +12,12 @@ DESCRIPTION="X.Org Xaw library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="deprecated"
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
>=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 50926ca4af48..7e2ea0e918c5 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,3 +1,3 @@
DIST libXaw3d-1.6.2.tar.bz2 551851 BLAKE2B 13a03eba7af518fcaa33e89e0cf7c0955c175866348d314210f15a291590fdea98e1b5b9628252932826069bb3a3e89b2377dd80f1adfe3a2bb06e6f82f85408 SHA512 11b15884e47efc139aa019f0a76086913535767fb2e20fcd837d810d3b6b4a7bda3408be5fa0cbe90ae16eeaebe5db9b0ec77a0e2b5767590662ef3a7c9c96ea
-EBUILD libXaw3d-1.6.2.ebuild 689 BLAKE2B 43fdd0bf5bf2888fe64c6fa529385084e68feac0886bddaabc4ca7e53c9a4bd8d9c0799257199f74da7cee93d8e8a0503e369f73f953ff57f2ecc9f7ccf79408 SHA512 eb7a17ba7d411284a8018236f8de7245d9874f22bcee93bdc096e27c8b0d04c5e5e6632a58d492218678842bab1668da4200d6b74947acb9b31a839d910f2eea
+EBUILD libXaw3d-1.6.2.ebuild 671 BLAKE2B c1b541170f716a2aeeb1b60243bb2e100c85e357e1f077980e7bf4786e56dfea1c0e511368d9c5bbbd129a5b04997e2bfb06a19b584362fbdc8631addc0735fd SHA512 1afa7f6c9b7ab380132c8b04ab88e410809e4d3871f1a46d35dd668f9c01d87fa4a2d2effcf4ca0dafcf6aaa56ee30ae5f1d30b865cd4300469209f767a1d960
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
index 05b2473ab0c7..d1ee612e8a51 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.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=4
@@ -16,8 +16,7 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}
sys-devel/flex
virtual/yacc
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
pkg_setup() {
XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
index 06d7f7a87971..ca03501c72c5 100644
--- a/x11-libs/libXaw3dXft/Manifest
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -1,5 +1,5 @@
DIST libXaw3dXft-1.6.2c.tar.bz2 574326 BLAKE2B 05a869567972c8b0aee270281c38dcc75ca849ffa1b5510557ddbf95974f93db5b2255cc2a99969b2da40ca125df95d7b0c7d905dec10ce373baab404ee5b9ba SHA512 4bc2b8257cc44cbdf1640c9946acd5958694beef4af9f5910cf07b1d32133708561e59532a3ae8f1540b930f97649978910b2eed349e81486ab86f340363faad
DIST libXaw3dXft-1.6.2d.tar.bz2 584670 BLAKE2B cde040659a90edb50ac5aa374e8ec04442479ae1c06fe3d5b1387bd3e02c1a0b40ff286ad40f0ae7841544d1244648e34905570e5827dc0efe60a62da3261c9a SHA512 ac434b7f055d20ceb0bd17851d8ba69976ec562a60cb8012a259045e52c038278f0a8b25b52a61befab3aa169b74fd919278c671f1b6e282efb404e089772740
-EBUILD libXaw3dXft-1.6.2c.ebuild 732 BLAKE2B 4d4194570bd4d553410da800d80ec09a95b707de6676deef53183e5b83e6fbd44e9db3b0e675fc4d06c1b7166e4b4e16650cf251ba6721ce80cf93b09bee3b5e SHA512 5df11ad419e817dd868b989cf75bb4a907499dfbe88e2fc2564b85f5329d35f58d02e45daf8586431abac5229e053203ff405608ae20737eb98cb8eb24c59532
-EBUILD libXaw3dXft-1.6.2d.ebuild 734 BLAKE2B d5920597b6b66448f67213ef5c5a539066693f7a2a3134ce8887f41f55e830e28f6a85cf2c382bcc5bac5946c4d8fed450cda004fa1ea7a61874cc5ca458e1b8 SHA512 0832a9f7c6de188a906159c7d7acfe60c39e04e3cfc9cce648b40525c44c199018fa4b40b401a5a772b8a2bfa1c3cd217bd9e051098996f9e1128b12c321469a
+EBUILD libXaw3dXft-1.6.2c.ebuild 714 BLAKE2B 74570912dfb9fb5dade34aeab9c974182aa707cbe6715723c3e29830b26ab5510f4cf896dd5945fa10c09f37cf0dab0706f7ffb0eee6c85fbb8da6dea6d59bc8 SHA512 6b0266b786fecfe01ebc79d3f679204234adf9d4be147fdc21de68a91d94d4800080d6e991cd4995f0a9e2db58271f654d5181b0d3278eb542952ac4db5e9177
+EBUILD libXaw3dXft-1.6.2d.ebuild 716 BLAKE2B ef0ce254bfe37a97285320d5e6c164be38092a19320f501d93c1eb8fa815f155528a9b6ad2059935f3c66da00023be85d963ba18ad991b10258711953d6f8b5d SHA512 3a5a1149a4e2ad9e7680357850d363c9a7523f10dad1291a95cba03c5b34fe38c754b789eba889832ff480a48bd402fc526e69d74c066cc1eeccde6414677a87
MISC metadata.xml 246 BLAKE2B fdb264ea0fcdffe3b15f288ef6958a743a7c88bc85f82e13d20af443e93182007ffcf8ccfd62071b57660a668f9c25753c12baa7a409c9d42a408293c21f482c SHA512 be42da502b805b08126629fdde43bd1473535fc5588faf7c65c05e923736fb18f0249fe61ac5c18c4de1619bd52e4865449d1f02ec19f2c2581f6c2e23a5ed4c
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild
index 40603156daf9..e75364e419e5 100644
--- a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.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
@@ -21,8 +21,7 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}
sys-devel/flex
virtual/yacc
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
pkg_setup() {
XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
index 14241ad4622c..706b92aa6dc6 100644
--- a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.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,8 +21,7 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}
sys-devel/flex
virtual/yacc
- x11-proto/xextproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
pkg_setup() {
XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 88cf4292ce0e..8ab4181fd53c 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,3 +1,3 @@
DIST libXcomposite-0.4.4.tar.bz2 283746 BLAKE2B d72781ee1352027fab3c6dd543b367757c63d878235e324098c65a47bcafcf9b3404343be0af15743a40c092146493360b661bdc42367502f97667d7cedbb2a9 SHA512 b15f8fdbe4cb7488bdad161d73ef8e59ef603c5af92d7b573110ba136d7d4ce3749aac45972bce87662b0310b67e831cffad72c45c15bfff988b5b555d4c884b
-EBUILD libXcomposite-0.4.4-r1.ebuild 751 BLAKE2B ca6e1c9b370f44c4cc5746483cba9a2b400c0a216a0a5fcf970260a99b4569c43f071c9f5feb635e50d4f2ac331f8219ebb471188fdd5a9b5ea5cca2ae0ba568 SHA512 fcbb8b30f0689f59e432389a5a0d4d508b1fae230260bfb0d567a8ba3a5737c7df9481622a76bbc4978c85bb9e72274b2c09782c6e92387b267b988343b0bbd3
+EBUILD libXcomposite-0.4.4-r2.ebuild 668 BLAKE2B 114df959e06436b6e96ee40a5be6b2d260577d40c899f4a7978f92ffad85e53982eabdc37c317d69313e249ce8630a7c61ccce2268522619b7bf072b9e226728 SHA512 21715452bc5daadbab822949faba9554909420b4bebf55d88e8f72f01fce4d8569476096c307688a0b50767220c40b9df17cfa70cbf75a88471084b32b88e240
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild
index 6a861dcc776a..500527554510 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,10 +12,9 @@ DESCRIPTION="X.Org Xcomposite library"
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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-proto/compositeproto-0.4.2-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index eba9dc5a29bc..a471f2b206b7 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,3 +1,3 @@
DIST libXdamage-1.1.4.tar.bz2 278937 BLAKE2B eff95312ae989893904fca167075c10a784222db1ba4850d941f26c4235ae39ddfa242037e48ccc4b7912c27bb5e92b58eb61d7ac1ee6185d0b872b0be3e0ed1 SHA512 1058cef11a8f0edfcae7265837369e492b007c34d56ae04145b558e5f02a163827aba1d0b80656f4c8e5d1e9a40f5077d93b7ff4f5e704f7409060dceba03904
-EBUILD libXdamage-1.1.4-r1.ebuild 630 BLAKE2B c46f3dfa41f001823630bbfe4181869a4a87d3d88d02a409baedae06f1f44b26a8cfdfa843b2d9a21d03164089807e9c1e400bdb17af85f954f1721eeb98e390 SHA512 e5cc6f7c58f06501d548474b5e7deca1012e8b40cd2b48b5cea1ff46976a220416897ccf6bf60a5c84d815cc1a5e07c1b9abc6478468844c7dbb3309ed0e357f
+EBUILD libXdamage-1.1.4-r2.ebuild 550 BLAKE2B 62674d0b749db9a760bd1ccb67b2946b9ef8e78b691fc6d2ac9f7ebddbe1029bcc85fbdf8305dbe199eb58c7061b95f201a3b7733732478faa7e13189295ae7e SHA512 2d76503d8b98dd982c9e15d2862740fd58219a8b16d0baaef633900666c81b22a33cd47b1d5fd378de53b4d47ff9295d70721953a5ef91afef76a7a118368109
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild b/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
index b952f9b7bbcd..e174a98d2242 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,8 +11,7 @@ DESCRIPTION="X.Org Xdamage library"
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 ~x86-winnt"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 9f2664af27df..fdbebafc9b69 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,3 +1,3 @@
DIST libXdmcp-1.1.2.tar.bz2 331518 BLAKE2B 1a6f98d03a2bce62cdf34be641096e0628ea133a1d2ce33d4cf35550c6cabddbe3519265644d44bec491bc246d7e1d361c86595b56d1d59fb72baaf6d1919316 SHA512 f96005934b8bc752059106f8caf7df0574f5ef3c7a83bd797497b56ca556a7ff4dc1d28195e421259e82ea027b5c738094add3ec107a22544c9070725d8d46bb
-EBUILD libXdmcp-1.1.2-r1.ebuild 694 BLAKE2B 84e01f7be62dd6728916d5d40e5e1aa791f5418c9d709897119996f6436f30607b99639d142df70b36cec6ac10b625d223615b33f9b658124d92910666b297ff SHA512 a99c5ca3cec917663a561950a0b9e727a85cabfaaa14f79ea86935f273689cd31c2d560d7f5ea4c23a00952a4af3754026d69ff4a75955cbc7b6d2618dd89478
+EBUILD libXdmcp-1.1.2-r2.ebuild 697 BLAKE2B fb7be0b128bc3b20934dff1df348e805c2d8c63de6b31ea574c553d5f2b35246aed3c07e65461fc3b82a62f9f90590d945e5a844d63a2ff674f7c406e07928ad SHA512 01d9e35b2683a8aba563990fbe4ce07fadfe54456be40707b518a5aaabf14348b3facd53ecb28d00038c2a486e0a6cbb4b21905ebaba7b7d8d5e073337f176a3
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
index eaa04f9d4aed..0022986da202 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.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=5
@@ -12,8 +12,8 @@ DESCRIPTION="X.Org X Display Manager Control Protocol library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND="elibc_glibc? ( dev-libs/libbsd )
- x11-proto/xproto"
+RDEPEND="x11-base/xorg-proto
+ elibc_glibc? ( dev-libs/libbsd )"
DEPEND="${RDEPEND}"
pkg_setup() {
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 63e406a79f51..e254d1fbd368 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,3 +1,3 @@
DIST libXext-1.3.3.tar.bz2 389523 BLAKE2B 5f187b85bcc4736c57011964821ca7fafc4ef44caefcafe60fd4c14fd8f60df8e9bd67136d067b62aa1b16e43ee1ab158f0931f9c1120fb4e391dc40ad9a0468 SHA512 669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a
-EBUILD libXext-1.3.3.ebuild 721 BLAKE2B ed4b34b12f1693e13e22176c00c9d4f1e40bbf143516c0fa9b9f05554feb290a00f693d278618342fe7e477db723f9665e20d0d60e7f9e4904feec9baab17509 SHA512 feca85f2ceae5794ca5a22d322f8c0c59a2eeefd6a0f7c8bcc9dbc488d52e5514ec7d864d17145a9525d5413bd349d4b8d15457b8e6d9b7067c30774796088e6
+EBUILD libXext-1.3.3-r1.ebuild 688 BLAKE2B 720867f8e06472107201d52ad4c81e9cbee5cca0825f457fe98c7105eaa4c2bf2632fc6842e21216b800354e7f42b1cbc26ce13744c272c08146ff4901b8198d SHA512 e3410e0ba27c655bef460827fef69f31f17060888653fd0779e7b38fc1293aa55092eb07e9ac1c82dfa34a27e9ab3c1f08678b81059bba1b58439212a6dcd28a
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXext/libXext-1.3.3.ebuild b/x11-libs/libXext/libXext-1.3.3-r1.ebuild
index 442f8c0f7b56..9296bee78797 100644
--- a/x11-libs/libXext/libXext-1.3.3.ebuild
+++ b/x11-libs/libXext/libXext-1.3.3-r1.ebuild
@@ -12,8 +12,8 @@ DESCRIPTION="X.Org Xext library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index ec33b6735144..a900b00815e2 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,3 +1,3 @@
DIST libXfixes-5.0.3.tar.bz2 294400 BLAKE2B b9a6ce65bef20c24cd75985d7518ab19d7874419d508f4ca6767fe804adfd0e3baebaab69aa9c201901192b8ff5067f5de8d10362ef5c9b6ec12363553389639 SHA512 72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10
-EBUILD libXfixes-5.0.3.ebuild 657 BLAKE2B 9361d20768970a103bed1ada7bc00d6cac278deba6131c177feb85ebf38426cec0dd2aa4fa2a4d276fb70641638e500d18cc6103199eea189d48c6ee9626acca SHA512 a70129a5fc92e982050fd00e8bbb9226fd0fb38a3867cf454b1807375572dc2856a4ad50abba298d427b611d388f837283791ce0790d6211c126baab654836fc
+EBUILD libXfixes-5.0.3-r1.ebuild 528 BLAKE2B 9c4880fb26b2d4049036ac6de66bcaa5798956723c0ca78248d255bbeef9cf04170e1e36d7e01b224f45bdb9b33ec1fde382183edb152766790d9405744bb80c SHA512 62ffc537d2dbfd7f9aa82fb4a1a16b09a919daecd2e504a4ba976e37d69dca9b8e387c3bf87283f499a97d57cfd95d0f4f075ec78eb97f65d607bc686d7f673d
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
index 68267a496244..d03439c03c58 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.3.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.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
@@ -11,8 +11,6 @@ DESCRIPTION="X.Org Xfixes library"
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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 379edd3e8653..52b1850b3e10 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,3 +1,3 @@
DIST libXfont-1.5.4.tar.bz2 528883 BLAKE2B d94a91dfa64e6b78bb4cb7f5ce59300b1cf31826308f3b3d29d495e166403ef57ddb8467033c08ea2b7a4fb0b160d25380f49aed79cd6b72a305eab07a0be25a SHA512 864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3
-EBUILD libXfont-1.5.4.ebuild 868 BLAKE2B 91e94121579fe06d3b12217efe04ab8db60176ec8543ed4363f3e851d520cad2e9c8838d874b56009ddec26ccdc1400f21955266763b323c52c86b52cd8547ea SHA512 bf29ce3df705a3ac6072722c520da24b838cc93577267a27491f1121ca2aa6bec548f1cdb50c92ceb93ffdc12b3914df92139a7839ca19a4ebd20cd8eaef698f
+EBUILD libXfont-1.5.4.ebuild 841 BLAKE2B f7f7be8175b3e1e0ee2b0d737744a2b0d068988681c8a99a81b525662b0748ac16d0cac12e47d2154f3b810974df963cdd7d3bff77a191b94508ca0440c23f28 SHA512 1f54de94669309baee085e852945635759e565a1cbc823c61da1570e0b93b48ba4eb284063139e3e67bb02ce9d70c94dace755edfe9b666f79cd9e56e194537f
MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont/libXfont-1.5.4.ebuild b/x11-libs/libXfont/libXfont-1.5.4.ebuild
index f54a49c17cf5..564cae8622cb 100644
--- a/x11-libs/libXfont/libXfont-1.5.4.ebuild
+++ b/x11-libs/libXfont/libXfont-1.5.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=5
@@ -11,13 +11,12 @@ DESCRIPTION="X.Org Xfont library"
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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 ipv6 truetype"
-RDEPEND="x11-libs/xtrans
+RDEPEND="sys-libs/zlib
+ x11-base/xorg-proto
x11-libs/libfontenc
- sys-libs/zlib
- truetype? ( >=media-libs/freetype-2 )
+ x11-libs/xtrans
bzip2? ( app-arch/bzip2 )
- x11-proto/xproto
- >=x11-proto/fontsproto-2.1.3
+ truetype? ( >=media-libs/freetype-2 )
!<x11-base/xorg-server-1.5.99.901"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 099151328e16..a52f607819c3 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,4 +1,4 @@
DIST libXfont2-2.0.3.tar.bz2 497085 BLAKE2B 91780c245d5e08b45fca6e940b0fe910b43417b2bed77fa600e0b8ab2b2c5a423b8a1c680349b95592a77f5bac45b1f5a7991d05df699aad080e8c3cf4d614cf SHA512 648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b
-EBUILD libXfont2-2.0.3.ebuild 833 BLAKE2B d470192afccde65732e1605b745c2c6eb1e3f322da11dd2ebf37e4ddbad28cc0beb5f42d94c5ff9eed97a6f24483ef8bc9c1c47fa0ed74bcb17cd16abc0d2880 SHA512 79693fcda9ec5c9990d28371a6817ff79c2bfd6a0d18b48b070e9455fa896e21a2602c7916f474dd1cd060f0d5347e5d4984fec7c74e6350556aad94f972c9fd
-EBUILD libXfont2-9999.ebuild 708 BLAKE2B a672500d5c0e604e32bcdc29db056a727a2c505bc665633b139862850980dab34befc47ac20c7964d2c20d09aa88dfae2ab995ca597a9e659f1289d9da1feeda SHA512 8056ae3ba2f101b84534c0b3b41e609e11a5673d73a4d135501295c198a0f58c2b1e67e7f7a0bbb4a6c565cc67dd7c9c799d68ea190c18f56d238d6b8f8697f1
+EBUILD libXfont2-2.0.3-r1.ebuild 806 BLAKE2B 7796af26c0ff67557e1965bb0ba191564016a7116b7d863b60dc51afbcf7b4fa0715cdb430a04ca40814aa33ca8e4a192b5f65cbef8a5619f68c492570e8a60b SHA512 41c8a876206af4e8f99dda6cbc7d8263a06b0971a7c00df51f1126b200a5ce98c53b1b0e89cefe90ac62e5cb753a18ee2c4ad2d480c4db0d8c36cda2fb189966
+EBUILD libXfont2-9999.ebuild 681 BLAKE2B ad3efc790c2a987a94bc26f57f6df91a3603e0f91472474681042c4f168eb73f170949da75aeab783cfdb58e2f90c3e73283b137d9a3d3992634c5cc64f1b1f5 SHA512 522674877cab94ac401d43979f9f30dbe3bcaa39784a9c6cd607bc5e197b590b95b249873c6271dcb70412146fc72283fc06af4f9127b45c08c9487149a329aa
MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont2/libXfont2-2.0.3.ebuild b/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
index 333ec175f52e..295e093ff5d8 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.3.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.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
@@ -11,13 +11,12 @@ DESCRIPTION="X.Org Xfont library"
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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 ipv6 truetype"
-RDEPEND="x11-libs/xtrans
+RDEPEND="sys-libs/zlib
+ x11-base/xorg-proto
x11-libs/libfontenc
- sys-libs/zlib
- truetype? ( >=media-libs/freetype-2 )
+ x11-libs/xtrans
bzip2? ( app-arch/bzip2 )
- x11-proto/xproto
- >=x11-proto/fontsproto-2.1.3"
+ truetype? ( >=media-libs/freetype-2 )"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/x11-libs/libXfont2/libXfont2-9999.ebuild b/x11-libs/libXfont2/libXfont2-9999.ebuild
index cb4dfd2d7d3f..cbf9a115a367 100644
--- a/x11-libs/libXfont2/libXfont2-9999.ebuild
+++ b/x11-libs/libXfont2/libXfont2-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
@@ -12,13 +12,12 @@ DESCRIPTION="X.Org Xfont library"
KEYWORDS=""
IUSE="bzip2 ipv6 truetype"
-RDEPEND="x11-libs/xtrans
+RDEPEND="sys-libs/zlib
+ x11-base/xorg-proto
x11-libs/libfontenc
- sys-libs/zlib
- truetype? ( >=media-libs/freetype-2 )
+ x11-libs/xtrans
bzip2? ( app-arch/bzip2 )
- x11-proto/xproto
- >=x11-proto/fontsproto-2.1.3"
+ truetype? ( >=media-libs/freetype-2 )"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index fb2678ea3a4c..9ce4c9e7da6b 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,3 +1,3 @@
DIST libXft-2.3.2.tar.bz2 335495 BLAKE2B 9592e82449d3253fc71cb93866275bfbea37988ad7bf05c1d17de14038e48099cbc2569e329daba9354bab1d522dac03077d94e82f561e0747f08bbc08f6a737 SHA512 eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398
-EBUILD libXft-2.3.2.ebuild 782 BLAKE2B 8307b65184e5e4d17d1e06b484727b6c5b52956aaa2c695ada5e04149acb7ca6e7366239d30e663e7bc2738c6a1ab97bb6f1a7d917d3bb5cf5579b65b8a59cf0 SHA512 626b5ee582cb0836464a18b677ad828a9bb76627f6fb30286fe3c42d3239d36f1b3fb0de9b9f68fdff435cf7172d5ddd9a4ede07589084508be1e1ef3f7773b4
+EBUILD libXft-2.3.2-r1.ebuild 756 BLAKE2B 6ac0edcc141d81fb42053a8a8d36d4227fcc7694a879b73e08da017aeb884168001f1afbe4e4c6ed96e536e31bc5d2076276008bb2759d171ba59a0d5540f946 SHA512 9f97213dd405abee75fd5412da7153e473518e2d3f839cb8b920ac5f5e2ef28f2cc24595ef160b56f181ea7fcdcb31c90aaf159ee6dd6bf6a17f1bc0b76dcf57
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXft/libXft-2.3.2.ebuild b/x11-libs/libXft/libXft-2.3.2-r1.ebuild
index 2db1b632983a..7a442c96feb4 100644
--- a/x11-libs/libXft/libXft-2.3.2.ebuild
+++ b/x11-libs/libXft/libXft-2.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,11 +11,11 @@ DESCRIPTION="X.Org Xft library"
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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+ virtual/ttf-fonts
+ x11-base/xorg-proto
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- virtual/ttf-fonts"
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index e2d4fd2dbcd5..2ff560ed94fb 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,3 +1,3 @@
DIST libXi-1.7.9.tar.bz2 486312 BLAKE2B 2dae307168431ed0a629ee1be1fa0f93732105452be822bc9cf54cc0863286306c2bdda67c16bb7ed92d63d669f884a4a67ae67ffcc7c170f91848039d470c0b SHA512 9f1536944fcd232ba725addbc3afb1154c4e0df3c4380f4a54bada31371029ce3714fe0458529cd6b2787e3283f3bd35366420bca15fedfbd41f2f6b10eddce5
-EBUILD libXi-1.7.9.ebuild 921 BLAKE2B c2516cf490455f5db91636f2704bcea76be7dd4fec3d2e4e104df9714acfcb1d0bd4a8ed22bbb9c0672b0fe133f783e8a3078d53ca65a0dc499de576f42cc610 SHA512 85a99607a29c1a0981ee98cde141570f5ef96ac74835c1c2575c122aa068c44d214c26017acfdc85dd1cf5df667d57c77880cfc347c9aeffd0d6085b02ca7749
+EBUILD libXi-1.7.9-r1.ebuild 795 BLAKE2B 46fb44e14f4fd806f24f9a61fff8f89f96118c6cba0cf07cba1e07abcb0b471e2a1cdae571978ee7aecfe5039dd5ec723eb0727852f3b4794e412ba5ca73f628 SHA512 61050bf15e1329fb125cc103f30816c51493c46dcb17aa94fd759502534729c526f1220874eb87cfe4164c3151482ba2a77d739a22853563fe0661e0748a040a
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXi/libXi-1.7.9.ebuild b/x11-libs/libXi/libXi-1.7.9-r1.ebuild
index f0da0f489080..90e84aacb9d9 100644
--- a/x11-libs/libXi/libXi-1.7.9.ebuild
+++ b/x11-libs/libXi/libXi-1.7.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=5
@@ -11,12 +11,10 @@ DESCRIPTION="X.Org Xi library"
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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index de0207fb8b10..95a841d573e3 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,3 +1,3 @@
DIST libXinerama-1.1.3.tar.bz2 278026 BLAKE2B d44c693cee0dab38918fb4a00803430fa4bbbc985e2cd541187bdbb717a9e3d843254f76e098f415ce4ada575aa271ab7d3ca14c8b590dcc3fe31e615ee0db99 SHA512 c9f059697c04fdc600d9e63873e924032d6cff456674ee28a885270c54722d96df0ef7a78432c2bdc0844241f115e00ad730c29d84681efc1c45a2e1acb3288c
-EBUILD libXinerama-1.1.3.ebuild 625 BLAKE2B a729d314c76656d052dfb4dfb1968b6630fc2d23f1dd170e0ab5e8c05638ebaf550a9fce7c8406b8fe40cfea3e1884ebd2d5d7a4a4a03fd47377f2e057871b92 SHA512 97e4e750a0ff2d98b82c1af39e58ef3b9cb4054c5bafa4ec2e16deb6e9d3e443e47c71419bf8ac9cb362ed93976af51fca6a74d27207365275c3d3ddb4ac6c56
+EBUILD libXinerama-1.1.3-r1.ebuild 538 BLAKE2B 49ddbe2db1c22bb44506b61d816af70b22ace8c537008de06e27dedca84e7d7bfc0df06963089268ffe7cd270275b0530c13bc168121b8a4ab25e62b3ca4bded SHA512 8879ae35313a40f791768d8c1a36089ba8b4ad8d493dc3b628faf147291d7c45815a8ae7530b9a8eb7c09f74ed8377af334ad92288ad3a2aacd24e4b5c197ddd
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXinerama/libXinerama-1.1.3.ebuild b/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
index 2e877b48e9ff..eaf067e1db43 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.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
@@ -11,8 +11,7 @@ DESCRIPTION="X.Org Xinerama library"
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=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 798442624b0a..6138404844a4 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,3 +1,3 @@
DIST libXmu-1.1.2.tar.bz2 396230 BLAKE2B adcea6ff4c9874b8f7022b236f9c0f76f6291b61ad2bc3ef16f9021d49c2cdee01b07e0bfa46afe3636bdbf2802f2c63f7e01854c1e0ca7acdaa274d348b2eb1 SHA512 eba4e3d10f7d75ba8464881fb69f295a89774a4b37793197d75f3312e3a342b2df8b7e13e3f5c887962704329b5347ff2f3395e229af9dadf46a93b1e8613cfc
-EBUILD libXmu-1.1.2.ebuild 819 BLAKE2B f7783bb7c9dcdfa1d6f4ab00b765a2e1890373ba3f0250eba764e73ddb6c13931b416c2d9bb48ed0465c10ca0d87bbb32cf1df4632d6c9f37b37a7f101e086f1 SHA512 50c78e134179aba4b2f7bf6d92c8151d59eff1ede1b07f6f6277df1b3d972f5c1d1c19cb2245474c8f13250601f3c625195b4ff4eb569f019195287f30aabe3a
+EBUILD libXmu-1.1.2-r1.ebuild 788 BLAKE2B bb462027eb8c584e8f8c5d095320c0ecee991eeb78b05a3ed4e0a4c4d5ed46c73fc49cded1ca048c904adf89b38a5c4d833c63af1b32b1c8541434b0daa0a60d SHA512 91b4df4d0efa0a34ac03744e1c0eb0f3bb7ae18b7cd614cf56de7a74a9214ae1aa5f50cbb992c3c9f43964161df3b4d83128f1a52052d58a0599796511bbebd2
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXmu/libXmu-1.1.2.ebuild b/x11-libs/libXmu/libXmu-1.1.2-r1.ebuild
index 59793d754e0c..62a672262ca1 100644
--- a/x11-libs/libXmu/libXmu-1.1.2.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,10 +12,10 @@ DESCRIPTION="X.Org Xmu library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6"
-RDEPEND=">=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+RDEPEND="x11-base/xorg-proto
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index ff64388fc0b4..1948bd4c2dc5 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1,3 +1,3 @@
DIST libXpm-3.5.12.tar.bz2 430736 BLAKE2B 738838f37643e4e8ce489d34adf33d2459e7bcd7b1eafb21415cd44620c3d4eb18750381a80d1e2c9a2f44ccf00159a029df18164ea7a7834dfee8d104303783 SHA512 a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e
-EBUILD libXpm-3.5.12.ebuild 1012 BLAKE2B 6b85bfb8590483220ab1a75d246815ef023ac29f29bf189ddf6264711c5fcf5ba0435ab84777deeea0833ffa61f5fa8c401de24642d20a1b1d7ef8069ad0dbcd SHA512 4462fffa6049025ee46d5ba01d0d06dc0d8e50b4f86c6a33fdfa89aef49b7d32b6509ea0de760222dbd153bca439a2ea11cc3fb39527d4eb6508b48aa4e0c663
+EBUILD libXpm-3.5.12-r1.ebuild 934 BLAKE2B 88090cae2e330bfa85878d3fa28d302b7d5b860112c961ac0f1687ffb247a56c1d06da16b8e4b8d1344efd066eb9eccd522843e7ff3b4405317d8137fbddee17 SHA512 6d246df2a80d6df571c11aab76969c7f50bf8c1ba76ba63097a94d3a56a8d631619c9af3986fc060bb4bc941184976b16989780ed9a4bdb8a03879d5dca3bcf7
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpm/libXpm-3.5.12.ebuild b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
index 4a4990d55ec8..265319ee68ef 100644
--- a/x11-libs/libXpm/libXpm-3.5.12.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,12 +12,11 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~p
IUSE=""
RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
- sys-devel/gettext"
+ sys-devel/gettext
+ x11-base/xorg-proto"
src_configure() {
# the gettext configure check and code in sxpm are incorrect; they assume
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index ed707ee830d4..afade4985452 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,4 +1,4 @@
AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
-EBUILD libXpresent-1.0.0.ebuild 713 BLAKE2B 8b23c5743348a13c84db9ab0018796e31edd9785516043bd6f905a083f58023d8851dfb2892ee988279e634a2965f6b01a0e75d1c723b5d3c85176fa542d859a SHA512 eee88057b7ae242d71e90f71e6669a899941e8cc2fb9e387d0f26606764fc7318de33d6ead1e3c058aa95969a0a51e3251aaaf1facc7be96e39c4c3eab67430d
+EBUILD libXpresent-1.0.0-r1.ebuild 611 BLAKE2B 2b0378181481c64e80c94a1f9b626e6af1cd4f14a99352a5b815c7e1dfbcdba857cba531e1c21145747c98a1c6d595f607719a7ba63bba9b4cc18c03fbb14b16 SHA512 19c44ceab26cb83d3f7aae8472558741201fb3fa6218a857f43af92ff3e7318611814c32795b5f10e6f5f08cfdf8cbfd2d6ddadc16d0e9702c4127cf8ca17d92
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
index 417917c1847d..b78713721bbf 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
@@ -12,13 +12,11 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-
IUSE=""
RDEPEND="
+ x11-base/xorg-proto
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-proto/presentproto[${MULTILIB_USEDEP}]
- x11-proto/xextproto[${MULTILIB_USEDEP}]
- x11-proto/xproto[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 42d9b4e9a4c0..18b05091e63a 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,3 +1,3 @@
DIST libXrandr-1.5.1.tar.bz2 315769 BLAKE2B 5cdf69656ac804cf8732e35d8e46d5f29b5959851a0313d17d6c767b4cce0e55a1e137f074b7f7029e031397572ad934aa2649ea7d8e2719a69f16cc1c3e172e SHA512 ddcee1c50da8810412fd747b05a073ee5522b2f3b0a74e6a9b48b489ce9712356d1bc3009f8898aeee85671cdb44e2dafa04c8caf23d97963b36b1af9174445a
-EBUILD libXrandr-1.5.1.ebuild 759 BLAKE2B 032f001732839cd412f39caf60d5ff97beedb7894c296eaa7f7f34f818a4e39161e3ef42d392a6e2ffe098fc57dc9c4569c4fb12f817be5f607e6a8be9cc15d7 SHA512 90d8f42b56310c500c1c19959494e8f99d8e8aea23577f04a6006ff82d5d8c77fe1dfa5d80e8dee6f9f2f1390b02b82361ba33fe81347e71c4aa98193e075ada
+EBUILD libXrandr-1.5.1-r1.ebuild 623 BLAKE2B f94d84a6e3d264886d0d7fe8959d0508bd907457982f96e386e09465738b94281db7e878456f5b10d91a2234b6c64a4625e182ea5587be0e2bef6c61d20e17ad SHA512 943653f6d3d4774ac9706bf6d21ec087f854cc236fc9325459a3bdf8fd64f5c118a23c0114ed74faab87168157e38a9118096b1f1b4bd7053ed88d5291a9d466
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrandr/libXrandr-1.5.1.ebuild b/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
index 5538b7e5cd01..ea5d42da85ba 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.1.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.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=5
@@ -11,10 +11,8 @@ DESCRIPTION="X.Org Xrandr library"
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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-proto/randrproto-1.5.0[${MULTILIB_USEDEP}]
- >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index 85b3fa41fec1..651dfa2a3a3b 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,3 +1,3 @@
DIST libXrender-0.9.10.tar.bz2 308318 BLAKE2B c9e250e16118a4878e7439fdb37549596abfd6a17f50e4e88242579fc285d0ef5b0c8d5d0fb592c7dbcd6e77c5fb284e6644e4edf9b12118cbfc0f179e274313 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe
-EBUILD libXrender-0.9.10.ebuild 610 BLAKE2B eb3b2359c31a28bff46cdbd0aa8070c2c6cd870af3b8c74aa2b8764da2651b9d996955dd681545c78790590932b79716d781d47a32f288c1aa798befdd19b105 SHA512 97adfeb5c5368e17328c8522ea1c1df5260a6505ad4d6f6eaa07fe5a8d9df45f5565191e915404c7bbc2d9905992368dc9fd9653631c676e781ecb284910e924
+EBUILD libXrender-0.9.10-r1.ebuild 529 BLAKE2B 26cb8bc16008988480d2b887fbb6e45e27b2d14359b831653ece015cfbc24a31ea3a09af7ac4a80a4590ec7e6a45367dacc06d53bbf34e9e7bbb77acfdf7b76e SHA512 b2218439e3fb88f2c3ae128a4d091be0e067116b05e461f590277eb854165df2a78994acfa5647746fd7b2a1f0ef6dc3fe549481a1d89440e7e108bd9e3e03b5
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrender/libXrender-0.9.10.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
index add3b3631dd1..a7c4d25b668f 100644
--- a/x11-libs/libXrender/libXrender-0.9.10.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.10-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
@@ -11,7 +11,6 @@ DESCRIPTION="X.Org Xrender library"
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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index 4b88dc4b4b9c..2bc985e0a054 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1,5 +1,3 @@
-DIST libXres-1.0.7.tar.bz2 282925 BLAKE2B fe453dfdddba0a07ed2bc086782e8e714d148adcc0316c35329cc1538fd1be53c286ed1aae136095e5b6f2fc57a0b74c06eb49a74375d6444bcbba96e16ab7e5 SHA512 796a79ab694317910442cb10a936711df9dde95764eef11efb8dedc85114977e56409de2f640553f1ad492325df178b8cfbeaeec3f03bf084638c555e44292e0
DIST libXres-1.2.0.tar.bz2 286635 BLAKE2B 0c0813118c7ecd5851b075a4001e0e34fa3df92bd8367717eee42ec20352cab3443d232715c1d40c5df313f6508d2dddc779980d11744a1f897cc7511bfdfdf4 SHA512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172
-EBUILD libXres-1.0.7.ebuild 546 BLAKE2B 87f33f90cfb623d0fe605520684093e946c60c27c1be5ef59759b8b1a4c05a16165a4771dc4b4c409dadebb74d7101d41cb71036dca124ed06613160d93cb487 SHA512 5d2df1ef0e9dd10f057a4481c85edb007e940cbd3a63738ccbe2d9795a1fc3b1092767a814bccf25bfbdc6c08793c72a14ca78f226db5c0e31edc682111db489
-EBUILD libXres-1.2.0.ebuild 547 BLAKE2B ba64d7fa05e7edb166882bbe32a7133fdaf5e40131c09fdcb3279dcaf56b6dee05a7715fddba9daa2c2d36f2bcf3baeb4bb0741caa3e40dd05555933b3358eec SHA512 2a04ab27823d6416aec900fe2ce26c9a3470bdbc5068304831bccc8d42c4615601d89467d77ae0417b8298a4d91a90b0ace4486bebd2aa19189c42cb3437c24a
+EBUILD libXres-1.2.0-r1.ebuild 521 BLAKE2B 836e1877bfb9b770a019bd048a77fd074d6486fab726d663aea4114f1dbb70940a5d6ea4ff0c35d6ff2bfd2b322d89b6b61ab483de2a546d7422d8c6f2d22e80 SHA512 d31f45c4030c9a419196f1bef21490d4a3f1f6d6f9c015b0fb115011cc557baa348628449e0ef77f7dbd1351376ebc9c98c1625dad5e7da6b0890c1c38a79630
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXres/libXres-1.0.7.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
index 0247056ddcb0..e413b50c8dbb 100644
--- a/x11-libs/libXres/libXres-1.0.7.ebuild
+++ b/x11-libs/libXres/libXres-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=5
@@ -10,8 +10,7 @@ DESCRIPTION="X.Org XRes library"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-proto/xextproto
- x11-proto/resourceproto"
+RDEPEND="x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXres/libXres-1.2.0.ebuild b/x11-libs/libXres/libXres-1.2.0.ebuild
deleted file mode 100644
index effb120a95e8..000000000000
--- a/x11-libs/libXres/libXres-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/lib/libXRes.git"
-DESCRIPTION="X.Org XRes library"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-proto/xextproto
- x11-proto/resourceproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 4ffb0ed4ea03..be8a83c7f71e 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,3 +1,3 @@
DIST libXt-1.1.5.tar.bz2 771567 BLAKE2B c3624f1ab81fdace1b2eef8749807e9a2157ec6f60e2f5f8b463aae088057d4eb82f9c6de547e286798b98f68be8f8097ff291b490baf49a4204e62566c1a9c4 SHA512 29828cfc021b60e0a0b5ff0321801db20f12bd635866cd000b35a23736b5477a3d1e5f936a1124ed3e3f4c0e7a27cb8744dbb5ab4fbcd45c817a13877081e05b
-EBUILD libXt-1.1.5.ebuild 831 BLAKE2B 86712a9de5325aeb7656f29a782757f4b5ce6bb724fbaa31041c80f3816fceaf02b805d2d709a11ed1752efd2108249672ca528e1e923405a59f6a1ead812551 SHA512 8a8e4da8b4ef5eb431d3ed6cb8e2ef88d53e94e091d4ffd54da0ec6f7b498e46730cd4bfb924dbfd816f4ee412d4daa08800545360a17a56d0a009b5213d57bc
+EBUILD libXt-1.1.5-r1.ebuild 755 BLAKE2B 645244cc1e3322d6e0a6bb395eba90d386e6cbb6f2ce5eb8e0b47c918b9996b0a1b87e050b7c041a5fa7ac233dcf5672e64ac5a23d3bc27f67e658a4f515a7d4 SHA512 698e78df059ef87e0fe19d97bb8397e436f3d93425d45068929e04c55956625edf1f436092b00c825ae8cfd58788dc167247eeeec343e9da2275f78f844a0733
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.1.5.ebuild b/x11-libs/libXt/libXt-1.1.5-r1.ebuild
index bd066ec22df2..a431f50bb83e 100644
--- a/x11-libs/libXt/libXt-1.1.5.ebuild
+++ b/x11-libs/libXt/libXt-1.1.5-r1.ebuild
@@ -11,11 +11,10 @@ DESCRIPTION="X.Org X Toolkit Intrinsics library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="test"
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
+RDEPEND="x11-base/xorg-proto
>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]"
+ >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-libs/glib )"
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index aa6b39dfcc30..517bf8f80273 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,3 +1,3 @@
DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765
-EBUILD libXtst-1.2.3.ebuild 805 BLAKE2B e48352c5011e911a6a6e696dbd86cece054a5fb0f207bd5a17b6cf2395fb368d3f46d2df06bed752fb2b8c085651cc24f457f8199583d2142c77c4e6e1aba682 SHA512 85a559230579390c75c5e8d04dcae0e9fd5dbb8a9a58962de099c1f0a899b18a469e0a91db1aa5e3bfc2158babfb24a9f2bd22b086a8d8cc2c73ebb9265a6d8b
+EBUILD libXtst-1.2.3-r1.ebuild 671 BLAKE2B 6074bef8956b6f217cc81e0914a013cb8ae17b09863cec547e11dd4c37831e6fed63980e7b70b3734998f5ebf9524b47c3689c91aff5fcdf62b42a7df80d7018 SHA512 3cfee3366b46e886ca2f2177671d7297a4592497a1413cf70f6848a433754e744c01d9d27907b0a1349c83367260884ceaf03d4d67e89767d9ac4fdc77c776c0
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXtst/libXtst-1.2.3.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
index 38413474ba30..2480d438c3ce 100644
--- a/x11-libs/libXtst/libXtst-1.2.3.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.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,10 +12,8 @@ DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions libra
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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
- >=x11-proto/recordproto-1.14.2-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]"
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index e3030ef037eb..9a15e4e04ab5 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1,3 +1,3 @@
DIST libXv-1.0.11.tar.bz2 317921 BLAKE2B 3c656e1f5cd02c936813b3e10a359d23e7a8643a45ade42ddd584084ba04d09cafbefcc68ab9356b78c1a716a050637062e956c7f50a03a522d28ff7aa31c3b0 SHA512 97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58
-EBUILD libXv-1.0.11.ebuild 630 BLAKE2B dc74f6bf5bac4611fdb4786d4eade0105e02c3df1735da3685bc9458f45f3b5a081e04e23e2efc937fdca4cb70dcffb47089f85d012746305fdfa48369ab17ec SHA512 52fab2549ee5b1ecf7fbe8f0889766b690a76256b9cc9decc2ec45411df2a997ee0b9f34aa0be3b2a2580ba5975d6e715f681510f1dc6981ee928c2e2c3cb0a4
+EBUILD libXv-1.0.11-r1.ebuild 551 BLAKE2B 5d00505419d8d0617a2f32c7139d6b8ab32014388b5755551d62c8a2a455d66eee3593ef9702e2261c5aebf4f9a1b99945ec4921b5b1ff185373f550b02e7550 SHA512 0e434f33f798ba36f92757a8846d5854b504a16f237ab1ff81596f619388271525c88bf9f8e3b430387fc0ccaf47a606a48fae071e99c69e47dfc2380786a5a6
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXv/libXv-1.0.11.ebuild b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
index 36d922b38445..6defba6f7438 100644
--- a/x11-libs/libXv/libXv-1.0.11.ebuild
+++ b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,8 +11,7 @@ DESCRIPTION="X.Org Xv library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index 3c73e783e87a..d6bd402062bc 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,3 +1,3 @@
DIST libXvMC-1.0.10.tar.bz2 313887 BLAKE2B f5440e60c29e83be8945d215e484a995547411fa8e96b2fbf757b93bc618b5d1083f41ccc770c9e8f4b0e13e6230968575aa7054f036ed2443b85b6301078930 SHA512 db979627eda2e58dbc95f0705681aa4acf51dc375a078467ea0b1c78414963e52417e525bcf224b4642eab2e540619c168c1e4757fad97bac7d07b60b23b3e19
-EBUILD libXvMC-1.0.10.ebuild 642 BLAKE2B 2eb252d7493ee730477d865de557d98de427c6fdd442c826e30bf10229303bddffa88443c10016306dddf0530fa21525af3087ffcf4b63877e3b4ef320738757 SHA512 b987d4f6503c6ef996cd8b79da5343c289401a3f35e5f6d77b99a3a7f30f3c5e5ab457166e9f3a5805195b34584e7cf9becbfd471b5599990bb4ee7bb5e7b829
+EBUILD libXvMC-1.0.10-r1.ebuild 563 BLAKE2B 9e9a39b429783064baa83e890c5c625e76d5050eb953133d8e28f55c73629bf644862d7fc2378e27903b3fc61d8c120287f36d0e5df96b559d245685b9e018d0 SHA512 cffe63bf5e0f2a8762ab4112059bc8bfb3e5a39237c704de4decf472e2e39215ee3ef54b930459e0a3883096e2058032f98fc3d0b2966b27befdbbb4ac89deca
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXvMC/libXvMC-1.0.10.ebuild b/x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild
index 109bb8a5f28f..a80dc54532df 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.10.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.10-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
@@ -11,10 +11,9 @@ DESCRIPTION="X.Org XvMC library"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+ >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
PDEPEND="app-eselect/eselect-xvmc"
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 89e623441a04..00e9764bfd0a 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,3 +1,3 @@
DIST libXxf86dga-1.1.4.tar.bz2 280216 BLAKE2B e67a1e2fafc91cdce5b1d4f4ad2083080656f27fceaf167fcf6626c641f1dd7fa14ebe4f8508042ef0489e0fd689b05f6088487b9eda65995888158452898546 SHA512 58d81a7850275fc8382018bcc56dbc65b4200828b1f1379dcee3da1878f12a83ee681a9d474bcd564d99bf93bedfeb7b243370e0ebb89177652b37cee158a3f2
-EBUILD libXxf86dga-1.1.4.ebuild 632 BLAKE2B f10e77d157d814596c4be76c1724d7f3d25d8171da974a928cf3d0dcc8545beba6f4c498c1ed3dc42dce0d4988ba2534b71ea3818934f60b0521a477c10996bb SHA512 63102495a0c089d9efdd9d0bd1d6a2a11af0395136351cbfd6f30d8269a5468455609b07becf1b8c2d6c40db7d2a42c6b8cd9bb40b90d7a04a9f3c1437f7844b
+EBUILD libXxf86dga-1.1.4-r1.ebuild 501 BLAKE2B 54a5934fe8504771b22c2e480fd40e4ebb5a9559c430e6d220158bb7428077a2f80dd45160975c4a3bf7ae5427cf26a3743db8f2b0773e103436db0c21c35f9a SHA512 afa73757ebf8e3fdb694f1b919956f2cd93e5d5c4906a19897f8aae7f47b7bdb2cdbcd218584f3db524d2f76049b1a8f52d6ede9887febd12c8d735adaf3f539
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild
index f6e587cbbd9b..9aa79b39f350 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.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=5
@@ -11,9 +11,7 @@ DESCRIPTION="X.Org Xxf86dga library"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/xf86dgaproto-2.1-r2[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
index 3acc2e3fe3b4..25669ba34945 100644
--- a/x11-libs/libXxf86misc/Manifest
+++ b/x11-libs/libXxf86misc/Manifest
@@ -1,3 +1,3 @@
DIST libXxf86misc-1.0.3.tar.bz2 255831 BLAKE2B 3e9fc6cc8853fb74facdbb9183111a513de7fdbc484679561def89af46a99b2cf6fd49fe66cd6b7ad9bf95cc96aeb09207bcaa46094fdebcf373198db10f9a68 SHA512 4df80bdf6cae9f43a1ddf09b078f354d0cfcab1861d073f3d274bc3a5dd0efe1057abae792f6c512e8f45286a62db95f85bf8c02de23fe96a76d8972cc1fdb7f
-EBUILD libXxf86misc-1.0.3-r1.ebuild 505 BLAKE2B a1efb57c93b291f0c05e9a444b97e15b33f5db409c36e4fdd826baa9aed0fac6241f6e3c6d5e022c7967a1e925c72cb61755a0e19e2a423d8604921c08cb0027 SHA512 b0db663a38d8786600b54ca478ad50521f1a58bc43f237c29f6187c8468fbd509baa049ddd9c0b8750441d6f521427ec4bd263b5538d95c523a96584a5590381
+EBUILD libXxf86misc-1.0.3-r2.ebuild 462 BLAKE2B 9d6283f7af5d246898cdd56a689ea391989adcd7e545d1dbcaff20b4c2c0c024c14628ab38372ec2245df41ec3af8deb2db9c9b497f2f060eca2cc5b675d8b72 SHA512 490a206c66a00c7f10573c29b88b82ae444e6a8e65fc8f6fc256134ae0ac50d9302e9d1e2b692d75a0010d9b2245242c2f6a2d92f2772124c4189fc76b0a2404
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.3-r1.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.3-r2.ebuild
index 9d04454736a3..a49f155b6511 100644
--- a/x11-libs/libXxf86misc/libXxf86misc-1.0.3-r1.ebuild
+++ b/x11-libs/libXxf86misc/libXxf86misc-1.0.3-r2.ebuild
@@ -9,9 +9,7 @@ DESCRIPTION="X.Org Xxf86misc library"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-proto/xproto
- x11-proto/xextproto
- x11-proto/xf86miscproto"
+RDEPEND="x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 6a9776ffb865..ec7aa8a57b21 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,3 +1,3 @@
DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
-EBUILD libXxf86vm-1.1.4.ebuild 694 BLAKE2B f749f992a0b67878ea9b9408cb24c9bbfa63bee4d7ed00d10332129470787b10273730e2a11b771b0899a7d611af3b8e08d586abe67b558f56f5c9210eb7d978 SHA512 cedf72c264774d5861a34c48dbb056e83aa80aaf9190f948cb3595a82cfaa2f05f25b66cf632b3a238e8df37bb0988e3dd313ae7bda51ef875a3a93c0c4b93a9
+EBUILD libXxf86vm-1.1.4-r1.ebuild 557 BLAKE2B 8ac6953e77d18c497646c78ceaf7b35759bf364f125dda468e210e66fbd7decc87880b1876afc11048996e62b4805d8da0c61d3d6c7a58c27a9e253a937e7a69 SHA512 1d6f212ffa33aef6a299971026825e83cfbc74acc0b7a79e857b73cde484c10968bc3a1d72e6a7f5feacca93e17a751007a727dcfc90109e744d6560aae350e1
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
index d6d8ab59fe08..a43801d9c3b7 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-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
@@ -11,9 +11,7 @@ DESCRIPTION="X.Org Xxf86vm library"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index f85f72d02691..afdf872154c7 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,5 +1,5 @@
DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
-EBUILD libast-0.7-r1.ebuild 947 BLAKE2B 03c61e1e987346c66ce52a759f930d783467b5e911c888ce68cddf806a1f892aa59e5ec9826fcaff19f6928ac6cc7ff5445861e30224b6d6be28c3616945066c SHA512 99f4a7915652f753dbdf3aacd3a35cc8d5f9efedc03cc7ac1079acba6f00d3bb5262f441b59c58326d5bd888d5b59384c3d841c78688ec8ddc06986eb27016a8
-EBUILD libast-0.7.ebuild 953 BLAKE2B 145d617da029a23c1ecbaf89185b8f2a16b4031ebe299807dc4917ffdd3fcb53fe0826db1ca1e4e62d7b7db3f03f3867459937ad02ec30a0f425933918f43204 SHA512 ffa9ad6155ef82e6d28406d052b9756886e94357964c8797e370b70117f4e427c24dcb7af97b28651bd0c741db67490f94cf2414188d9f7e2a6277dc4c40605e
-EBUILD libast-9999.ebuild 1043 BLAKE2B 4ce05b3519547be5d47a49c5b7642d54b76c0dcf170a9d6f549f22fc84ed5a0a29a5553812cfc7d0cf7bf06fb7e40436c6389ac01b4bee4a44d57a12662246e7 SHA512 d01366e05d46a3b551526f6d7e7a07da312799e85aeb1c7f8fa55445d484186a65a5cb78a5b5f96ab9b7db2ab0ce27a41022154e3516a1393dd3cbd37e621f7a
+EBUILD libast-0.7-r2.ebuild 950 BLAKE2B bdefcf9dcf81200064201d7c963fc5e7faf8054963998535b40cb51154c280c142e347dae1ac0a0085355d53a19e638402023cad91876c395b1d3fb6ffc63e38 SHA512 556507266959e0c4ec26395056d86b56345cfaf2027979a89ec28830d58eea9408361c682a5e05cfe363cd6dae960b98be3b06847fc7b7a9a283cee3e1ccc99b
+EBUILD libast-0.7.ebuild 956 BLAKE2B 51ad500db03219e1860f4a20c73d283cf25632d9413660f26ef59ea71408ca2003d6b94bd21a2619fa36d70a1280443008b02479af241957e13f101d642e280f SHA512 119258ed0398b0a007795a0889a0d1f57b15dee7135db65703e722c03d58a2da85eaa155eaac2bd8f23c79ad5ec96653a0b802d986e9faa303e50becfe554c16
+EBUILD libast-9999.ebuild 1046 BLAKE2B 961ad3edf0693b6ae5339c82fa0a9410a34b050361f4d5f5d826fc1dffebbccccbc07fd89e9676a2e53246140bb17a2a1de70badaf9842c04a2b95ff624c7dea SHA512 831b2b42607f673510482a48f8a5eb4bbc3fad111945cc3f00a9e6dc578ef65f4dec03fbae504727e2cef4f841f1ba129c9d07a72238b0639be866d4799a4cfe
MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc
diff --git a/x11-libs/libast/libast-0.7-r1.ebuild b/x11-libs/libast/libast-0.7-r2.ebuild
index 15f2c7592ddb..c1751cb774ce 100644
--- a/x11-libs/libast/libast-0.7-r1.ebuild
+++ b/x11-libs/libast/libast-0.7-r2.ebuild
@@ -14,8 +14,8 @@ IUSE="imlib cpu_flags_x86_mmx pcre"
RDEPEND="
!sci-astronomy/ast
+ x11-base/xorg-proto
x11-libs/libXt
- x11-proto/xproto
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
diff --git a/x11-libs/libast/libast-0.7.ebuild b/x11-libs/libast/libast-0.7.ebuild
index 88f91e397fa1..c2ef2a3a112e 100644
--- a/x11-libs/libast/libast-0.7.ebuild
+++ b/x11-libs/libast/libast-0.7.ebuild
@@ -13,8 +13,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x8
IUSE="imlib cpu_flags_x86_mmx pcre"
RDEPEND="!sci-astronomy/ast
+ x11-base/xorg-proto
x11-libs/libXt
- x11-proto/xproto
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
diff --git a/x11-libs/libast/libast-9999.ebuild b/x11-libs/libast/libast-9999.ebuild
index eb51359edbf5..94feeb7a119c 100644
--- a/x11-libs/libast/libast-9999.ebuild
+++ b/x11-libs/libast/libast-9999.ebuild
@@ -18,8 +18,8 @@ KEYWORDS=""
IUSE="imlib cpu_flags_x86_mmx pcre"
RDEPEND="!sci-astronomy/ast
+ x11-base/xorg-proto
x11-libs/libXt
- x11-proto/xproto
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index 9746abc93a49..141242675503 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1,5 +1,5 @@
DIST libdmx-1.1.3.tar.bz2 290859 BLAKE2B 3cf8094d7b1a3d82657ae5b4c41735738beed4ed5264f0d7dcdcf25c0741f9dc567d330f1a8b8bd1dbddfd87b7317a16692053379a0aebe62637614be96c3610 SHA512 551cbba06e87ddc6f9a1f4567de4b8c592a4b6f6b6c27970c67c644ffe5c7f396e3c64c6df564d83a73f1b3842ba0a29a2463580fc0a264c552d76fbcba5a021
DIST libdmx-1.1.4.tar.bz2 316517 BLAKE2B bede1dcf554fba15257277419c1a458125ab962365a4ae679b22a98d6a1e31584087fe09fc1a2e5a7e9b212c0fd332438cdf5c56c8a9d32b6ea755091026b6b0 SHA512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9
-EBUILD libdmx-1.1.3.ebuild 385 BLAKE2B 9e2d84d27f6d81cf9e087e31d4d181745959cc8f77e15328bc82317091a7205bfc131b995a0199e9e3068aaa835ce54bde3cf62131f2490269e66686a15db0c5 SHA512 0957479fa47d97fe8bb10af1d1a10f6a7abe08d51c2e3290c5618b0ef2cb140900464cf079eca9213697049291be144f8792cf3a4f7a5217ceaca341facb01e3
-EBUILD libdmx-1.1.4.ebuild 368 BLAKE2B 1d6c8fc339f73af813a7bd110aceb747299e0081f5d380b3d95f135a3caf279c172225760a240a11f4586c6fed8000d4e1ae95206919e5f1ecf8cacc820284eb SHA512 952642d7d5e23baed9b9f15f6a1b2684684699ab8c2248f986a495d3d3fe404820d7b2f289972c6e5afcbe57e1b28ac6480a0557126149153447124ecaabbc5e
+EBUILD libdmx-1.1.3-r1.ebuild 359 BLAKE2B 8ee2514e4da96c37b58cc12db00731d825ed7a49c0b3fad307f6fd9644c2e3bd7cac620f7dfbe24641f9deec578c21a4e6eac31e0487f2cbe0b107af570d53f4 SHA512 58869b3c4b000ce98e1d355370437fcb107551969e3fbced849b5c7f3fe14056f7d43b330e93b49bfd402fee0d1dd3c1a7a7b8337a4c9c8dfdc9f7da04d945a2
+EBUILD libdmx-1.1.4.ebuild 368 BLAKE2B 0550aae684b4a1b05ccee4c42120902ee9cefea5c791dc32a5d6cf4f5351467a589d39300f35083d37cc2c9aa2f7733f3ef3ca0b7d41304281862ae888c7f275 SHA512 1a12677891d305f8e299ac43d1fc2c4dceb75ad3b79c3ecc19ee67c35cb93da51294c2703d6ca8700b8186945f1a384bbe2008c417c52344ef7ecd5042b559b7
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libdmx/libdmx-1.1.3.ebuild b/x11-libs/libdmx/libdmx-1.1.3-r1.ebuild
index c8d018aea3ce..d1f21753e75a 100644
--- a/x11-libs/libdmx/libdmx-1.1.3.ebuild
+++ b/x11-libs/libdmx/libdmx-1.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
@@ -8,8 +8,7 @@ DESCRIPTION="X.Org dmx library"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- >=x11-proto/dmxproto-2.3
- x11-proto/xextproto"
+RDEPEND="x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild
index 68d16096b58b..2b721a00efc2 100644
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.4.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="X.Org dmx library"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-base/xorg-proto"
+RDEPEND="x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 5f30be83b3ed..646904284c08 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1,3 +1,3 @@
DIST libdockapp-0.7.2.tar.gz 40462 BLAKE2B 8d4d2e3d9b1856875a275661cba809852e7c91867ffae33052bc472208db911c19caf1b77b16e367f007e1606be6add6d9bc5a1e76ea8fa2b8616163e922f21e SHA512 a2f216ac1105abe0efbea191691bae986b6022510f96c78b08c1b809cff131794c81810197af7d1321f9b248202376cc7092e79a4d4afa3fb93e9ed8000c9d79
-EBUILD libdockapp-0.7.2.ebuild 829 BLAKE2B 95af9e63d07089513e971b0d044be835564977c3eea8deded816fcb3009ed205398b5bcf76e92bf9cdad29d83995b28d1ddac978c53757fc55215215d6432bbb SHA512 da8c65c940cf11b85c29741073d16424a2921c5109f4d284941036a9bdcf4f36d6bc84a2c9d7c9e604dd6618a1ca07e8062b8ac513fc0a3411a865b46b2b2a5e
+EBUILD libdockapp-0.7.2.ebuild 832 BLAKE2B 4780766c1a6a51a76adad1b33dd9547a977d8d339a81abbdb867c5ffb9db72dcbeaade01908da55b51c8224510d9586db85210b987a95989f7a56a904bd4b8b6 SHA512 729bac0aec905580db6bff6a30ae16abaa32f77f0d479ab2ddc1b62c2f86f4c2702cab30e6b6ac377776ceccc60ba34f0281e559d21f42f486a5771cbea21304
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-libs/libdockapp/libdockapp-0.7.2.ebuild b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
index e633685c4d28..c46855270162 100644
--- a/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
+++ b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
FONT_S=${S}/fonts
FONT_SUFFIX="gz"
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 4c9bf14152dc..50d7f3987c4b 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,3 +1,3 @@
DIST libfontenc-1.1.3.tar.bz2 301494 BLAKE2B 1d9d5387cd11820b1d458cab8de26fbaebeb2d0b5c6197a455b0261e53004e6d8eb9cea7dab27ad163c8897237a864075f981ec3a740cf8056c3f15be23ecd3d SHA512 7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c
-EBUILD libfontenc-1.1.3.ebuild 548 BLAKE2B 2511ed11bb919e55ed0fbfdbb6a0f18703758091cc4b79739b86aaf550f44e2e81a12430b3b8d33d47fcb00c6b26fc4defed8a88d8b0218f839cd1ad65b9f56c SHA512 6e2060dfd8de400fff99f3149c5a236548e6dc07b12991253a59757766fd29c5ed67bf61fd4fe93ae116413a16ad3dbdb8416f8829eab0bdafc42dd379897aa2
+EBUILD libfontenc-1.1.3-r1.ebuild 551 BLAKE2B 86f980e63033e2b83b0d252d9b18b9cfc6eb137aa366bb8a8edd8e517ad2964cb693eef73fa5d3839d284a1d9d46d5cb9fc225cae98729b63b0fd71084be3b12 SHA512 43529d2b9713a861abf15b32a9211caf5ff2ea61ca7a7f166fc362218abd67a9dcdcc9cfd04da1ca7862f9390d85fdf9481043fca6ace55c18d30e0cfb846b08
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libfontenc/libfontenc-1.1.3.ebuild b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
index 818d54079017..f0b707ef6947 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.3.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="X.Org fontenc library"
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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND="sys-libs/zlib
- x11-proto/xproto"
-DEPEND="${RDEPEND}"
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
XORG_CONFIGURE_OPTIONS=(
--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index d15cf3e1d746..a43c5ee82a62 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,7 +1,3 @@
-DIST libpciaccess-0.13.4.tar.bz2 372004 BLAKE2B 7cad6755d1aa6f29738cff7996f3f6fb4216f10be8c138fd0b868f8ff50cad9fe0231d48bb11eb785a824c0f21be9fcda88b31a079fabb34a6b26be5086900c4 SHA512 d5b32c525dd36dc85c9a09f45696808730eabbbd3cce892a6dbfb02a566598baad27be58567eb7ced15b3d99fb9afa1d1c24ec19754bcf7a1857a0c8cea34d92
-DIST libpciaccess-0.13.5.tar.bz2 381729 BLAKE2B f62a8820493782657c8dcaba32900f0fefdaef4bd1085a27675b852e06717c97af50d8bf3cac2277befd950406bb9dcd1da344d51be8c4ebb3d3f83452b3ae84 SHA512 4b77aa66b3429fd5f9bff0408b0624305e766bf209f3fa2a0a9024df55bf87ca68f9a5aa34f97ffe131997e0669c65cf542210cf308c0de09842424968c5a159
DIST libpciaccess-0.14.tar.bz2 361375 BLAKE2B 05af836e52c7a8e19537a5c246f2dbbfee0a8c078ed0d6c45de6d1cc5f07b70d91b9409846b175da74f31b0e2536e38ffcb65983d79d40a54abc878b679d845d SHA512 bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b
-EBUILD libpciaccess-0.13.4.ebuild 868 BLAKE2B d9f2e456e788f05c26eec95030f2092f47a1afa4ab5b4f945e25edb6459cdaf5831b376b6eb7f6368391555cd9e9ccfb1ecd8c88bfee8ddab77221d397d102fe SHA512 5fe17935dab18929a01fe41991496751f64a0a8ab87bd95b077cf794158b189272c6745c222be9f0c01e5c6dbbe5cc911d9bb7100e84f1608702dcaf27138d22
-EBUILD libpciaccess-0.13.5.ebuild 877 BLAKE2B 6f3b6ef03c0eecdf5e62b0e13a328eeb3f4e0e86bbe92fa436de03ef3df8d843fc86d2ce2e458b6ca0fe18818b74dba607cab9ed130118b8bda47947d641d9f5 SHA512 79805b3c23a399936dbf77d49408a2966e27d650168451dc9c5bec940e276f6eafa73617a19406cbc24f1c625eeb72078fea9a95715fb103c58f90634c379009
-EBUILD libpciaccess-0.14.ebuild 869 BLAKE2B b23828ad6bcd938423724158bc99f383800c71fb4b6277f121cbcbf8486e6e949dd11de87e46f0d05612a5188aa4d353fc6c18a2f58b7b6841b6abe6fa184e65 SHA512 81522aa7b82e9db17b6225d32f297eb147a2bedae269608284e6c320d0ce5facf362af9fab34f5e5594bdaafb4b5ee10d52f9291e1d4f8eb8c6e90c7244eea72
+EBUILD libpciaccess-0.14.ebuild 868 BLAKE2B 2b57234268336ecaebb7d7bdf69b7e5eb7aa0947eb30fa47c2e1e4f0dc5fe698b34b91be5fb4cd426814fa624828b30c78a112a0532f81a87aa316786273bf67 SHA512 6046db54f5491cbbd5956c92886709a201727cf483090506f8c00abbefe52f9348608040d8523ff32272a228f2fb21d468c9c85234dfaed3238a7da9958b7ab9
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
deleted file mode 100644
index 3bf3b027aff7..000000000000
--- a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
- zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- sys-apps/hwids"
-
-pkg_setup() {
- xorg-2_pkg_setup
-
- XORG_CONFIGURE_OPTIONS=(
- "$(use_with zlib)"
- "--with-pciids-path=${EPREFIX}/usr/share/misc"
- )
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi; then
- dodir /usr/bin
- ${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
- fi
-}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.5.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.5.ebuild
deleted file mode 100644
index 40538ee468ce..000000000000
--- a/x11-libs/libpciaccess/libpciaccess-0.13.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
- zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- sys-apps/hwids"
-
-pkg_setup() {
- xorg-2_pkg_setup
-
- XORG_CONFIGURE_OPTIONS=(
- "$(use_with zlib)"
- "--with-pciids-path=${EPREFIX}/usr/share/misc"
- )
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi; then
- dodir /usr/bin
- ${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
- fi
-}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.14.ebuild b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
index 9f0ffaf2fe62..b51ded2a4499 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
inherit xorg-2
DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="zlib"
DEPEND="!<x11-base/xorg-server-1.5
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 7add8e749fe5..07a69ea2ff7e 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,3 +1,3 @@
DIST libvdpau-1.1.1.tar.gz 541752 BLAKE2B 346dad1ee83193fb489a67016874b1cb9eccc88833766f1df987ed7369078cf259c168546d64ab847d81baceb4e4969d859c29a4081befbe100925d457dfb6df SHA512 e094494fc820c2395c9dbb4e69daa89334b9186e2ad1a6c06671c7f844568db191ce4d1d9df95c4536579864bcc8541eb6fd159c377bc73c228cdf2a0fea50fb
-EBUILD libvdpau-1.1.1.ebuild 1171 BLAKE2B 1de73128329ad0684d70e4d6b9fbb08e343b574586a3d5159750de14dc2de2bc1114ad3dd62f63bd69022e1ef98c42c00aacc362d1432565a9ebc95bc6ca0543 SHA512 8c9afd0473e2b5665adb5467a780aff8b0fd1d774779bfc334b9163ad7f6ec91e84244ce3be6088d6a4f3864f2c2680e7ab68de4e84cf0fb6379891ef76de4fe
+EBUILD libvdpau-1.1.1.ebuild 1165 BLAKE2B 6fb9d1bdac07ea034a84c7d30377c745458069c25fe472e03be4a1a37aafce067fcfe8983e3e3b97d7445dfd42d72258834ebc4fd19a5d3d10f409528d490c37 SHA512 932f0a2b09e6cd324847e035c9d28882ea4b4dfc268df68c280b288bbc0e22a5da83e4d0965b2b7e605f54724a5c52600c6e2055481b7635841f9b61d6bd495d
MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/x11-libs/libvdpau/libvdpau-1.1.1.ebuild b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
index 37cf439581e5..a9de7350064c 100644
--- a/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.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
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
media-gfx/graphviz
virtual/latex-base
)
- dri? ( >=x11-proto/dri2proto-2.2 )"
+ dri? ( x11-base/xorg-proto )"
src_configure() {
append-cppflags -D_GNU_SOURCE
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 1aeeb7b9dae9..0716302a3012 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,7 +1,3 @@
-AUX libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch 8094 BLAKE2B 1c5938cfc89201682ed1b4e777ea534ce5e1dd9d66cdcc452a641fa56b95d76b48756cf1e70ef5f03f693505e9c2e70b58c19f109839c239efc380ffb046658e SHA512 0775a4c98bda6d37a44c83ed67d8ec7c8bece1d4a7b0f3d06d7f7c16596cb5de27a77e1ef1f40921555a60a3054124c8c1192c8b4747a3a84d16d847341379b7
-AUX libxcb-1.12-fix-inconsistent-use-tabs-space.patch 2515 BLAKE2B 74b2969e976ce7736232a5caa35d7ab525cefdcc7915db2ea5a3333aa356e7995935a40ed0b1362abbe2d72e3ef5a847aa22d780a9267cf785a8540257967a4a SHA512 ad3b9d9b16b42756a72e583b7d42bd670ef581b614cf185de667badb6121524b84f2738933d2ea1e5da3d135b3a5f2296eb62206463bedc9e4d3f8343f476f85
-DIST libxcb-1.12.tar.bz2 613822 BLAKE2B 61f164ba6fb9493fe0692badc74a2866ee08ce3c3499773be0bddf742d0ffc69bb876233aae46a7e76cb9263485eb007d105b16091a73750d490da0528482ff2 SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896
DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c
-EBUILD libxcb-1.12-r2.ebuild 1788 BLAKE2B 005e197d4ab0a47f500f7391b19edaa6992af4f3c42151d40b32a90e55bf520e58f77238fc84abc18bf746797f546519931b46af4263e4727e54b6fd96f72f08 SHA512 d95d60568dccb221be4786eb55c0b35cfce848d6091e8102f382f986af8d1c51a20c57ddc15da29c26fd4f53d661f01dea00475d56a4f697961132908acbbec7
-EBUILD libxcb-1.13.ebuild 1481 BLAKE2B 3252cfff6300ed6abc082487041c06f68ac21ed823b6d947ef26c4c5f0fabdc2367ce02b5e62be27da292a57b82f009a372b70dcdffe41d5c04c67c1eb1238c0 SHA512 0fd3f22b0176bfef908718a37254bff6054145cd163b1a0137884623c62ae8945fbfad192008c9ac2d59d2e5c4652dc2657ddcb8b787f0409bcce3ac681eda88
+EBUILD libxcb-1.13.ebuild 1480 BLAKE2B 7f3fbfaef1ed787023ee3a89223d847290f125dfed4bce76c97e66fcb7b785c027e2a5b9084313d0a4350789e9e8f3b60262e49df5a9ce488fae0de8bc0bca51 SHA512 8a81b7791eaba7057579a5de35305b4abd92665a254afe26403a14c4202b58b6b5291c0e431f229b959bc6994e05ace2a3403251d3da2f8170cef8db7d716c47
MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
diff --git a/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch b/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
deleted file mode 100644
index 0f8aa1198234..000000000000
--- a/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From e9b5234b3b0b53bd3a35f947ddb8a72d03cf1825 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Mon, 29 Dec 2014 20:18:22 +0100
-Subject: [PATCH] Don't install headers/man pages for disabled extensions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugs.gentoo.org/show_bug.cgi?id=533906
-
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
----
- src/Makefile.am | 52 ++++++++++++++++++++++++++--------------------------
- 1 file changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5a3c52a..774ad8e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -24,208 +24,208 @@ XCB_LIBS = libxcb.la
-
- # FIXME: find a way to autogenerate this from the XML files.
-
--EXTSOURCES += composite.c
- if BUILD_COMPOSITE
-+EXTSOURCES += composite.c
- lib_LTLIBRARIES += libxcb-composite.la
- libxcb_composite_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_composite_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_composite_la_SOURCES = composite.c composite.h
- endif
-
--EXTSOURCES += damage.c
- if BUILD_DAMAGE
-+EXTSOURCES += damage.c
- lib_LTLIBRARIES += libxcb-damage.la
- libxcb_damage_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_damage_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_damage_la_SOURCES = damage.c damage.h
- endif
-
--EXTSOURCES += dpms.c
- if BUILD_DPMS
-+EXTSOURCES += dpms.c
- lib_LTLIBRARIES += libxcb-dpms.la
- libxcb_dpms_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_dpms_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_dpms_la_SOURCES = dpms.c dpms.h
- endif
-
--EXTSOURCES += dri2.c
- if BUILD_DRI2
-+EXTSOURCES += dri2.c
- lib_LTLIBRARIES += libxcb-dri2.la
- libxcb_dri2_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_dri2_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_dri2_la_SOURCES = dri2.c dri2.h
- endif
-
--EXTSOURCES += dri3.c
- if BUILD_DRI3
-+EXTSOURCES += dri3.c
- lib_LTLIBRARIES += libxcb-dri3.la
- libxcb_dri3_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_dri3_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_dri3_la_SOURCES = dri3.c dri3.h
- endif
-
--EXTSOURCES += present.c
- if BUILD_PRESENT
-+EXTSOURCES += present.c
- lib_LTLIBRARIES += libxcb-present.la
- libxcb_present_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_present_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_present_la_SOURCES = present.c present.h
- endif
-
--EXTSOURCES += glx.c
- if BUILD_GLX
- lib_LTLIBRARIES += libxcb-glx.la
-+EXTSOURCES += glx.c
- libxcb_glx_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_glx_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_glx_la_SOURCES = glx.c glx.h
- endif
-
--EXTSOURCES += randr.c
- if BUILD_RANDR
-+EXTSOURCES += randr.c
- lib_LTLIBRARIES += libxcb-randr.la
- libxcb_randr_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
- libxcb_randr_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_randr_la_SOURCES = randr.c randr.h
- endif
-
--EXTSOURCES += record.c
- if BUILD_RECORD
-+EXTSOURCES += record.c
- lib_LTLIBRARIES += libxcb-record.la
- libxcb_record_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_record_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_record_la_SOURCES = record.c record.h
- endif
-
--EXTSOURCES += render.c
- if BUILD_RENDER
-+EXTSOURCES += render.c
- lib_LTLIBRARIES += libxcb-render.la
- libxcb_render_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_render_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_render_la_SOURCES = render.c render.h
- endif
-
--EXTSOURCES += res.c
- if BUILD_RESOURCE
-+EXTSOURCES += res.c
- lib_LTLIBRARIES += libxcb-res.la
- libxcb_res_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_res_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_res_la_SOURCES = res.c res.h
- endif
-
--EXTSOURCES += screensaver.c
- if BUILD_SCREENSAVER
-+EXTSOURCES += screensaver.c
- lib_LTLIBRARIES += libxcb-screensaver.la
- libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
- endif
-
--EXTSOURCES += shape.c
- if BUILD_SHAPE
-+EXTSOURCES += shape.c
- lib_LTLIBRARIES += libxcb-shape.la
- libxcb_shape_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_shape_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_shape_la_SOURCES = shape.c shape.h
- endif
-
--EXTSOURCES += shm.c
- if BUILD_SHM
-+EXTSOURCES += shm.c
- lib_LTLIBRARIES += libxcb-shm.la
- libxcb_shm_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_shm_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_shm_la_SOURCES = shm.c shm.h
- endif
-
--EXTSOURCES += sync.c
- if BUILD_SYNC
-+EXTSOURCES += sync.c
- lib_LTLIBRARIES += libxcb-sync.la
- libxcb_sync_la_LDFLAGS = -version-info 1:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_sync_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_sync_la_SOURCES = sync.c sync.h
- endif
-
--EXTSOURCES += xevie.c
- if BUILD_XEVIE
-+EXTSOURCES += xevie.c
- lib_LTLIBRARIES += libxcb-xevie.la
- libxcb_xevie_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xevie_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xevie_la_SOURCES = xevie.c xevie.h
- endif
-
--EXTSOURCES += xf86dri.c
- if BUILD_XFREE86_DRI
-+EXTSOURCES += xf86dri.c
- lib_LTLIBRARIES += libxcb-xf86dri.la
- libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
- endif
-
--EXTSOURCES += xfixes.c
- if BUILD_XFIXES
-+EXTSOURCES += xfixes.c
- lib_LTLIBRARIES += libxcb-xfixes.la
- libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
- endif
-
--EXTSOURCES += xinerama.c
- if BUILD_XINERAMA
-+EXTSOURCES += xinerama.c
- lib_LTLIBRARIES += libxcb-xinerama.la
- libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
- endif
-
--EXTSOURCES += xinput.c
- if BUILD_XINPUT
-+EXTSOURCES += xinput.c
- lib_LTLIBRARIES += libxcb-xinput.la
- libxcb_xinput_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
- libxcb_xinput_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h
- endif
-
--EXTSOURCES += xkb.c
- if BUILD_XKB
-+EXTSOURCES += xkb.c
- lib_LTLIBRARIES += libxcb-xkb.la
- libxcb_xkb_la_LDFLAGS = -version-info 1:0:0 -no-undefined
- libxcb_xkb_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xkb_la_SOURCES = xkb.c xkb.h
- endif
-
--EXTSOURCES += xprint.c
- if BUILD_XPRINT
-+EXTSOURCES += xprint.c
- lib_LTLIBRARIES += libxcb-xprint.la
- libxcb_xprint_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xprint_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xprint_la_SOURCES = xprint.c xprint.h
- endif
-
--EXTSOURCES += xselinux.c
- if BUILD_SELINUX
-+EXTSOURCES += xselinux.c
- lib_LTLIBRARIES += libxcb-xselinux.la
- libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xselinux_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h
- endif
-
--EXTSOURCES += xtest.c
- if BUILD_XTEST
-+EXTSOURCES += xtest.c
- lib_LTLIBRARIES += libxcb-xtest.la
- libxcb_xtest_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xtest_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xtest_la_SOURCES = xtest.c xtest.h
- endif
-
--EXTSOURCES += xv.c
- if BUILD_XV
-+EXTSOURCES += xv.c
- lib_LTLIBRARIES += libxcb-xv.la
- libxcb_xv_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xv_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_xv_la_SOURCES = xv.c xv.h
- endif
-
--EXTSOURCES += xvmc.c
- if BUILD_XVMC
-+EXTSOURCES += xvmc.c
- lib_LTLIBRARIES += libxcb-xvmc.la
- libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
- libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
---
-2.2.1
-
diff --git a/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch b/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch
deleted file mode 100644
index bbac9a96fc3b..000000000000
--- a/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <wiz@NetBSD.org>
-Date: Thu, 19 May 2016 17:31:18 +0200
-Subject: Fix inconsistent use of tabs vs. space.
-
-Needed for at least python-3.5.x.
-
-Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
-
-diff --git a/src/c_client.py b/src/c_client.py
-index 57de3fb..043338d 100644
---- a/src/c_client.py
-+++ b/src/c_client.py
-@@ -1364,7 +1364,7 @@ def _c_serialize(context, self):
- _c(' unsigned int xcb_align_to = 0;')
- if self.is_switch:
- _c(' unsigned int xcb_padding_offset = %d;',
-- self.get_align_offset() )
-+ self.get_align_offset() )
- prefix = [('_aux', '->', self)]
- aux_ptr = 'xcb_out'
-
-@@ -1390,7 +1390,7 @@ def _c_serialize(context, self):
- _c(' unsigned int xcb_align_to = 0;')
- if self.is_switch:
- _c(' unsigned int xcb_padding_offset = %d;',
-- self.get_align_offset() )
-+ self.get_align_offset() )
-
- elif 'sizeof' == context:
- param_names = [p[2] for p in params]
-@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field):
- # from the request size and divide that by the member size
- return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))'
- else:
-- # use the accessor to get the start of the list, then
-- # compute the length of it by subtracting it from
-+ # use the accessor to get the start of the list, then
-+ # compute the length of it by subtracting it from
- # the adress of the first byte after the end of the
- # request
-- after_end_of_request = '(((char*)R) + R->length * 4)'
-- start_of_list = '%s(R)' % (field.c_accessor_name)
-+ after_end_of_request = '(((char*)R) + R->length * 4)'
-+ start_of_list = '%s(R)' % (field.c_accessor_name)
- bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list)
-- return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
-+ return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
- else:
- raise Exception(
- "lengthless lists with varsized members are not supported. Fieldname '%s'"
---
-cgit v0.10.2
-
diff --git a/x11-libs/libxcb/libxcb-1.12-r2.ebuild b/x11-libs/libxcb/libxcb-1.12-r2.ebuild
deleted file mode 100644
index 922c0eb9855b..000000000000
--- a/x11-libs/libxcb/libxcb-1.12-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-XORG_EAUTORECONF=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
-[[ ${PV} != 9999* ]] && \
- SRC_URI="https://xcb.freedesktop.org/dist/${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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test xkb"
-SLOT="0/1.12" # Locked down for now to 1.12 to avoid further rebuilds on no ABI changes (e.g with any upcoming 1.12.1 bugfix release), bug 576890
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
- test? ( dev-libs/check[${MULTILIB_USEDEP}] )
- doc? ( app-doc/doxygen[dot] )
- dev-libs/libxslt
- ${PYTHON_DEPS}
- $(python_gen_any_dep \
- "~x11-base/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
- has_version --host-root ">=x11-base/xcb-proto-1.11[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch"
- "${FILESDIR}/${P}-fix-inconsistent-use-tabs-space.patch"
-)
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable doc devel-docs)
- $(use_enable selinux)
- $(use_enable xkb)
- --enable-xinput
- )
- xorg-2_src_configure
-}
diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
index 1cf7f6bf9b02..dcb64fbaa989 100644
--- a/x11-libs/libxcb/libxcb-1.13.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.ebuild
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
[[ ${PV} != 9999* ]] && \
SRC_URI="https://xcb.freedesktop.org/dist/${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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc selinux test xkb"
SLOT="0/1.12"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 2c56c04585b9..5fd27cc4369a 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,9 +1,3 @@
-DIST libxkbcommon-0.6.0.tar.xz 608700 BLAKE2B c82ce8dd9971e53161630d044b48fc5d11011d828ac20f5918a985a3c38c05e85ee3864610238d77a78b7295d7f95a074cec829767e31d1629d23cc8811ea539 SHA512 b70ff4b3b85f03cc2875622ccfa60ba6f1b86a07be90df8be73b867771dd08a85740df95fe8dfef2bacf4356a6dfc9c51523ec6ce60d197184860577b39586c4
-DIST libxkbcommon-0.7.1.tar.xz 622384 BLAKE2B f45c0a8f882504210e1fd7d4535643cb4245b3fdfedc03a73fd1c149ee32149431d1ae3f0a54a27a28dc05a70c6701c314f07f252da9363e5b8124f1b9f1c18d SHA512 9f209214d5d7f9334cabb2cd7e0d9b9b0392c1fae06b60e92a03398875399fe48754b543389f78b8b06dd28a86dfd440720e534bae309ca8ef882eb874dce4e1
-DIST libxkbcommon-0.7.2.tar.xz 630276 BLAKE2B df4f29be0583f40008b48077dc5d4c0de7bdf66fc5df6e6df723f59623cbc681578f40fa5240fbef62ea785aed049805b65bfce82eb6497a4eaa27660103a10e SHA512 4a06f9d719393a34689fdd74b0cce80af20e26cc5bd6e1b34fff4093a4f8f103704bdc54f0245b62903cdd7529cd8d59864924b9f4ddab314d152804da4da649
DIST libxkbcommon-0.8.0.tar.xz 643456 BLAKE2B 37f8e8ccff63354dc37ec26091a7da28f5a1f05ca0656b03716cdcdbf3172344d600b3b2b646da309ea3e4f04bde1b1279c96b07c493266ec6489935177efbbc SHA512 ad64baa03685b72e1047f9fdfc95661acf5bace59280a95d3defaca73c91fb77c31ecde00b430726e3521ff90cf8dd93ecbc816c18be0971cb616e00b81cf163
-EBUILD libxkbcommon-0.6.0.ebuild 951 BLAKE2B 37edc93a4af4e6f76d0e94e478cee9633ff0c945f7ad8dd5d15ff8d41231f9d6b820e4e001cdd9fd2f2cc0da444281b9637fd0778e6971b5907351f63ffeadcc SHA512 de65aee937a33286f600d70aa94d75b312c3ef54f1234054b26414db5699927108d20ed1b43fd1f4a4e6bb1fa165ca0d568da18b1aee840c40d1a19b25f548ca
-EBUILD libxkbcommon-0.7.1.ebuild 986 BLAKE2B b5fbcb23d89770c2c138623d3e8b57bdc57bfad1de2b63c547fea5b8bf1e43f2759d5d8fcec336873321d87321eb1f5e30bd2ac525ea74b8b04db8c80609f9b5 SHA512 cd5d6383fd37932afc59a79c8018da07e81e706906f384f79bf5bf0603a1c921073add913433fd216c046bacbb7cf4be90991f322d5408aa2513aa59f5564506
-EBUILD libxkbcommon-0.7.2.ebuild 995 BLAKE2B 277162985edb0258a290a6cdc0f3efb7a70f3ab7933cf414ccac08eed25c7b1863502405a5ddf1f55b1a0c37caffbb75d86d5b3cb5e984ae240a5c324c819b89 SHA512 b6fcbfe5723191ebf1390b63b21c49142f952b138e703c5715f693670a8eb8039f5808135ef7ee57d7b84f038d6d12be4c47d758f4aa91e079b37abd56c6f543
-EBUILD libxkbcommon-0.8.0.ebuild 1006 BLAKE2B c5d3d2d0bc924011083a281bfed1e14e26200c0676d79b4e3c619a0c17db7d339ef2e70dc51b433cf89ccd2c337aea75e7e3a5eb66bf65fa1ef3484ba82c9472 SHA512 6348410e210f78c7757566a6ba5d5be7aa7637c22e2fe93c578664c4b6352d091d36a20f719868c352251c3386a784a7d12f96b9df3bb86f35740c8d33e275e2
+EBUILD libxkbcommon-0.8.0.ebuild 927 BLAKE2B b61005d7c7bf19d47222572da239a90d15ba4d5e1ed3bed32891ed4bcfb5da66a102190630d3f004d33da0ac81aaacc0b1cccfd5d506c312883df275e1beffb3 SHA512 583c890dda84aa07a0ad9a42afde72e57c6ec8a6bcd808dceca9a82aea1e2ce5d8b633eedf8a9539f647eeb108ad8135d0a357efd770c711dd465524abb3a91d
MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild
deleted file mode 100644
index 69ff6c0b4422..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_EAUTORECONF="yes"
-XORG_MULTILIB="yes"
-
-if [[ ${PV} = *9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
- EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
- XORG_BASE_INDIVIDUAL_URI=""
- SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-fi
-
-inherit xorg-2 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="X doc test"
-
-DEPEND="sys-devel/bison
- X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
- doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-pkg_setup() {
- XORG_CONFIGURE_OPTIONS=(
- --with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
- $(use X || use_enable X x11)
- $(use_with doc doxygen)
- )
- xorg-2_pkg_setup
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
deleted file mode 100644
index ab4a07d9ac54..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB="yes"
-
-if [[ ${PV} = *9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
- EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
- XORG_BASE_INDIVIDUAL_URI=""
- SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-fi
-
-inherit xorg-2 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="X doc test"
-
-DEPEND="sys-devel/bison
- X? (
- >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
- )
- doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
-
-pkg_setup() {
- XORG_CONFIGURE_OPTIONS=(
- --with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
- $(use X || use_enable X x11)
- $(use_with doc doxygen)
- )
- xorg-2_pkg_setup
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.7.2.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.7.2.ebuild
deleted file mode 100644
index 0a4987e6ce5a..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.7.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB="yes"
-
-if [[ ${PV} = *9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
- EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
- XORG_BASE_INDIVIDUAL_URI=""
- SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-fi
-
-inherit xorg-2 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X doc test"
-
-DEPEND="sys-devel/bison
- X? (
- >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
- )
- doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
-
-pkg_setup() {
- XORG_CONFIGURE_OPTIONS=(
- --with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
- $(use X || use_enable X x11)
- $(use_with doc doxygen)
- )
- xorg-2_pkg_setup
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
index 8cb418863fbb..1957a763a86b 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
@@ -17,14 +17,13 @@ inherit xorg-2 ${GIT_ECLASS}
DESCRIPTION="X.Org xkbcommon library"
HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
IUSE="X doc test"
DEPEND="sys-devel/bison
X? (
+ x11-base/xorg-proto
>=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
)
doc? ( app-doc/doxygen )"
RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 49f1f4fbd700..640c2f653334 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,4 +1,3 @@
DIST libxkbfile-1.0.9.tar.bz2 348009 BLAKE2B 2b4f398c7ef35ae6fcae8491733669408db98a27c2351514ea1cd0332a34cd995a34d18013c0ed2a70977935ee1dec527f744bd3a01530e6eefcf715752be9e1 SHA512 5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1
-EBUILD libxkbfile-1.0.9-r1.ebuild 540 BLAKE2B ed6bfd34655030deef6138d1096d46608a7720f087bde1d5bd3395b5a572f77887f92d7a6d6c510acc86638af3676eedf83bd030335a369dd6af0226189ab0a9 SHA512 53a44e414a40c3f08ac2fbbca67c1129365a5a744d2b8db04093c9f2a947279b8108ae978590a4a826cea041f13a8b48149fac579fcadb2e36e2c760b988ce80
-EBUILD libxkbfile-1.0.9.ebuild 481 BLAKE2B 6d1d85f609322d52bd2c2d8e863d312565f7a44ac43b52b980804e5f1f01dafed3852e97170299444dc675996aea787376aeb81e9c1374e0a22b5937029412fb SHA512 699f1c1b354f820c126118385a8f5322b8d3609f36b3ee4f51d3bb74de85e2e0e64c1bd9f8e71e60bef08685b7011f0f4fd1199797f014f00b9c78883319a323
+EBUILD libxkbfile-1.0.9-r2.ebuild 521 BLAKE2B e9ebab7506e0d0355ca50eacf34474508a1029da39505785732e1f0797a5f5d97adbf5370846e02311a23cfc891bb01076a64e24592ba0e2b2f100a09b83da73 SHA512 279faec968a64dd75afa950d9a979ad29999166a911b927ad58b769c7527ceacbb6477eb8a6c4d7a6f269a3005a63fc429869d28f43750f1b299ccb89997b177
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild
deleted file mode 100644
index 04384a61af93..000000000000
--- a/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org xkbfile library"
-
-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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-proto/kbproto[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
index f5e0823304ec..c624ff0d36f7 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.0.9.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
+XORG_MULTILIB=yes
inherit xorg-2
DESCRIPTION="X.Org xkbfile library"
@@ -9,6 +10,6 @@ DESCRIPTION="X.Org xkbfile library"
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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
-RDEPEND="x11-libs/libX11
- x11-proto/kbproto"
+RDEPEND="x11-base/xorg-proto
+ x11-libs/libX11[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbui/Manifest b/x11-libs/libxkbui/Manifest
index 64ef6fc22fc9..62b921fa060e 100644
--- a/x11-libs/libxkbui/Manifest
+++ b/x11-libs/libxkbui/Manifest
@@ -1,3 +1,3 @@
DIST libxkbui-1.0.2.tar.bz2 221435 BLAKE2B a2d5bcbc4960888516e4c1c0b7458411c9374629e459e1e55173a7c2bde17b685e155e3a3392a8c8e3a06d9cf685a7c247547308adf49a04e236275b5e0cd33a SHA512 ccfa2c8f740ae66e5b7c2ed19a8243696a34fb60d45d8d01bb540eb925d69c95ebe16b7a54f4362acc3170b1543f44eea8910135b11c4af88abce3637726062d
-EBUILD libxkbui-1.0.2-r1.ebuild 410 BLAKE2B 6e02300b4f90c398658fef16e39441e4948017ffe3fdefef7fcd75b2fe22e9062bddee3b18c3e220682aa4e273e757fe81153f968697bb6bad235285b5740204 SHA512 16e4a02c134d16c9b9bb07b071b51e4ed9a0d0dfd3099edf310745f0144fb70c9e871baf0c59ce51096cf30c3185b41e3bebfc6abd28107cf9900cfb371a016a
+EBUILD libxkbui-1.0.2-r2.ebuild 412 BLAKE2B a2d8f34f6d208783117d8bf94b839fcfd8f62de95eb0a310fe1d4c32a1a75e4b31bc0a64aaad19c13671735d39430ec34422d5714d433e1a0c8c84e0e7304196 SHA512 859c5da62e01faac64a1d234b57700aacb01d4f451a8e58e15b6ad9bd39dd48968d82fbf74ad6410ef3782aa5d0714bf531c108eb39d5bd3a575d3a73f2fe7cc
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild b/x11-libs/libxkbui/libxkbui-1.0.2-r2.ebuild
index 01a06ba109a1..364ee589207c 100644
--- a/x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild
+++ b/x11-libs/libxkbui/libxkbui-1.0.2-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
@@ -9,7 +9,7 @@ DESCRIPTION="X.Org xkbui library"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
-RDEPEND="x11-libs/libXt
- >=x11-libs/libxkbfile-1.0.3
- x11-proto/kbproto"
+RDEPEND="x11-base/xorg-proto
+ x11-libs/libXt
+ >=x11-libs/libxkbfile-1.0.3"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 03fbaaf409af..06b7fc6a8120 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,7 +1,3 @@
-DIST libxshmfence-1.1.tar.bz2 291347 BLAKE2B 76b9f91e2bd03cd52212ca5ac548d7f4c64ad93bb0e2c8e2ecc719b820295fc53521089241bd9e7e892dbf60c1644bd73fad93732b95aa552e1121a4e8359404 SHA512 ed3aae4a44849c11ce041df53d47667606dba5357059c13d5c0989205df57dfa626598db6ad66432114a80e69ab4118fb067877ea275897aab64d4bbf9bcd346
-DIST libxshmfence-1.2.tar.bz2 267170 BLAKE2B 16e253a9f8e567cab048f8b54838929f8e78d222549c854baa682ec6736e5dd13d3cb5d1b9c2635d79b1bf41ee03dded0fac1845fbeedd07385c173f2660567f SHA512 340a6dff5c7ce7f0fe89d8094ee91a0572c8bf0da888861c5262d6a65a13ecad0e2a079949ccc115e15a2d0d108c4f1ba1743874289cacbbc17aa3a05cd8e072
DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
-EBUILD libxshmfence-1.1.ebuild 464 BLAKE2B 0688f6dc0549ce92f64ff70181e7f810c79c22a09fe669bbc5224e2cbc8d030b80375ad227b74c8c44b3b35ea9d47f14c0265792e563bb5a99ba3a89baa73ccb SHA512 d4bb938b7975702ea7d979c93c27a34e6e6181c445325b4a750322ef181e3b564f4ba9e08cb797a475bfbb29bb4fd47735c0cd6f8fa299f57b73c1b43134453b
-EBUILD libxshmfence-1.2.ebuild 466 BLAKE2B 26bdef08333387bc8f9a4ad2f358129307e644b34f370de616b6c07e72cf1ae883b428eff2743b7029905a5acf786d61eba8db42c9063b880aed52226806d5d8 SHA512 4003a74a9b05c1813cd078eec0a25c56b6efdc5bc43721a8ae9fa1570a6c9de31ce027d2a8b5615b99c03dc55a9e0dc38eb95212bcd4f2563eecc6b901dbfdb7
-EBUILD libxshmfence-1.3.ebuild 467 BLAKE2B a24b9281d272ab63a9dfecfdbc60ad730d22a9f14e422136f9e942e6c06cc471e4f77aa9bffe13c7a7fab45eaf0b70cc8b765bb4d397b12c5285500d70fcee12 SHA512 d0a18a03a0cfc712924d16b1a884be9d4ca9bbd44671d17f2873bfb8fbb091987e31e585ea99b8bbd22cb1dd06253c0e3a2acc7ba0ff8584c0898b14bb6bc6a4
+EBUILD libxshmfence-1.3.ebuild 426 BLAKE2B 6bdf3a30c37bfa20dd1b0df2b33e07ea683b5c84aa0dc3ba398e0cf6a5dbcb678bf1896e5aed707fb7326655be50fdffd93d1ebf17a75943580397529cca108e SHA512 4b3821f758847c1f19d64464e2b4eae8e20b44ca567e35211daa9efdbf5017eb2300f2fd9574aa5b413c604df143d33f09c6f66636e25e91f7e3560fbd48ce27
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.1.ebuild
deleted file mode 100644
index b94851a8c876..000000000000
--- a/x11-libs/libxshmfence/libxshmfence-1.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Shared memory fences using futexes"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- ${RDEPEND}"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.2.ebuild
deleted file mode 100644
index 8006b0c50cfa..000000000000
--- a/x11-libs/libxshmfence/libxshmfence-1.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Shared memory fences using futexes"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
- ${RDEPEND}"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
index 956711331662..4d71010ce83d 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
@@ -7,9 +7,8 @@ inherit xorg-2
DESCRIPTION="Shared memory fences using futexes"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
-DEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
- ${RDEPEND}"
+DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index 941141abcefc..e90d3abe483b 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,4 +1,4 @@
DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
-EBUILD neXtaw-0.15.1-r1.ebuild 765 BLAKE2B a5182f859dbf61532b29bf93c1cbfcd878b63aebffd027f7cbfa7f9deb311bc62667f82beacc11fa3b54c253cc7b412b944582d8cae108d1064ff4c1bacdffc5 SHA512 6cabdab5a5020a065b0ddeb37c618b30ad17eb819cc7899da6891ed4f09859843255bfab278b50b48a9776b56da16980cd8278f79666f0321c44657c6c965d90
-EBUILD neXtaw-0.15.1-r2.ebuild 762 BLAKE2B d583d902bc9e86986a5b45554ef5ad334b7a56a31b989879944680a57a8415d5335c7d8bbce70335db00cd707133d14669ffd5ffee0ea5f4153503bc114af543 SHA512 fbe9f245893941df3c766012d9248da13d8fd70da40903aede71396859b7e5042ab3ce056a7834c74902ffb359a3dccb0362da00029afeda53468f942c411eec
+EBUILD neXtaw-0.15.1-r1.ebuild 747 BLAKE2B 0bd1a1abcddf3bb38b92f32374738f0d77cf4d6c49e767d64843c6373cd9ea892b87c3f3f71c0e5945b5d49b1136f5c0f91a76301c6aa0d7e1da1a26467d97da SHA512 ff3cade37f66d9a02ee8eb87ff76b5640bf78a7b0d03e6c4676d40c9c9dd65fb7e975123e94d1fe1aeb52bebca9632c51399b9652ef01123e93931c014bf96c8
+EBUILD neXtaw-0.15.1-r3.ebuild 744 BLAKE2B fac4af8c7983b7c5b6dac20937750dc4548f2e2169ae0d76366ea4e870c99979142f3b92103bea50752553d9b4c1887898772ffcb8f20427aba755e3a93a2195 SHA512 50ba4b1c6fbf39c068cfba85dc77c34bcd2ee2bfe156d64dbd40fbebb81765aab79e0a16ba7514154cf3dde70e5be3982941c387edd76ac0e21c42dca1870fff
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
index bad687e8b025..8af31b14ee62 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
@@ -12,7 +12,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE=""
-RDEPEND="x11-libs/libICE
+RDEPEND="x11-base/xorg-proto
+ x11-libs/libICE
x11-libs/libXext
x11-libs/libXt
x11-libs/libX11
@@ -20,8 +21,6 @@ RDEPEND="x11-libs/libICE
x11-libs/libXmu
x11-libs/libxkbfile
x11-libs/libXpm
- x11-proto/xextproto
- x11-proto/xproto
!<x11-libs/neXtaw-0.15.1-r1"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index ea38789cddfd..8d08b1607971 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
@@ -12,7 +12,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE=""
-RDEPEND="x11-libs/libICE
+RDEPEND="x11-base/xorg-proto
+ x11-libs/libICE
x11-libs/libXext
x11-libs/libXt
x11-libs/libX11
@@ -20,8 +21,6 @@ RDEPEND="x11-libs/libICE
x11-libs/libXmu
x11-libs/libxkbfile
x11-libs/libXpm
- x11-proto/xextproto
- x11-proto/xproto
!<x11-libs/neXtaw-0.15.1-r1"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 2424ab1909bb..79f6b510a201 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,7 +1,7 @@
DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06c1686ac07aa08b587bfba761a834e698f033bdb79666ea6ddd6c1f672ce968897c7594e4467c5b6dee644877e SHA512 772792edac9ab5b6f76617cd3512432ca6b9af1d5ee6bfb87d0b60293f560026d479df059da66f53ba567f916a275e82f1cdd17ca75bb0da7ae2a79d4a75ed6d
DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
DIST pango-1.42.0.tar.xz 824984 BLAKE2B 2ea7b5d0d95c91b61ad8f841e75d7431f405ba1c1a01acef52364d3143c4e99f6ba66d03b52e7e94d4074edc7a116e4c9ffa16b7538851a82ec0b638c8f83f05 SHA512 32f621f7af65102ddf7f5ad949c1a9da9a559259255de42a6c0e7992b8692088f6701a4e11558c4243edc881cb8907defd6712f4c2bfca4bcadfe1cb5009b59f
-EBUILD pango-1.40.12-r1.ebuild 1701 BLAKE2B f97fb2dc9cf1f55c91e0b0b5059ba7b739e0f1017b5c58dc73cbb8758bd42645d4afe5a2ff36fd5c22cadbdaa4285e035afd48bf7890b3cee58232f35057766b SHA512 54102b30b15ee4ec75ff087282ee1cfc6cd99a5c26df5fa49b566191e93e1cffe825a5af5a91e4aa23bf4c197df61717a8d22706d7ef6cb8190d56145bb1abe9
-EBUILD pango-1.40.14-r1.ebuild 1701 BLAKE2B 08aab38b70ab96697395dce5420c50ec000f3d6c51322a42136f07dda38caf78c79bbbcd7bd569c56b8abc853eeb631d6f0865f650af7fe398ff7f36af77956d SHA512 f7474728b77fd1c2ee5095035a182fb90f325e6094e6f130ee575d6655c1c5b558929b87b8f56c1b67854913c6fd61f3658d7cb99ef79e372883483655990872
-EBUILD pango-1.42.0.ebuild 1757 BLAKE2B 88a70aa9f599d1271b94703b35ed67c6b44e9585fdae33662494dd208ca86325c0053203709c76cd40dc64cc90510ce4872a6abd6477dab9b84ca599343b760e SHA512 38297cf108af940d5679f556de1b0385795149c85193fa4d1220e3b69829e2963f46a7d10b06dc25e78922a0df5822a599d90ad2e9a1485d25bc5f2c35b94899
+EBUILD pango-1.40.12-r1.ebuild 1675 BLAKE2B ebad2b225bf4182438ce05b45ba8d99dcf89b730c24408e96ad266144007ac9f26559d51d5a42d6c678acf37d24b93fa0707653bf114af614b2d4781a7980337 SHA512 03dd6d7d005e1f7753a630af3be6bc299dbff0832a6200c81b2b2a53e334aeb2ce1cc9ed8a622692c0b78cc60306851dfadf2b57511e1e30892340caf7c0524e
+EBUILD pango-1.40.14-r1.ebuild 1675 BLAKE2B afbf20e48ff6f0164ec598f17485becb136b51ae297c6e4daeaa38c43d63255627cb3c7293916cb7d6a959fed09c5a098f4112394d2d9a410d0f3ff81fb3c15a SHA512 b924bbde81ae8ae830bb049e96b40fc26fc1767e59c2a3dc96fb13828d55feded75198b324ef436e5c850342a36a1f2bd585001b99b9a10aec97df281f7dd925
+EBUILD pango-1.42.0.ebuild 1731 BLAKE2B f9bb73c5885d5fa2852cdbc67116850fc3f783c0edc924ec34d60c6bfc5b6edfa2e67ca00e48270aed88d8744bbc55558ec3e9709d187accc80a9abc1d72cc15 SHA512 1947849d7c8bf0590964d50271c0356ce8ff07af4fd90eff5dbf90456e980607d43f3cfe3d36d7e774cef56d045f2150dff04de2998e79327df8ce102be1130f
MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.12-r1.ebuild b/x11-libs/pango/pango-1.40.12-r1.ebuild
index 7097e5a810ec..fd8b2eb1f4ae 100644
--- a/x11-libs/pango/pango-1.40.12-r1.ebuild
+++ b/x11-libs/pango/pango-1.40.12-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.20
virtual/pkgconfig[${MULTILIB_USEDEP}]
test? ( media-fonts/cantarell )
- X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+ X? ( x11-base/xorg-proto )
!<=sys-devel/autoconf-2.63:2.5
"
diff --git a/x11-libs/pango/pango-1.40.14-r1.ebuild b/x11-libs/pango/pango-1.40.14-r1.ebuild
index 94f249b25876..f9569a296132 100644
--- a/x11-libs/pango/pango-1.40.14-r1.ebuild
+++ b/x11-libs/pango/pango-1.40.14-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.20
virtual/pkgconfig[${MULTILIB_USEDEP}]
test? ( media-fonts/cantarell )
- X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+ X? ( x11-base/xorg-proto )
!<=sys-devel/autoconf-2.63:2.5
"
diff --git a/x11-libs/pango/pango-1.42.0.ebuild b/x11-libs/pango/pango-1.42.0.ebuild
index 888df2f5b938..3fa51895fb50 100644
--- a/x11-libs/pango/pango-1.42.0.ebuild
+++ b/x11-libs/pango/pango-1.42.0.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.20
virtual/pkgconfig[${MULTILIB_USEDEP}]
test? ( media-fonts/cantarell )
- X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+ X? ( x11-base/xorg-proto )
!<=sys-devel/autoconf-2.63:2.5
"
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index 88df377b19fa..6d14c4977d4b 100644
--- a/x11-libs/startup-notification/Manifest
+++ b/x11-libs/startup-notification/Manifest
@@ -1,5 +1,5 @@
AUX startup-notification-0.12-sys-select_h.patch 928 BLAKE2B 048e3a834d6ec993d629bd72d13fc3008b7c52885cd34f5b057c77c5be3b8601e05d5280443eb567696ff5e590f49f3b6f184971c92e8bffc8b94cd1103e9b81 SHA512 5f89b2747a2e5d633229b2e858380919121bdfd8f5788898824115fe5c4f60ffb51d0303830b7896657a96f4c2468de0ada0a72782a48cb990d614a1805e91cd
AUX startup-notification-0.12-time_t-crash-with-32bit.patch 3377 BLAKE2B 2ed2cd342d606e6d3a2065aa127b7c1e2f6352c9e8142795d2a3a654706d771ec5a8cd1c26d5f75538d8961d081577cc3738d1c169790ebe954d3ade07f1721d SHA512 b1bbef28012a08e265e19296f6f6b1adf4bf82efa2d585680f06a352258deee6f2d8b2f842a8f27febe78f23048afe5f39fe80bd555b826aec927d14a289928d
DIST startup-notification-0.12.tar.gz 355285 BLAKE2B 9822de9745fdeef28d7c6422d2a967394ffc329e7f37e1676c79e900f8e776578698ef47ff199fa05aa795540382f5eab5cb63f6cb20512328897236df1ab152 SHA512 ea1246acdb50dafd9ced9914ec3c8f0d499c0ca3cfd447b43a444c768a6e9ea7135e5c42d9ca0089354698ac235bd86d42f12c70a3a17c9c79f998c07461f7ab
-EBUILD startup-notification-0.12-r1.ebuild 908 BLAKE2B 2cd2b2a43822b952510ffc26ca1fdcafb1b2e6214befea3102af7cf6f3205b4322444ff484a1e32815591d0c73512edf3db9ae9e3ea12b3adbf7e1594611cd08 SHA512 9dcfc75f4180849c5fbb7b37aa27948db995a164de9d99d4da2e2924f648b93b42358a7ff8c353056044c7ae2c20c21c6e8eb5daabe4530a7abf70ae6e8a6d37
+EBUILD startup-notification-0.12-r1.ebuild 911 BLAKE2B a87e22d223216f16838e046dcf1c2466410ca57df10ed6ad94dae3020cd50b97f76f99b702cc78270ba179d87bcab0cc088e3a8f7d05b763cc489ca56d0fa05d SHA512 4af250d0a4daba92c7b6b61c3297b45dfed2c000f4646670fe6a95cabfb657d7c37675b54445142cf45ad79a824ed157ce0f5038911a327f8b0ab85f5d7daa3a
MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
index 6467a3f570eb..5ab3c6b03cbb 100644
--- a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,7 @@ RDEPEND=">=x11-libs/libX11-1.4.3
>x11-libs/libxcb-1.6
>=x11-libs/xcb-util-0.3.8"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( AUTHORS ChangeLog NEWS doc/${PN}.txt )
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index e1909ff258fa..ee97186cc631 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -15,9 +15,9 @@ DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873
DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
-EBUILD wxGTK-2.8.12.1-r2.ebuild 4790 BLAKE2B 556048e9d98cf57dbbf2cf5097101e1640576a0df596e296f0e500d672b417ab530f37469e8bd5cb8c656fe902c572ee4998782bd6a7b8dfd735f87d2f85e681 SHA512 688c1121691fcfd701f6b396aff2425e8aac5eaa644cf1e8d216145b975fb7edef709eae4e9ef0e847f1c3c189685b75f86791487dd4ac71edca579a49f896ee
-EBUILD wxGTK-3.0.3-r300.ebuild 5171 BLAKE2B 99b37ad239e16c3f7215859321e893bdca4271586291385c0616da70856352719b551f060f77cace1f269baa4a461f09832d40279f4bb2e5749b6198164a4689 SHA512 d3b11cc147bc7fd4bf1eb7d36772905d8fc36118a3ad970a92edddff60893b9f226b5e0d6915e719e49ab3c878bca88f664004831a9be998947f674ae28baff6
-EBUILD wxGTK-3.0.3.ebuild 4097 BLAKE2B becfe3d3c069ae85d9fdd342f5551cd8c2c45f207485edbf4243813e4346fa11b68c4cd88cfc42b94ca5b05937da1e182f22e107e58e90b0178aa8f68574a178 SHA512 6cca341d1076f359dc919d4fcfdc576bfd1c5af5cb841fecaff62eea87a7a0ef3cb6bffdc357d83329dc994391a5ac199968519698097ad4a59330844af4734f
-EBUILD wxGTK-3.0.4-r300.ebuild 5323 BLAKE2B 510bcad4bf61681a18c3b9da051abef88f41954565021258c6e2b28e9dced87a2be058d226f3f5b659caa21406a4f2b9f744bcf33c646c29c13dbab2fe986dbe SHA512 eaa3ac8e011f961b0db88c0454c33cb758ce5497634873b24de51e396191f55b2588ee67247b3ed43d0537dd4f8263b4b5e86625d1ae9a079147776e80787aed
-EBUILD wxGTK-3.0.4.ebuild 4106 BLAKE2B fb75b220d26bff5bd2440da2b0dc0f663b0f822468e7371834d514c61da63a41124ae72be5f77696aa9b43d7156fcf2feaba69300f18260aad8da02afe699b67 SHA512 4c7dc5aec444b20015b31064053f75d08f25f5c51a8c636a646beec40d0ff46005a130a30908fd307305762398ad490804675a6ec0136a0d63df4c77e176a5a8
+EBUILD wxGTK-2.8.12.1-r2.ebuild 4675 BLAKE2B b73898dba9c7e77e560e7ba9ab960dc2608d20db1c2debcf70f4101fea9a05b832c4912e102f2cf8e29d03090fc3b25bcaf2ff6f73b19504d3197564fdfabc69 SHA512 8580b8f943fbbec1b1df60f58880c83064533afd8a4b4f5156b02aa4042e85cb1bbf17939ac08aebdd2488082d7e0f5d16e4cbe0c70282e57e4696e4e9b5fec6
+EBUILD wxGTK-3.0.3-r300.ebuild 5056 BLAKE2B 187c4e043e912beee9a58c9796866493fe83b85e5c814b30029bf5e4d92a3c561d814cd41e635028d97b9e9d8b7dbdb9b19694023caed063976b9ec1b919d5fe SHA512 aa1ba5f27f7593e0a3f57010509169173ab6521f66890400d2f654f636cbc154723cc2fea403c02bdfca516ef7ec5cf83e71be74ef5cdc543b2676d01ec3d65e
+EBUILD wxGTK-3.0.3.ebuild 3982 BLAKE2B 5b49474a6ab03648d801c2cc1e1df298bb52b2cc61c2e957368f1d2bb06f910d20b533ab1cf80dcf9fdf124b9c37b56b9233b775e3fc07803173d440e3a28e29 SHA512 4c63f058ba1c7eded7978a9adac5637d3d4b40de6cdb92eb079eb697a3792581a32641f4d8e6062181d1c2e763e2528416691f5b4fe8d88d7bd41092eeda0509
+EBUILD wxGTK-3.0.4-r300.ebuild 5208 BLAKE2B 9355af8daad8a6715d6b97cb43a1b41a882ec47e35b3397b34c10d93b2037aba3b4cf459d336ea3087d590b2ff0dd041bec6fd30ab8b29631e53855b0895eb86 SHA512 d24eade694e2bb327bfe0b4770668ea3dc7e8b65ebad46af8dd9c25318856666e97edd63915f07f52cf851b1bc6cbe459618b3990864625b16bd545fc678c5cc
+EBUILD wxGTK-3.0.4.ebuild 3991 BLAKE2B 465bfd210702024644ad620e6522f136eaf02178a5833f123a38dcd7a4fdb73011351a11f51744c7a338f9ac89eecf0047560069e9af767d362cdc6f48ce1075 SHA512 6b7ed5761de66a29f1be5fbefc46b17e279aefd77b16c8cb39e66d0746f9cf1fa431858fa62da83f7546f26afcf6f5d1c3d8a7b26231293bbca36158978cd735
MISC metadata.xml 856 BLAKE2B 9f03dc05155eba5aee9ca7233d96dc7d0929df2a016dce4131b3b639358eea8ebbecfb5e7f59e7382f5467259885c14bcdc3df416a678f213cd58cd3096b4252 SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
index dc5c6587baac..5bfab6f5f38e 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.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="5"
@@ -51,11 +51,7 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
- X? (
- x11-proto/xproto[${MULTILIB_USEDEP}]
- x11-proto/xineramaproto[${MULTILIB_USEDEP}]
- x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
- )
+ X? ( x11-base/xorg-proto )
"
PDEPEND=">=app-eselect/eselect-wxwidgets-0.7"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
index 362ca7bb08f1..30890d5025f0 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
@@ -53,11 +53,7 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
- X? (
- x11-proto/xproto[${MULTILIB_USEDEP}]
- x11-proto/xineramaproto[${MULTILIB_USEDEP}]
- x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
- )"
+ X? ( x11-base/xorg-proto )"
PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
index 88e502ac3678..866cbd7ed0a7 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
@@ -45,11 +45,7 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
- X? (
- x11-proto/xproto[${MULTILIB_USEDEP}]
- x11-proto/xineramaproto[${MULTILIB_USEDEP}]
- x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
- )"
+ X? ( x11-base/xorg-proto )"
PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
index 3fbb85799fdf..e34473cc72ab 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
@@ -53,11 +53,7 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
- X? (
- x11-proto/xproto[${MULTILIB_USEDEP}]
- x11-proto/xineramaproto[${MULTILIB_USEDEP}]
- x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
- )"
+ X? ( x11-base/xorg-proto )"
PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
index b390c7f0ba4d..99c63f47bc72 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
@@ -45,11 +45,7 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
- X? (
- x11-proto/xproto[${MULTILIB_USEDEP}]
- x11-proto/xineramaproto[${MULTILIB_USEDEP}]
- x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
- )"
+ X? ( x11-base/xorg-proto )"
PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index 0c35e3f01aa3..95168c328442 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,3 +1,3 @@
DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
-EBUILD xcb-util-image-0.4.0.ebuild 958 BLAKE2B a73e50a878932a7f278d35bfa88a2a291760e04795e248c8da1bf555ff812de8c25d68e980fb594e32246abe377d341dbce6a7a976c08fa1ba408e2606e75022 SHA512 ad10fb839095e1bc3d06ebae80b9fb08fe16b79f589cd359d13ee82925d7e8652f89632257428638cfefae36bbc01b6e57c5934589d11920905919de3b8a2c1b
+EBUILD xcb-util-image-0.4.0-r1.ebuild 930 BLAKE2B 14ea04b689d704b49b002c1bb9c57c4493da9b7a82e65deba42b21c93acd6188d7f3ab749d98a53a403767545241ac949e1dfc46d09a34e81218038977ba9478 SHA512 976ce59cd496cdadcf04bd51d0f89a5faff97729136aa9ca03286706d30bfaeaa6756c5a1132de7e6d4a545cc1e266c61fdb3aeee2d9cf5d52cf94ab8a4424bb
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
index 193b84cdd4bc..ab30ac4feefe 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,9 +17,9 @@ HOMEPAGE="https://xcb.freedesktop.org/"
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"
IUSE="test"
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
>=dev-util/gperf-3.0.1
test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index bfd163938ff7..b06179f3e155 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,3 +1,3 @@
DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
-EBUILD xcb-util-keysyms-0.4.0.ebuild 903 BLAKE2B a2b594d912a216dd4a19f2cc4e88d6b3b63cdb1a9d19049454ef0082bdcdca4a435aff41c85c0a509c14cf9e2fce3e4b6f152191aae0a993b46fa7792a161b22 SHA512 c514d811aad038cdff23628cc9a15c9acfdb713c734f6ca39c86f8e9abe7b60acec83016797bd280023810c051819150df102c8dd6e66dfe27bd71ea4a1fa85d
+EBUILD xcb-util-keysyms-0.4.0-r1.ebuild 875 BLAKE2B ba503049cbf45927a031ca5da520c50b1cd2b57d4aadeca18d964e728129ec4cff8a6d3f85bd6630eaf6e73f20cb11bb6acd974b410c4e8b185f43ac1e844911 SHA512 a317be61dba6470a40569b61115db4e4f2737f6563aea632d911ca1c6e23ba8fba0757b44a655698bfce1e4754db18e6a1401d1abe8bc43b5fa7e02a8b1ba90a
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
index ac33aa169bb9..8fc2eab4ebbf 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,10 +17,10 @@ HOMEPAGE="https://xcb.freedesktop.org/"
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"
IUSE="test"
-RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
>=dev-util/gperf-3.0.1
+ x11-base/xorg-proto
test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
src_configure() {
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 92889b772928..a800d9376d8e 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,3 +1,3 @@
DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
-EBUILD xcb-util-renderutil-0.3.9-r1.ebuild 939 BLAKE2B 93829c21c83803449f7b2b7dd302ea311e2d13b807d1411d7355afd93f0bba683b45c6a98c978cf9af49748885e9481c282d0ac63c61a3bdc01d9f6a266e86b6 SHA512 a87b2fb345743c463867aa2d345d0ec804f8bd54a2d5d4d68eac5b6fea718847148696cc5c719901bd1154fcc565364802324d8f24b9e2aa8042d1c000fe9053
+EBUILD xcb-util-renderutil-0.3.9-r2.ebuild 890 BLAKE2B d6201cc9829bb30510974f6d701b87a33a3c3c68049630295a138362304594c4436d500e159c4a56d33022bf2565231cf8233891d56a8f9cd4a7bdef3f457588 SHA512 bb0874aae12d1c48fac81c1c85b6ddc9ce5f5563a44ae3bacfbf37871d489e0d00b2865b3e49bb515266850bb5add995066fa9e979498fd9a7965f1c4f8dae8e
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
index 7f8a056ea0b5..073a9fb693f0 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,8 +18,7 @@ HOMEPAGE="https://xcb.freedesktop.org/"
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"
IUSE="test"
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
>=dev-util/gperf-3.0.1
test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index efd269d4072f..f7d8326996a9 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,3 +1,3 @@
DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
-EBUILD xcb-util-wm-0.4.1-r1.ebuild 919 BLAKE2B 98403f4419a1876ea58dd80b60dfc4acaf1703881a9ef1b0dcf7872185d534432b5015788e2b667b24c9218823692df83910b0df5ca9128c1447392119c6ed9f SHA512 9350c9822fd8a9e5c4fce77e4b974a013b2a6c41f1a1694c2105aa830e6f9ec10dc15c33c90a6ab1cfd709344a723a4775c7b0569b69cf7854d5709a7e686d7b
+EBUILD xcb-util-wm-0.4.1-r2.ebuild 870 BLAKE2B 153ea5d52569bf80ea4935e98d48c80c6a09c96299abd54dcb5202516962778fb1788e63531a87dbc2071f44d234439bbaf4e3cd6cf380e0b4e077f7d71593d3 SHA512 7339504d7e2f1e07ca534a2c33e3920f05f1a5fc9ab6fdb7c75c7f1948837194e908ff7959404e080ef9009ed18d4b183bcb01fbef2355361c4da1b204f238ca
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
index a3a84ca25fbf..c5ea04a317a2 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.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=5
@@ -18,8 +18,7 @@ HOMEPAGE="https://xcb.freedesktop.org/"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
>=dev-util/gperf-3.0.1
test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 6a2044e811e4..8e5c519306f7 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,3 +1,3 @@
DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e
-EBUILD xcb-util-0.4.0.ebuild 1196 BLAKE2B 745497b6e433905642829ac0c8d2eae47cabaca5791422ebe9e9183846bd18bf318f2e77005837ba6e7db978a814b6553c4d0015ad94c8c05764be18dbeb52fb SHA512 342083a849dbe8f62f97f217481db89e1485b4412c57353d08047cd56b1bd2e7a46a3af2c96ff6207a644381e963b90466ad222341c057afbabadadb695b5a12
+EBUILD xcb-util-0.4.0-r1.ebuild 1147 BLAKE2B daa3f1c8077ba1703f0d6dcbed5dad1f44973f8d54594369666625f1147a6f3a26f8ca7e7d6d48e49afaa1597e3b07744f30104e05ab2aa8822e149e593b6956 SHA512 997a172df80d4d1ba80d67c68ea3070ecf7585cfe72e5a8e6228cdd6a7962495421ba73b397e5b3f39768735b07b8821ed08e5562a29d36a84acd4d593add4d8
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
index 30030133f96d..ef4072e97e27 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,8 +17,7 @@ HOMEPAGE="https://xcb.freedesktop.org/"
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"
IUSE="test"
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
>=dev-util/gperf-3.0.1
test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/xforms/Manifest b/x11-libs/xforms/Manifest
index 5a5b64db7ae7..bbbbbd42d34e 100644
--- a/x11-libs/xforms/Manifest
+++ b/x11-libs/xforms/Manifest
@@ -1,3 +1,3 @@
DIST xforms-1.2.4.tar.gz 1438503 BLAKE2B 5027fbd06d001f3291419e5d4e71f7c55e97394b7bda5bf0b4796ba34d7804e7b0bdd12271c082de150d7718039fc3ec6da1b1c530f6a36dcc3a7841c2cd416d SHA512 58669a64b2390da4f4c8b76b1dc34c2e6a4094ebbcfa7f75e0846db4d5c4455d772d9ef59e5aff09edd777957140015faea129c180600634a8d0962b01b912aa
-EBUILD xforms-1.2.4.ebuild 896 BLAKE2B ff23f55979efa0ef261f9b7754b278bee3343602765c553d6df32b82230e70359675d30fdf27b81507fc2edec4de325e47df4d473444f2babc56a8c6f99a1d80 SHA512 a73ca05aa5a019019d35b38661d077c7b9131dcaa035dfef9ab32c77d216ab8948bee5bfec536e0729a279044aa40e73fc9134af1d6eeb635d43739718665ce8
+EBUILD xforms-1.2.4.ebuild 899 BLAKE2B 4b73841c3b09c6ed9ef98ac2fabe8ee9916a710ad8b372dbfb42fdcfd30058d275f51f71c0504489ef490a6fa6b7c17d4052c3fa97f2bf460d89c3642457979d SHA512 be241f86ddc3fa691fedcd929832fd22d7a94703b054868555e3effaa983e809c9520f2d9f9d1369471d2d53327fd3c190a6b8880fd08f82ed88eb5af16ed2cc
MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/x11-libs/xforms/xforms-1.2.4.ebuild b/x11-libs/xforms/xforms-1.2.4.ebuild
index 787761f1260f..24d84ae03bd6 100644
--- a/x11-libs/xforms/xforms-1.2.4.ebuild
+++ b/x11-libs/xforms/xforms-1.2.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
@@ -25,7 +25,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index ed1905b35dfe..c009b93c814e 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -5,7 +5,7 @@ DIST xosd-gentoo-m4-1.tar.bz2 5043 BLAKE2B c855a8c114911c2bec1bd582c19ef09f731a8
DIST xosd_2.2.14-1.diff.gz 8616 BLAKE2B b9eb96eee0bd561923507fb2bddf87e8f9ad986aae1cb8c820d1bf3de00685934b3813dd0e697406855afe1c0aa5111e214260cb2e425725b479a23617fe5c75 SHA512 257ada9e0261c45c4c182acceeb24b95bbce08ec2ccae7ef49f9c5ee7a1e9995bd9527df725e0a871d48fa444899669320dc536674d0de71b766e9106097f86e
DIST xosd_2.2.14-2.1.debian.tar.xz 17276 BLAKE2B 77caf1f33ba66698ab7f1894da3da27e754fe5989814427de804b9797f71930e2d52ced403f72cdbac9522337876bec2c93fc83b0d97f7e0d05f8b78337d0b34 SHA512 ba5d86d2391e6dfdc6a2994e486f9c5ecd1934438815f4dc01c0633192d74a2fa2cabe647574052c4a87203e0c12b9bb8c38851975c36f19d113787dae3681ee
DIST xosd_2.2.14.orig.tar.gz 418331 BLAKE2B 2f7b8fbc31a2341ede7bc85c35ede4209c1d3a74ce07dbc62f302aa6d81a00e5e0dd4880d8ac290c0ff0f3babfcdb8b5975f7375cdafdc87fa0747c8ed8295ad SHA512 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473
-EBUILD xosd-2.2.14-r1.ebuild 1156 BLAKE2B 7be00aaab8272e9b143e06908e6e8b95c8f48aebfbbd6148af8638cc3e5378f5748a0fe9565fa8467d3eae10a4291d01b8d17abb6b49fe40044cda25d92577b1 SHA512 d84399e4bd1a77f674e6bf5a594ac09deaf829c077e32876a984e4d4bff8e69bf9d85303b729deb285077556573e937332db7363f1184ea1c7daa8980b7c5d7d
-EBUILD xosd-2.2.14-r2.ebuild 1247 BLAKE2B 23c1013bc117d0fb57580b94bd454fa129624dcc138aee6235002600c1e5e6e98d13861565084e98bc95a21fe09b3fff3ee02e57ce13e77dc059d03607c37188 SHA512 32984e501b28942e69ba29483764dca176a420af1e36772fe0764db8df338e808a44824e042a0187d519266ebddcb57ddf3c9f5452d448e1306f4a23849df2e6
-EBUILD xosd-2.2.14_p2_p1.ebuild 1356 BLAKE2B ff4930d70a9c76fb6f4adc4ced32f7a0eff627ed3869371a4f21f47abcfb4713c9148bc3911aa0d2867479e4073df8752b537191fcdb19198cef6b3da10f009a SHA512 d0ad103f468b1fdaf720f4d3adabcef8d4eca235828fef7bb6767654d10a3f2334e81ce1c0e22a84d7cf4e588bce85354bd423e5023fd53dda993dee22b0f0c1
+EBUILD xosd-2.2.14-r1.ebuild 1099 BLAKE2B a9efbbb9e7b743c9d04f1ebc6c803c427a312ea3e792c1fa5903136a3cf32fee16c1e53358dbd6e9d890c59d7b8665557c247ab8014a30b6bd6b18a372e512ae SHA512 b0b66039f6275381f403a9be4f5354cd4bfbee8b8ac006aff95fe20b0876dbdb866ea01be8ea3b5eceb374cdb21f5ed988edd8d021a44988b0679ee060ba954a
+EBUILD xosd-2.2.14-r2.ebuild 1190 BLAKE2B 054a0dae420343fd1cd566e99a27303db6c2864ce7b3f9f80b951a0cc2d378d1b60991b45a037b0d14c376c35c6408ce9ea82abded92dd082166e401062db3c6 SHA512 07682fb573d500f91c8ec140edd30b7caa438a38f07e05f6fde9b040d4ce26d58023c3f3e3783364faf1bd52ed73cd0ab3ff9b07ead6ccbc62e4d340de1a0f89
+EBUILD xosd-2.2.14_p2_p1.ebuild 1299 BLAKE2B 17b626b5b5fe3a3575c1c5e920a3540ee3dad816090f4144fb2d020734043d19b1756af3b13aad2be880de7ce06eb672bbad6f2133dd862b4df818fb0b3be995 SHA512 b4c294dec4978c8bb2ba6b16d1505f678877b814c1fc0d9231cd085f829177017441b0a0e5fe80215729d069e4702a5d4931b4df97fb26bdb8f110bff15f5b55
MISC metadata.xml 216 BLAKE2B 21fa7ec50873cc5605163ee8d7bd348d3626bcb0bf69e879aae3dc4f65dfd7fe3b81c862c9d17fb2d97284a119e4282d850879c54b03096059958a308146a4c0 SHA512 8b8a55269a3c1429d2f13a0056d9e500cf3b176584b9dc259eaccc2e68a3eb86234e522fdd960e9ee35d6039ce1e747c6bb986ef00af259279537a29a15adfc7
diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
index 4f7e0879011e..1279eb3dc264 100644
--- a/x11-libs/xosd/xosd-2.2.14-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
@@ -21,10 +21,8 @@ RDEPEND="x11-libs/libX11
x11-libs/libXt
media-fonts/font-misc-misc"
DEPEND="${RDEPEND}
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xextproto
- x11-proto/xproto
- virtual/pkgconfig"
+ virtual/pkgconfig
+ x11-base/xorg-proto"
src_unpack() {
unpack ${A}
diff --git a/x11-libs/xosd/xosd-2.2.14-r2.ebuild b/x11-libs/xosd/xosd-2.2.14-r2.ebuild
index 69eccafd1c8c..f5629247357b 100644
--- a/x11-libs/xosd/xosd-2.2.14-r2.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14-r2.ebuild
@@ -21,10 +21,8 @@ RDEPEND="x11-libs/libX11
x11-libs/libXt
media-fonts/font-misc-misc"
DEPEND="${RDEPEND}
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xextproto
- x11-proto/xproto
- virtual/pkgconfig"
+ virtual/pkgconfig
+ x11-base/xorg-proto"
src_unpack() {
unpack ${A}
diff --git a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
index c255a3e1ee6e..98ff80fc919a 100644
--- a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,10 +24,8 @@ RDEPEND="x11-libs/libX11
x11-libs/libXt
media-fonts/font-misc-misc"
DEPEND="${RDEPEND}
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xextproto
- x11-proto/xproto
- virtual/pkgconfig"
+ virtual/pkgconfig
+ x11-base/xorg-proto"
DOCS=(
AUTHORS ChangeLog NEWS README TODO