summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-proto
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-proto')
-rw-r--r--x11-proto/bigreqsproto/Manifest1
-rw-r--r--x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild26
-rw-r--r--x11-proto/bigreqsproto/metadata.xml5
-rw-r--r--x11-proto/compositeproto/Manifest1
-rw-r--r--x11-proto/compositeproto/compositeproto-0.4.2-r1.ebuild16
-rw-r--r--x11-proto/compositeproto/metadata.xml5
-rw-r--r--x11-proto/damageproto/Manifest1
-rw-r--r--x11-proto/damageproto/damageproto-1.2.1-r1.ebuild16
-rw-r--r--x11-proto/damageproto/metadata.xml5
-rw-r--r--x11-proto/dmxproto/Manifest1
-rw-r--r--x11-proto/dmxproto/dmxproto-2.3.1.ebuild15
-rw-r--r--x11-proto/dmxproto/metadata.xml5
-rw-r--r--x11-proto/dri2proto/Manifest2
-rw-r--r--x11-proto/dri2proto/dri2proto-2.6.ebuild14
-rw-r--r--x11-proto/dri2proto/dri2proto-2.8-r1.ebuild16
-rw-r--r--x11-proto/dri2proto/dri2proto-2.8.ebuild14
-rw-r--r--x11-proto/dri2proto/metadata.xml5
-rw-r--r--x11-proto/dri3proto/Manifest1
-rw-r--r--x11-proto/dri3proto/dri3proto-1.0.ebuild15
-rw-r--r--x11-proto/dri3proto/metadata.xml5
-rw-r--r--x11-proto/evieext/Manifest1
-rw-r--r--x11-proto/evieext/evieext-1.1.1.ebuild15
-rw-r--r--x11-proto/evieext/metadata.xml5
-rw-r--r--x11-proto/fixesproto/Manifest1
-rw-r--r--x11-proto/fixesproto/fixesproto-5.0-r1.ebuild16
-rw-r--r--x11-proto/fixesproto/fixesproto-5.0.ebuild14
-rw-r--r--x11-proto/fixesproto/metadata.xml5
-rw-r--r--x11-proto/fontcacheproto/Manifest1
-rw-r--r--x11-proto/fontcacheproto/fontcacheproto-0.1.3.ebuild14
-rw-r--r--x11-proto/fontcacheproto/metadata.xml5
-rw-r--r--x11-proto/fontsproto/Manifest2
-rw-r--r--x11-proto/fontsproto/fontsproto-2.1.2.ebuild26
-rw-r--r--x11-proto/fontsproto/fontsproto-2.1.3.ebuild25
-rw-r--r--x11-proto/fontsproto/metadata.xml5
-rw-r--r--x11-proto/glproto/Manifest2
-rw-r--r--x11-proto/glproto/glproto-1.4.16-r1.ebuild41
-rw-r--r--x11-proto/glproto/glproto-1.4.16.ebuild38
-rw-r--r--x11-proto/glproto/glproto-1.4.17-r1.ebuild25
-rw-r--r--x11-proto/glproto/glproto-1.4.17.ebuild41
-rw-r--r--x11-proto/glproto/metadata.xml5
-rw-r--r--x11-proto/inputproto/Manifest2
-rw-r--r--x11-proto/inputproto/inputproto-2.3.1.ebuild17
-rw-r--r--x11-proto/inputproto/inputproto-2.3.ebuild17
-rw-r--r--x11-proto/inputproto/metadata.xml5
-rw-r--r--x11-proto/kbproto/Manifest2
-rw-r--r--x11-proto/kbproto/kbproto-1.0.6-r1.ebuild16
-rw-r--r--x11-proto/kbproto/kbproto-1.0.7.ebuild16
-rw-r--r--x11-proto/kbproto/metadata.xml5
-rw-r--r--x11-proto/metadata.xml24
-rw-r--r--x11-proto/presentproto/Manifest1
-rw-r--r--x11-proto/presentproto/metadata.xml5
-rw-r--r--x11-proto/presentproto/presentproto-1.0.ebuild15
-rw-r--r--x11-proto/printproto/Manifest1
-rw-r--r--x11-proto/printproto/metadata.xml5
-rw-r--r--x11-proto/printproto/printproto-1.0.5-r1.ebuild15
-rw-r--r--x11-proto/randrproto/Manifest3
-rw-r--r--x11-proto/randrproto/metadata.xml5
-rw-r--r--x11-proto/randrproto/randrproto-1.4.0-r1.ebuild16
-rw-r--r--x11-proto/randrproto/randrproto-1.4.1.ebuild16
-rw-r--r--x11-proto/randrproto/randrproto-1.5.0.ebuild16
-rw-r--r--x11-proto/recordproto/Manifest1
-rw-r--r--x11-proto/recordproto/metadata.xml5
-rw-r--r--x11-proto/recordproto/recordproto-1.14.2-r1.ebuild27
-rw-r--r--x11-proto/renderproto/Manifest1
-rw-r--r--x11-proto/renderproto/metadata.xml5
-rw-r--r--x11-proto/renderproto/renderproto-0.11.1-r1.ebuild16
-rw-r--r--x11-proto/resourceproto/Manifest1
-rw-r--r--x11-proto/resourceproto/metadata.xml5
-rw-r--r--x11-proto/resourceproto/resourceproto-1.2.0.ebuild14
-rw-r--r--x11-proto/scrnsaverproto/Manifest1
-rw-r--r--x11-proto/scrnsaverproto/metadata.xml5
-rw-r--r--x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r1.ebuild27
-rw-r--r--x11-proto/trapproto/Manifest1
-rw-r--r--x11-proto/trapproto/metadata.xml5
-rw-r--r--x11-proto/trapproto/trapproto-3.4.3.ebuild14
-rw-r--r--x11-proto/videoproto/Manifest1
-rw-r--r--x11-proto/videoproto/metadata.xml5
-rw-r--r--x11-proto/videoproto/videoproto-2.3.2.ebuild16
-rw-r--r--x11-proto/xcalibrateproto/Manifest1
-rw-r--r--x11-proto/xcalibrateproto/metadata.xml6
-rw-r--r--x11-proto/xcalibrateproto/xcalibrateproto-0.1_pre20081210.ebuild21
-rw-r--r--x11-proto/xcb-proto/Manifest4
-rw-r--r--x11-proto/xcb-proto/metadata.xml5
-rw-r--r--x11-proto/xcb-proto/xcb-proto-1.10.ebuild64
-rw-r--r--x11-proto/xcb-proto/xcb-proto-1.11.ebuild64
-rw-r--r--x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild58
-rw-r--r--x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild63
-rw-r--r--x11-proto/xcmiscproto/Manifest1
-rw-r--r--x11-proto/xcmiscproto/metadata.xml5
-rw-r--r--x11-proto/xcmiscproto/xcmiscproto-1.2.2.ebuild26
-rw-r--r--x11-proto/xextproto/Manifest3
-rw-r--r--x11-proto/xextproto/metadata.xml5
-rw-r--r--x11-proto/xextproto/xextproto-7.2.0.ebuild25
-rw-r--r--x11-proto/xextproto/xextproto-7.2.1-r1.ebuild26
-rw-r--r--x11-proto/xextproto/xextproto-7.2.1.ebuild25
-rw-r--r--x11-proto/xextproto/xextproto-7.3.0.ebuild26
-rw-r--r--x11-proto/xf86bigfontproto/Manifest1
-rw-r--r--x11-proto/xf86bigfontproto/metadata.xml5
-rw-r--r--x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r1.ebuild16
-rw-r--r--x11-proto/xf86dgaproto/Manifest1
-rw-r--r--x11-proto/xf86dgaproto/metadata.xml5
-rw-r--r--x11-proto/xf86dgaproto/xf86dgaproto-2.1-r2.ebuild16
-rw-r--r--x11-proto/xf86driproto/Manifest1
-rw-r--r--x11-proto/xf86driproto/metadata.xml5
-rw-r--r--x11-proto/xf86driproto/xf86driproto-2.1.1-r1.ebuild16
-rw-r--r--x11-proto/xf86miscproto/Manifest1
-rw-r--r--x11-proto/xf86miscproto/metadata.xml5
-rw-r--r--x11-proto/xf86miscproto/xf86miscproto-0.9.3.ebuild14
-rw-r--r--x11-proto/xf86rushproto/Manifest1
-rw-r--r--x11-proto/xf86rushproto/metadata.xml5
-rw-r--r--x11-proto/xf86rushproto/xf86rushproto-1.1.2-r1.ebuild11
-rw-r--r--x11-proto/xf86vidmodeproto/Manifest1
-rw-r--r--x11-proto/xf86vidmodeproto/metadata.xml5
-rw-r--r--x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r1.ebuild16
-rw-r--r--x11-proto/xineramaproto/Manifest1
-rw-r--r--x11-proto/xineramaproto/metadata.xml5
-rw-r--r--x11-proto/xineramaproto/xineramaproto-1.2.1-r1.ebuild16
-rw-r--r--x11-proto/xproto/Manifest2
-rw-r--r--x11-proto/xproto/metadata.xml5
-rw-r--r--x11-proto/xproto/xproto-7.0.27.ebuild25
-rw-r--r--x11-proto/xproto/xproto-7.0.28.ebuild25
121 files changed, 1440 insertions, 0 deletions
diff --git a/x11-proto/bigreqsproto/Manifest b/x11-proto/bigreqsproto/Manifest
new file mode 100644
index 000000000000..34b54b746a56
--- /dev/null
+++ b/x11-proto/bigreqsproto/Manifest
@@ -0,0 +1 @@
+DIST bigreqsproto-1.1.2.tar.bz2 113218 SHA256 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e SHA512 9c2f98191169f7bca69601fcea5ddcb45d50b3a6bae087a2d6ee2d83f9729155b23268ad4c46a3cc99162cdacf4c8e3d7f061e58d73237da96f23123444f67d8 WHIRLPOOL b1e1f3d944daaa18e5858f0be6ab0eb01e478a2a15a57eae684202717a1a6d2894401d664fe5e35c4108a2ad027a83843f6e5356e9a4769ef727f8b64c188e72
diff --git a/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild b/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild
new file mode 100644
index 000000000000..3f67f7254adf
--- /dev/null
+++ b/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org BigReqs protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-proto/bigreqsproto/metadata.xml b/x11-proto/bigreqsproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/bigreqsproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/compositeproto/Manifest b/x11-proto/compositeproto/Manifest
new file mode 100644
index 000000000000..476be51e1b2d
--- /dev/null
+++ b/x11-proto/compositeproto/Manifest
@@ -0,0 +1 @@
+DIST compositeproto-0.4.2.tar.bz2 101208 SHA256 049359f0be0b2b984a8149c966dd04e8c58e6eade2a4a309cf1126635ccd0cfc SHA512 ad5e4d87b77a8447c228ca85ac8d010d93b5c64929dc866e99a25700b9905f7c3f22e48f8c7fdc54e87879ddcc90e5d4adc338aeea393d7057b19b5ccae31f11 WHIRLPOOL 7c219daf6651462d3caafc8a58dcf27a6bb622564b8c1858a6ed6745857a539c66c4abc7900651db0d1aa41d53d31c85c31b816e7c0493fc74395b9ab92f5e58
diff --git a/x11-proto/compositeproto/compositeproto-0.4.2-r1.ebuild b/x11-proto/compositeproto/compositeproto-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..e0dac1e7d7c9
--- /dev/null
+++ b/x11-proto/compositeproto/compositeproto-0.4.2-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Composite protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/compositeproto/metadata.xml b/x11-proto/compositeproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/compositeproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/damageproto/Manifest b/x11-proto/damageproto/Manifest
new file mode 100644
index 000000000000..97baa59c5d9c
--- /dev/null
+++ b/x11-proto/damageproto/Manifest
@@ -0,0 +1 @@
+DIST damageproto-1.2.1.tar.bz2 98392 SHA256 5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b SHA512 f124e85fb3cc70ed3536cb9db57ac93461bbb5df1a713bc6b67a5ea49122556c321781ca150df681502f6ccfb7305f290e131ad25ce9ccbff5af268df11c86fc WHIRLPOOL 378ef118ef5d9136adf3b02b27526befcbee9e813713545eb62cb239a4f21aa00b4e0cd29de2d345147dc706f4de5cfdc09656238487ae5bdc93beefdde7c156
diff --git a/x11-proto/damageproto/damageproto-1.2.1-r1.ebuild b/x11-proto/damageproto/damageproto-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..6ce686b793ed
--- /dev/null
+++ b/x11-proto/damageproto/damageproto-1.2.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Damage protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/damageproto/metadata.xml b/x11-proto/damageproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/damageproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/dmxproto/Manifest b/x11-proto/dmxproto/Manifest
new file mode 100644
index 000000000000..2c1184ea672c
--- /dev/null
+++ b/x11-proto/dmxproto/Manifest
@@ -0,0 +1 @@
+DIST dmxproto-2.3.1.tar.bz2 96467 RMD160 d1ef4dcd268f85a935a63bdc4ff0dceb6b51aa8b SHA1 3b8b273b8ef3d8dbab998df9ec1dddf99edf4d91 SHA256 e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509
diff --git a/x11-proto/dmxproto/dmxproto-2.3.1.ebuild b/x11-proto/dmxproto/dmxproto-2.3.1.ebuild
new file mode 100644
index 000000000000..4e5d963142a2
--- /dev/null
+++ b/x11-proto/dmxproto/dmxproto-2.3.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org DMX protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="!<x11-libs/libdmx-1.0.99.1"
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/dmxproto/metadata.xml b/x11-proto/dmxproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/dmxproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/dri2proto/Manifest b/x11-proto/dri2proto/Manifest
new file mode 100644
index 000000000000..374e8997ac7c
--- /dev/null
+++ b/x11-proto/dri2proto/Manifest
@@ -0,0 +1,2 @@
+DIST dri2proto-2.6.tar.bz2 102188 SHA256 ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909 SHA512 dbdba408af65c91e62d14eab6020a327550a195da9762b4c0ffb50d2c40c20093a89889ec868457400b1c601612d1de7ef3dff8e43a6c06a4b5b8469720e312c WHIRLPOOL 7ca56db77b4fa359bbb36f6ba0e71b0578ff340a8d46c8a2426a6d405a8f6600b85ce8906893c4e99e9e635bf3e84bde6f73e93d669630cefec70440000e46ad
+DIST dri2proto-2.8.tar.bz2 108746 SHA256 f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04 SHA512 1602f58cd8a3371dacf894cde4889b9147fc08e83f98d8e0d1c748abe43ecb74cf4e0e3d5eb2f33568ba5e6d9f310303b98ba43ae3bc956ae693824b1ae0745a WHIRLPOOL f27b9a5e62df4146b8d8ef8552ae316068d66c058d837b67c3e8f113a41c92d216f7606f127779992cec21221a3b529f9c6113bc419c14d7f1c8552bf87b4d2e
diff --git a/x11-proto/dri2proto/dri2proto-2.6.ebuild b/x11-proto/dri2proto/dri2proto-2.6.ebuild
new file mode 100644
index 000000000000..8d5e10acac19
--- /dev/null
+++ b/x11-proto/dri2proto/dri2proto-2.6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org DRI2 protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/dri2proto/dri2proto-2.8-r1.ebuild b/x11-proto/dri2proto/dri2proto-2.8-r1.ebuild
new file mode 100644
index 000000000000..c275690aa26d
--- /dev/null
+++ b/x11-proto/dri2proto/dri2proto-2.8-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org DRI2 protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/dri2proto/dri2proto-2.8.ebuild b/x11-proto/dri2proto/dri2proto-2.8.ebuild
new file mode 100644
index 000000000000..734970ef962e
--- /dev/null
+++ b/x11-proto/dri2proto/dri2proto-2.8.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org DRI2 protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/dri2proto/metadata.xml b/x11-proto/dri2proto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/dri2proto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/dri3proto/Manifest b/x11-proto/dri3proto/Manifest
new file mode 100644
index 000000000000..a6c2d76616c5
--- /dev/null
+++ b/x11-proto/dri3proto/Manifest
@@ -0,0 +1 @@
+DIST dri3proto-1.0.tar.bz2 105366 SHA256 01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074 SHA512 d2925bc2e2bfb3f30c4dc3082d84dc6a2e7d8ea02021ea02d681cbf92e6b256e9e4e0f5abfc394aa0c7762d841b1c8f82d2098c616ca1d7f4a3b5fd8a54f01f8 WHIRLPOOL 3010aae8ca5a72d31f61bac3c2dd976ae7ddace283782768d8ea6713f2c0d2eb2ed5090af1b8778ae04cf4ddb6d3620823ef2d0cbf137c4de8fa30eaf599007c
diff --git a/x11-proto/dri3proto/dri3proto-1.0.ebuild b/x11-proto/dri3proto/dri3proto-1.0.ebuild
new file mode 100644
index 000000000000..7f35985f141e
--- /dev/null
+++ b/x11-proto/dri3proto/dri3proto-1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org DRI3 protocol specification and Xlib/Xserver headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/dri3proto/metadata.xml b/x11-proto/dri3proto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/dri3proto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/evieext/Manifest b/x11-proto/evieext/Manifest
new file mode 100644
index 000000000000..579ad4a286ac
--- /dev/null
+++ b/x11-proto/evieext/Manifest
@@ -0,0 +1 @@
+DIST evieext-1.1.1.tar.bz2 95093 RMD160 520fe89b5922418e9c8434eb3a922d01efd4eb23 SHA1 86d9545273b07961f0d5ba65c6c408371e10c0d2 SHA256 1cf74114436d99f56577a90b6438a32ba31b8128c9e63842bb179aba592733fe
diff --git a/x11-proto/evieext/evieext-1.1.1.ebuild b/x11-proto/evieext/evieext-1.1.1.ebuild
new file mode 100644
index 000000000000..98b027c66a96
--- /dev/null
+++ b/x11-proto/evieext/evieext-1.1.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org EvIE protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/evieext/metadata.xml b/x11-proto/evieext/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/evieext/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/fixesproto/Manifest b/x11-proto/fixesproto/Manifest
new file mode 100644
index 000000000000..1e4d1d66d683
--- /dev/null
+++ b/x11-proto/fixesproto/Manifest
@@ -0,0 +1 @@
+DIST fixesproto-5.0.tar.bz2 100886 SHA256 ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce SHA512 93c6a8b6e4345c3049c08f2f3960f5eb5f92c487f26d227430964361bf82041b49e61f873fbbb8ee0e111556f90532b852c20e6082ee8008be641373251fa78c WHIRLPOOL 000f5bacb68682e2a46312c594f80086a7126448b2f79d79a81df8fd791991cc3654106841ada039f667855dbe226be34d5b2e3b3dd3a2ea7be422b5167d57a5
diff --git a/x11-proto/fixesproto/fixesproto-5.0-r1.ebuild b/x11-proto/fixesproto/fixesproto-5.0-r1.ebuild
new file mode 100644
index 000000000000..d5f05eeb753b
--- /dev/null
+++ b/x11-proto/fixesproto/fixesproto-5.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Fixes protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/fixesproto/fixesproto-5.0.ebuild b/x11-proto/fixesproto/fixesproto-5.0.ebuild
new file mode 100644
index 000000000000..271659bcc223
--- /dev/null
+++ b/x11-proto/fixesproto/fixesproto-5.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org Fixes protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-proto/xextproto-7.0.99.1"
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/fixesproto/metadata.xml b/x11-proto/fixesproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/fixesproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/fontcacheproto/Manifest b/x11-proto/fontcacheproto/Manifest
new file mode 100644
index 000000000000..dbb928eb7590
--- /dev/null
+++ b/x11-proto/fontcacheproto/Manifest
@@ -0,0 +1 @@
+DIST fontcacheproto-0.1.3.tar.bz2 84470 RMD160 4d3689e4616957966c8b51e24cd4ae6b7fb08c18 SHA1 07f6ab3e1e1efe71c51f50e95851d93d2a1de773 SHA256 1dcaa659d416272ff68e567d1910ccc1e369768f13b983cffcccd6c563dbe3cb
diff --git a/x11-proto/fontcacheproto/fontcacheproto-0.1.3.ebuild b/x11-proto/fontcacheproto/fontcacheproto-0.1.3.ebuild
new file mode 100644
index 000000000000..91d75f563ee8
--- /dev/null
+++ b/x11-proto/fontcacheproto/fontcacheproto-0.1.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org Fontcache protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/fontcacheproto/metadata.xml b/x11-proto/fontcacheproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/fontcacheproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest
new file mode 100644
index 000000000000..1a0a9b1f0b63
--- /dev/null
+++ b/x11-proto/fontsproto/Manifest
@@ -0,0 +1,2 @@
+DIST fontsproto-2.1.2.tar.bz2 141990 SHA256 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9 SHA512 728d4df6d65b811cc2516cddcd1ba53aadf75521450baaad27ae10448e8eda66c4898369b4cff13874c26b5541cbac231190f7f32f873939aa6d4a72ee720050 WHIRLPOOL 3f0b4b627d0c0bafae116022ef0a998efe2801d2dda49ccb1fff4fe6732ca4bc56bc00ded6ad10adeb8f7bd98aa144370c9a73770736bce6e72a08d2b0df9c80
+DIST fontsproto-2.1.3.tar.bz2 154087 SHA256 259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8 SHA512 f46d5b733aa48644aa3aa75d4ed47231ef78cb60f747f7200d82331a1ba566190bf37b5b9926c690dec6356043ce7c85a5b59fc1b4b11667ef432518b5d4cc87 WHIRLPOOL ebf1e550989c08658f56e0a0fbd90c14d966779c640fbdaae9cbcb453169822456fe0f3bebd50edc5346428a1ac7a2e797e402637d0cf9ba3064df6c9938650c
diff --git a/x11-proto/fontsproto/fontsproto-2.1.2.ebuild b/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
new file mode 100644
index 000000000000..48b1d0334063
--- /dev/null
+++ b/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Fonts protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-proto/fontsproto/fontsproto-2.1.3.ebuild b/x11-proto/fontsproto/fontsproto-2.1.3.ebuild
new file mode 100644
index 000000000000..3b82e1fc7d84
--- /dev/null
+++ b/x11-proto/fontsproto/fontsproto-2.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Fonts protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-proto/fontsproto/metadata.xml b/x11-proto/fontsproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/fontsproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
new file mode 100644
index 000000000000..1dcac62fc192
--- /dev/null
+++ b/x11-proto/glproto/Manifest
@@ -0,0 +1,2 @@
+DIST glproto-1.4.16.tar.bz2 119584 SHA256 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d SHA512 404c72a0f54f31ed639a08b72cbdb6f4d28b76885759df12cdd76fc3ea3b2930c1c8fb7460cd49a36c3a799dc5fd809ffce7da35ff67e1c9604c3c21cca9cb63 WHIRLPOOL 54ce49011b9e4d9a7ab7f0297dec2ab92b707142901fceb2ba60b62db96de16c3b5f9e168c7db24027544dab80d43b9e943c95c89364122486e818c4d34f144c
+DIST glproto-1.4.17.tar.bz2 126969 SHA256 adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40 SHA512 3e5bb1949ab9993e07d2ed7e829b9e0a8803eab476e9f4082fc01087c3dce01f3bcb9d55261eaf60e55977a689b326ed1dcf40f74d5e1fc660c83bea094b6754 WHIRLPOOL 48b345a946f136cdd011d25ac796cd43c761fbe052e5d238c6250c4db798c5612978b1e526b10bd1b870bb302f745574a8e4ed8403464305278afb15694f4630
diff --git a/x11-proto/glproto/glproto-1.4.16-r1.ebuild b/x11-proto/glproto/glproto-1.4.16-r1.ebuild
new file mode 100644
index 000000000000..b33c58b656b0
--- /dev/null
+++ b/x11-proto/glproto/glproto-1.4.16-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org GL protocol headers"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+LICENSE="SGI-B-2.0"
+IUSE=""
+
+RDEPEND=">=app-eselect/eselect-opengl-1.2.6"
+DEPEND=""
+
+src_install() {
+ xorg-2_src_install
+ dynamic_libgl_install
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ eselect opengl set --ignore-missing --use-old xorg-x11
+}
+
+dynamic_libgl_install() {
+ # next section is to setup the dynamic libGL stuff
+ ebegin "Moving GL files for dynamic switching"
+ local gldir=/usr/$(get_libdir)/opengl/xorg-x11/include/GL
+ dodir ${gldir}
+ local x=""
+ # glext.h added for #54984
+ for x in "${ED}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
+ if [[ -f ${x} || -L ${x} ]]; then
+ mv -f "${x}" "${ED}"${gldir}
+ fi
+ done
+ eend 0
+}
diff --git a/x11-proto/glproto/glproto-1.4.16.ebuild b/x11-proto/glproto/glproto-1.4.16.ebuild
new file mode 100644
index 000000000000..5c54fc6a7d2a
--- /dev/null
+++ b/x11-proto/glproto/glproto-1.4.16.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+DESCRIPTION="X.Org GL protocol headers"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+LICENSE="SGI-B-2.0"
+IUSE=""
+
+RDEPEND=">=app-eselect/eselect-opengl-1.2.6"
+DEPEND=""
+
+src_install() {
+ xorg-2_src_install
+ dynamic_libgl_install
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ eselect opengl set --ignore-missing --use-old xorg-x11
+}
+
+dynamic_libgl_install() {
+ # next section is to setup the dynamic libGL stuff
+ ebegin "Moving GL files for dynamic switching"
+ local gldir=/usr/$(get_libdir)/opengl/xorg-x11/include/GL
+ dodir ${gldir}
+ local x=""
+ # glext.h added for #54984
+ for x in "${ED}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
+ if [[ -f ${x} || -L ${x} ]]; then
+ mv -f "${x}" "${ED}"${gldir}
+ fi
+ done
+ eend 0
+}
diff --git a/x11-proto/glproto/glproto-1.4.17-r1.ebuild b/x11-proto/glproto/glproto-1.4.17-r1.ebuild
new file mode 100644
index 000000000000..47be112ff005
--- /dev/null
+++ b/x11-proto/glproto/glproto-1.4.17-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org GL protocol headers"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+LICENSE="SGI-B-2.0"
+IUSE=""
+
+RDEPEND=">=app-eselect/eselect-opengl-1.3.0"
+DEPEND=""
+
+src_install() {
+ xorg-2_src_install
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ eselect opengl set --ignore-missing --use-old xorg-x11
+}
diff --git a/x11-proto/glproto/glproto-1.4.17.ebuild b/x11-proto/glproto/glproto-1.4.17.ebuild
new file mode 100644
index 000000000000..945f3eb7f40c
--- /dev/null
+++ b/x11-proto/glproto/glproto-1.4.17.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org GL protocol headers"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+LICENSE="SGI-B-2.0"
+IUSE=""
+
+RDEPEND=">=app-eselect/eselect-opengl-1.2.6"
+DEPEND=""
+
+src_install() {
+ xorg-2_src_install
+ dynamic_libgl_install
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ eselect opengl set --ignore-missing --use-old xorg-x11
+}
+
+dynamic_libgl_install() {
+ # next section is to setup the dynamic libGL stuff
+ ebegin "Moving GL files for dynamic switching"
+ local gldir=/usr/$(get_libdir)/opengl/xorg-x11/include/GL
+ dodir ${gldir}
+ local x=""
+ # glext.h added for #54984
+ for x in "${ED}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
+ if [[ -f ${x} || -L ${x} ]]; then
+ mv -f "${x}" "${ED}"${gldir}
+ fi
+ done
+ eend 0
+}
diff --git a/x11-proto/glproto/metadata.xml b/x11-proto/glproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/glproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest
new file mode 100644
index 000000000000..f027ee07f7a4
--- /dev/null
+++ b/x11-proto/inputproto/Manifest
@@ -0,0 +1,2 @@
+DIST inputproto-2.3.1.tar.bz2 196435 SHA256 5a47ee62053a6acef3a83f506312494be1461068d0b9269d818839703b95c1d1 SHA512 84f8acff3d54e929af6da088624adcd8dffe2eba0d9ef672e136f76d12f3814fbf6a7962de27becfaa0aa5e70d874eb5297d9eed8809576d7b0d96f8c29d9d72 WHIRLPOOL 954defa7fd9115c6ca0795ee77645375f0e28dfaad87f2fc902e9c38196c93339a9f0eac9018c00179b583f4334e42cac844c4f974f9bbf5234e36faa25d1512
+DIST inputproto-2.3.tar.bz2 195642 SHA256 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f SHA512 4bc3986a49273777850342cfa086641eeba0fd95ad428a2f025bd44e9ea04516cb6e190b3fd2a99fe21c63d9fe4010bebe57aefe3807050d00f8b301289ec43a WHIRLPOOL 6604906b9bf756559a6ba236b4f0b4fb97062e6b09aac57fdd17c3e1ca7c4bec470f725c2e4a1a3252fae4326a27e06486008e8f859cc58c1b0471482066f7fb
diff --git a/x11-proto/inputproto/inputproto-2.3.1.ebuild b/x11-proto/inputproto/inputproto-2.3.1.ebuild
new file mode 100644
index 000000000000..0659ec4702c3
--- /dev/null
+++ b/x11-proto/inputproto/inputproto-2.3.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Input protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+!<x11-libs/libXi-1.2.99"
diff --git a/x11-proto/inputproto/inputproto-2.3.ebuild b/x11-proto/inputproto/inputproto-2.3.ebuild
new file mode 100644
index 000000000000..6bcc251746f3
--- /dev/null
+++ b/x11-proto/inputproto/inputproto-2.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Input protocol headers"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+!<x11-libs/libXi-1.2.99"
diff --git a/x11-proto/inputproto/metadata.xml b/x11-proto/inputproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/inputproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/kbproto/Manifest b/x11-proto/kbproto/Manifest
new file mode 100644
index 000000000000..ea8a6ba22bd6
--- /dev/null
+++ b/x11-proto/kbproto/Manifest
@@ -0,0 +1,2 @@
+DIST kbproto-1.0.6.tar.bz2 256988 SHA256 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479 SHA512 3cef1df57138264dac9802cc4074bc58f82609c6ef859e238108d9ad1ac3a720b991d91f61ca47ea48c56019b465e7e6b37bcbe0b519d1999126255a7d879d54 WHIRLPOOL 761727b2e1c06bf02d519020d38fef6fd48a2eabcbfe3bb77be0d9c9aebc935b5df9665c779170b9fc5301bbc1e4468d9eb1bce2b54eaaeab0527eb680a882a5
+DIST kbproto-1.0.7.tar.bz2 250178 SHA256 f882210b76376e3fa006b11dbd890e56ec0942bc56e65d1249ff4af86f90b857 SHA512 49f24bfd11ee4ef0de658a1f55bcfb4b3a1f7057d90137b899ea3d4ecc40cebde97926a3f4315ddca4ae28d32b2d15f16fda993296acffdb4c007d2f84a39a22 WHIRLPOOL ecff2308c1348e5809cea18ac87bdf19ed4a048a0962110bd7c6737d2d2d5189b12e65bbbcefc256e8325f06cc708f3d0fb190ca62fbbf4d67a2a98a21c8e803
diff --git a/x11-proto/kbproto/kbproto-1.0.6-r1.ebuild b/x11-proto/kbproto/kbproto-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..99e26efc7632
--- /dev/null
+++ b/x11-proto/kbproto/kbproto-1.0.6-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org KB protocol headers"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/kbproto/kbproto-1.0.7.ebuild b/x11-proto/kbproto/kbproto-1.0.7.ebuild
new file mode 100644
index 000000000000..57c7f304d1b9
--- /dev/null
+++ b/x11-proto/kbproto/kbproto-1.0.7.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org KB protocol headers"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/kbproto/metadata.xml b/x11-proto/kbproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/kbproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/metadata.xml b/x11-proto/metadata.xml
new file mode 100644
index 000000000000..855298e2c530
--- /dev/null
+++ b/x11-proto/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ x11-proto contains the X11 protocol headers.
+ </longdescription>
+ <longdescription lang="ja">
+ x11-protoカテゴリにはX11のプロトコルヘーダが含まれます。
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie x11-proto enthält die Headerdateien für das
+ X11-Protokoll.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria x11-proto contém os cabeçalhos de protocolo de X11.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria x11-proto zawiera nagłówki protokołu X11.
+ </longdescription>
+ <longdescription lang="es">
+ x11-proto contiene las cabeceras del protocolo X11.
+ </longdescription>
+</catmetadata>
+
diff --git a/x11-proto/presentproto/Manifest b/x11-proto/presentproto/Manifest
new file mode 100644
index 000000000000..8d0008542235
--- /dev/null
+++ b/x11-proto/presentproto/Manifest
@@ -0,0 +1 @@
+DIST presentproto-1.0.tar.bz2 107998 SHA256 812c7d48721f909a0f7a2cb1e91f6eead76159a36c4712f4579ca587552839ce SHA512 6d6b3cb78ff7c6ad8103d0003479f94702aea412640feec5d82cb630c9560fd0e1f7b6124e9eaba138adc9bf61ee08ef193537c2754c9b79737ef871c5114c59 WHIRLPOOL 57476a23543587949d2b2cf7505eaba9769fa3d4bca0005461957f03a7700f0c21a742a66d71bb3ad91b2a14debbabade0277143749b46acc09e6b9755db6592
diff --git a/x11-proto/presentproto/metadata.xml b/x11-proto/presentproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/presentproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/presentproto/presentproto-1.0.ebuild b/x11-proto/presentproto/presentproto-1.0.ebuild
new file mode 100644
index 000000000000..e76c4cf84c85
--- /dev/null
+++ b/x11-proto/presentproto/presentproto-1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Present protocol specification and Xlib/Xserver headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/printproto/Manifest b/x11-proto/printproto/Manifest
new file mode 100644
index 000000000000..eca63ed9f986
--- /dev/null
+++ b/x11-proto/printproto/Manifest
@@ -0,0 +1 @@
+DIST printproto-1.0.5.tar.bz2 222559 SHA256 1298316cf43b987365ab7764d61b022a3d7f180b67b423eed3456862d155911a SHA512 1f7b2cb8cce0b65c0f859666f9e0d1be19c8323bc36c514d1e47f9b52390ee6ec49661e18e0ae8f4b7c76775667b5489ef177adb4e6ae87eed9fe1864fbf8279 WHIRLPOOL 83dc47c33d85e8bed605526e045f892145c3eddd71c7800347d4aaf6f8755d33f85fb7dc784c20ec0120f48825812a4ccadede5a47f19b10b27f94ae5a5026b9
diff --git a/x11-proto/printproto/metadata.xml b/x11-proto/printproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/printproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/printproto/printproto-1.0.5-r1.ebuild b/x11-proto/printproto/printproto-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..ddfa04ecdf2d
--- /dev/null
+++ b/x11-proto/printproto/printproto-1.0.5-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Print protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/randrproto/Manifest b/x11-proto/randrproto/Manifest
new file mode 100644
index 000000000000..16495600e72b
--- /dev/null
+++ b/x11-proto/randrproto/Manifest
@@ -0,0 +1,3 @@
+DIST randrproto-1.4.0.tar.bz2 133300 SHA256 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf SHA512 7880360e0f63a9bf88bc4ea76160311ba1d64af30414068df90d6b613b5cc24c2cc7986f2e68ee9a2fcde1359108da25017dd32885b09e878406e66aefe06f0d WHIRLPOOL 83eaabaec01650f3573ce064004f5ab2ae15d3c527b0e825fdd91325e12b2c97c15e86b582279346cd53a5246f224b922d01d39a6a21ac2099440b9882ca9e6c
+DIST randrproto-1.4.1.tar.bz2 143474 SHA256 543dcb2ebb0622d8a506dcef6470c6dd066f3e3f866552a5060b91ab6129e1dc SHA512 0d8151b400c6af697b267219b9dfe6f1e64635134268a43a4412ab571e7a755fe5a1c099a41b678729cbdeeb6c69dee3fa08dba0a9dff1c6afcb8b10985e79f8 WHIRLPOOL 944d3a4b3c195003f38c9b856f40f0b8464c1fbf260654466d46c3e467f7428198c2e731cd0c3c9ed01efceac75ed5b470b42cc498c87edd6c8fd9c442c2cbb2
+DIST randrproto-1.5.0.tar.bz2 142168 SHA256 4c675533e79cd730997d232c8894b6692174dce58d3e207021b8f860be498468 SHA512 5c56f6acfe3a9da5ffda45e4af2da5081a5116d53f4d2dafe399eae168656727927ca0fb4c29fc6583e87709ac83b025ae206fba9356ebf9e26d3ff545da57f4 WHIRLPOOL 74948985aad576b81055abc1b97697f6324d936278560dbc95a3250fd2be74dd5dde470a39e033a6cbbc535a9cdb65454a2591820465688e0d3d2bbb70cf84dc
diff --git a/x11-proto/randrproto/metadata.xml b/x11-proto/randrproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/randrproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild b/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..f40159f9dea8
--- /dev/null
+++ b/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Randr protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/randrproto/randrproto-1.4.1.ebuild b/x11-proto/randrproto/randrproto-1.4.1.ebuild
new file mode 100644
index 000000000000..b060936a975f
--- /dev/null
+++ b/x11-proto/randrproto/randrproto-1.4.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Randr protocol headers"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/randrproto/randrproto-1.5.0.ebuild b/x11-proto/randrproto/randrproto-1.5.0.ebuild
new file mode 100644
index 000000000000..b060936a975f
--- /dev/null
+++ b/x11-proto/randrproto/randrproto-1.5.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Randr protocol headers"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest
new file mode 100644
index 000000000000..071ffe7dc306
--- /dev/null
+++ b/x11-proto/recordproto/Manifest
@@ -0,0 +1 @@
+DIST recordproto-1.14.2.tar.bz2 123033 SHA256 a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370 SHA512 ab82d966ffacb46c001df15b272ca58f996826dc6f6835d3dc4d385b31c682acacb073a380d61938e2f242bffdabdd9b8f7107cd5ac67cb7aa3a28cc14a8ea02 WHIRLPOOL cf3b1547c1d2bcea06b772b8273c4d08039c492e2afc1146ede1f644260cfffcedad7ff67e5763f658f31aa437253f9495ac4e951ab239bb1c373231b1046c1e
diff --git a/x11-proto/recordproto/metadata.xml b/x11-proto/recordproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/recordproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/recordproto/recordproto-1.14.2-r1.ebuild b/x11-proto/recordproto/recordproto-1.14.2-r1.ebuild
new file mode 100644
index 000000000000..0348281238df
--- /dev/null
+++ b/x11-proto/recordproto/recordproto-1.14.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Record protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXtst-1.0.99.2"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-proto/renderproto/Manifest b/x11-proto/renderproto/Manifest
new file mode 100644
index 000000000000..7f842ea2c5fa
--- /dev/null
+++ b/x11-proto/renderproto/Manifest
@@ -0,0 +1 @@
+DIST renderproto-0.11.1.tar.bz2 105741 SHA256 06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537 SHA512 c38bc7247fd7b89732c892ee41c061b20397f4e79195601b7015dd55054b966f0797ac3990b147f80234596ba2c201ce90e292ecefed2e133167955bca70acc5 WHIRLPOOL b2c3dcd69cd308008754e57ff0ecdd0a28855d2c42c6a7731c1ec31a687fcf520562c8151ff8769f842977e9865b34f86258a597c84e31b1c16a6bc725b4a204
diff --git a/x11-proto/renderproto/metadata.xml b/x11-proto/renderproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/renderproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/renderproto/renderproto-0.11.1-r1.ebuild b/x11-proto/renderproto/renderproto-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..d805fc5db0fe
--- /dev/null
+++ b/x11-proto/renderproto/renderproto-0.11.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Render protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/resourceproto/Manifest b/x11-proto/resourceproto/Manifest
new file mode 100644
index 000000000000..77cbbe01e390
--- /dev/null
+++ b/x11-proto/resourceproto/Manifest
@@ -0,0 +1 @@
+DIST resourceproto-1.2.0.tar.bz2 102992 SHA256 3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818 SHA512 ce8c8fda178ac7fb22b192d4a0f707a96f42ecd550ae8e6ddd7e1ed0067951ef955f7bee60f63a2b2422176e5f093c38e3903f7c4e5e3bea230b934b7abcc4ca WHIRLPOOL 57af096cbbbf5cc654ca63b51256e35e05c1766b077f92ef215546ef176b0ceb8bf231ae239563e3bc465919ea8b73bdba33d6844eb633226869d656bbc0da6d
diff --git a/x11-proto/resourceproto/metadata.xml b/x11-proto/resourceproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/resourceproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/resourceproto/resourceproto-1.2.0.ebuild b/x11-proto/resourceproto/resourceproto-1.2.0.ebuild
new file mode 100644
index 000000000000..5c32ec0a857d
--- /dev/null
+++ b/x11-proto/resourceproto/resourceproto-1.2.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org Resource protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest
new file mode 100644
index 000000000000..d62bf5712f2c
--- /dev/null
+++ b/x11-proto/scrnsaverproto/Manifest
@@ -0,0 +1 @@
+DIST scrnsaverproto-1.2.2.tar.bz2 118820 SHA256 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65 SHA512 e74a512a6101967983a1d713d22a1f456f77519998116ef0f0a9e4b44ae4730ecd41eb9c0f7fa53e9f5c94967541daf10693d701af832597f5347461c5990ebc WHIRLPOOL e144d235167d39aaa0ed1cb1fd3ca33d34949026fa9984c87e9cbee471a33c4229222d8481f4a9db80379f10c6cf34ff849b183a1988ba5804c8e90ba69e8b59
diff --git a/x11-proto/scrnsaverproto/metadata.xml b/x11-proto/scrnsaverproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/scrnsaverproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r1.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..137c316f9734
--- /dev/null
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org ScrnSaver protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXScrnSaver-1.2"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-proto/trapproto/Manifest b/x11-proto/trapproto/Manifest
new file mode 100644
index 000000000000..b191be8a437c
--- /dev/null
+++ b/x11-proto/trapproto/Manifest
@@ -0,0 +1 @@
+DIST trapproto-3.4.3.tar.bz2 48785 SHA256 ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1 SHA512 a5bf93bfa2f675e874ece8510a693d3a1ca4ba0b3981740249d4c78273a74724209f5f6d83c6207038bce1c3edca0bdd98ca3e1dd7aba04dcea146c9a1a2e8ef WHIRLPOOL 91127b62ee2cd6128bc82e60fe091f800646875094d7545a5def785353ee991f70a1fc13328dfe06bea20b265eb1f3d609b94df3dfda61fb6d0b9e01f6eea0c8
diff --git a/x11-proto/trapproto/metadata.xml b/x11-proto/trapproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/trapproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/trapproto/trapproto-3.4.3.ebuild b/x11-proto/trapproto/trapproto-3.4.3.ebuild
new file mode 100644
index 000000000000..a66a8b02eb8d
--- /dev/null
+++ b/x11-proto/trapproto/trapproto-3.4.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org Trap protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/videoproto/Manifest b/x11-proto/videoproto/Manifest
new file mode 100644
index 000000000000..58370dfd3a10
--- /dev/null
+++ b/x11-proto/videoproto/Manifest
@@ -0,0 +1 @@
+DIST videoproto-2.3.2.tar.bz2 118862 SHA256 8dae168cb820fcd32f564879afb3f24d27c176300d9af66819a18265539bd4b6 SHA512 57ca8981b217724e4e0599624e6d8077aca0f2568855c54b74dbf5e03d25864eb114540b02a49c11487beb03d55d52efc09d8a7fb86a3078a4d52f4a3042ef36 WHIRLPOOL dca8458262eb87518cdfa08cfd07894b8ea079d89d15e823654c81636803c594ea5caf04cc80d14ca8382bd7bc6a541a64f5b82c2c45197752dab4fe33f36f28
diff --git a/x11-proto/videoproto/metadata.xml b/x11-proto/videoproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/videoproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/videoproto/videoproto-2.3.2.ebuild b/x11-proto/videoproto/videoproto-2.3.2.ebuild
new file mode 100644
index 000000000000..538d08b77201
--- /dev/null
+++ b/x11-proto/videoproto/videoproto-2.3.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Video protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xcalibrateproto/Manifest b/x11-proto/xcalibrateproto/Manifest
new file mode 100644
index 000000000000..0d056f4c92fd
--- /dev/null
+++ b/x11-proto/xcalibrateproto/Manifest
@@ -0,0 +1 @@
+DIST calibrateproto-20081210.tar.bz2 2457 SHA256 2b95d1e84846c4cbeb57046cff928a2389dbb12adeae05283d2c08bb1ec77f92 SHA512 be00ff957050ac10659795a3736e308800a1fa26857feb9f6dcfde822888eec7cf921d0106a6a83a511a36eb6fb031275b34949b041e06c4999c24aa77c87491 WHIRLPOOL 6a9ab0a530556ce96a482861b7e6a8ab87f285187af65dabcf7672c3127e0ccc4b37131f6df5a2b985a84eaaef72620e0df6303cee17081e2dd9a64b9fc81c31
diff --git a/x11-proto/xcalibrateproto/metadata.xml b/x11-proto/xcalibrateproto/metadata.xml
new file mode 100644
index 000000000000..d7e55682affc
--- /dev/null
+++ b/x11-proto/xcalibrateproto/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<herd>embedded</herd>
+</pkgmetadata>
diff --git a/x11-proto/xcalibrateproto/xcalibrateproto-0.1_pre20081210.ebuild b/x11-proto/xcalibrateproto/xcalibrateproto-0.1_pre20081210.ebuild
new file mode 100644
index 000000000000..906ccf51f492
--- /dev/null
+++ b/x11-proto/xcalibrateproto/xcalibrateproto-0.1_pre20081210.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P="${PN/x/}-${PV#*_pre}"
+XORG_EAUTORECONF="yes"
+inherit xorg-2
+
+DESCRIPTION="Touchscreen calibration protocol"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest
new file mode 100644
index 000000000000..4cbae9fe4d0c
--- /dev/null
+++ b/x11-proto/xcb-proto/Manifest
@@ -0,0 +1,4 @@
+DIST xcb-proto-1.10.tar.bz2 138834 SHA256 7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05 SHA512 b979d6432dcb58b5040a460ecb5285c67d288203768e2b6d032acac6593219dda9f29ae95920bc10b1d9451d928e3295f49d8e457b2bfb69d06481219745c6de WHIRLPOOL aa6905d8d402a5900c37ea411a3818820ec19c90250eb8e86b93e901e0a81f102216e7f2603a851365305c07630c91356b0e827ec85359da9eb8d66c73186830
+DIST xcb-proto-1.11.tar.bz2 139213 SHA256 b4aceee6502a0ce45fc39b33c541a2df4715d00b72e660ebe8c5bb444771e32e SHA512 13c228d974f99e2f17a7352629b85c76674e395567474997015941780df123f9c809a76935242aaf31b7836b0478bd557e3cc9161dd4880b4fb8eb576216dbc1 WHIRLPOOL 61bac70a6e2945f881460838352190f77550e647531c5076bf926193490cf38e1e97c879a3da95f1253d5783a54a33ccc91afe39badb27a93150eee5660bd5cc
+DIST xcb-proto-1.8.tar.bz2 125072 SHA256 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0 SHA512 181fee36ab4c842b8b3eaa244ff94c31be2488cb24bdb82cc23082b229d1994746c00307dc0a37d00ae0b7c92f804f90f1ad9ba29f4d5134c5c64a4f23c696ab WHIRLPOOL 3d0b394428544660b82b3984a7c707e93987e686678b737fb396404a20f0d8e78e6deae564925bffe917f6a3b573bff936647f2cf9fde80b9c4469dcb2cd6cf0
+DIST xcb-proto-1.9.tar.bz2 136421 SHA256 895afe21793e6e26c5ce999b1900c02a5984c201d96d55cc42c182d3c3bde43c SHA512 063e08e51893302b160f7cbfe75e2319c6c0c7172cae3d1bbda4cb69695e47ce4938ea18679d36eda436bab7ee1cc288e62381d7d6115892e35626bb6ca2607d WHIRLPOOL 60cea257c17bb6d953f7435340cca2102c116ea71b6cdd71773274926e1442b7d72ed36d2cd915ae8b8b4033c6a6f7e8d1d3fae6a80eeb08f9f88ad6815d9b15
diff --git a/x11-proto/xcb-proto/metadata.xml b/x11-proto/xcb-proto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xcb-proto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
new file mode 100644
index 000000000000..ca4d7e005f89
--- /dev/null
+++ b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+XORG_MULTILIB=yes
+
+inherit python-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ dev-libs/libxml2"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+ python_export_best
+ xorg-2_src_configure
+}
+
+multilib_src_configure() {
+ autotools-utils_src_configure
+
+ if multilib_is_native_abi; then
+ python_parallel_foreach_impl autotools-utils_src_configure
+ fi
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi; then
+ python_foreach_impl autotools-utils_src_compile -C xcbgen \
+ top_builddir="${BUILD_DIR}"
+ fi
+}
+
+src_install() {
+ xorg-2_src_install
+
+ # pkg-config file hardcodes python sitedir, bug 486512
+ sed -i -e '/pythondir/s:=.*$:=/dev/null:' \
+ "${ED}"/usr/lib*/pkgconfig/xcb-proto.pc || die
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi; then
+ python_foreach_impl autotools-utils_src_install -C xcbgen \
+ top_builddir="${BUILD_DIR}"
+ fi
+}
diff --git a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
new file mode 100644
index 000000000000..ec6758a979e2
--- /dev/null
+++ b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+XORG_MULTILIB=yes
+
+inherit python-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ dev-libs/libxml2"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+ python_setup
+ xorg-2_src_configure
+}
+
+multilib_src_configure() {
+ autotools-utils_src_configure
+
+ if multilib_is_native_abi; then
+ python_parallel_foreach_impl autotools-utils_src_configure
+ fi
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi; then
+ python_foreach_impl autotools-utils_src_compile -C xcbgen \
+ top_builddir="${BUILD_DIR}"
+ fi
+}
+
+src_install() {
+ xorg-2_src_install
+
+ # pkg-config file hardcodes python sitedir, bug 486512
+ sed -i -e '/pythondir/s:=.*$:=/dev/null:' \
+ "${ED}"/usr/lib*/pkgconfig/xcb-proto.pc || die
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi; then
+ python_foreach_impl autotools-utils_src_install -C xcbgen \
+ top_builddir="${BUILD_DIR}"
+ fi
+}
diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
new file mode 100644
index 000000000000..818f062cf35e
--- /dev/null
+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+XORG_MULTILIB=yes
+
+inherit python-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ dev-libs/libxml2"
+
+src_configure() {
+ python_export_best
+ xorg-2_src_configure
+}
+
+multilib_src_configure() {
+ autotools-utils_src_configure
+
+ if multilib_is_native_abi; then
+ python_parallel_foreach_impl autotools-utils_src_configure
+ fi
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi; then
+ python_foreach_impl autotools-utils_src_compile -C xcbgen \
+ top_builddir="${BUILD_DIR}"
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi; then
+ python_foreach_impl autotools-utils_src_install -C xcbgen \
+ top_builddir="${BUILD_DIR}"
+ fi
+}
+
+pkg_postinst() {
+ ewarn "Please rebuild both libxcb and xcb-util if you are upgrading from version 1.6"
+}
diff --git a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
new file mode 100644
index 000000000000..627c706b4d7c
--- /dev/null
+++ b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+XORG_MULTILIB=yes
+
+inherit python-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ dev-libs/libxml2"
+
+# Work around py-compile being generated by some ancient version.
+src_prepare() {
+ rm -f py-compile
+ eautoreconf
+
+ # Remove tabs, bug 490928.
+ sed -i -e 's/ / /' xcbgen/xtypes.py || die
+}
+
+src_configure() {
+ python_export_best
+ xorg-2_src_configure
+}
+
+multilib_src_configure() {
+ autotools-utils_src_configure
+
+ if multilib_is_native_abi; then
+ python_parallel_foreach_impl autotools-utils_src_configure
+ fi
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi; then
+ python_foreach_impl autotools-utils_src_compile -C xcbgen \
+ top_builddir="${BUILD_DIR}"
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi; then
+ python_foreach_impl autotools-utils_src_install -C xcbgen \
+ top_builddir="${BUILD_DIR}"
+ fi
+}
diff --git a/x11-proto/xcmiscproto/Manifest b/x11-proto/xcmiscproto/Manifest
new file mode 100644
index 000000000000..82edf563f1af
--- /dev/null
+++ b/x11-proto/xcmiscproto/Manifest
@@ -0,0 +1 @@
+DIST xcmiscproto-1.2.2.tar.bz2 112486 SHA256 b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df SHA512 33060d0f9bba92670fce6e42f5d9094e84b803fd07e61b159aafdbee40a9876b49cf844bc7bae4c628fbb11a6a0883a9ee07041b59290488f1e9dbfe6e5128a8 WHIRLPOOL 4b85a167e89f1f7dc9209a66b7b9ee706f8cc70671598ccf0e4f9ee0085d779bad11ce05f2caf5b085ac40d7257ac785375e95701eafac46490abd4d894e04a6
diff --git a/x11-proto/xcmiscproto/metadata.xml b/x11-proto/xcmiscproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xcmiscproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xcmiscproto/xcmiscproto-1.2.2.ebuild b/x11-proto/xcmiscproto/xcmiscproto-1.2.2.ebuild
new file mode 100644
index 000000000000..7d5c93f45f72
--- /dev/null
+++ b/x11-proto/xcmiscproto/xcmiscproto-1.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org XCMisc protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
new file mode 100644
index 000000000000..0f796aef4a39
--- /dev/null
+++ b/x11-proto/xextproto/Manifest
@@ -0,0 +1,3 @@
+DIST xextproto-7.2.0.tar.bz2 207724 SHA256 d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5 SHA512 910de76dbcbe752fbbf8e9496e2d5aba480347dabc8dc365362b1835d14d14c9815189b6d77d1d2c63a42cb559800b4a52fa789aa5f1a0c8519768439a9856a8 WHIRLPOOL c337c22ed57a0bfbf9e2e259aa09b77b00a527c74cffdf436419cc15a359f4f6151d017da7ba9860d2d400904ea82f6f25c5893a24bb440621bfde724f74ad75
+DIST xextproto-7.2.1.tar.bz2 229282 SHA256 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a SHA512 c2b60f07c16f850c5fce2aeec071654d34d88f9c775a4386286f597bcce437a124ed3f8c9f7ddc58427c1413f5326a26ee15866fd6725c6315e6da32b323cf33 WHIRLPOOL cd01d2258c9152b68703fef97f200cdbb849c56c2205b4d81f59217b9c0830504b57ca6d13e9a263c6346fa5a69d63480dc9c9783e84530ed110a403319eafae
+DIST xextproto-7.3.0.tar.bz2 229310 SHA256 f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0 SHA512 238beed85fcf6fe5b0809e52814dd44fa45fe6868239990086cb8dd2c446292dd4794698abd07ed10bd146a7096c1679f7160da226f9e861dfaf6c8e22315d61 WHIRLPOOL ae113b48e79d540e3b5cb90a6d89e3f1fb6af139726153c31f0cbaeaf34fcad2cded56bf7dd2b2b3bbf1834d85df68abb7eb671ce2b67119ef4e194b30c4cd6f
diff --git a/x11-proto/xextproto/metadata.xml b/x11-proto/xextproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xextproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xextproto/xextproto-7.2.0.ebuild b/x11-proto/xextproto/xextproto-7.2.0.ebuild
new file mode 100644
index 000000000000..eb8c03e360cb
--- /dev/null
+++ b/x11-proto/xextproto/xextproto-7.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org XExt protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXext-1.0.99"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ CONFIGURE_OPTIONS="
+ $(use_with doc xmlto)
+ --without-fop
+ "
+}
diff --git a/x11-proto/xextproto/xextproto-7.2.1-r1.ebuild b/x11-proto/xextproto/xextproto-7.2.1-r1.ebuild
new file mode 100644
index 000000000000..fd17e78a3311
--- /dev/null
+++ b/x11-proto/xextproto/xextproto-7.2.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XExt protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXext-1.0.99"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-proto/xextproto/xextproto-7.2.1.ebuild b/x11-proto/xextproto/xextproto-7.2.1.ebuild
new file mode 100644
index 000000000000..f69ccb92d439
--- /dev/null
+++ b/x11-proto/xextproto/xextproto-7.2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org XExt protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXext-1.0.99"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-proto/xextproto/xextproto-7.3.0.ebuild b/x11-proto/xextproto/xextproto-7.3.0.ebuild
new file mode 100644
index 000000000000..f61ece0fdbfe
--- /dev/null
+++ b/x11-proto/xextproto/xextproto-7.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XExt protocol headers"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXext-1.0.99"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-proto/xf86bigfontproto/Manifest b/x11-proto/xf86bigfontproto/Manifest
new file mode 100644
index 000000000000..a67765fcc063
--- /dev/null
+++ b/x11-proto/xf86bigfontproto/Manifest
@@ -0,0 +1 @@
+DIST xf86bigfontproto-1.2.0.tar.bz2 49191 SHA256 ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648 SHA512 35b53ee1f428fee6777733264a7534a28ec6ffb29fc0ad9ab02337101d651ec94007bf840d0b591ee36a063280d4a4c71ff08f37100a63bb27581b5a9f69a710 WHIRLPOOL aeab03f5ef6657314c59367622d887dd8c7add543c5a25015a366ef41b50f3af6f2a1b56ce499914de6a7b04e7c3fd728ca1cd16dee5b4f92b755cf7d75e3e21
diff --git a/x11-proto/xf86bigfontproto/metadata.xml b/x11-proto/xf86bigfontproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xf86bigfontproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r1.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..f1c30dd9d4ec
--- /dev/null
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XF86BigFont protocol headers"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86dgaproto/Manifest b/x11-proto/xf86dgaproto/Manifest
new file mode 100644
index 000000000000..6423c4ff030a
--- /dev/null
+++ b/x11-proto/xf86dgaproto/Manifest
@@ -0,0 +1 @@
+DIST xf86dgaproto-2.1.tar.bz2 85934 SHA256 ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050 SHA512 dab56f5e59d1099d0d462e2f056e073c0ebde46aae6b9cf1c12b1fda43b5f21fb438dc811305c3114e04eb2fd2b1d13ddbe0a1d9a5c8155525db82db00e1461c WHIRLPOOL d2ef3a680611beea7d317b2ab026cac09a1fafca38605d10f745154086ea3edf6b0e2ee78b100465ab0cfe34528739c11a4b403dc571dda3d1fd619b08808b59
diff --git a/x11-proto/xf86dgaproto/metadata.xml b/x11-proto/xf86dgaproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xf86dgaproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r2.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r2.ebuild
new file mode 100644
index 000000000000..7413b81263e8
--- /dev/null
+++ b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XF86DGA protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXxf86dga-1.0.99.1"
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86driproto/Manifest b/x11-proto/xf86driproto/Manifest
new file mode 100644
index 000000000000..638f2ae65a30
--- /dev/null
+++ b/x11-proto/xf86driproto/Manifest
@@ -0,0 +1 @@
+DIST xf86driproto-2.1.1.tar.bz2 96528 SHA256 9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f SHA512 dce0d4da1dd703a6cdfe7676537034d43c9e84d70f20afdfe59be7929a97fbd077fa7026e41c0fca8aafd5fe666b2ee99265c8e94e69263bdf46e2be9ff34df2 WHIRLPOOL b8a45e07df6291da32ac6f31f8a6719618929a5faa76f85641d5209b9d575cc0abd65a390c214e091ba3734b3d5029e742c3c3bd2a356f549b60bd06846bdabd
diff --git a/x11-proto/xf86driproto/metadata.xml b/x11-proto/xf86driproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xf86driproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xf86driproto/xf86driproto-2.1.1-r1.ebuild b/x11-proto/xf86driproto/xf86driproto-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..66559c636e00
--- /dev/null
+++ b/x11-proto/xf86driproto/xf86driproto-2.1.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XF86DRI protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86miscproto/Manifest b/x11-proto/xf86miscproto/Manifest
new file mode 100644
index 000000000000..5d0bcbec1cdb
--- /dev/null
+++ b/x11-proto/xf86miscproto/Manifest
@@ -0,0 +1 @@
+DIST xf86miscproto-0.9.3.tar.bz2 84950 SHA256 45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095 SHA512 b82370ee3aff3ee13c15ce645a74e6d927df0a2db01830a21fea4c36445495849d24410639525f02f369aabe8e1b6e6ab9acbfd3a41cb3cd7e6060a9c8ae320d WHIRLPOOL c23c5708b0e4ae1b6a1c946167f73e03d7b57c71da1a05c9aa5465e8e867504bfde932443f740af525dc830c73b1d39d9c4f0b3c79aae92539c83382fe0276b8
diff --git a/x11-proto/xf86miscproto/metadata.xml b/x11-proto/xf86miscproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xf86miscproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xf86miscproto/xf86miscproto-0.9.3.ebuild b/x11-proto/xf86miscproto/xf86miscproto-0.9.3.ebuild
new file mode 100644
index 000000000000..03aa6a1d3cfe
--- /dev/null
+++ b/x11-proto/xf86miscproto/xf86miscproto-0.9.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org XF86Misc protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86rushproto/Manifest b/x11-proto/xf86rushproto/Manifest
new file mode 100644
index 000000000000..ba3f51c13e72
--- /dev/null
+++ b/x11-proto/xf86rushproto/Manifest
@@ -0,0 +1 @@
+DIST xf86rushproto-1.1.2.tar.bz2 37695 SHA256 07d9b237541f2d6313b5b28f5335d987a766b36c87b133f77cc48f31d969a3ae SHA512 d92f7b8d40188fee1f0cbcb759aff46dd482b367b0519e103fc912b7a5d80d8c626eb2fa9d1f64a2563c13cba2d2ba4e9de3dae3fda7d5ae78bbf5d029dc8a60 WHIRLPOOL 0e1d295271d4961ed292e998e7cae3599e82c221173743c8f6e09d3e7960c9ca92a9a5dde115d8a68aedf48e86bbc8cd64748a00a40b23b158d25cd3be01089f
diff --git a/x11-proto/xf86rushproto/metadata.xml b/x11-proto/xf86rushproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xf86rushproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xf86rushproto/xf86rushproto-1.1.2-r1.ebuild b/x11-proto/xf86rushproto/xf86rushproto-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..677203a02e47
--- /dev/null
+++ b/x11-proto/xf86rushproto/xf86rushproto-1.1.2-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org XF86Rush protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
diff --git a/x11-proto/xf86vidmodeproto/Manifest b/x11-proto/xf86vidmodeproto/Manifest
new file mode 100644
index 000000000000..379e48ac5911
--- /dev/null
+++ b/x11-proto/xf86vidmodeproto/Manifest
@@ -0,0 +1 @@
+DIST xf86vidmodeproto-2.3.1.tar.bz2 96822 SHA256 45d9499aa7b73203fd6b3505b0259624afed5c16b941bd04fcf123e5de698770 SHA512 d68784339271226a71360253b5f35d9cbec483801b4df3684bd070b1208a478edf9e5f55f1ff8ff186c81c56fb6e105e8cebad43d650cdbe605eed10bb7c7c50 WHIRLPOOL 9f52dc495d2566575633c7a0feebed9602f2c47ab27304ca15ba73ae60cb8e4e7e11768eafaf07b7e4c973b9cfb70d1d96897c520796f03277e8dadfa0cd02cf
diff --git a/x11-proto/xf86vidmodeproto/metadata.xml b/x11-proto/xf86vidmodeproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xf86vidmodeproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r1.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..27ce502c8c86
--- /dev/null
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XF86VidMode protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXxf86vm-1.0.99.1"
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xineramaproto/Manifest b/x11-proto/xineramaproto/Manifest
new file mode 100644
index 000000000000..1a8b8de6f4ad
--- /dev/null
+++ b/x11-proto/xineramaproto/Manifest
@@ -0,0 +1 @@
+DIST xineramaproto-1.2.1.tar.bz2 96239 SHA256 977574bb3dc192ecd9c55f59f991ec1dff340be3e31392c95deff423da52485b SHA512 ec2194c9bcad3f0f3eb3e9298792272213aa032ae9d6c00dcad567f31d7278a8c676fc67f47aae1a6deef5bade0b204346ed16da4a4c4d5a507c04d109d3dbb3 WHIRLPOOL 972653600ed3cd8b4ac0683abea5c726c44a8e5ecbe53cc0c5c9a602655d384c46d2141a42c011bdc3722cdc4e1c75465db076f0c1a6776d19a28a21827179f5
diff --git a/x11-proto/xineramaproto/metadata.xml b/x11-proto/xineramaproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xineramaproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xineramaproto/xineramaproto-1.2.1-r1.ebuild b/x11-proto/xineramaproto/xineramaproto-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..03d8ef30e9d7
--- /dev/null
+++ b/x11-proto/xineramaproto/xineramaproto-1.2.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xinerama protocol headers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXinerama-1.0.99.1"
+DEPEND="${RDEPEND}"
diff --git a/x11-proto/xproto/Manifest b/x11-proto/xproto/Manifest
new file mode 100644
index 000000000000..b76771c823ff
--- /dev/null
+++ b/x11-proto/xproto/Manifest
@@ -0,0 +1,2 @@
+DIST xproto-7.0.27.tar.bz2 305768 SHA256 246f23a6b235c8008183deeb1dcd76d529a099f93600b648b399811b10ea110c SHA512 3daf7a669ed7419aa054c374e52d9421c6121d79ccac939072651cef9d56b541521a645980f0ef7582fdee8e7a83c47ea1c1b065f5f169ddd83e7ede684a5545 WHIRLPOOL e0b5c2508ae344fda0bfc5c883671d49bcc1b04446d382034594a450c781dd5de4967919a73aed037703a4962be09904949e195e5678f58e77631d4ce9baf115
+DIST xproto-7.0.28.tar.bz2 300886 SHA256 29e85568d1f68ceef8a2c081dad9bc0e5500a53cfffde24b564dc43d46ddf6ca SHA512 8cc9f94380211ba319ceaaf4d2556e2fa5eb1c784369c0c4441604c84b9a6e841516e438228eba5c4f342199ff88d8f4f0887ef112247165e69f962ffcb62f84 WHIRLPOOL b769fabbce97e39dbae3d774e30ccdcf077ad15d9a22695d616d365677017c065ba6236ce2b7ca632a0a098b20579f8124ffc0f1d10db556e48fc46ca29b0571
diff --git a/x11-proto/xproto/metadata.xml b/x11-proto/xproto/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-proto/xproto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-proto/xproto/xproto-7.0.27.ebuild b/x11-proto/xproto/xproto-7.0.27.ebuild
new file mode 100644
index 000000000000..564ec570f09c
--- /dev/null
+++ b/x11-proto/xproto/xproto-7.0.27.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org xproto protocol headers"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-proto/xproto/xproto-7.0.28.ebuild b/x11-proto/xproto/xproto-7.0.28.ebuild
new file mode 100644
index 000000000000..92e72188ca76
--- /dev/null
+++ b/x11-proto/xproto/xproto-7.0.28.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org xproto protocol headers"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-2_src_configure
+}