diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2018-05-21 22:21:06 +0200 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2018-05-21 18:05:13 -0700 |
| commit | 8b3b12c36140d06d2e8e9fc06b7c87af36446176 (patch) | |
| tree | dc8db94936131598ed0328893c7e7fb97a9c91fb | |
| parent | x11-libs/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto). (diff) | |
| download | gentoo-8b3b12c36140d06d2e8e9fc06b7c87af36446176.tar.gz gentoo-8b3b12c36140d06d2e8e9fc06b7c87af36446176.tar.bz2 gentoo-8b3b12c36140d06d2e8e9fc06b7c87af36446176.zip | |
x11-misc/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
108 files changed, 196 insertions, 289 deletions
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild index ad64f92fe636..9751760d13b8 100644 --- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild +++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,8 +25,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xf86vidmodeproto - x11-proto/xproto + x11-base/xorg-proto " DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers ) diff --git a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild b/x11-misc/autocutsel/autocutsel-0.10.0.ebuild index c69e5ccadd2c..f7dec4fbc608 100644 --- a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild +++ b/x11-misc/autocutsel/autocutsel-0.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,5 +20,5 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto " diff --git a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild b/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild index effec90b00f1..6acd544ba6b4 100644 --- a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild +++ b/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXext" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" PATCHES=( "${FILESDIR}"/${P}-gcc4.3.patch diff --git a/x11-misc/chgres/chgres-0.1-r2.ebuild b/x11-misc/chgres/chgres-0.1-r2.ebuild index c88e4dd3ba1e..af5228d50ea5 100644 --- a/x11-misc/chgres/chgres-0.1-r2.ebuild +++ b/x11-misc/chgres/chgres-0.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm" DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto - x11-proto/xf86dgaproto" + x11-base/xorg-proto" PATCHES=( "${FILESDIR}"/${P}-{flags,includes}.patch ) diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild index a12b639f15df..c0e2472a6353 100644 --- a/x11-misc/compton/compton-0.1_beta2.ebuild +++ b/x11-misc/compton/compton-0.1_beta2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} app-text/asciidoc virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto drm? ( x11-libs/libdrm )" nobuildit() { use $1 || echo yes ; } diff --git a/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild index 5b77b9aa14c6..3837f2f126b9 100644 --- a/x11-misc/compton/compton-9999.ebuild +++ b/x11-misc/compton/compton-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,7 +37,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} app-text/asciidoc virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto drm? ( x11-libs/libdrm )" nobuildit() { use $1 || echo yes ; } diff --git a/x11-misc/devilspie2/devilspie2-0.42.ebuild b/x11-misc/devilspie2/devilspie2-0.42.ebuild index ad543d5081a1..5d8bea8c26cb 100644 --- a/x11-misc/devilspie2/devilspie2-0.42.ebuild +++ b/x11-misc/devilspie2/devilspie2-0.42.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,7 +27,7 @@ DEPEND=" ${RDEPEND} sys-devel/gettext virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild index dbf358fff497..5d02c8d814f9 100644 --- a/x11-misc/dmenu/dmenu-4.6.ebuild +++ b/x11-misc/dmenu/dmenu-4.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -21,8 +21,7 @@ RDEPEND=" " DEPEND="${RDEPEND} virtual/pkgconfig - xinerama? ( x11-proto/xineramaproto ) - x11-proto/xproto + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/dmenu/dmenu-4.7-r1.ebuild b/x11-misc/dmenu/dmenu-4.7-r1.ebuild index 05dc375cb2ba..1bf43050b79d 100644 --- a/x11-misc/dmenu/dmenu-4.7-r1.ebuild +++ b/x11-misc/dmenu/dmenu-4.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,8 +21,7 @@ RDEPEND=" " DEPEND="${RDEPEND} virtual/pkgconfig - xinerama? ( x11-proto/xineramaproto ) - x11-proto/xproto + x11-base/xorg-proto " PATCHES=( "${FILESDIR}"/${PN}-4.7-gentoo.patch diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild index 8740afefa1f1..1bf43050b79d 100644 --- a/x11-misc/dmenu/dmenu-4.8.ebuild +++ b/x11-misc/dmenu/dmenu-4.8.ebuild @@ -21,8 +21,7 @@ RDEPEND=" " DEPEND="${RDEPEND} virtual/pkgconfig - xinerama? ( x11-proto/xineramaproto ) - x11-proto/xproto + x11-base/xorg-proto " PATCHES=( "${FILESDIR}"/${PN}-4.7-gentoo.patch diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild index 5cb15906696b..f2222c4d6bc8 100644 --- a/x11-misc/dmenu/dmenu-9999.ebuild +++ b/x11-misc/dmenu/dmenu-9999.ebuild @@ -21,8 +21,7 @@ RDEPEND=" " DEPEND="${RDEPEND} virtual/pkgconfig - xinerama? ( x11-proto/xineramaproto ) - x11-proto/xproto + x11-base/xorg-proto " PATCHES=( "${FILESDIR}"/${P}-gentoo.patch diff --git a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild b/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild index b1761c0c8b91..14d7f61a1526 100644 --- a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild +++ b/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ IUSE="" RDEPEND="x11-libs/libXt >=dev-libs/lzo-2" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" DOCS=( CHANGES README TODO ) diff --git a/x11-misc/dzen/dzen-0.9.5-r1.ebuild b/x11-misc/dzen/dzen-0.9.5-r1.ebuild index 12498cc73da3..9addccdf4bb7 100644 --- a/x11-misc/dzen/dzen-0.9.5-r1.ebuild +++ b/x11-misc/dzen/dzen-0.9.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -24,8 +24,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) + x11-base/xorg-proto " DOCS=( README ) diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild index 2fac809fbe2f..6f6b0d17eab1 100644 --- a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild +++ b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11 media-libs/imlib2[X] png? ( media-libs/libpng:0= )" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" PATCHES=( "${FILESDIR}/${P}-gcc-4.3.patch" diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild index 8a3a05f7abd3..60b62d30aa6f 100644 --- a/x11-misc/fbpanel/fbpanel-7.0.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ DEPEND=" ${RDEPEND} ${PYTHON_DEPS} virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto " PATCHES=( diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild index b2ee97f05ca5..d834582a08e0 100644 --- a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild +++ b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,4 +9,4 @@ DESCRIPTION="create dependencies in makefiles using 'gcc -M'" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" -DEPEND="x11-proto/xproto" +DEPEND="x11-base/xorg-proto" diff --git a/x11-misc/grabc/grabc-1.1-r2.ebuild b/x11-misc/grabc/grabc-1.1-r2.ebuild index fc963dc09905..236e8510f814 100644 --- a/x11-misc/grabc/grabc-1.1-r2.ebuild +++ b/x11-misc/grabc/grabc-1.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ IUSE="" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" S="${WORKDIR}/${PN}${PV}" PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) diff --git a/x11-misc/habak/habak-0.2.5-r2.ebuild b/x11-misc/habak/habak-0.2.5-r2.ebuild index 31cb75d3256d..d7fbf4a80f4f 100644 --- a/x11-misc/habak/habak-0.2.5-r2.ebuild +++ b/x11-misc/habak/habak-0.2.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ IUSE="" RDEPEND="media-libs/imlib2[X] x11-libs/libX11" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" # Skip into the src directory so we avoid a recursive make call that # is going to break parallel make. diff --git a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2.ebuild index d6a05f1442fa..b5f7777a34b9 100644 --- a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild +++ b/x11-misc/hsetroot/hsetroot-1.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11 >=media-libs/imlib2-1.0.6.2003[X]" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" DOCS="AUTHORS ChangeLog NEWS README" diff --git a/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild index 0879e20f060b..691121fea2e5 100644 --- a/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild +++ b/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,7 +22,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto " DOCS="AUTHORS ChangeLog NEWS README" diff --git a/x11-misc/imake/imake-1.0.7.ebuild b/x11-misc/imake/imake-1.0.7.ebuild index 7c067f92b0ae..3c873f2e98cb 100644 --- a/x11-misc/imake/imake-1.0.7.ebuild +++ b/x11-misc/imake/imake-1.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ IUSE="" RDEPEND="x11-misc/xorg-cf-files" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" src_prepare() { # don't use Sun compilers on Solaris, we want GCC from prefix diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild index b6f4e06ea860..116f0bcb67a4 100644 --- a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild +++ b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild @@ -21,9 +21,7 @@ RDEPEND="x11-libs/libXtst x11-libs/libXext" DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto >=sys-apps/sed-4" S=${WORKDIR}/${P/_/} diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild index 001734201dfb..bef62cd2ef71 100644 --- a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild +++ b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="2" @@ -21,9 +21,7 @@ RDEPEND="x11-libs/libXtst x11-libs/libXext" DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto >=sys-apps/sed-4" src_prepare() { diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild index 20dfb499c5a4..454c50ad61e5 100644 --- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild +++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -20,7 +20,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/inputproto + x11-base/xorg-proto " S=${WORKDIR}/${MY_P} diff --git a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild index 45b5b54d2ab1..a2967bdf38c2 100644 --- a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild +++ b/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -20,11 +20,9 @@ RDEPEND="x11-libs/libICE x11-libs/libX11 x11-libs/libXext" DEPEND="${RDEPEND} + x11-base/xorg-proto x11-libs/libxkbfile x11-libs/libXt - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto x11-libs/libXtst" S=${WORKDIR}/${MY_P} diff --git a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild index 2d09ca519372..2ff6da09dbc1 100644 --- a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild +++ b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild @@ -23,11 +23,9 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + x11-base/xorg-proto x11-libs/libxkbfile x11-libs/libXt - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto x11-libs/libXtst " diff --git a/x11-misc/lndir/lndir-1.0.3-r1.ebuild b/x11-misc/lndir/lndir-1.0.3-r1.ebuild index cb471e37cfe8..074102cb4eb0 100644 --- a/x11-misc/lndir/lndir-1.0.3-r1.ebuild +++ b/x11-misc/lndir/lndir-1.0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,4 +12,4 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" diff --git a/x11-misc/lsw/lsw-0.3.ebuild b/x11-misc/lsw/lsw-0.3.ebuild index 09db83b1ff03..8d3f62603016 100644 --- a/x11-misc/lsw/lsw-0.3.ebuild +++ b/x11-misc/lsw/lsw-0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ KEYWORDS="amd64 ~x86" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" src_prepare() { sed -i config.mk \ diff --git a/x11-misc/makedepend/makedepend-1.0.5.ebuild b/x11-misc/makedepend/makedepend-1.0.5.ebuild index c0d6990d325f..de8260303eaa 100644 --- a/x11-misc/makedepend/makedepend-1.0.5.ebuild +++ b/x11-misc/makedepend/makedepend-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,4 +11,4 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" diff --git a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild index 293a46855a05..76b25db57a18 100644 --- a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild +++ b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11 x11-libs/libXpm" DEPEND="${RDEPEND} virtual/os-headers - x11-proto/xextproto" + x11-base/xorg-proto" S=${WORKDIR}/${MY_P} diff --git a/x11-misc/netwmpager/netwmpager-2.05.ebuild b/x11-misc/netwmpager/netwmpager-2.05.ebuild index db30db2314e1..88a563c5bce6 100644 --- a/x11-misc/netwmpager/netwmpager-2.05.ebuild +++ b/x11-misc/netwmpager/netwmpager-2.05.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,7 +22,7 @@ RDEPEND=" " DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto " src_configure() { diff --git a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild index 39089968c1c3..90955390f26a 100644 --- a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild +++ b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild @@ -24,7 +24,7 @@ DEPEND=" ${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext ) - xinerama? ( x11-proto/xineramaproto ) + xinerama? ( x11-base/xorg-proto ) " src_prepare() { diff --git a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild index 95bd82cc0720..d94dd9b86c08 100644 --- a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild +++ b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild @@ -31,7 +31,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} virtual/pkgconfig gnome-base/gnome-common - x11-proto/xproto + x11-base/xorg-proto " RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules diff --git a/x11-misc/numlockx/numlockx-1.2.ebuild b/x11-misc/numlockx/numlockx-1.2.ebuild index d2799cdefcc8..68050e42c963 100644 --- a/x11-misc/numlockx/numlockx-1.2.ebuild +++ b/x11-misc/numlockx/numlockx-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -20,8 +20,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/qterm/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild index 50c09addf91f..9196ecbc57cb 100644 --- a/x11-misc/qterm/qterm-0.7.1.ebuild +++ b/x11-misc/qterm/qterm-0.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,7 +30,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-qt/linguist-tools:5 dev-qt/qthelp:5 - x11-proto/xproto + x11-base/xorg-proto " DOCS=( README.rst RELEASE_NOTES TODO ) diff --git a/x11-misc/rofi/rofi-1.3.1.ebuild b/x11-misc/rofi/rofi-1.3.1.ebuild index 510e5d7b52f2..6d2181a39178 100644 --- a/x11-misc/rofi/rofi-1.3.1.ebuild +++ b/x11-misc/rofi/rofi-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -31,8 +31,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/xineramaproto - x11-proto/xproto + x11-base/xorg-proto " PATCHES=( "${FILESDIR}"/${PN}-0.15.12-Werror.patch diff --git a/x11-misc/rofi/rofi-1.5.0.ebuild b/x11-misc/rofi/rofi-1.5.0.ebuild index b0ce40db61f1..dc85085b3148 100644 --- a/x11-misc/rofi/rofi-1.5.0.ebuild +++ b/x11-misc/rofi/rofi-1.5.0.ebuild @@ -31,8 +31,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/xineramaproto - x11-proto/xproto + x11-base/xorg-proto test? ( >=dev-libs/check-0.11 ) " PATCHES=( diff --git a/x11-misc/rofi/rofi-1.5.1.ebuild b/x11-misc/rofi/rofi-1.5.1.ebuild index b0ce40db61f1..dc85085b3148 100644 --- a/x11-misc/rofi/rofi-1.5.1.ebuild +++ b/x11-misc/rofi/rofi-1.5.1.ebuild @@ -31,8 +31,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/xineramaproto - x11-proto/xproto + x11-base/xorg-proto test? ( >=dev-libs/check-0.11 ) " PATCHES=( diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild index 4c1fd136e3d4..f9ae27770ea4 100644 --- a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild +++ b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild @@ -28,7 +28,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xextproto + x11-base/xorg-proto virtual/pkgconfig sys-apps/sed " diff --git a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild index 59f0d1afaf19..33678d15e886 100644 --- a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild +++ b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,7 +25,7 @@ RDEPEND="x11-libs/libX11 openal? ( >=media-libs/freealut-1.1.0-r1 ) quesoglc? ( media-libs/quesoglc )" DEPEND="${RDEPEND} - x11-proto/xextproto + x11-base/xorg-proto virtual/pkgconfig sys-apps/sed" diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild index 8382ae2c2094..c6a8cc504965 100644 --- a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild +++ b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -20,7 +20,7 @@ RDEPEND="dev-libs/glib:2 x11-libs/libXxf86vm" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xf86vidmodeproto" + x11-base/xorg-proto" DOCS="AUTHORS ChangeLog NEWS README" diff --git a/x11-misc/skippy/skippy-0.5.0-r1.ebuild b/x11-misc/skippy/skippy-0.5.0-r1.ebuild index e2823f2dfb16..1b63a8fe60e7 100644 --- a/x11-misc/skippy/skippy-0.5.0-r1.ebuild +++ b/x11-misc/skippy/skippy-0.5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,8 +20,7 @@ RDEPEND="media-libs/imlib2[X] x11-libs/libXmu x11-libs/libXft" DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/xineramaproto + x11-base/xorg-proto virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-pointer-size.patch diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild index 3a0c714df65d..79f4540da207 100644 --- a/x11-misc/slim/slim-1.3.6-r5.ebuild +++ b/x11-misc/slim/slim-1.3.6-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -29,7 +29,7 @@ RDEPEND="x11-libs/libXmu !x11-misc/slimlock )" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" PATCHES=( diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild index 7b08d5e831de..263d58016abb 100644 --- a/x11-misc/slim/slim-9999.ebuild +++ b/x11-misc/slim/slim-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -35,7 +35,7 @@ RDEPEND="x11-libs/libXmu !x11-misc/slimlock )" DEPEND="${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" PATCHES=( diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild index b6a698a98bc6..8f6a2d972ac3 100644 --- a/x11-misc/slock/slock-1.4.ebuild +++ b/x11-misc/slock/slock-1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,8 +19,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/randrproto - x11-proto/xproto + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/sprop/sprop-0.1-r1.ebuild b/x11-misc/sprop/sprop-0.1-r1.ebuild index 7c0084b7b4e9..c0cee8850f7d 100644 --- a/x11-misc/sprop/sprop-0.1-r1.ebuild +++ b/x11-misc/sprop/sprop-0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto " src_prepare() { sed -i \ diff --git a/x11-misc/stalonetray/stalonetray-0.8.3.ebuild b/x11-misc/stalonetray/stalonetray-0.8.3.ebuild index c415409cc447..2cff1037b9f0 100644 --- a/x11-misc/stalonetray/stalonetray-0.8.3.ebuild +++ b/x11-misc/stalonetray/stalonetray-0.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11 x11-libs/libSM x11-libs/libXpm" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" src_configure() { econf $(use_enable debug) \ diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild index dda9e9c3a8d1..0484cd37832e 100644 --- a/x11-misc/synergy/synergy-1.9.1.ebuild +++ b/x11-misc/synergy/synergy-1.9.1.ebuild @@ -42,11 +42,7 @@ COMMON_DEPEND=" " DEPEND=" ${COMMON_DEPEND} - x11-proto/kbproto - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto + x11-base/xorg-proto " RDEPEND=" ${COMMON_DEPEND} diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild index e39361604e42..c6741a4ca9d8 100644 --- a/x11-misc/synergy/synergy-2.0.0.ebuild +++ b/x11-misc/synergy/synergy-2.0.0.ebuild @@ -32,11 +32,7 @@ COMMON_DEPEND=" " DEPEND=" ${COMMON_DEPEND} - x11-proto/kbproto - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto + x11-base/xorg-proto " RDEPEND=" ${COMMON_DEPEND} diff --git a/x11-misc/tabbed/tabbed-0.6.ebuild b/x11-misc/tabbed/tabbed-0.6.ebuild index 62c051535985..2848e538dacb 100644 --- a/x11-misc/tabbed/tabbed-0.6.ebuild +++ b/x11-misc/tabbed/tabbed-0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,7 +15,7 @@ IUSE="" RDEPEND="x11-libs/libX11" DEPEND=" - x11-proto/xproto + x11-base/xorg-proto ${RDEPEND} " diff --git a/x11-misc/unclutter/unclutter-8-r4.ebuild b/x11-misc/unclutter/unclutter-8-r4.ebuild index d73744fa9e89..55f953d0b10c 100644 --- a/x11-misc/unclutter/unclutter-8-r4.ebuild +++ b/x11-misc/unclutter/unclutter-8-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" S=${WORKDIR}/${PN} diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild index d3dbaaac30c2..eec56d67179c 100644 --- a/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild +++ b/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,5 +18,5 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/xproto + x11-base/xorg-proto " diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild index 66b55e518508..8f9e37b5c918 100644 --- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild +++ b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild @@ -20,8 +20,7 @@ RDEPEND="x11-libs/libX11 x11-libs/libXmu x11-libs/libXt" DEPEND="${RDEPEND} - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto sys-apps/sed sys-libs/zlib x11vnc? ( x11-misc/x11vnc )" diff --git a/x11-misc/wayv/wayv-0.3-r2.ebuild b/x11-misc/wayv/wayv-0.3-r2.ebuild index dd82e5259727..b7763a8fdc81 100644 --- a/x11-misc/wayv/wayv-0.3-r2.ebuild +++ b/x11-misc/wayv/wayv-0.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -17,8 +17,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/inputproto - x11-proto/xproto + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild index a34c0ed1edf0..a4def6b97b6a 100644 --- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild +++ b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/xproto" + x11-base/xorg-proto" PATCHES=( "${FILESDIR}/amd64-Xlib.patch" ) diff --git a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild index 820d6f6ac5e6..34d249366e1a 100644 --- a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild +++ b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,13 +28,8 @@ RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?] zeroconf? ( >=net-dns/avahi-0.6.4 ) " DEPEND="${RDEPEND} - x11-libs/libXt - x11-proto/inputproto - x11-proto/trapproto - x11-proto/recordproto - x11-proto/xproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto )" + x11-base/xorg-proto + x11-libs/libXt" src_prepare() { default diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild index b4062821bbd2..7a41c7b368d7 100644 --- a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild +++ b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild @@ -19,9 +19,7 @@ RDEPEND="x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama" DEPEND="${RDEPEND} - x11-proto/scrnsaverproto - x11-proto/xproto - x11-proto/xineramaproto + x11-base/xorg-proto tk? ( dev-tcltk/expect )" src_unpack() { diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild index c0c4f247d980..a353108f7c60 100644 --- a/x11-misc/x2x/x2x-1.27-r3.ebuild +++ b/x11-misc/x2x/x2x-1.27-r3.ebuild @@ -21,10 +21,9 @@ RDEPEND="x11-libs/libX11 x11-libs/libXtst x11-libs/libXext" DEPEND="${RDEPEND} - x11-proto/inputproto app-text/rman - x11-misc/imake - x11-proto/xproto" + x11-base/xorg-proto + x11-misc/imake" src_unpack() { unpack ${A} diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild index f6eee716fe67..8f8963c98d1b 100644 --- a/x11-misc/xaos/xaos-3.6.ebuild +++ b/x11-misc/xaos/xaos-3.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -32,10 +32,7 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig doc? ( virtual/texi2dvi ) - X? ( - x11-proto/xf86vidmodeproto - x11-proto/xextproto - x11-proto/xproto )" + X? ( x11-base/xorg-proto )" PATCHES=( "${FILESDIR}"/${PN}-3.4-png.patch diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild index 7192ed11358a..4367a147b013 100644 --- a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild +++ b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -32,8 +32,8 @@ RDEPEND=" DEPEND=" ${RDEPEND} app-text/rman + x11-base/xorg-proto x11-misc/imake - x11-proto/scrnsaverproto " S=${WORKDIR}/${P/_p*} diff --git a/x11-misc/xautomation/xautomation-1.09-r1.ebuild b/x11-misc/xautomation/xautomation-1.09-r1.ebuild index 7d90eaa218a8..d78715f36b68 100644 --- a/x11-misc/xautomation/xautomation-1.09-r1.ebuild +++ b/x11-misc/xautomation/xautomation-1.09-r1.ebuild @@ -19,7 +19,5 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " diff --git a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild index 2030809b7733..49c4acc7577b 100644 --- a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild +++ b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=2 @@ -22,7 +22,7 @@ RDEPEND="x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXpm" DEPEND="${RDEPEND} - x11-proto/xextproto + x11-base/xorg-proto x11-misc/imake" src_prepare(){ diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild index f291714e25c9..c7c8c3949274 100644 --- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild +++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild @@ -23,7 +23,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xextproto + x11-base/xorg-proto x11-misc/imake " PATCHES=( diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild index b1814ef74740..4283d2e664b0 100644 --- a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild +++ b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -16,7 +16,7 @@ RDEPEND="x11-libs/libX11 guile? ( >=dev-scheme/guile-1.8.4[deprecated] ) tk? ( dev-lang/tk )" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" src_configure() { econf \ diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild index 13ec7c00d2c3..cce03ac2a410 100644 --- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild +++ b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,8 +19,8 @@ RDEPEND="x11-libs/libX11 x11-libs/libXaw x11-libs/libXext" DEPEND="${RDEPEND} + x11-base/xorg-proto x11-misc/imake - x11-proto/xproto x11-misc/gccmakedep motif? ( >=x11-libs/motif-2.3:0 )" diff --git a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild b/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild index 52da368b475d..3a3511979e2a 100644 --- a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild +++ b/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,8 +21,8 @@ RDEPEND=" x11-libs/libXxf86vm " DEPEND="${RDEPEND} + x11-base/xorg-proto x11-libs/libXext - x11-proto/xf86vidmodeproto " S="${WORKDIR}/${PN}-${COMMIT}" diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r1.ebuild index f6d054fdf6be..5813bf01dd29 100644 --- a/x11-misc/xcb/xcb-2.4-r1.ebuild +++ b/x11-misc/xcb/xcb-2.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto motif? ( >=x11-libs/motif-2.3:0 ) " diff --git a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild index 634b4c586c7e..b10623d13aa6 100644 --- a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild +++ b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -19,8 +19,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " S=${WORKDIR}/${P}/X11 diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild index cf84faf3f802..2104e57383da 100644 --- a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild +++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" RDEPEND="x11-libs/libXext" DEPEND="${RDEPEND} - x11-proto/xextproto" + x11-base/xorg-proto" KEYWORDS="amd64 ppc x86" IUSE="" diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild index 5fbc2ab8e123..5a726ac8063b 100644 --- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild +++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild @@ -22,8 +22,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xineramaproto - x11-proto/xproto + x11-base/xorg-proto " # The test wants to manualy start Xvfb, wont use VirtualX and it tries diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild index 97ec7ce03faa..be7b038c09fe 100644 --- a/x11-misc/xearth/xearth-1.1-r1.ebuild +++ b/x11-misc/xearth/xearth-1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -21,9 +21,9 @@ RDEPEND=" x11-libs/libXt " DEPEND="${RDEPEND} + x11-base/xorg-proto x11-misc/imake app-text/rman - x11-proto/xproto " src_prepare() { diff --git a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild b/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild index dbd26fe73cc3..3e5fbb14c7ea 100644 --- a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild +++ b/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11 x11-libs/libXt x11-libs/libXext" DEPEND="${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto x11-misc/imake" S=${WORKDIR}/${MY_P} diff --git a/x11-misc/xgestures/xgestures-0.4.ebuild b/x11-misc/xgestures/xgestures-0.4.ebuild index a9921db7a5d5..4e72115627db 100644 --- a/x11-misc/xgestures/xgestures-0.4.ebuild +++ b/x11-misc/xgestures/xgestures-0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,8 +17,7 @@ RDEPEND="x11-libs/libXmu x11-libs/libXtst x11-libs/libXt" DEPEND="${RDEPEND} - x11-proto/xextproto - x11-proto/xproto" + x11-base/xorg-proto" DOCS=( AUTHORS ChangeLog NEWS README ) diff --git a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild index e4c4db3ec3a4..8aa761d9e7da 100644 --- a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild +++ b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,8 +19,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " PATCHES=( diff --git a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild index 986dae594ba3..d3c9125a799e 100644 --- a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild +++ b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,8 +21,7 @@ RDEPEND="x11-libs/libXrender dev-libs/expat sys-libs/zlib" DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/xextproto" + x11-base/xorg-proto" DOCS=( AUTHORS ) PATCHES=( diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild index 504fde9935bc..9031ec51246d 100644 --- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild +++ b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ RDEPEND="x11-misc/xbitmaps x11-libs/libXaw x11-libs/libXext" DEPEND="${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto x11-misc/imake >=sys-apps/sed-4" diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50.ebuild index 529559f87230..39ac85126845 100644 --- a/x11-misc/xlockmore/xlockmore-5.50.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.50.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -40,7 +40,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/xineramaproto + x11-base/xorg-proto " PATCHES=( diff --git a/x11-misc/xlockmore/xlockmore-5.54.ebuild b/x11-misc/xlockmore/xlockmore-5.54.ebuild index c5181b227ac2..f0e831cad9c0 100644 --- a/x11-misc/xlockmore/xlockmore-5.54.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.54.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -40,7 +40,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/xineramaproto + x11-base/xorg-proto " PATCHES=( diff --git a/x11-misc/xlockmore/xlockmore-5.55.ebuild b/x11-misc/xlockmore/xlockmore-5.55.ebuild index 8277ee4c2f00..71f04c0a70fd 100644 --- a/x11-misc/xlockmore/xlockmore-5.55.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.55.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -40,7 +40,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/xineramaproto + x11-base/xorg-proto " PATCHES=( diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild b/x11-misc/xmountains/xmountains-2.9-r1.ebuild index b3e18f2cd2bb..a77dfe86d278 100644 --- a/x11-misc/xmountains/xmountains-2.9-r1.ebuild +++ b/x11-misc/xmountains/xmountains-2.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ RDEPEND=" x11-libs/libX11 x11-misc/xbitmaps" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" S=${WORKDIR} diff --git a/x11-misc/xnee/xnee-3.19-r1.ebuild b/x11-misc/xnee/xnee-3.19-r1.ebuild index c4eab6452b7f..9e2f128b15f3 100644 --- a/x11-misc/xnee/xnee-3.19-r1.ebuild +++ b/x11-misc/xnee/xnee-3.19-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -28,7 +28,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - x11-proto/inputproto + x11-base/xorg-proto virtual/pkgconfig sys-devel/gettext gnome? ( virtual/imagemagick-tools[jpeg,png] ) diff --git a/x11-misc/xnots/xnots-0.2.1-r1.ebuild b/x11-misc/xnots/xnots-0.2.1-r1.ebuild index 0438e287b2d9..f177612e4c75 100644 --- a/x11-misc/xnots/xnots-0.2.1-r1.ebuild +++ b/x11-misc/xnots/xnots-0.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -24,9 +24,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/xnots/xnots-0.2.1-r2.ebuild b/x11-misc/xnots/xnots-0.2.1-r2.ebuild index 15752d347787..c92abc690cd7 100644 --- a/x11-misc/xnots/xnots-0.2.1-r2.ebuild +++ b/x11-misc/xnots/xnots-0.2.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,9 +24,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto + x11-base/xorg-proto " PATCHES=( "${FILESDIR}"/${PN}-0.2.1-gcc6.patch diff --git a/x11-misc/xnots/xnots-9999.ebuild b/x11-misc/xnots/xnots-9999.ebuild index 4574a53d43aa..3f81446e468c 100644 --- a/x11-misc/xnots/xnots-9999.ebuild +++ b/x11-misc/xnots/xnots-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,9 +23,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/pkgconfig - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/xosview/xosview-1.20-r1.ebuild b/x11-misc/xosview/xosview-1.20-r1.ebuild index 5cc53ca93dbe..e06a58bfd2c2 100644 --- a/x11-misc/xosview/xosview-1.20-r1.ebuild +++ b/x11-misc/xosview/xosview-1.20-r1.ebuild @@ -20,7 +20,7 @@ COMMON_DEPS="x11-libs/libX11 RDEPEND="${COMMON_DEPS} media-fonts/font-misc-misc" DEPEND="${COMMON_DEPS} - x11-proto/xproto" + x11-base/xorg-proto" DOCS=( CHANGES README.linux TODO ) diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild index c469ef0208a8..7fd20ea87c28 100644 --- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild +++ b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,10 +35,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} truetype? ( virtual/pkgconfig ) - X? ( - x11-proto/scrnsaverproto - x11-proto/xproto - ) + X? ( x11-base/xorg-proto ) " PATCHES=( diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild index 4ddbab73daf2..3cf2f929a6e2 100644 --- a/x11-misc/xrestop/xrestop-0.4.ebuild +++ b/x11-misc/xrestop/xrestop-0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -19,8 +19,8 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xproto virtual/pkgconfig + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild index 111832c3752d..58f43f33c854 100644 --- a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild +++ b/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" PATCHES=( "${FILESDIR}/${P}.noversion.patch" diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild index 0cb1d531963e..a4de3213fff7 100644 --- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild +++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,8 +22,8 @@ CDEPEND=" " DEPEND=" ${CDEPEND} - x11-proto/xproto virtual/pkgconfig + x11-base/xorg-proto " RDEPEND=" ${CDEPEND} diff --git a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild b/x11-misc/xscreensaver/xscreensaver-5.36.ebuild index 7b5b69a88e32..1e5f9a6da935 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.36.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -59,12 +59,7 @@ DEPEND=" sys-devel/bc sys-devel/gettext virtual/pkgconfig - x11-proto/recordproto - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - xinerama? ( x11-proto/xineramaproto ) + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/xscreensaver/xscreensaver-5.37.ebuild b/x11-misc/xscreensaver/xscreensaver-5.37.ebuild index 6c8fa54ec6f2..27ea9efb104a 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.37.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.37.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -59,12 +59,7 @@ DEPEND=" sys-devel/bc sys-devel/gettext virtual/pkgconfig - x11-proto/recordproto - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - xinerama? ( x11-proto/xineramaproto ) + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild index aa05146673b7..7217682cba63 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild @@ -60,12 +60,7 @@ DEPEND=" sys-devel/bc sys-devel/gettext virtual/pkgconfig - x11-proto/recordproto - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - xinerama? ( x11-proto/xineramaproto ) + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild b/x11-misc/xscreensaver/xscreensaver-5.39.ebuild index 53d05029957a..cc36c3d5c819 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.39.ebuild @@ -60,12 +60,7 @@ DEPEND=" sys-devel/bc sys-devel/gettext virtual/pkgconfig - x11-proto/recordproto - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - xinerama? ( x11-proto/xineramaproto ) + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/xsel/xsel-1.2.0-r1.ebuild b/x11-misc/xsel/xsel-1.2.0-r1.ebuild index bfc59a723622..cdf297508f71 100644 --- a/x11-misc/xsel/xsel-1.2.0-r1.ebuild +++ b/x11-misc/xsel/xsel-1.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXext" DEPEND="${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto x11-libs/libXt" src_compile() { diff --git a/x11-misc/xsel/xsel-9999.ebuild b/x11-misc/xsel/xsel-9999.ebuild index b2971adb4fed..d3edca7a9f74 100644 --- a/x11-misc/xsel/xsel-9999.ebuild +++ b/x11-misc/xsel/xsel-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto x11-libs/libXt " diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild index d9d5530b4c5d..d0105b2c7f9f 100644 --- a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild +++ b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,9 +18,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild index a7fea73b665d..cd140527393c 100644 --- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild +++ b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,9 +21,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " PATCHES=( "${FILESDIR}"/${P}-assignment.patch diff --git a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild index 98310014da85..f8f3dd11c404 100644 --- a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild +++ b/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,8 +28,8 @@ DEPEND=" ${COMMON_DEPEND} app-text/rman dev-lang/perl + x11-base/xorg-proto x11-misc/imake - x11-proto/xproto " DOCS=( AUTHORS Changelog README ) diff --git a/x11-misc/xsnow/xsnow-1.42-r2.ebuild b/x11-misc/xsnow/xsnow-1.42-r2.ebuild index 993c4e5a5bd5..e9d9084f1313 100644 --- a/x11-misc/xsnow/xsnow-1.42-r2.ebuild +++ b/x11-misc/xsnow/xsnow-1.42-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,10 +21,9 @@ RDEPEND=" DEPEND=" ${RDEPEND} app-text/rman + x11-base/xorg-proto x11-misc/imake x11-misc/gccmakedep - x11-proto/xextproto - x11-proto/xproto " src_compile() { diff --git a/x11-misc/xssstate/xssstate-1.1.ebuild b/x11-misc/xssstate/xssstate-1.1.ebuild index cda0b3adfc2b..311c55ab00f7 100644 --- a/x11-misc/xssstate/xssstate-1.1.ebuild +++ b/x11-misc/xssstate/xssstate-1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -19,8 +19,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/scrnsaverproto - x11-proto/xproto + x11-base/xorg-proto " src_prepare() { diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild index 8d03a8cf83eb..c797405cf802 100644 --- a/x11-misc/xstroke/xstroke-0.6-r1.ebuild +++ b/x11-misc/xstroke/xstroke-0.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -28,9 +28,7 @@ DEPEND=" sys-devel/flex virtual/pkgconfig virtual/yacc - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto + x11-base/xorg-proto " DOCS=( AUTHORS ChangeLog NEWS README TODO ) diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild index 574b3c3e28b9..b1878e8d3e44 100644 --- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild +++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -17,8 +17,8 @@ RDEPEND="x11-libs/libX11 x11-libs/libXext" DEPEND="${RDEPEND} app-text/rman - x11-misc/imake - x11-proto/xproto" + x11-base/xorg-proto + x11-misc/imake" src_prepare() { xmkmf || die diff --git a/x11-misc/xtrlock/xtrlock-2.8.ebuild b/x11-misc/xtrlock/xtrlock-2.8.ebuild index 50e34becf41a..b84dce881f7b 100644 --- a/x11-misc/xtrlock/xtrlock-2.8.ebuild +++ b/x11-misc/xtrlock/xtrlock-2.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto x11-misc/imake " diff --git a/x11-misc/xvkbd/xvkbd-3.7.ebuild b/x11-misc/xvkbd/xvkbd-3.7.ebuild index 1277bf4b7f60..777c7043cb89 100644 --- a/x11-misc/xvkbd/xvkbd-3.7.ebuild +++ b/x11-misc/xvkbd/xvkbd-3.7.ebuild @@ -23,11 +23,9 @@ RDEPEND=" DEPEND=" ${RDEPEND} app-text/rman + x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto " src_prepare() { diff --git a/x11-misc/xvkbd/xvkbd-3.8.ebuild b/x11-misc/xvkbd/xvkbd-3.8.ebuild index 04a518b10850..3033ea4d6dd8 100644 --- a/x11-misc/xvkbd/xvkbd-3.8.ebuild +++ b/x11-misc/xvkbd/xvkbd-3.8.ebuild @@ -23,11 +23,9 @@ RDEPEND=" DEPEND=" ${RDEPEND} app-text/rman + x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto " PATCHES=( "${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch diff --git a/x11-misc/xvkbd/xvkbd-3.9.ebuild b/x11-misc/xvkbd/xvkbd-3.9.ebuild index 04a518b10850..3033ea4d6dd8 100644 --- a/x11-misc/xvkbd/xvkbd-3.9.ebuild +++ b/x11-misc/xvkbd/xvkbd-3.9.ebuild @@ -23,11 +23,9 @@ RDEPEND=" DEPEND=" ${RDEPEND} app-text/rman + x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xproto " PATCHES=( "${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch diff --git a/x11-misc/xwit/xwit-3.4_p15.ebuild b/x11-misc/xwit/xwit-3.4_p15.ebuild index 94f68ee55400..6f20325979dd 100644 --- a/x11-misc/xwit/xwit-3.4_p15.ebuild +++ b/x11-misc/xwit/xwit-3.4_p15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ IUSE="" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" S=${WORKDIR}/${P/_p*/}.orig diff --git a/x11-misc/xwrits/xwrits-2.26-r1.ebuild b/x11-misc/xwrits/xwrits-2.26-r1.ebuild index 2dc0baa2074a..d25703bca7fd 100644 --- a/x11-misc/xwrits/xwrits-2.26-r1.ebuild +++ b/x11-misc/xwrits/xwrits-2.26-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,6 @@ RDEPEND="x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama" DEPEND="${RDEPEND} - x11-proto/xineramaproto - x11-proto/xproto" + x11-base/xorg-proto" DOCS=( GESTURES NEWS README TODO ) |