diff options
79 files changed, 195 insertions, 312 deletions
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/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/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+/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/libXres-1.2.0.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild index 47c6d6d31ac4..e413b50c8dbb 100644 --- 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 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/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/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/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/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/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/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/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/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/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/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/libxkbcommon/libxkbcommon-0.8.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild index 559aeac12b62..1957a763a86b 100644 --- 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 index ef529ef28271..c624ff0d36f7 100644 --- 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 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/libxshmfence-1.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild index 6fd3310d75f2..4d71010ce83d 100644 --- 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 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/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/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/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/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/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/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 |