Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-proto
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2018-02-26 11:05:41 -0800
committerMatt Turner <mattst88@gentoo.org>2018-02-26 11:08:19 -0800
commite6ac2d85289f84c33d04012576244abe61269044 (patch)
tree7ca391ea507ff7689863bdb8c14b6de11383f65d /x11-proto
parentnet-libs/nativebiginteger: Drop old (diff)
downloadgentoo-e6ac2d85289f84c33d04012576244abe61269044.tar.gz
gentoo-e6ac2d85289f84c33d04012576244abe61269044.tar.bz2
gentoo-e6ac2d85289f84c33d04012576244abe61269044.zip
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/).
Diffstat (limited to 'x11-proto')
-rw-r--r--x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild2
-rw-r--r--x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild2
-rw-r--r--x11-proto/damageproto/damageproto-1.2.1-r2.ebuild2
-rw-r--r--x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild2
-rw-r--r--x11-proto/dri2proto/dri2proto-2.8-r2.ebuild2
-rw-r--r--x11-proto/dri3proto/dri3proto-1.0-r1.ebuild2
-rw-r--r--x11-proto/fixesproto/fixesproto-5.0-r2.ebuild2
-rw-r--r--x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild2
-rw-r--r--x11-proto/glproto/glproto-1.4.17-r2.ebuild2
-rw-r--r--x11-proto/inputproto/inputproto-2.3.2-r1.ebuild2
-rw-r--r--x11-proto/kbproto/kbproto-1.0.7-r1.ebuild2
-rw-r--r--x11-proto/presentproto/presentproto-1.1-r1.ebuild2
-rw-r--r--x11-proto/randrproto/randrproto-1.5.0-r1.ebuild2
-rw-r--r--x11-proto/recordproto/recordproto-1.14.2-r2.ebuild2
-rw-r--r--x11-proto/renderproto/renderproto-0.11.1-r2.ebuild2
-rw-r--r--x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild2
-rw-r--r--x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild2
-rw-r--r--x11-proto/trapproto/trapproto-3.4.3-r1.ebuild2
-rw-r--r--x11-proto/videoproto/videoproto-2.3.3-r1.ebuild2
-rw-r--r--x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild2
-rw-r--r--x11-proto/xextproto/xextproto-7.3.0-r1.ebuild2
-rw-r--r--x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild2
-rw-r--r--x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild2
-rw-r--r--x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild2
-rw-r--r--x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild2
-rw-r--r--x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild2
-rw-r--r--x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild2
-rw-r--r--x11-proto/xorgproto/Manifest1
-rw-r--r--x11-proto/xorgproto/metadata.xml8
-rw-r--r--x11-proto/xorgproto/xorgproto-2018.3.ebuild65
-rw-r--r--x11-proto/xorgproto/xorgproto-9999.ebuild65
-rw-r--r--x11-proto/xproto/xproto-7.0.31-r1.ebuild2
32 files changed, 28 insertions, 167 deletions
diff --git a/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild b/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
index bd8af00504ce..8e6d950fbcaa 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 e086aacf8640..957e7d20a292 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 db2e631815de..4ba1a539c512 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 98f26f92c221..b671964fcfb2 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 205caa075a84..9be37edea51e 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 2db3bb148c14..7327b3fc0368 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 f3e7178a7015..742d2ae6fc62 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 ed40f9e1bd4b..57bec58fd15e 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 02011f2e903d..1bf6a2199b8f 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 4f0e727bdb5b..125857ed70ea 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 6d6a4b8a4c44..cb25885925d7 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 43c75d92086e..09e0205d97ee 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 5daf023f65b0..32f3614b2cfa 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 e8528d21584c..c32fd3009f64 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 948a815baea5..1dc58b18d83d 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 a0a993bcfd12..f3265388014e 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 8f76ad120ae4..4b6eea962ab9 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 b10e96d4d021..203515807b5b 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 983e4b68b6c3..0258f0820fda 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 e144c941a792..aeddba3376e2 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 ffae14aec727..3ebb61ec478d 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 23bf43a361d0..38e55aefab94 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 f4ed6f35f72b..e5a7ad87bcff 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 56c563cbeff6..0eb048e674ae 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 9bfe52aa37d6..c21fa3a711fd 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 586b90e7a97d..3ed52c085870 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 3f4845e01848..34e052a45eed 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/xorgproto/Manifest b/x11-proto/xorgproto/Manifest
deleted file mode 100644
index 30e135e68df6..000000000000
--- a/x11-proto/xorgproto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xorgproto-2018.3.tar.gz 486632 BLAKE2B 9343f3d6be7c579a1dcff387d8668ae56e95e144657a619439dad57788c657a9dbfa40821dc7a551229d5921e247421cf26bccf60d8a41bc99bf05ac1b8845b2 SHA512 94f9c2573fe816ed6f359c1e1a7db92b9e0d8c7ef2ea6fcd6839e34b27b9803ab966d9f0ee29923e40361d189cb51279a18c09bcfba130a7dec8b3cbae01245c
diff --git a/x11-proto/xorgproto/metadata.xml b/x11-proto/xorgproto/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-proto/xorgproto/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-proto/xorgproto/xorgproto-2018.3.ebuild b/x11-proto/xorgproto/xorgproto-2018.3.ebuild
deleted file mode 100644
index a72ac3844f5c..000000000000
--- a/x11-proto/xorgproto/xorgproto-2018.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${PN}"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
-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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- !<x11-proto/bigreqsproto-1.1.2-r1
- !<x11-proto/compositeproto-0.4.2-r2
- !<x11-proto/damageproto-1.2.1-r2
- !<x11-proto/dmxproto-2.3.1-r2
- !<x11-proto/dri2proto-2.8-r2
- !<x11-proto/dri3proto-1.0-r1
- !<x11-proto/fixesproto-5.0-r2
- !<x11-proto/fontsproto-2.1.3-r1
- !<x11-proto/glproto-1.4.17-r2
- !<x11-proto/inputproto-2.3.2-r1
- !<x11-proto/kbproto-1.0.7-r1
- !<x11-proto/presentproto-1.1-r1
- !<x11-proto/randrproto-1.5.0-r1
- !<x11-proto/recordproto-1.14.2-r2
- !<x11-proto/renderproto-0.11.1-r2
- !<x11-proto/resourceproto-1.2.0-r1
- !<x11-proto/scrnsaverproto-1.2.2-r2
- !<x11-proto/trapproto-3.4.3-r1
- !<x11-proto/videoproto-2.3.3-r1
- !<x11-proto/xcmiscproto-1.2.2-r1
- !<x11-proto/xextproto-7.3.0-r1
- !<x11-proto/xf86bigfontproto-1.2.0-r2
- !<x11-proto/xf86dgaproto-2.1-r3
- !<x11-proto/xf86driproto-2.1.1-r2
- !<x11-proto/xf86miscproto-0.9.3-r1
- !<x11-proto/xf86vidmodeproto-2.3.1-r2
- !<x11-proto/xineramaproto-1.2.1-r2
- !<x11-proto/xproto-7.0.31-r1
-
- !x11-proto/fontcacheproto
- !x11-proto/printproto
- !x11-proto/xf86rushproto"
-
-src_unpack() {
- default
- [[ $PV = 9999* ]] && git-r3_src_unpack
-}
diff --git a/x11-proto/xorgproto/xorgproto-9999.ebuild b/x11-proto/xorgproto/xorgproto-9999.ebuild
deleted file mode 100644
index a72ac3844f5c..000000000000
--- a/x11-proto/xorgproto/xorgproto-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${PN}"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
-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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- !<x11-proto/bigreqsproto-1.1.2-r1
- !<x11-proto/compositeproto-0.4.2-r2
- !<x11-proto/damageproto-1.2.1-r2
- !<x11-proto/dmxproto-2.3.1-r2
- !<x11-proto/dri2proto-2.8-r2
- !<x11-proto/dri3proto-1.0-r1
- !<x11-proto/fixesproto-5.0-r2
- !<x11-proto/fontsproto-2.1.3-r1
- !<x11-proto/glproto-1.4.17-r2
- !<x11-proto/inputproto-2.3.2-r1
- !<x11-proto/kbproto-1.0.7-r1
- !<x11-proto/presentproto-1.1-r1
- !<x11-proto/randrproto-1.5.0-r1
- !<x11-proto/recordproto-1.14.2-r2
- !<x11-proto/renderproto-0.11.1-r2
- !<x11-proto/resourceproto-1.2.0-r1
- !<x11-proto/scrnsaverproto-1.2.2-r2
- !<x11-proto/trapproto-3.4.3-r1
- !<x11-proto/videoproto-2.3.3-r1
- !<x11-proto/xcmiscproto-1.2.2-r1
- !<x11-proto/xextproto-7.3.0-r1
- !<x11-proto/xf86bigfontproto-1.2.0-r2
- !<x11-proto/xf86dgaproto-2.1-r3
- !<x11-proto/xf86driproto-2.1.1-r2
- !<x11-proto/xf86miscproto-0.9.3-r1
- !<x11-proto/xf86vidmodeproto-2.3.1-r2
- !<x11-proto/xineramaproto-1.2.1-r2
- !<x11-proto/xproto-7.0.31-r1
-
- !x11-proto/fontcacheproto
- !x11-proto/printproto
- !x11-proto/xf86rushproto"
-
-src_unpack() {
- default
- [[ $PV = 9999* ]] && git-r3_src_unpack
-}
diff --git a/x11-proto/xproto/xproto-7.0.31-r1.ebuild b/x11-proto/xproto/xproto-7.0.31-r1.ebuild
index 2a8172c25c81..152413784239 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"