[gentoo-commits] repo/gentoo:master commit in: x11-proto/presentproto/, x11-base/xorg-proto/, x11-proto/xf86vidmodeproto/, ...

[Matt Turner]

commit:     e6ac2d85289f84c33d04012576244abe61269044
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 19:05:41 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 19:08:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ac2d85

x11: Move x11-proto/xorgproto to x11-base/xorg-proto

Once the individual x11-proto/ packages subsumed by xorg-proto are gone,
the x11-proto/ category will contain only xcb-proto, printproto (should
be tree cleaned) and xorgproto. That's not enough packages for a
category, so move xorgproto to x11-base/xorg-proto (with the hyphen to
match other packages in x11-base/).

 profiles/package.mask                                             | 2 +-
 profiles/updates/1Q-2018                                          | 1 +
 {x11-proto/xorgproto => x11-base/xorg-proto}/Manifest             | 0
 {x11-proto/xorgproto => x11-base/xorg-proto}/metadata.xml         | 0
 .../xorg-proto/xorg-proto-2018.3.ebuild                           | 8 ++++++--
 .../xorg-proto/xorg-proto-9999.ebuild                             | 8 ++++++--
 x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild               | 2 +-
 x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild           | 2 +-
 x11-proto/damageproto/damageproto-1.2.1-r2.ebuild                 | 2 +-
 x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild                       | 2 +-
 x11-proto/dri2proto/dri2proto-2.8-r2.ebuild                       | 2 +-
 x11-proto/dri3proto/dri3proto-1.0-r1.ebuild                       | 2 +-
 x11-proto/fixesproto/fixesproto-5.0-r2.ebuild                     | 2 +-
 x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild                   | 2 +-
 x11-proto/glproto/glproto-1.4.17-r2.ebuild                        | 2 +-
 x11-proto/inputproto/inputproto-2.3.2-r1.ebuild                   | 2 +-
 x11-proto/kbproto/kbproto-1.0.7-r1.ebuild                         | 2 +-
 x11-proto/presentproto/presentproto-1.1-r1.ebuild                 | 2 +-
 x11-proto/randrproto/randrproto-1.5.0-r1.ebuild                   | 2 +-
 x11-proto/recordproto/recordproto-1.14.2-r2.ebuild                | 2 +-
 x11-proto/renderproto/renderproto-0.11.1-r2.ebuild                | 2 +-
 x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild             | 2 +-
 x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild           | 2 +-
 x11-proto/trapproto/trapproto-3.4.3-r1.ebuild                     | 2 +-
 x11-proto/videoproto/videoproto-2.3.3-r1.ebuild                   | 2 +-
 x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild                 | 2 +-
 x11-proto/xextproto/xextproto-7.3.0-r1.ebuild                     | 2 +-
 x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild       | 2 +-
 x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild                 | 2 +-
 x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild               | 2 +-
 x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild             | 2 +-
 x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild       | 2 +-
 x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild             | 2 +-
 x11-proto/xproto/xproto-7.0.31-r1.ebuild                          | 2 +-
 34 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index a15f79a39c0..b0e84576a60 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -175,7 +175,7 @@ media-sound/lastfmplayer
 # Matt Turner <mattst88@g.o> (06 Feb 2018)
 # New package with subsuming lots of existing packages. Lots of reverse
 # dependencies will need to be updated.
-x11-proto/xorgproto
+x11-base/xorg-proto
 >=x11-proto/bigreqsproto-1.1.2-r1
 >=x11-proto/compositeproto-0.4.2-r2
 >=x11-proto/damageproto-1.2.1-r2

diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 6c2aef30c13..9ef13e4e949 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -5,3 +5,4 @@ slotmove =dev-util/cucumber-3.1.0 3.0 3.1
 move app-admin/restart_services app-admin/restart-services
 move dev-libs/purpose kde-frameworks/purpose
 move kde-misc/plasma-applet-redshift-control kde-misc/plasma-redshift-control
+move x11-proto/xorgproto x11-base/xorg-proto

diff --git a/x11-proto/xorgproto/Manifest b/x11-base/xorg-proto/Manifest
similarity index 100%
rename from x11-proto/xorgproto/Manifest
rename to x11-base/xorg-proto/Manifest

diff --git a/x11-proto/xorgproto/metadata.xml b/x11-base/xorg-proto/metadata.xml
similarity index 100%
rename from x11-proto/xorgproto/metadata.xml
rename to x11-base/xorg-proto/metadata.xml

diff --git a/x11-proto/xorgproto/xorgproto-2018.3.ebuild b/x11-base/xorg-proto/xorg-proto-2018.3.ebuild
similarity index 94%
rename from x11-proto/xorgproto/xorgproto-2018.3.ebuild
rename to x11-base/xorg-proto/xorg-proto-2018.3.ebuild
index a72ac3844f5..4fdeec342fc 100644
--- a/x11-proto/xorgproto/xorgproto-2018.3.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2018.3.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${PN}"
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${MY_PN}"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -17,7 +20,8 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${P}.tar.gz"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="MIT"

diff --git a/x11-proto/xorgproto/xorgproto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild
similarity index 94%
rename from x11-proto/xorgproto/xorgproto-9999.ebuild
rename to x11-base/xorg-proto/xorg-proto-9999.ebuild
index a72ac3844f5..4fdeec342fc 100644
--- a/x11-proto/xorgproto/xorgproto-9999.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-9999.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${PN}"
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${MY_PN}"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -17,7 +20,8 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${P}.tar.gz"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="MIT"

diff --git a/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild b/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
index bd8af00504c..8e6d950fbca 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild b/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
index e086aacf864..957e7d20a29 100644
--- a/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
+++ b/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild b/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
index db2e631815d..4ba1a539c51 100644
--- a/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
+++ b/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild b/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
index 98f26f92c22..b671964fcfb 100644
--- a/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
+++ b/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild b/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
index 205caa075a8..9be37edea51 100644
--- a/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
+++ b/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild b/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
index 2db3bb148c1..7327b3fc036 100644
--- a/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
+++ b/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild b/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
index f3e7178a701..742d2ae6fc6 100644
--- a/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
+++ b/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild b/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
index ed40f9e1bd4..57bec58fd15 100644
--- a/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
+++ b/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/glproto/glproto-1.4.17-r2.ebuild b/x11-proto/glproto/glproto-1.4.17-r2.ebuild
index 02011f2e903..1bf6a2199b8 100644
--- a/x11-proto/glproto/glproto-1.4.17-r2.ebuild
+++ b/x11-proto/glproto/glproto-1.4.17-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild b/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
index 4f0e727bdb5..125857ed70e 100644
--- a/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
+++ b/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild b/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
index 6d6a4b8a4c4..cb25885925d 100644
--- a/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
+++ b/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/presentproto/presentproto-1.1-r1.ebuild b/x11-proto/presentproto/presentproto-1.1-r1.ebuild
index 43c75d92086..09e0205d97e 100644
--- a/x11-proto/presentproto/presentproto-1.1-r1.ebuild
+++ b/x11-proto/presentproto/presentproto-1.1-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild b/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
index 5daf023f65b..32f3614b2cf 100644
--- a/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
+++ b/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild b/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
index e8528d21584..c32fd3009f6 100644
--- a/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
+++ b/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild b/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
index 948a815baea..1dc58b18d83 100644
--- a/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
+++ b/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild b/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
index a0a993bcfd1..f3265388014 100644
--- a/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
+++ b/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
index 8f76ad120ae..4b6eea962ab 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild b/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
index b10e96d4d02..203515807b5 100644
--- a/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
+++ b/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild b/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
index 983e4b68b6c..0258f0820fd 100644
--- a/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
+++ b/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild b/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
index e144c941a79..aeddba3376e 100644
--- a/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
+++ b/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild b/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
index ffae14aec72..3ebb61ec478 100644
--- a/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
+++ b/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
index 23bf43a361d..38e55aefab9 100644
--- a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
index f4ed6f35f72..e5a7ad87bcf 100644
--- a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
+++ b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild b/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
index 56c563cbeff..0eb048e674a 100644
--- a/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
+++ b/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild b/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
index 9bfe52aa37d..c21fa3a711f 100644
--- a/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
+++ b/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
index 586b90e7a97..3ed52c08587 100644
--- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild b/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
index 3f4845e0184..34e052a45ee 100644
--- a/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
+++ b/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"

diff --git a/x11-proto/xproto/xproto-7.0.31-r1.ebuild b/x11-proto/xproto/xproto-7.0.31-r1.ebuild
index 2a8172c25c8..15241378423 100644
--- a/x11-proto/xproto/xproto-7.0.31-r1.ebuild
+++ b/x11-proto/xproto/xproto-7.0.31-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"