x11-libs/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).

diff --git a/x11-libs/cairo/cairo-1.14.10.ebuild b/x11-libs/cairo/cairo-1.14.10.ebuild
index 5aaa2fe51429a6db3148ff3f7437e55a250c4040..38c7f9c49214f205d87204c9c474bf4ec698ec80 100644 (file)
--- 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 b6e16c5bd43c58fc18adcc63b017733050751cde..93a2b8f96d00b134fb77472ec944c094c6f6d671 100644 (file)
--- 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 d09ee28f153134236220878e011fc621619a3624..a738d2bae073e0bc4629bf39047976dd7c96dda5 100644 (file)
--- 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 278ea13a4cdcaf5313df56ceacd08299b9b05537..0814ca8fec0cf1a2a1a8176aa9b6813b349afd99 100644 (file)
--- 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/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 8f4919272d66644ca0412f66faaf7198966fbeef..93aea9c564efe7b85aad5aa12fa8bfe7ef061b8c 100644 (file)
--- 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 a548bc7fb1e798e3ef92690e26d46f1de8ea8763..596b790d9751ddd912f228b0d316ccb07b94b145 100644 (file)
--- 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 d8b4321dcc15a04703635f41be1d915c3275ab62..d06a2da1ff68c7d5acf6e4b90912dc8778769f7b 100644 (file)
--- 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 f85727938fd2abc454e58cff30f9ba0477c8d2b8..cf4958abf3dbfec94e432a86f0997203058dd4f9 100644 (file)
--- 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 85a0f7d8365b01becbf7102972bd7a8e98344937..97500930d1183cad11faba10fcd55bfc1b013f1c 100644 (file)
--- 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/fox-1.6.49.ebuild b/x11-libs/fox/fox-1.6.49.ebuild
index 40e756906bdcbd45c84a15e0714f538521a464ce..fde8d32d03a46fd74e5c8989666f6a2d8bd35546 100644 (file)
--- 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 557b42fffffda997edc0749718ac951c938a71f5..b566273e59cd9d9f9096a2cdc44e153e228947bc 100644 (file)
--- 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 8eb7652d56eee1eb92590a88b9ce14a299c6c6cf..1d22508a8b86d055a2e541b6bef2d704903f83cc 100644 (file)
--- 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+/gtk+-2.24.31-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
index bb7b00678e4a13a1cf61709d989d0e9adecf2ca1..cd1dca6f259d4e7943ee904158d63b0e19b84fbe 100644 (file)
--- 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 dde87af5e34a6299951e10664893ddcd4f6b80dc..847e511a254a5b8216711a1734008f0e2d1835bb 100644 (file)
--- 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 5cfe545d2c1c9fdd3f8961a848b54dd0afdc7e2b..6220fd3c590f9d4f11def1e4da49812761a12620 100644 (file)
--- 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 0f2ed64289cf771ccf0333a7960ef496f03b0728..2005ed92274f2053a5da50fc8ba2e1f1b1f1bb8d 100644 (file)
--- 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 6ccbfdb46f8575f99150a64ec77b9276d4ff4535..4ace496e1e8a27c700432b252539cfb70991a567 100644 (file)
--- 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 4f99d0d75ca0f1263f77c1d42fb4e5870fb8391e..7661241aa30e3a24f1b02d461b6bb93482cca221 100644 (file)
--- 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/libFS-1.0.7.ebuild b/x11-libs/libFS/libFS-1.0.7-r1.ebuild
similarity index 75%
rename from x11-libs/libFS/libFS-1.0.7.ebuild
rename to x11-libs/libFS/libFS-1.0.7-r1.ebuild
index b66b91ff3d11323837a08ec403b0978174696ef3..5c4bd97e81126c79cde1541c6adc672e2b89e114 100644 (file)
--- 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/libICE-1.0.9-r1.ebuild b/x11-libs/libICE/libICE-1.0.9-r2.ebuild
similarity index 83%
rename from x11-libs/libICE/libICE-1.0.9-r1.ebuild
rename to x11-libs/libICE/libICE-1.0.9-r2.ebuild
index 0478d6c0f7cb2de319a1d3404a034b9859d716f6..6aa479cdf05e65f118e5cebbb7ff0cad9d6cb0f6 100644 (file)
--- 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/libSM-1.2.2-r1.ebuild b/x11-libs/libSM/libSM-1.2.2-r2.ebuild
similarity index 91%
rename from x11-libs/libSM/libSM-1.2.2-r1.ebuild
rename to x11-libs/libSM/libSM-1.2.2-r2.ebuild
index 303ae7650ca248d119bbec5d8c8c48d6b90df74b..bd0fd69552dd1d6ba8b53f4efb1c3639eccc9455 100644 (file)
--- 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/libX11-1.6.5.ebuild b/x11-libs/libX11/libX11-1.6.5-r1.ebuild
similarity index 75%
rename from x11-libs/libX11/libX11-1.6.5.ebuild
rename to x11-libs/libX11/libX11-1.6.5-r1.ebuild
index a3b6aea1896bdf23f6e12b7e84fb40d2b481d4e9..b05a688843a2f7ebf07df4acdbaa49b11d667c17 100644 (file)
--- 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/libXScrnSaver-1.2.2-r1.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild
similarity index 64%
rename from x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild
rename to x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild
index 9130a449b440e9d6025b0a91091fb2992211c1a2..c4535430c85aae8d5932f1a93330172aa77dac1c 100644 (file)
--- 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/libXTrap-1.0.1.ebuild b/x11-libs/libXTrap/libXTrap-1.0.1-r1.ebuild
similarity index 68%
rename from x11-libs/libXTrap/libXTrap-1.0.1.ebuild
rename to x11-libs/libXTrap/libXTrap-1.0.1-r1.ebuild
index 932a23d771a3a062740bfecf5073be9c9469b9d8..8496fcade1c263166d59504b6b528ce28fd2d1f5 100644 (file)
--- 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/libXau-1.0.8.ebuild b/x11-libs/libXau/libXau-1.0.8-r1.ebuild
similarity index 81%
rename from x11-libs/libXau/libXau-1.0.8.ebuild
rename to x11-libs/libXau/libXau-1.0.8-r1.ebuild
index f8179478300656e24e1790300ad1dbb994c1c196..43562b4657181038e62e5d008430dade091e92b3 100644 (file)
--- 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/libXaw-1.0.13.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
similarity index 75%
rename from x11-libs/libXaw/libXaw-1.0.13.ebuild
rename to x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
index e6e751e4bb7040a75387922eef0566ce530954d7..30049f1229fae8503a9a0890b5f34daf7aff93ba 100644 (file)
--- 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/libXaw3d-1.6.2.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
index 05b2473ab0c75d6ee80aa590f2cdf7dfd6b9a14b..d1ee612e8a512beaa0d896226936f0b79453f028 100644 (file)
--- 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/libXaw3dXft-1.6.2c.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild
index 40603156daf9332c8e1f8804e4422c8dfdda10d3..e75364e419e5ead674b716d04e4d726b0a3d752d 100644 (file)
--- 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 14241ad4622c7ae9d4e4a41830683cba3d5c782d..706b92aa6dc60770aec476861d7a6aa7a474c409 100644 (file)
--- 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/libXcomposite-0.4.4-r1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild
similarity index 67%
rename from x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild
rename to x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild
index 6a861dcc776aaf9799b5198cafb334b8f421bfaa..500527554510c663ceb438e89e013d3212ef46c2 100644 (file)
--- 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/libXdamage-1.1.4-r1.ebuild b/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
similarity index 61%
rename from x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild
rename to x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
index b952f9b7bbcd3e60a5100ee2f8a035013e837f64..e174a98d2242d765231e7f4c8cde8d2374ca7b36 100644 (file)
--- 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/libXdmcp-1.1.2-r1.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
similarity index 85%
rename from x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild
rename to x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
index eaa04f9d4aed1b976b55bd3b074bdca61f399266..0022986da20270fd400f4d07337cf885545811af 100644 (file)
--- 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/libXext-1.3.3.ebuild b/x11-libs/libXext/libXext-1.3.3-r1.ebuild
similarity index 84%
rename from x11-libs/libXext/libXext-1.3.3.ebuild
rename to x11-libs/libXext/libXext-1.3.3-r1.ebuild
index 442f8c0f7b56c1fe065bb467116880b8ce1f549b..9296bee78797eefb28ed6f4fd7524c7f83c82758 100644 (file)
--- 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/libXfixes-5.0.3.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
similarity index 62%
rename from x11-libs/libXfixes/libXfixes-5.0.3.ebuild
rename to x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
index 68267a496244ee344aeb1325f0316a4ac6f03dfa..d03439c03c58987efb932b0114e36fafe3f3b222 100644 (file)
--- 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/libXfont-1.5.4.ebuild b/x11-libs/libXfont/libXfont-1.5.4.ebuild
index f54a49c17cf58e99e9a1211ccecb435d5cc2f801..564cae8622cb122d9199f0d1c49eb328604e54dd 100644 (file)
--- 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/libXfont2-2.0.3.ebuild b/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
similarity index 79%
rename from x11-libs/libXfont2/libXfont2-2.0.3.ebuild
rename to x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
index 333ec175f52ed0a1b2cc473d6b1c48e8b02c16be..295e093ff5d8c8ebd73fefbbf5aee2a23eaa1512 100644 (file)
--- 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 cb4dfd2d7d3fd868108715e05ddd1c50e69b54bc..cbf9a115a367e9804e65d456cc22323f2b42738a 100644 (file)
--- 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/libXft-2.3.2.ebuild b/x11-libs/libXft/libXft-2.3.2-r1.ebuild
similarity index 72%
rename from x11-libs/libXft/libXft-2.3.2.ebuild
rename to x11-libs/libXft/libXft-2.3.2-r1.ebuild
index 2db1b632983ac7547dd41045696b07fadcd88565..7a442c96feb46d748faf2d00d97710febf018fa5 100644 (file)
--- 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/libXi-1.7.9.ebuild b/x11-libs/libXi/libXi-1.7.9-r1.ebuild
similarity index 68%
rename from x11-libs/libXi/libXi-1.7.9.ebuild
rename to x11-libs/libXi/libXi-1.7.9-r1.ebuild
index f0da0f489080b8caae319af6db234ca60f07a57d..90e84aacb9d9c4cfa7c572f70cc210d3213b424e 100644 (file)
--- 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/libXinerama-1.1.3.ebuild b/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
similarity index 60%
rename from x11-libs/libXinerama/libXinerama-1.1.3.ebuild
rename to x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
index 2e877b48e9ff9dcd4db99fbf70b411aab27b3100..eaf067e1db4358f45aa72f04242503d27174b336 100644 (file)
--- 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/libXmu-1.1.2.ebuild b/x11-libs/libXmu/libXmu-1.1.2-r1.ebuild
similarity index 82%
rename from x11-libs/libXmu/libXmu-1.1.2.ebuild
rename to x11-libs/libXmu/libXmu-1.1.2-r1.ebuild
index 59793d754e0c0d5f48b51254a5d426de2fc52cd2..62a672262ca167eb4844431a82f87ff15dba5cd2 100644 (file)
--- 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/libXpresent/libXpresent-1.0.0.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
similarity index 82%
rename from x11-libs/libXpresent/libXpresent-1.0.0.ebuild
rename to x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
index 417917c1847d9fa8a6f003b3eef10a7bc3d4ec55..b78713721bbfc24282faee26279a449e582ba903 100644 (file)
--- 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/libXrandr-1.5.1.ebuild b/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
similarity index 60%
rename from x11-libs/libXrandr/libXrandr-1.5.1.ebuild
rename to x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
index 5538b7e5cd016b1a01d279fb5dfd8adcc8e9fd65..ea5d42da85ba031b9e3033d4464fc12f889748cf 100644 (file)
--- 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/libXrender-0.9.10.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
similarity index 67%
rename from x11-libs/libXrender/libXrender-0.9.10.ebuild
rename to x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
index add3b3631dd1f676f913799624f6f6335c84794f..a7c4d25b668f321f3be8105e55c60c5d7f5cbab3 100644 (file)
--- 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/libXres-1.2.0.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
similarity index 83%
rename from x11-libs/libXres/libXres-1.2.0.ebuild
rename to x11-libs/libXres/libXres-1.2.0-r1.ebuild
index 47c6d6d31ac49e8aec0185a7868cb7c6a6f85ebd..e413b50c8dbbbb03b68051ba98e3fcb6e629d314 100644 (file)
--- a/x11-libs/libXres/libXres-1.2.0.ebuild
+++ b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
@@ -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/libXt/libXt-1.1.5.ebuild b/x11-libs/libXt/libXt-1.1.5-r1.ebuild
similarity index 81%
rename from x11-libs/libXt/libXt-1.1.5.ebuild
rename to x11-libs/libXt/libXt-1.1.5-r1.ebuild
index bd066ec22df2f4fd2aee134c6ae829d0f03185bf..a431f50bb83e4c567c99adc0d48350717e95c079 100644 (file)
--- 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/libXtst-1.2.3.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
similarity index 63%
rename from x11-libs/libXtst/libXtst-1.2.3.ebuild
rename to x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
index 38413474ba308666f728514a99a3a53121762d2f..2480d438c3cefe9bf1dd5174f4ae1544f66e96e7 100644 (file)
--- 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/libXv-1.0.11.ebuild b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
similarity index 61%
rename from x11-libs/libXv/libXv-1.0.11.ebuild
rename to x11-libs/libXv/libXv-1.0.11-r1.ebuild
index 36d922b384456d761a67ef69823c696950274536..6defba6f7438407707250d6c9d65fa19ccdb9022 100644 (file)
--- 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/libXvMC-1.0.10.ebuild b/x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild
similarity index 62%
rename from x11-libs/libXvMC/libXvMC-1.0.10.ebuild
rename to x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild
index 109bb8a5f28feba31dfb10d190c7d557ded629f0..a80dc54532df43acfc0d8d16ebe5f6f2c0dc122c 100644 (file)
--- 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/libXxf86dga-1.1.4.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild
similarity index 53%
rename from x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild
rename to x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild
index f6e587cbbd9b102755942b967bf046db0f9b2363..9aa79b39f350726437afebd002dac9d4693106a6 100644 (file)
--- 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/libXxf86misc-1.0.3-r1.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.3-r2.ebuild
similarity index 78%
rename from x11-libs/libXxf86misc/libXxf86misc-1.0.3-r1.ebuild
rename to x11-libs/libXxf86misc/libXxf86misc-1.0.3-r2.ebuild
index 9d04454736a31c7bd145be8dd9a1f1480402b4d8..a49f155b65114165681617e75ea49adcd2f960fa 100644 (file)
--- 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/libXxf86vm-1.1.4.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
similarity index 57%
rename from x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild
rename to x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
index d6d8ab59fe0898d5deee28fbf56230353ece9c85..a43801d9c3b760bc9dd96bbfcfefa3d4d31f18a0 100644 (file)
--- 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/libast-0.7-r1.ebuild b/x11-libs/libast/libast-0.7-r2.ebuild
similarity index 97%
rename from x11-libs/libast/libast-0.7-r1.ebuild
rename to x11-libs/libast/libast-0.7-r2.ebuild
index 15f2c7592ddb6eebdfc71256212a12c000e1f659..c1751cb774cef1470c30e7a6d98499ff893c09ad 100644 (file)
--- 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 88f91e397fa16f974531444cd22ac427357bb979..c2ef2a3a112eb05c11c092bd6a6875d116f7a2bf 100644 (file)
--- 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 eb51359edbf566c8cc2ae709c55ce568dda8b3da..94feeb7a119c321c701653b2570bc5cffa525a16 100644 (file)
--- 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/libdmx-1.1.3.ebuild b/x11-libs/libdmx/libdmx-1.1.3-r1.ebuild
similarity index 65%
rename from x11-libs/libdmx/libdmx-1.1.3.ebuild
rename to x11-libs/libdmx/libdmx-1.1.3-r1.ebuild
index c8d018aea3ce0a9ea10b5b5fec37ebec6e08109b..d1f21753e75ad909ce7cde50c4553da63fe72c64 100644 (file)
--- 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 68d16096b58bb5f4830dcd845e4e3beb7a22f424..2b721a00efc2f118dfda5b426f10bb41ed1c7033 100644 (file)
--- 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/libdockapp-0.7.2.ebuild b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
index e633685c4d28ed78b0943c5e98b639570722c339..c4685527016262f9ec34fb6c62efaabb901a8407 100644 (file)
--- 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/libvdpau/libvdpau-1.1.1.ebuild b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
index 37cf439581e5336aace813ce9e264c2e1c8bc3bc..a9de7350064cf3e8511e6aa29186990578227fd4 100644 (file)
--- 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/libxkbcommon/libxkbcommon-0.8.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
index 559aeac12b6233b8d7af0f559ea4105c56e86da5..1957a763a86bd156c9c7ac1e7f3b35072cf3910b 100644 (file)
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
@@ -22,9 +22,8 @@ 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/libxkbfile-1.0.9-r1.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
similarity index 84%
rename from x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild
rename to x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
index ef529ef28271ffcdf443a4d779a912929aae076e..c624ff0d36f7764f0d0a3007a1d3bdc4cb85dd83 100644 (file)
--- a/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
@@ -10,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[${MULTILIB_USEDEP}]
-       x11-proto/kbproto[${MULTILIB_USEDEP}]"
+RDEPEND="x11-base/xorg-proto
+       x11-libs/libX11[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"

diff --git a/x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild b/x11-libs/libxkbui/libxkbui-1.0.2-r2.ebuild
similarity index 72%
rename from x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild
rename to x11-libs/libxkbui/libxkbui-1.0.2-r2.ebuild
index 01a06ba109a11860450cf735eb1acb2312c4e16e..364ee589207c214353bc6cdc972a84ec42b3e08e 100644 (file)
--- 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/libxshmfence-1.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
index 6fd3310d75f231ddc4dda00cd6df2adc86a90811..4d71010ce83da85c0428262a7f0e783c4a767c9a 100644 (file)
--- a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
@@ -11,5 +11,4 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
 IUSE=""
 
 RDEPEND=""
-DEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-       ${RDEPEND}"
+DEPEND="x11-base/xorg-proto"

diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
index bad687e8b025ea0d91e47aee12c9876226504110..8af31b14ee62be268de9244440e78d6c694209a5 100644 (file)
--- 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
similarity index 91%
rename from x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
rename to x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index ea38789cddfda86b02eded91e705a308c707f8c2..8d08b1607971b40c134139e95238b7af660a809e 100644 (file)
--- 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/pango-1.40.12-r1.ebuild b/x11-libs/pango/pango-1.40.12-r1.ebuild
index 7097e5a810ecdf67093ebd278fef8b8ca1cb31e8..fd8b2eb1f4aef763bacb5fc5e4b68d0e8dd3ef89 100644 (file)
--- 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 94f249b25876c7499bcb61f753021be60e27e297..f9569a296132e496e4ea1c8dbbea51a5e419fe24 100644 (file)
--- 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 888df2f5b93815b87de7e25f9c37b91c57566669..3fa51895fb5059b75007147de2dc49758a951d06 100644 (file)
--- 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/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
index 6467a3f570ebe3e651a89ddc8f4b2940928abfd8..5ab3c6b03cbbbe28776d8a307a9f413d124dca5a 100644 (file)
--- 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/wxGTK-2.8.12.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
index dc5c6587baac8da08693794cbaedf695904692b4..5bfab6f5f38eac1499edf084a0299c5b6f28af91 100644 (file)
--- 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 362ca7bb08f1ab52a669d7be20bbc0c323e94d0e..30890d5025f08e8537e60f0779340d8bad6b49b6 100644 (file)
--- 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 88e502ac36784654bb9c5a1b0a7e928c8f215bc2..866cbd7ed0a7e19049808b5019818fd90f4edce7 100644 (file)
--- 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 3fbb85799fdffcea1bd8fb2f34a2f86f4db4c84f..e34473cc72abe6fd6414a1ec48ce5406f9e8c2e7 100644 (file)
--- 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 b390c7f0ba4dc1f048e0465cfd8f7d24cb471211..99c63f47bc72ef3b1cac67b385da49fc58f8f3c3 100644 (file)
--- 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/xcb-util-image-0.4.0.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
similarity index 79%
rename from x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
rename to x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
index 193b84cdd4bc249662865b8fcf866d992fabc149..ab30ac4feefec4bc982f685301c7e54a4e675066 100644 (file)
--- 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/xforms/xforms-1.2.4.ebuild b/x11-libs/xforms/xforms-1.2.4.ebuild
index 787761f1260fa1ee2a4f2d88a1f519193a5c958e..24d84ae03bd60476f789f534de6adc49250eaab9 100644 (file)
--- 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/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
index 4f7e0879011e32edd33fdb55c474c43f017b2159..1279eb3dc264ad4419d89e29245faac0ccd86c10 100644 (file)
--- 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 69eccafd1c8c9fa5cc2b5584a9befe6c7d444450..f5629247357bb9f8ecd521ca8ece4b7953d64446 100644 (file)
--- 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 c255a3e1ee6eac7a2364190457862039a1cbc0f4..98ff80fc919a8b5c538247ee819e57359e6aac75 100644 (file)
--- 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