gentoo resync : 28.04.2021

3 files changed, 2 insertions, 24 deletions

diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index e72aa7b524b0..8d0f9c29ebca 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,4 +1,3 @@
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
-EBUILD xdriinfo-1.0.6-r1.ebuild 480 BLAKE2B 7b59e791bb350cbf4099a3946c3aa79bca1ab03897757919f1492f600da525be3f988534eb8b0c4df626689655982b0f79502c5eae3bab33f9b8399bf3d8db7e SHA512 c272261235b43fa053e403709a2c9844bc99f3d444c340cf881055b605f72f894f9224164159f00cf0522d55ce4cd09cc86547673415680c6fca39f5eec542c9
-EBUILD xdriinfo-1.0.6.ebuild 488 BLAKE2B 7118a5e7ff9a2dd7e9425536447299cb8e8b77823ca8e423d31bbeb5f0a41b1f256f90b123fc3711e39122e13b854285eec92760f96d2011c82a8e6e1e376dca SHA512 938a89980c771e34926ae5efad21fcf9de3e778d55df68b29fce4d4016e69039775826cbdb6de702f58db198bf1762c1ec666551e11d93b5764a7242bc6dbc79
+EBUILD xdriinfo-1.0.6-r1.ebuild 474 BLAKE2B 2a5f33eb89d85ef7305e77989b3e3279220b9a56db9161f25f789c52ca7823e86d4adfda62eb4b726b09f74afdc21a7572f4a802107d57ad8ce189d32e040ee3 SHA512 b075858a16ae5c6f6b69dac088822cdbe226602e686c71f42f73305fa42084f9b3fcf00ea420dace47e2b61b76134334dda690d3d157f78da13b18fef39ed7cc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
index 12d615ee4f87..16dde9988301 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3 flag-o-matic
 
 DESCRIPTION="query configuration information of DRI drivers"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
deleted file mode 100644
index 222f878bae67..000000000000
--- a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2 flag-o-matic multilib
-
-DESCRIPTION="query configuration information of DRI drivers"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	append-cppflags "-I${EPREFIX}/usr/$(get_libdir)/opengl/xorg-x11/include/"
-}