diff --git a/x11-proto/xorgproto/Manifest b/x11-proto/xorgproto/Manifest
new file mode 100644
index 0000000000000..9f57b4d023c10
--- /dev/null
+++ b/x11-proto/xorgproto/Manifest
@@ -0,0 +1 @@
+DIST xorgproto-2018.2.tar.gz 461877 BLAKE2B f7a802b9dec3c51981a3244cf62ffe0abd89f88cb28d3a3799e8a174ea11e48a0faf85febfcb5e96e12c3a843cdb09077a6aa4101852c748a15bc847ba29c883 SHA512 31bff77c54e4832dbd55534b90606e49b2face0356245edd7d6028f26b06fa9e95dab63aed23d55f8552291fa384f65dde2f223b96cc705e98c425a1d0dd3d4b
diff --git a/x11-proto/xorgproto/xorgproto-2018.2.ebuild b/x11-proto/xorgproto/xorgproto-2018.2.ebuild
new file mode 100644
index 0000000000000..9b4dce089d5a7
--- /dev/null
+++ b/x11-proto/xorgproto/xorgproto-2018.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson
+
+DESCRIPTION="X.Org combined protocol headers"
+HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	!<x11-proto/bigreqsproto-1.1.2-r1
+	!<x11-proto/compositeproto-0.4.2-r2
+	!<x11-proto/damageproto-1.2.1-r2
+	!<x11-proto/dmxproto-2.3.1-r2
+	!<x11-proto/dri2proto-2.8-r2
+	!<x11-proto/dri3proto-1.0-r1
+	!<x11-proto/fixesproto-5.0-r2
+	!<x11-proto/fontsproto-2.1.3-r1
+	!<x11-proto/glproto-1.4.17-r2
+	!<x11-proto/inputproto-2.3.2-r1
+	!<x11-proto/kbproto-1.0.7-r1
+	!<x11-proto/presentproto-1.1-r1
+	!<x11-proto/randrproto-1.5.0-r1
+	!<x11-proto/recordproto-1.14.2-r2
+	!<x11-proto/renderproto-0.11.1-r2
+	!<x11-proto/resourceproto-1.2.0-r1
+	!<x11-proto/scrnsaverproto-1.2.2-r2
+	!<x11-proto/trapproto-3.4.3-r1
+	!<x11-proto/videoproto-2.3.3-r1
+	!<x11-proto/xcmiscproto-1.2.2-r1
+	!<x11-proto/xextproto-7.3.0-r1
+	!<x11-proto/xf86bigfontproto-1.2.0-r2
+	!<x11-proto/xf86dgaproto-2.1-r3
+	!<x11-proto/xf86driproto-2.1.1-r2
+	!<x11-proto/xf86miscproto-0.9.3-r1
+	!<x11-proto/xf86vidmodeproto-2.3.1-r2
+	!<x11-proto/xineramaproto-1.2.1-r2
+	!<x11-proto/xproto-7.0.31-r1
+
+	!x11-proto/fontcacheproto
+	!x11-proto/printproto
+	!x11-proto/xf86rushproto"
+RDEPEND=""
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}