3 files changed, 2 insertions, 29 deletions
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index 2851569e2f11..91855913da79 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1,4 +1,2 @@
-DIST xextproto-7.3.0.tar.bz2 229310 BLAKE2B 21a5474ab0aaf835abf6eec860a9f0838114c616bd90d79005a7b2cd700872375fe8a40657fbd3b76768e1cdff27baeb2b8ba8c2e6c52410b03e8f9f9592762e SHA512 238beed85fcf6fe5b0809e52814dd44fa45fe6868239990086cb8dd2c446292dd4794698abd07ed10bd146a7096c1679f7160da226f9e861dfaf6c8e22315d61
-EBUILD xextproto-7.3.0-r1.ebuild 544 BLAKE2B 7dc7aa3ebfbaf2c01f551023fc01ae5e284d384a7b3bd1879a3569daa989fd212d07a4ec4f8915c1f0dc334597c1012e418044c48c004380bc579690f4ec7074 SHA512 eda335a53a56bbb717010b5b22e5bdafaa77648dffcea1b854038ad2db1ec26afc3e0fc0c11c915aa1a17a994f5b1be4e7c6f9a79267ff6dfa4c2a915c08fed7
-EBUILD xextproto-7.3.0.ebuild 626 BLAKE2B 1a23a8ea8ccb370d30d2d8e86c3c2ce60f9d35c2833eae02d11559e0d07d87a3c90129fd8209c257721a439dffb909bd68e3ab20172470267d29826f2da0d86e SHA512 b08c1c830d8712c94ba75824b522859f30e99d8441132360963f0dc6c7f9b7c55e38428788320e1868a067e3f20df765d63e3f3a4b60e0828231dfc8c91578d9
+EBUILD xextproto-7.3.0-r1.ebuild 543 BLAKE2B 34f417dc6a7f0b8ef9cace575d48c4844acd587365c518415e1d8ef6f916f12660074e061f33b4752fcb4c5bc43e90ccacc7511095c8a757b0c58e98d5a4b164 SHA512 56d841560b811c4d616089d489c33cbf5fa359c5550a6204a58375de636ec06f38b1473c2e035bbfc6e57b029eeabf6cd3490d00295a2de8dc3910ca421d6111
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild b/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
index 97a7dbaf3f9f..b76b2ac8f128 100644
--- a/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
+++ b/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~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 ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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 ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xextproto/xextproto-7.3.0.ebuild b/x11-proto/xextproto/xextproto-7.3.0.ebuild
deleted file mode 100644
index d65a312f714c..000000000000
--- a/x11-proto/xextproto/xextproto-7.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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
-	)
-}