diff options
95 files changed, 149 insertions, 548 deletions
diff --git a/app-editors/elvis/elvis-2.2.0-r4.ebuild b/app-editors/elvis/elvis-2.2.0-r6.ebuild index 5f1ee0752233..96b7930c80da 100644 --- a/app-editors/elvis/elvis-2.2.0-r4.ebuild +++ b/app-editors/elvis/elvis-2.2.0-r6.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 @@ -16,13 +16,14 @@ KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris" IUSE="X" RDEPEND=">=sys-libs/ncurses-5.7-r7:0= - X? ( >=x11-proto/xproto-7.0.4 + X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi" DEPEND="${RDEPEND} + x11-base/xorg-proto virtual/pkgconfig" S=${WORKDIR}/${PN}-${MY_PV} diff --git a/app-editors/elvis/elvis-2.2.0-r5.ebuild b/app-editors/elvis/elvis-2.2.0-r7.ebuild index a17ff3472331..733e770e90e2 100644 --- a/app-editors/elvis/elvis-2.2.0-r5.ebuild +++ b/app-editors/elvis/elvis-2.2.0-r7.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,6 @@ RDEPEND=" sys-libs/ncurses:0= app-eselect/eselect-vi X? ( - >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 @@ -29,6 +28,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} + x11-base/xorg-proto virtual/pkgconfig" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-editors/xvile/xvile-9.8r.ebuild b/app-editors/xvile/xvile-9.8r-r1.ebuild index 8748bca62a91..d2cd7608324f 100644 --- a/app-editors/xvile/xvile-9.8r.ebuild +++ b/app-editors/xvile/xvile-9.8r-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,9 +20,9 @@ RDEPEND="perl? ( dev-lang/perl ) >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 - >=x11-libs/libXpm-3.5.4.2 - >=x11-proto/xproto-7.0.4" + >=x11-libs/libXpm-3.5.4.2" DEPEND="${RDEPEND} + x11-base/xorg-proto sys-devel/flex" S=${WORKDIR}/${MY_P} diff --git a/app-editors/xvile/xvile-9.8s.ebuild b/app-editors/xvile/xvile-9.8s-r1.ebuild index 360881561dd8..8ea94b51724e 100644 --- a/app-editors/xvile/xvile-9.8s.ebuild +++ b/app-editors/xvile/xvile-9.8s-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,9 +20,9 @@ RDEPEND="perl? ( dev-lang/perl ) >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 - >=x11-libs/libXpm-3.5.4.2 - >=x11-proto/xproto-7.0.4" + >=x11-libs/libXpm-3.5.4.2" DEPEND="${RDEPEND} + x11-base/xorg-proto sys-devel/flex" S=${WORKDIR}/${MY_P} diff --git a/app-emulation/bochs/bochs-2.6.9.ebuild b/app-emulation/bochs/bochs-2.6.9.ebuild index 1fbf6c61aec6..80e103e7f589 100644 --- a/app-emulation/bochs/bochs-2.6.9.ebuild +++ b/app-emulation/bochs/bochs-2.6.9.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} doc? ( app-text/docbook-sgml-utils ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) sys-apps/sed >=app-text/opensp-1.5 " diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild index 8b5fcdc0a693..4f7a7c37c07a 100644 --- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild +++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-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=6 @@ -37,7 +37,7 @@ RDEPEND="X? ( x11-libs/libX11 >=sys-libs/slang-1.4" DEPEND="${RDEPEND} - X? ( x11-proto/xf86dgaproto ) + X? ( x11-base/xorg-proto ) >=sys-devel/autoconf-2.57" S="${WORKDIR}/${PN}-code-${COMMIT}" diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild index d9078de33c1e..63d99f142b49 100644 --- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild +++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-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=6 @@ -44,8 +44,7 @@ RDEPEND="X? ( x11-libs/libXt virtual/cdrtools" DEPEND="${RDEPEND} - X? ( dga? ( x11-proto/xf86vidmodeproto - x11-proto/xf86dgaproto ) )" + X? ( dga? ( x11-base/xorg-proto ) )" src_prepare() { default diff --git a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild index 97c1a3de88f7..889530285923 100644 --- a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild +++ b/app-emulation/gxemul/gxemul-0.6.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" @@ -16,7 +16,7 @@ IUSE="debug X" RDEPEND="X? ( x11-libs/libX11 )" DEPEND="${RDEPEND} - X? ( x11-proto/xproto )" + X? ( x11-base/xorg-proto )" src_prepare() { epatch "${FILESDIR}"/${PV}-gcc46.patch diff --git a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild index 1052d0a334f7..478549c3d5ca 100644 --- a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild +++ b/app-emulation/spectemu/spectemu-0.99.3-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 @@ -16,9 +16,7 @@ IUSE="readline svga +X" REQUIRED_USE="|| ( svga X )" -DEPEND="X? ( >=x11-proto/xf86vidmodeproto-2.2.2 - >=x11-proto/xextproto-7.0.2 - >=x11-proto/xproto-7.0.4 +DEPEND="X? ( x11-base/xorg-proto >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) diff --git a/app-emulation/spectemu/spectemu-0.99.3.ebuild b/app-emulation/spectemu/spectemu-0.99.3.ebuild index 2ab41303ddcd..cbdae8d8a0e8 100644 --- a/app-emulation/spectemu/spectemu-0.99.3.ebuild +++ b/app-emulation/spectemu/spectemu-0.99.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 ### Several versions of specemu exist, xspect & vgaspect, utilising X11 @@ -17,9 +17,7 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="X readline svga" -DEPEND="X? ( >=x11-proto/xf86vidmodeproto-2.2.2 - >=x11-proto/xextproto-7.0.2 - >=x11-proto/xproto-7.0.4 +DEPEND="X? ( x11-base/xorg-proto >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) diff --git a/app-emulation/spim/spim-8.0-r3.ebuild b/app-emulation/spim/spim-8.0-r3.ebuild index 00776564c323..2717b50ee23c 100644 --- a/app-emulation/spim/spim-8.0-r3.ebuild +++ b/app-emulation/spim/spim-8.0-r3.ebuild @@ -19,8 +19,10 @@ RDEPEND=" x11-libs/libXaw ) " DEPEND="${RDEPEND} - X? ( x11-misc/imake - x11-proto/xproto ) + X? ( + x11-base/xorg-proto + x11-misc/imake + ) sys-devel/bison " # test hangs forever, disabling it diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild index cc4fb987e508..6fe9e2623e27 100644 --- a/app-emulation/vice/vice-3.1.ebuild +++ b/app-emulation/vice/vice-3.1.ebuild @@ -75,15 +75,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig x11-apps/bdftopcf x11-apps/mkfontdir - x11-proto/xproto - x11-proto/xextproto + x11-base/xorg-proto media-libs/fontconfig - x11-proto/videoproto nls? ( sys-devel/gettext ) !sdl? ( - fullscreen? ( - x11-proto/xf86vidmodeproto - ) !gtk? ( x11-libs/libICE x11-libs/libSM diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild index 6e4ec727e56f..3c8b9c6ca161 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild @@ -27,8 +27,7 @@ RDEPEND="X? ( x11-apps/xrandr x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM - x11-libs/libICE - x11-proto/glproto ) + x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox" DEPEND="${RDEPEND} @@ -37,8 +36,7 @@ DEPEND="${RDEPEND} sys-devel/bin86 sys-libs/pam sys-power/iasl - X? ( x11-proto/renderproto ) - !X? ( x11-proto/xproto )" + x11-base/xorg-proto" PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )" BUILD_TARGETS="all" diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild index b85dda606c3f..97d4f9402e9b 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild @@ -27,8 +27,7 @@ RDEPEND="X? ( x11-apps/xrandr x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM - x11-libs/libICE - x11-proto/glproto ) + x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox" DEPEND="${RDEPEND} @@ -37,8 +36,7 @@ DEPEND="${RDEPEND} sys-devel/bin86 sys-libs/pam sys-power/iasl - X? ( x11-proto/renderproto ) - !X? ( x11-proto/xproto )" + x11-base/xorg-proto" PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )" BUILD_TARGETS="all" diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild index b85dda606c3f..97d4f9402e9b 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild @@ -27,8 +27,7 @@ RDEPEND="X? ( x11-apps/xrandr x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM - x11-libs/libICE - x11-proto/glproto ) + x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox" DEPEND="${RDEPEND} @@ -37,8 +36,7 @@ DEPEND="${RDEPEND} sys-devel/bin86 sys-libs/pam sys-power/iasl - X? ( x11-proto/renderproto ) - !X? ( x11-proto/xproto )" + x11-base/xorg-proto" PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )" BUILD_TARGETS="all" diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild index 13cfeb79a1d6..9a895f357c2a 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild @@ -28,8 +28,7 @@ RDEPEND=" x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM - x11-libs/libICE - x11-proto/glproto ) + x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox @@ -41,8 +40,7 @@ DEPEND=" sys-devel/bin86 sys-libs/pam sys-power/iasl - X? ( x11-proto/renderproto ) - !X? ( x11-proto/xproto ) + x11-base/xorg-proto " PDEPEND=" X? ( x11-drivers/xf86-video-vboxvideo ) diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild index 13cfeb79a1d6..9a895f357c2a 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild @@ -28,8 +28,7 @@ RDEPEND=" x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM - x11-libs/libICE - x11-proto/glproto ) + x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox @@ -41,8 +40,7 @@ DEPEND=" sys-devel/bin86 sys-libs/pam sys-power/iasl - X? ( x11-proto/renderproto ) - !X? ( x11-proto/xproto ) + x11-base/xorg-proto " PDEPEND=" X? ( x11-drivers/xf86-video-vboxvideo ) diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild index 1f394f6f13bf..52aa80d79f24 100644 --- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild @@ -150,17 +150,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild index 62b897aa0e7a..d0b16c47aa1e 100644 --- a/app-emulation/wine-any/wine-any-2.19.ebuild +++ b/app-emulation/wine-any/wine-any-2.19.ebuild @@ -151,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.20.ebuild b/app-emulation/wine-any/wine-any-2.20.ebuild index ceb899dbb839..913e3e1528aa 100644 --- a/app-emulation/wine-any/wine-any-2.20.ebuild +++ b/app-emulation/wine-any/wine-any-2.20.ebuild @@ -152,17 +152,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.21.ebuild b/app-emulation/wine-any/wine-any-2.21.ebuild index ceb899dbb839..913e3e1528aa 100644 --- a/app-emulation/wine-any/wine-any-2.21.ebuild +++ b/app-emulation/wine-any/wine-any-2.21.ebuild @@ -152,17 +152,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild index 4ac2529840fe..d8688841e0a8 100644 --- a/app-emulation/wine-any/wine-any-9999.ebuild +++ b/app-emulation/wine-any/wine-any-9999.ebuild @@ -154,17 +154,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild index 296fe4e7b71a..0ca4d6a8699e 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild @@ -134,13 +134,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild index 94d819782d2f..45394c946984 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild @@ -135,13 +135,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild index cd620120b755..d8fd326eccbc 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild @@ -136,13 +136,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild index cd620120b755..d8fd326eccbc 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild @@ -136,13 +136,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild index 7781bcbed2f8..b48cb73fb1b6 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild @@ -138,13 +138,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild index 191ee925a443..2eb9fbdb2a49 100644 --- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild @@ -140,17 +140,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-2.19.ebuild index e6caef35641a..933b53a87ffc 100644 --- a/app-emulation/wine-staging/wine-staging-2.19.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild @@ -141,17 +141,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-staging/wine-staging-2.20.ebuild b/app-emulation/wine-staging/wine-staging-2.20.ebuild index 3733269fd131..e3bcca8e5dae 100644 --- a/app-emulation/wine-staging/wine-staging-2.20.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.20.ebuild @@ -142,17 +142,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-staging/wine-staging-2.21.ebuild b/app-emulation/wine-staging/wine-staging-2.21.ebuild index 3733269fd131..e3bcca8e5dae 100644 --- a/app-emulation/wine-staging/wine-staging-2.21.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.21.ebuild @@ -142,17 +142,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index a231afd2ad86..fd41d6cfdb22 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -144,17 +144,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild index 122d7b748931..44f1a68f219e 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild @@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild index c701c112800e..203ac31a11d8 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild @@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild index c701c112800e..203ac31a11d8 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild @@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild index e24402ac58f6..42ea191ef336 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild @@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild index 1897a5fe7ad6..e012559463d5 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild @@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild index 3f1778611a37..40d354c58c00 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild @@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild index 3f1778611a37..40d354c58c00 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild @@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild index 3f1778611a37..40d354c58c00 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild @@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild index ad6493ebe95d..0fc721308065 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild @@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild index 28b84951d9b6..a7cee7750644 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild @@ -122,13 +122,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild index 28b84951d9b6..a7cee7750644 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild @@ -122,13 +122,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index ddf4b23d2eec..62ef97c197eb 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -123,13 +123,9 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/xen-tools/xen-tools-4.10.0.ebuild b/app-emulation/xen-tools/xen-tools-4.10.0.ebuild index 03bc0dd63837..1d2b4deba3b0 100644 --- a/app-emulation/xen-tools/xen-tools-4.10.0.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.10.0.ebuild @@ -110,7 +110,7 @@ DEPEND="${COMMON_DEPEND} dev-texlive/texlive-latexextra media-gfx/transfig ) - hvm? ( x11-proto/xproto + hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= diff --git a/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild index 4c35903b2c5d..f18cfce1271b 100644 --- a/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild @@ -108,7 +108,7 @@ DEPEND="${COMMON_DEPEND} dev-texlive/texlive-latexextra media-gfx/transfig ) - hvm? ( x11-proto/xproto + hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= diff --git a/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild index 0ef35d660eb6..191c3222dbe1 100644 --- a/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild @@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND} dev-texlive/texlive-latexextra media-gfx/transfig ) - hvm? ( x11-proto/xproto + hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= diff --git a/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild index e7a533511e10..723cc4fdf1d4 100644 --- a/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild @@ -108,7 +108,7 @@ DEPEND="${COMMON_DEPEND} dev-texlive/texlive-latexextra media-gfx/transfig ) - hvm? ( x11-proto/xproto + hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild index 2b32a98e6ca6..a8b1cae3566d 100644 --- a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild +++ b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild @@ -212,12 +212,9 @@ DEPEND="${COMMON_DEPEND} sys-devel/ucpp sys-libs/zlib virtual/pkgconfig + x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild index 8ee18655d754..fd1f349a9f70 100644 --- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild @@ -217,12 +217,9 @@ DEPEND="${COMMON_DEPEND} sys-devel/ucpp sys-libs/zlib virtual/pkgconfig + x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 9ac42f54a68d..edf22ead40df 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -217,12 +217,9 @@ DEPEND="${COMMON_DEPEND} sys-devel/ucpp sys-libs/zlib virtual/pkgconfig + x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 491edb6043aa..3799a7815c0e 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -216,12 +216,9 @@ DEPEND="${COMMON_DEPEND} sys-devel/ucpp sys-libs/zlib virtual/pkgconfig + x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild index e249940edd06..cb200d9236b5 100644 --- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild +++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-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 @@ -40,7 +40,7 @@ COMMON_DEPEND="x11-libs/libICE mng? ( media-libs/libmng )" DEPEND="${COMMON_DEPEND} sys-devel/autoconf - x11-proto/xextproto + x11-base/xorg-proto x11-libs/libxkbfile app-text/rman x11-misc/imake" diff --git a/app-office/texmacs/texmacs-1.99.2-r1.ebuild b/app-office/texmacs/texmacs-1.99.2-r1.ebuild index f408b0358af2..b699dc377ee2 100644 --- a/app-office/texmacs/texmacs-1.99.2-r1.ebuild +++ b/app-office/texmacs/texmacs-1.99.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 @@ -31,7 +31,7 @@ RDEPEND=" svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) " DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" S="${WORKDIR}/${MY_P}" diff --git a/app-office/texmacs/texmacs-1.99.5.ebuild b/app-office/texmacs/texmacs-1.99.5.ebuild index 38d576fe4680..879508352d2e 100644 --- a/app-office/texmacs/texmacs-1.99.5.ebuild +++ b/app-office/texmacs/texmacs-1.99.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=6 @@ -31,7 +31,7 @@ RDEPEND=" svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) " DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" S="${WORKDIR}/${MY_P}" diff --git a/app-office/texmacs/texmacs-1.99.6-r1.ebuild b/app-office/texmacs/texmacs-1.99.6-r1.ebuild index f30d4670bf1f..22770bc0ecc5 100644 --- a/app-office/texmacs/texmacs-1.99.6-r1.ebuild +++ b/app-office/texmacs/texmacs-1.99.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 @@ -32,7 +32,7 @@ RDEPEND=" svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) " DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" S="${WORKDIR}/${MY_P}" diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild index f7586e26e7c2..d033045a79f5 100644 --- a/app-office/texmacs/texmacs-1.99.6-r2.ebuild +++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild @@ -34,7 +34,7 @@ RDEPEND=" svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) " DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" S="${WORKDIR}/${MY_P}" diff --git a/app-office/texmacs/texmacs-1.99.6.ebuild b/app-office/texmacs/texmacs-1.99.6.ebuild index bd65c285bdbd..c4e5c3f4e6fe 100644 --- a/app-office/texmacs/texmacs-1.99.6.ebuild +++ b/app-office/texmacs/texmacs-1.99.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=6 @@ -31,7 +31,7 @@ RDEPEND=" svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) " DEPEND="${RDEPEND} - x11-proto/xproto" + x11-base/xorg-proto" S="${WORKDIR}/${MY_P}" diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild index 465018f8f624..9229206c5f76 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.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 @@ -39,9 +39,9 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) DEPEND="app-arch/zip gtk? ( + x11-base/xorg-proto x11-libs/libXrender >=x11-libs/libXtst-1.1.0 - x11-proto/xproto ) >=virtual/jdk-1.5 ${RDEPEND}" diff --git a/dev-java/icedtea/icedtea-3.7.0.ebuild b/dev-java/icedtea/icedtea-3.7.0.ebuild index be3cb438b0bc..8605d13cd9d0 100644 --- a/dev-java/icedtea/icedtea-3.7.0.ebuild +++ b/dev-java/icedtea/icedtea-3.7.0.ebuild @@ -86,13 +86,10 @@ X_COMMON_DEP=" >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite" X_DEPEND=" + x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 - x11-proto/inputproto - >=x11-proto/xextproto-7.1.1 - x11-proto/xineramaproto - x11-proto/xproto" + >=x11-libs/libXinerama-1.0.2" # The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn COMMON_DEP=" diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild index 63f3c11299f2..aa38b1de0654 100644 --- a/dev-java/swt/swt-3.7.2-r2.ebuild +++ b/dev-java/swt/swt-3.7.2-r2.ebuild @@ -40,11 +40,11 @@ COMMON=">=dev-libs/glib-2.6 DEPEND=">=virtual/jdk-1.4 app-arch/unzip + x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 - x11-proto/inputproto virtual/pkgconfig ${COMMON}" diff --git a/dev-java/swt/swt-3.8.2-r2.ebuild b/dev-java/swt/swt-3.8.2-r2.ebuild index 72289d111711..64b28cc018f3 100644 --- a/dev-java/swt/swt-3.8.2-r2.ebuild +++ b/dev-java/swt/swt-3.8.2-r2.ebuild @@ -40,11 +40,11 @@ COMMON=">=dev-libs/glib-2.6 DEPEND=">=virtual/jdk-1.4 app-arch/unzip + x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 - x11-proto/inputproto virtual/pkgconfig ${COMMON}" diff --git a/dev-java/swt/swt-4.2-r3.ebuild b/dev-java/swt/swt-4.2-r3.ebuild index 40625a0c8c8b..fdfce91451a6 100644 --- a/dev-java/swt/swt-4.2-r3.ebuild +++ b/dev-java/swt/swt-4.2-r3.ebuild @@ -42,11 +42,11 @@ DEPEND="${COMMON_DEP} >=virtual/jdk-1.4 app-arch/unzip virtual/pkgconfig + x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt - >=x11-libs/libXtst-1.1.0 - x11-proto/inputproto" + >=x11-libs/libXtst-1.1.0" RDEPEND="${COMMON_DEP} >=virtual/jre-1.4" diff --git a/dev-perl/X11-XCB/Manifest b/dev-perl/X11-XCB/Manifest index 16a5b8827209..98a6448dd20e 100644 --- a/dev-perl/X11-XCB/Manifest +++ b/dev-perl/X11-XCB/Manifest @@ -1,2 +1 @@ -DIST X11-XCB-0.16.tar.gz 89791 BLAKE2B 24107c6d9c3340ebe87a5569f4ffb45e892009cd954fb35dd1af93e0388870f76fab79319a618e322a2d3876008978b36b967085a913022e2668ef06eb6b7184 SHA512 08642ffe99b3bb83f68f05157613b895e5abf7f3c17e6bee4b835bde33654208d9bb1c34633163ccae0b9dafbd869c35fd36f3ce46d3220c6ca254f0ccf5926a DIST X11-XCB-0.17.tar.gz 90833 BLAKE2B 7de56a99abb27373f0473e4d98c177d3db4f4811bdee358e79a85db26345e59f3dfa0998e10678fce1585ddbf1f58796f75d2adc198ec6d23ae521720b3d93ae SHA512 8a5457afdb3b32fd6d425a27dee1a6afbbded222cf71a9d7201ed2c0db0b0b7c803ae3e69a897c510b9b07b79e880efe0cf062ea025d2d3ff7ee16d364c568bc diff --git a/dev-perl/X11-XCB/X11-XCB-0.160.0.ebuild b/dev-perl/X11-XCB/X11-XCB-0.160.0.ebuild deleted file mode 100644 index 215dfcde73f8..000000000000 --- a/dev-perl/X11-XCB/X11-XCB-0.160.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_AUTHOR=MSTPLBG -DIST_VERSION=0.16 -inherit perl-module virtualx - -DESCRIPTION="Perl bindings for libxcb" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND=" - dev-perl/Data-Dump - dev-perl/Mouse - dev-perl/MouseX-NativeTraits - dev-perl/Try-Tiny - dev-perl/XML-Descent - dev-perl/XML-Simple - >=virtual/perl-XSLoader-0.20.0 - x11-proto/xcb-proto - >=x11-libs/libxcb-1.2 - x11-libs/xcb-util - x11-libs/xcb-util-wm -" -DEPEND="${RDEPEND} - >=virtual/perl-Devel-PPPort-3.190.0 - dev-perl/ExtUtils-Depends - >=virtual/perl-ExtUtils-MakeMaker-6.590.0 - >=virtual/perl-ExtUtils-ParseXS-3.180.0 - dev-perl/ExtUtils-PkgConfig - dev-perl/XS-Object-Magic - test? ( - dev-perl/Test-Deep - dev-perl/Test-Exception - virtual/perl-Test-Simple - ) -" -PATCHES=( "${FILESDIR}/${P}-526.patch" ) -src_compile() { - MAKEOPTS="-j1" perl-module_src_compile -} -src_test() { - virtx perl-module_src_test -} diff --git a/dev-perl/X11-XCB/X11-XCB-0.170.0.ebuild b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild index dc970e896d51..7f439ecb1b9b 100644 --- a/dev-perl/X11-XCB/X11-XCB-0.170.0.ebuild +++ b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild @@ -20,12 +20,12 @@ RDEPEND=" dev-perl/XML-Descent dev-perl/XML-Simple >=virtual/perl-XSLoader-0.20.0 - x11-proto/xcb-proto >=x11-libs/libxcb-1.2 x11-libs/xcb-util x11-libs/xcb-util-wm " DEPEND="${RDEPEND} + x11-base/xcb-proto >=virtual/perl-Devel-PPPort-3.190.0 dev-perl/ExtUtils-Depends >=virtual/perl-ExtUtils-MakeMaker-6.590.0 diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild index cb2eede7312f..8a3472702226 100644 --- a/dev-qt/qtgui/qtgui-4.8.7.ebuild +++ b/dev-qt/qtgui/qtgui-4.8.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 @@ -53,12 +53,7 @@ RDEPEND=" !<dev-qt/qthelp-4.8.5:4 " DEPEND="${RDEPEND} - !aqua? ( - >=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] ) - xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] ) - ) + !aqua? ( x11-base/xorg-proto ) " PDEPEND=" qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild index 598421b6701d..04cc34da1d15 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild @@ -35,7 +35,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - gstreamer? ( x11-proto/videoproto ) + gstreamer? ( x11-base/xorg-proto ) " src_prepare() { diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild index 255a5e8a1523..5c2c8c280424 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.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 @@ -35,7 +35,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - gstreamer? ( x11-proto/videoproto ) + gstreamer? ( x11-base/xorg-proto ) " src_prepare() { diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild index b026b99070d0..07c0609fcc71 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild @@ -35,7 +35,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - gstreamer? ( x11-proto/videoproto ) + gstreamer? ( x11-base/xorg-proto ) " src_prepare() { diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild index a3c48dc046ab..ccc57e3e45a4 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild @@ -35,7 +35,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - gstreamer? ( x11-proto/videoproto ) + gstreamer? ( x11-base/xorg-proto ) " src_prepare() { diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild index 598421b6701d..04cc34da1d15 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild @@ -35,7 +35,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - gstreamer? ( x11-proto/videoproto ) + gstreamer? ( x11-base/xorg-proto ) " src_prepare() { diff --git a/media-libs/waffle/waffle-1.5.2.ebuild b/media-libs/waffle/waffle-1.5.2.ebuild index 140bb05b121d..ec71eacc2bfe 100644 --- a/media-libs/waffle/waffle-1.5.2.ebuild +++ b/media-libs/waffle/waffle-1.5.2.ebuild @@ -33,7 +33,7 @@ RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - >=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] + >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] doc? ( dev-libs/libxslt app-text/docbook-xml-dtd:4.2 diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild index 8d8286cd45ce..23384f2ecadf 100644 --- a/media-libs/waffle/waffle-9999.ebuild +++ b/media-libs/waffle/waffle-9999.ebuild @@ -33,7 +33,7 @@ RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - >=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] + >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] doc? ( dev-libs/libxslt app-text/docbook-xml-dtd:4.2 diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018 index 49ce4ec28a5b..87eaba8c3a3a 100644 --- a/profiles/updates/2Q-2018 +++ b/profiles/updates/2Q-2018 @@ -4,3 +4,4 @@ move gnome-extra/gnome-builder dev-util/gnome-builder move kde-apps/kstars sci-astronomy/kstars move media-video/kamoso kde-apps/kamoso move app-backup/kbackup kde-apps/kbackup +move x11-proto/xcb-proto x11-base/xcb-proto diff --git a/x11-proto/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest index e4b1cc4e7beb..e4b1cc4e7beb 100644 --- a/x11-proto/xcb-proto/Manifest +++ b/x11-base/xcb-proto/Manifest diff --git a/x11-proto/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch b/x11-base/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch index 695794864da7..695794864da7 100644 --- a/x11-proto/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch +++ b/x11-base/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch diff --git a/x11-proto/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch b/x11-base/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch index fed0745a5e9c..fed0745a5e9c 100644 --- a/x11-proto/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch +++ b/x11-base/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch diff --git a/x11-proto/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch b/x11-base/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch index deb6673fe1eb..deb6673fe1eb 100644 --- a/x11-proto/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch +++ b/x11-base/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch diff --git a/x11-proto/xcb-proto/metadata.xml b/x11-base/xcb-proto/metadata.xml index e943b72b8a48..e943b72b8a48 100644 --- a/x11-proto/xcb-proto/metadata.xml +++ b/x11-base/xcb-proto/metadata.xml diff --git a/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild b/x11-base/xcb-proto/xcb-proto-1.12-r2.ebuild index a49cbb8e2a4a..a49cbb8e2a4a 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild +++ b/x11-base/xcb-proto/xcb-proto-1.12-r2.ebuild diff --git a/x11-proto/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild index 81add3e7b94f..81add3e7b94f 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.13.ebuild +++ b/x11-base/xcb-proto/xcb-proto-1.13.ebuild diff --git a/x11-libs/libxcb/libxcb-1.12-r2.ebuild b/x11-libs/libxcb/libxcb-1.12-r2.ebuild index 5ec2a2ba345b..922c0eb9855b 100644 --- a/x11-libs/libxcb/libxcb-1.12-r2.ebuild +++ b/x11-libs/libxcb/libxcb-1.12-r2.ebuild @@ -31,10 +31,10 @@ DEPEND="${RDEPEND} dev-libs/libxslt ${PYTHON_DEPS} $(python_gen_any_dep \ - "~x11-proto/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")" + "~x11-base/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")" python_check_deps() { - has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]" + has_version --host-root ">=x11-base/xcb-proto-1.11[${PYTHON_USEDEP}]" } pkg_setup() { diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild index a8f6ab111833..f3ce17fcb187 100644 --- a/x11-libs/libxcb/libxcb-1.13.ebuild +++ b/x11-libs/libxcb/libxcb-1.13.ebuild @@ -30,10 +30,10 @@ DEPEND="${RDEPEND} dev-libs/libxslt ${PYTHON_DEPS} $(python_gen_any_dep \ - ">=x11-proto/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")" + ">=x11-base/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")" python_check_deps() { - has_version --host-root ">=x11-proto/xcb-proto-1.13[${PYTHON_USEDEP}]" + has_version --host-root ">=x11-base/xcb-proto-1.13[${PYTHON_USEDEP}]" } pkg_setup() { diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild index 1729b1717639..1b44dc87488b 100644 --- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild +++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-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=5 @@ -20,10 +20,10 @@ IUSE="test" RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] >=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}] - >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}] - >=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]" + >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} + >=x11-base/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}] + x11-base/xorg-proto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )" diff --git a/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild deleted file mode 100644 index 64d7a33b7dab..000000000000 --- a/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -AUTOTOOLS_AUTORECONF=1 - -inherit flag-o-matic xorg-2 python-r1 - -#EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/xpyb.git" -SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2" -DESCRIPTION="XCB-based Python bindings for the X Window System" -HOMEPAGE="https://xcb.freedesktop.org/" - -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="selinux" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=x11-libs/libxcb-1.7 - >=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-python.patch - "${FILESDIR}"/${PN}-1.3.1-xcbproto-1.9.patch -) -DOCS=( NEWS README ) - -pkg_setup() { - xorg-2_pkg_setup - XORG_CONFIGURE_OPTIONS=( - $(use_enable selinux) - ) -} - -src_configure() { - append-cflags -fno-strict-aliasing - python_foreach_impl xorg-2_src_configure -} - -src_compile() { - python_foreach_impl xorg-2_src_compile -} - -src_install() { - python_foreach_impl xorg-2_src_install -} diff --git a/x11-libs/xpyb/xpyb-1.3.1-r4.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild index 1e7d210bc6ae..5e162838c60d 100644 --- a/x11-libs/xpyb/xpyb-1.3.1-r4.ebuild +++ b/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild @@ -18,9 +18,9 @@ IUSE="selinux" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=">=x11-libs/libxcb-1.7 - >=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}] ${PYTHON_DEPS}" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + >=x11-base/xcb-proto-1.7.1[${PYTHON_USEDEP}]" PATCHES=( "${FILESDIR}"/${PN}-python.patch diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild index 0f94c1127f5c..19db570fd479 100644 --- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild +++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild @@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND} dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] - >=x11-proto/xcb-proto-1.5 + >=x11-base/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild index ef80e0b80123..2ed75628ce4a 100644 --- a/x11-wm/awesome/awesome-4.2-r2.ebuild +++ b/x11-wm/awesome/awesome-4.2-r2.ebuild @@ -44,7 +44,7 @@ DEPEND="${RDEPEND} dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] - >=x11-proto/xcb-proto-1.5 + >=x11-base/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) test? ( diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index ec01a3cc9a5d..72cb2ec82622 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-9999.ebuild @@ -43,7 +43,7 @@ DEPEND="${RDEPEND} dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] - >=x11-proto/xcb-proto-1.5 + >=x11-base/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( dev-lua/ldoc ) test? ( diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest index 9c88ed960b1c..d582910bde41 100644 --- a/x11-wm/page/Manifest +++ b/x11-wm/page/Manifest @@ -1,3 +1 @@ -DIST page-1.9.8.tar.gz 993882 BLAKE2B 2ede40d5ce223b7ab775d56cd594b5db69dadfd7d376d2232e6739bb288479913807755a74a209e4705b5d43da84e649b341f83461b449a639639372fc1021f0 SHA512 624493282bb3258bbbaf731d4b6e0fe50741a6dfe80a559feb40112042aeb799b46e820c23d8a1679c4374ceb5be0b63890e2f660f1240b4dd249bb3b8aa61a8 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012 -DIST page-1.9.9.tar.gz 1007419 BLAKE2B 0f7c59d153bdc85b5f8167ff6a07202b3e294829573fb9427893b33b23b66605691ec664223fbdba1244e3059f5b103c4ea62c67165eeccc161738a839a29ae9 SHA512 4dfd7b04823e13c2a592e3037803022d6e30019ac9390b6da9196e0a250de8e213d2a6a7546cd97c3d77deac4fa70410def2ed2367bb3a21c6f1ddb3df61d5f8 diff --git a/x11-wm/page/page-1.9.8-r1.ebuild b/x11-wm/page/page-1.9.8-r1.ebuild deleted file mode 100644 index e121fb854d10..000000000000 --- a/x11-wm/page/page-1.9.8-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="A mouse friendly tiling window manager" -HOMEPAGE="http://www.hzog.net/index.php/Main_Page" -SRC_URI="http://www.hzog.net/pub/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - x11-proto/xcb-proto - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/libXfixes - x11-libs/libXdamage - x11-proto/damageproto - x11-proto/randrproto - x11-libs/libXrandr - x11-proto/xproto - x11-proto/fixesproto - x11-proto/compositeproto - x11-libs/libXcomposite - x11-proto/renderproto - x11-libs/libXrender - x11-libs/libXext - x11-proto/xextproto - x11-libs/cairo[X,xcb] - x11-libs/pango - dev-libs/glib:2" - -DEPEND="${RDEPEND}" - -src_install() { - default - - # Solves file collision with dev-tcltk/tcllib, bug #574074 - ebegin "Changing references from 'page' to 'pagewm'" - mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!" - sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!" - eend -} - -pkg_postinst() { - elog "page can now be launched using \"pagewm\". To find out more about this functionality," - elog "see the following bug report: https://bugs.gentoo.org/574074." -} diff --git a/x11-wm/page/page-1.9.8.ebuild b/x11-wm/page/page-1.9.8.ebuild deleted file mode 100644 index c03cb2442c54..000000000000 --- a/x11-wm/page/page-1.9.8.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="A mouse friendly tiling window manager" -HOMEPAGE="http://www.hzog.net/index.php/Main_Page" -SRC_URI="http://www.hzog.net/pub/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - x11-proto/xcb-proto - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/libXfixes - x11-libs/libXdamage - x11-proto/damageproto - x11-proto/randrproto - x11-libs/libXrandr - x11-proto/xproto - x11-proto/fixesproto - x11-proto/compositeproto - x11-libs/libXcomposite - x11-proto/renderproto - x11-libs/libXrender - x11-libs/libXext - x11-proto/xextproto - x11-libs/cairo[xcb] - x11-libs/pango - dev-libs/glib:2" - -DEPEND="${RDEPEND}" - -src_install() { - default - - # Solves file collision with dev-tcltk/tcllib, bug #574074 - ebegin "Changing references from 'page' to 'pagewm'" - mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!" - sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!" - eend -} - -pkg_postinst() { - elog "page can now be launched using \"pagewm\". To find out more about this functionality," - elog "see the following bug report: https://bugs.gentoo.org/574074." -} diff --git a/x11-wm/page/page-1.9.9-r1.ebuild b/x11-wm/page/page-1.9.9-r1.ebuild deleted file mode 100644 index 21d6b712d59c..000000000000 --- a/x11-wm/page/page-1.9.9-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A mouse friendly tiling window manager" -HOMEPAGE="http://www.hzog.net/index.php/Main_Page" -SRC_URI="http://www.hzog.net/pub/${PF}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=x11-proto/xcb-proto-1.12-r2 - >=x11-libs/libxcb-1.11[xkb] - >=x11-libs/xcb-util-0.4.0 - >=x11-libs/libXfixes-5.0.3 - >=x11-libs/libXdamage-1.1.4-r1 - >=x11-proto/damageproto-1.2.1-r1 - >=x11-proto/randrproto-1.5.0 - >=x11-libs/libXrandr-1.5.1 - >=x11-proto/xproto-7.0.31 - >=x11-proto/fixesproto-5.0-r1 - >=x11-proto/compositeproto-0.4.2-r1 - >=x11-libs/libXcomposite-0.4.4-r1 - >=x11-proto/renderproto-0.11.1-r1 - >=x11-libs/libXrender-0.9.10 - >=x11-libs/libXext-1.3.3 - >=x11-proto/xextproto-7.3.0 - >=x11-libs/cairo-1.14.6[X,xcb] - >=x11-libs/pango-1.40.5 - >=dev-libs/glib-2.50.3-r1:2" - -DEPEND="${RDEPEND}" - -src_install() { - default - - # Solves file collision with dev-tcltk/tcllib, bug #574074 - ebegin "Changing references from 'page' to 'pagewm'" - mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!" - sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!" - eend -} - -pkg_postinst() { - elog "page can now be launched using \"pagewm\". To find out more about this functionality," - elog "see the following bug report: https://bugs.gentoo.org/574074." -} diff --git a/x11-wm/page/page-1.9.9.ebuild b/x11-wm/page/page-1.9.9-r2.ebuild index 4bd58b7eb176..a99b66b74284 100644 --- a/x11-wm/page/page-1.9.9.ebuild +++ b/x11-wm/page/page-1.9.9-r2.ebuild @@ -1,38 +1,32 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 DESCRIPTION="A mouse friendly tiling window manager" HOMEPAGE="http://www.hzog.net/index.php/Main_Page" -SRC_URI="http://www.hzog.net/pub/${P}.tar.gz" +SRC_URI="http://www.hzog.net/pub/${PN}-1.9.9-r1.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" - >=x11-proto/xcb-proto-1.12-r2 >=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 - >=x11-proto/damageproto-1.2.1-r1 - >=x11-proto/randrproto-1.5.0 >=x11-libs/libXrandr-1.5.1 - >=x11-proto/xproto-7.0.31 - >=x11-proto/fixesproto-5.0-r1 - >=x11-proto/compositeproto-0.4.2-r1 >=x11-libs/libXcomposite-0.4.4-r1 - >=x11-proto/renderproto-0.11.1-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 - >=x11-proto/xextproto-7.3.0 >=x11-libs/cairo-1.14.6[X,xcb] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + >=x11-base/xcb-proto-1.12-r2 + x11-base/xorg-proto" src_install() { default |