3 files changed, 2 insertions, 28 deletions
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index bd2eeba7659a..4dd30177d7af 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1,4 +1,2 @@
-DIST glproto-1.4.17.tar.bz2 126969 BLAKE2B 09643a5e9de4aa0f7f9486998d41ff8b3e8cf84c55f785293d3fe224b5aee26e816b83983c380a0208db1269e6643986e04f8899c56f96917c640a6c074ceba5 SHA512 3e5bb1949ab9993e07d2ed7e829b9e0a8803eab476e9f4082fc01087c3dce01f3bcb9d55261eaf60e55977a689b326ed1dcf40f74d5e1fc660c83bea094b6754
-EBUILD glproto-1.4.17-r1.ebuild 621 BLAKE2B be5c3fa1fe4bf4fbb81673d6fb7c60f47e891e31f6419c4c0e678c95b5466239896428b359261759fcb66a59b1a4cb72743c3680bfc8acbfb7560ac205a5ca42 SHA512 f821f6ce120aab20e6bd456de8671e14e5bacdfd500a7abba78bda58ac17ab006ade5a20e7847034c4297383d1d17eeffcb30c80b0bd5525cd49060327e3693a
-EBUILD glproto-1.4.17-r2.ebuild 532 BLAKE2B 7403ce1b50aa634a137a47bb246d2e078e9902b84eeafa64bcf52b8746f59ff92c219f50bc392bd4715d7b0eb8300961d33eae25cdc18719f567a17883d10388 SHA512 3c9c643b1964f2c33f65041f7937114c5a434a701087a7bcef0015d06f74b639094c1d92b52404ab356646575fdc1e73ee7e360e90080045c260882c304f4437
+EBUILD glproto-1.4.17-r2.ebuild 531 BLAKE2B 4cfc5d3e62298c3cfe8d95fdd7efb11ce504c1c262d405ea08abb83cbc115153718a0316668a53218f56c565d5796087e257c783e1fac13401751723fc4a6919 SHA512 a58264b339fe7cc5f9569bb0a1837957a33b233bc029583d9d7c4d3e168c9d2eb7ee64e56ca260d734053241b5f24afc44bf9ff76323f665bcddf68eb3120256
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/glproto/glproto-1.4.17-r1.ebuild b/x11-proto/glproto/glproto-1.4.17-r1.ebuild
deleted file mode 100644
index 124343f3b2f5..000000000000
--- a/x11-proto/glproto/glproto-1.4.17-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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-r2.ebuild b/x11-proto/glproto/glproto-1.4.17-r2.ebuild
index 2f03402f45fe..2e4e7191c0f4 100644
--- a/x11-proto/glproto/glproto-1.4.17-r2.ebuild
+++ b/x11-proto/glproto/glproto-1.4.17-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="SGI-B-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""