app-emulation/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Thu, 26 Apr 2018 19:09:43 +0000 (21:09 +0200)
committerMatt Turner <mattst88@gentoo.org>
Fri, 27 Apr 2018 01:04:41 +0000 (18:04 -0700)
44 files changed:
app-emulation/bochs/bochs-2.6.9.ebuild
app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
app-emulation/spectemu/spectemu-0.99.3.ebuild
app-emulation/spim/spim-8.0-r3.ebuild
app-emulation/vice/vice-3.1.ebuild
app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild
app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild
app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild
app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild
app-emulation/wine-any/wine-any-2.0-r1.ebuild
app-emulation/wine-any/wine-any-2.19.ebuild
app-emulation/wine-any/wine-any-2.20.ebuild
app-emulation/wine-any/wine-any-2.21.ebuild
app-emulation/wine-any/wine-any-9999.ebuild
app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
app-emulation/wine-staging/wine-staging-2.19.ebuild
app-emulation/wine-staging/wine-staging-2.20.ebuild
app-emulation/wine-staging/wine-staging-2.21.ebuild
app-emulation/wine-staging/wine-staging-9999.ebuild
app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
app-emulation/xen-tools/xen-tools-4.10.0.ebuild
app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild
app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild
app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild

index 1fbf6c61aec6d0472df627ce82cf133e6f37b2fd..80e103e7f58909998de0a2853334cbaaa8bac621 100644 (file)
@@ -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
 "
index 8b5fcdc0a6932f4f1d0126083cb070e9fa20be6f..4f7a7c37c07a9d2e3567d4ed9ae988630fcc7591 100644 (file)
@@ -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}"
index d9078de33c1e97949e7424882145467dff023ac6..63d99f142b49e6c7178004171e31f85a6f613024 100644 (file)
@@ -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
index 97c1a3de88f72c82e68a741d5fecf0f17a346efb..88953028592335e1ca5af91594cbdbc317132b0c 100644 (file)
@@ -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
index 1052d0a334f7a239172f00205ab6c6d82fa3821f..478549c3d5caacfbd1d7913291d0bd3bba8f050d 100644 (file)
@@ -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 )
index 2ab41303ddcd8940af1b40f297924fe3a75c1f44..cbdae8d8a0e8d6206d907aa3e4ef57a8bff4998e 100644 (file)
@@ -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 )
index 00776564c32333f58a5f9806bbb05a02a4ade064..2717b50ee23c0b084f11f6a7bd040971d2835544 100644 (file)
@@ -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
index cc4fb987e508b25b1e94ac8b2ab30018eaaa1c38..6fe9e2623e277b4b23acc4192259f3e661b7debd 100644 (file)
@@ -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
index 6e4ec727e56f3be08e143765a0a35ff572ae0b45..49506f057f7889c797a7ca40e89eda6b883f5cdf 100644 (file)
@@ -20,6 +20,7 @@ IUSE="X"
 
 RDEPEND="X? ( x11-apps/xrandr
                x11-apps/xrefresh
+               x11-base/xorg-proto
                x11-libs/libXmu
                x11-libs/libX11
                x11-libs/libXt
@@ -27,8 +28,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 +37,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"
index b85dda606c3f2ca4fbbee9a8958126becaa39e41..1e207ed862ff2f2f79e4b3b2ed7acfed5907fb9f 100644 (file)
@@ -20,6 +20,7 @@ IUSE="X"
 
 RDEPEND="X? ( x11-apps/xrandr
                x11-apps/xrefresh
+               x11-base/xorg-proto
                x11-libs/libXmu
                x11-libs/libX11
                x11-libs/libXt
@@ -27,8 +28,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 +37,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"
index b85dda606c3f2ca4fbbee9a8958126becaa39e41..1e207ed862ff2f2f79e4b3b2ed7acfed5907fb9f 100644 (file)
@@ -20,6 +20,7 @@ IUSE="X"
 
 RDEPEND="X? ( x11-apps/xrandr
                x11-apps/xrefresh
+               x11-base/xorg-proto
                x11-libs/libXmu
                x11-libs/libX11
                x11-libs/libXt
@@ -27,8 +28,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 +37,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"
index 13cfeb79a1d668ef1299844e323d49fc17b49329..9330c3a361e04b38773069380c24e89dad3a83ef 100644 (file)
@@ -21,6 +21,7 @@ IUSE="X"
 RDEPEND="
        X? ( x11-apps/xrandr
                x11-apps/xrefresh
+               x11-base/xorg-proto
                x11-libs/libXmu
                x11-libs/libX11
                x11-libs/libXt
@@ -28,8 +29,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 +41,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 )
index 13cfeb79a1d668ef1299844e323d49fc17b49329..9330c3a361e04b38773069380c24e89dad3a83ef 100644 (file)
@@ -21,6 +21,7 @@ IUSE="X"
 RDEPEND="
        X? ( x11-apps/xrandr
                x11-apps/xrefresh
+               x11-base/xorg-proto
                x11-libs/libXmu
                x11-libs/libX11
                x11-libs/libXt
@@ -28,8 +29,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 +41,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 )
index 1f394f6f13bfe76383d0908c495a08f0a6a8edff..52aa80d79f2431ece2ba0268a2e218f539328d49 100644 (file)
@@ -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
index 62b897aa0e7aa87ad6b507139a1d1d73c7fd12ca..d0b16c47aa1ed8b0f2ce27d95911c237b2741f8c 100644 (file)
@@ -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
index ceb899dbb839c5f0cc5d394a1999c09f77a554bd..913e3e1528aabfbc135060f795f33de0753a61b5 100644 (file)
@@ -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
index ceb899dbb839c5f0cc5d394a1999c09f77a554bd..913e3e1528aabfbc135060f795f33de0753a61b5 100644 (file)
@@ -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
index 4ac2529840fee90a4b4d5438552750f430e1e8c0..d8688841e0a8290595fd5465dec063d3c66dc316 100644 (file)
@@ -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
index 296fe4e7b71a957ed3cad2e1028616cdead844bb..0ca4d6a8699e27bfbd82df85d71eaa2a184b58e7 100644 (file)
@@ -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
index 94d819782d2f9b92859382e0b4372b9f95448d68..45394c9469841b8f947e0ab276621ca200096b65 100644 (file)
@@ -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
index cd620120b755ec2ad77dca8053f0fb79fc109c31..d8fd326eccbc0ddca3cda5eca5aa2dc75e0cb9cd 100644 (file)
@@ -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
index cd620120b755ec2ad77dca8053f0fb79fc109c31..d8fd326eccbc0ddca3cda5eca5aa2dc75e0cb9cd 100644 (file)
@@ -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
index 7781bcbed2f833927e49280f842c5ee21331b096..b48cb73fb1b617dea0cb47da92421ca5936ce91f 100644 (file)
@@ -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
index 191ee925a443a3a2f8452cce3d4bd0ccc14a0321..2eb9fbdb2a49c9f1a409dea627ca9e14d5bf8125 100644 (file)
@@ -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
index e6caef35641a9d92f0c1fc3548ba3fb9204fb877..933b53a87ffc25f1ea9780165491caa922cf98ea 100644 (file)
@@ -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
index 3733269fd1312a6159091d0b974f338a4ba0a707..e3bcca8e5dae30fcbbe5ce0a1fb8b18a1ed2266f 100644 (file)
@@ -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
index 3733269fd1312a6159091d0b974f338a4ba0a707..e3bcca8e5dae30fcbbe5ce0a1fb8b18a1ed2266f 100644 (file)
@@ -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
index a231afd2ad8633773d4c425b410778ce59b20c61..fd41d6cfdb22d185aab067482531a21270eb1b9f 100644 (file)
@@ -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
index 122d7b748931411511f97942847724e62c77de5c..44f1a68f219e3481ceb30ebd39f6133b87b59f1a 100644 (file)
@@ -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
index c701c112800ee6ed951bdfe42333b6a4b2b6701d..203ac31a11d880260dd400f16a3b295884822560 100644 (file)
@@ -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
index c701c112800ee6ed951bdfe42333b6a4b2b6701d..203ac31a11d880260dd400f16a3b295884822560 100644 (file)
@@ -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
index e24402ac58f6eb3bea7517b97ca2225a72c943b9..42ea191ef3366f6b080faa31eb0107d4138412a2 100644 (file)
@@ -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
index 1897a5fe7ad6b39e6b915689ad9b40d9e9d69ced..e012559463d59587f2439ff51491486ed8f9ad87 100644 (file)
@@ -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
index 3f1778611a37813e97833ec8871bc5b8f96385c0..40d354c58c00ebf928b06927f93d3add0fd2dae3 100644 (file)
@@ -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
index 3f1778611a37813e97833ec8871bc5b8f96385c0..40d354c58c00ebf928b06927f93d3add0fd2dae3 100644 (file)
@@ -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
index 3f1778611a37813e97833ec8871bc5b8f96385c0..40d354c58c00ebf928b06927f93d3add0fd2dae3 100644 (file)
@@ -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
index ad6493ebe95d2d4aaac0f1753f0a28c4c94e774d..0fc7213080657cba2beeca2107b3480f5f1a1138 100644 (file)
@@ -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
index 28b84951d9b6c16bda2f1ed07ad9a949703cc4b4..a7cee7750644d76831ed082bf944c26bec27e075 100644 (file)
@@ -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
index 28b84951d9b6c16bda2f1ed07ad9a949703cc4b4..a7cee7750644d76831ed082bf944c26bec27e075 100644 (file)
@@ -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
index ddf4b23d2eec340a11adb1025f1b21ab1cbf6997..62ef97c197eb8c519262f4378d1839b2f8569f47 100644 (file)
@@ -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
index 03bc0dd638375060332ef3f3a4decc30dccb365c..1d2b4deba3b044d5b8a09a86e95c7d055800f271 100644 (file)
@@ -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:=
index 4c35903b2c5d6e4a920b3bc64952703ca398fcb4..f18cfce1271bedc3dea4de1757f289edb4f5f504 100644 (file)
@@ -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:=
index 0ef35d660eb62be6d957368f40f3df0a223dbefc..191c3222dbe163d312e0e1c311776b51ce6713d6 100644 (file)
@@ -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:=
index e7a533511e101396774cc8ebb88364ad90e58bd9..723cc4fdf1d469a0d1f82a0a3f369225fd578f99 100644 (file)
@@ -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:=