commit: 0430f3ea803e8a7a8673b079a3ada878539606a9
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Apr 26 19:09:43 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 01:04:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0430f3ea
app-emulation/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
app-emulation/bochs/bochs-2.6.9.ebuild | 4 ++--
app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild | 4 ++--
app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild | 5 ++---
app-emulation/gxemul/gxemul-0.6.0-r1.ebuild | 4 ++--
app-emulation/spectemu/spectemu-0.99.3-r1.ebuild | 6 ++----
app-emulation/spectemu/spectemu-0.99.3.ebuild | 6 ++----
app-emulation/spim/spim-8.0-r3.ebuild | 6 ++++--
app-emulation/vice/vice-3.1.ebuild | 7 +------
.../virtualbox-guest-additions-5.1.32.ebuild | 7 +++----
.../virtualbox-guest-additions-5.1.34.ebuild | 7 +++----
.../virtualbox-guest-additions-5.1.36.ebuild | 7 +++----
.../virtualbox-guest-additions-5.2.10.ebuild | 7 +++----
.../virtualbox-guest-additions-5.2.8.ebuild | 7 +++----
app-emulation/wine-any/wine-any-2.0-r1.ebuild | 8 ++------
app-emulation/wine-any/wine-any-2.19.ebuild | 8 ++------
app-emulation/wine-any/wine-any-2.20.ebuild | 8 ++------
app-emulation/wine-any/wine-any-2.21.ebuild | 8 ++------
app-emulation/wine-any/wine-any-9999.ebuild | 8 ++------
app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild | 8 ++------
app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild | 8 ++------
app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild | 8 ++------
app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild | 8 ++------
app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 8 ++------
app-emulation/wine-staging/wine-staging-2.0-r1.ebuild | 8 ++------
app-emulation/wine-staging/wine-staging-2.19.ebuild | 8 ++------
app-emulation/wine-staging/wine-staging-2.20.ebuild | 8 ++------
app-emulation/wine-staging/wine-staging-2.21.ebuild | 8 ++------
app-emulation/wine-staging/wine-staging-9999.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild | 8 ++------
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 8 ++------
app-emulation/xen-tools/xen-tools-4.10.0.ebuild | 2 +-
app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild | 2 +-
app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild | 2 +-
app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild | 2 +-
44 files changed, 90 insertions(+), 211 deletions(-)
diff --git a/app-emulation/bochs/bochs-2.6.9.ebuild
b/app-emulation/bochs/bochs-2.6.9.ebuild
index 1fbf6c61aec..80e103e7f58 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 8b5fcdc0a69..4f7a7c37c07 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 d9078de33c1..63d99f142b4 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 97c1a3de88f..88953028592 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 1052d0a334f..478549c3d5c 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 2ab41303ddc..cbdae8d8a0e 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 00776564c32..2717b50ee23 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 cc4fb987e50..6fe9e2623e2 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 6e4ec727e56..49506f057f7 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
@@ -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"
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 b85dda606c3..1e207ed862f 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
@@ -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"
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 b85dda606c3..1e207ed862f 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
@@ -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"
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 13cfeb79a1d..9330c3a361e 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
@@ -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 )
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 13cfeb79a1d..9330c3a361e 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
@@ -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 )
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 1f394f6f13b..52aa80d79f2 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 62b897aa0e7..d0b16c47aa1 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 ceb899dbb83..913e3e1528a 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 ceb899dbb83..913e3e1528a 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 4ac2529840f..d8688841e0a 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 296fe4e7b71..0ca4d6a8699 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 94d819782d2..45394c94698 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 cd620120b75..d8fd326eccb 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 cd620120b75..d8fd326eccb 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 7781bcbed2f..b48cb73fb1b 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 191ee925a44..2eb9fbdb2a4 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 e6caef35641..933b53a87ff 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 3733269fd13..e3bcca8e5da 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 3733269fd13..e3bcca8e5da 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 a231afd2ad8..fd41d6cfdb2 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 122d7b74893..44f1a68f219 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 c701c112800..203ac31a11d 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 c701c112800..203ac31a11d 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 e24402ac58f..42ea191ef33 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 1897a5fe7ad..e012559463d 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 3f1778611a3..40d354c58c0 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 3f1778611a3..40d354c58c0 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 3f1778611a3..40d354c58c0 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 ad6493ebe95..0fc72130806 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 28b84951d9b..a7cee775064 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 28b84951d9b..a7cee775064 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 ddf4b23d2ee..62ef97c197e 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 03bc0dd6383..1d2b4deba3b 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 4c35903b2c5..f18cfce1271 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 0ef35d660eb..191c3222dbe 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 e7a533511e1..723cc4fdf1d 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:=
