gentoo resync : 29.12.2022

3 files changed, 2 insertions, 41 deletions

diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index 2b252ff39914..24b821b64df3 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,5 +1,3 @@
-DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
 DIST xdpyinfo-1.3.3.tar.xz 137088 BLAKE2B 8fdf49e65ac05ab27672ef2044044353f8bbfe0c8bf6135e71b9fbd45b3cb643f5794977802cbb7a44cfe9d20905b5e74b0cc41829c9fef837f32c81bb05ea2f SHA512 47fe0821bc64145876853712ebd7c0af80111c243813615b892429021cc9a53abd38c4684551ae300cb5a4eacdd3d26e2c93e789ed91a948b20e2c37cd2d2442
-EBUILD xdpyinfo-1.3.2-r1.ebuild 807 BLAKE2B 9809040ba064c2c295f455a5a6ba350973348abcf8fd09e7f768831ffde5e182aee5e199147c968ecf2f441a252d8e17f3b4fbf65041a89be038bc6a50d75786 SHA512 3e7301b21af2bdb457c020aec37b9a9cab6cee2afd7f9dfa064cb4f95b9c9dff078d3bcdb2e81dbaa52c5c0c3783f5e92e5ce543b50c39d82cfebad85319b26a
-EBUILD xdpyinfo-1.3.3.ebuild 843 BLAKE2B 26741118e76b8b87ad4ea0dac7415cec2f213fad989759e80a4ebb13a367f58d9b699bda1dcc03aaf6192308401a814ac7fe0b2cfc79fe09066f60e9a959b709 SHA512 99882d5123748b5a92aebc1e2ae7e68144d9604751edd63557b9feee2b753da85cde9dd40067e4231824a3db4b40076188e7fc34b0156bd7717125636c8adb2c
+EBUILD xdpyinfo-1.3.3.ebuild 839 BLAKE2B 3f2f7ea5acfe02edc9afbd02adc844801fb5a03968e901d10a84d857e288af982c1bce8ec74355443a733cbd0e11917e342105da805212fbea70a3f56d1b9ece SHA512 85106268c09a3244b8e28574c99b9275a856dc066d25e3d4436efd5b5fab58937b732d964393772dd4775f11841d4cbd85749e4132c5568dd744190007012ed4
 MISC metadata.xml 348 BLAKE2B c29f79a25abe32eee42ed83aae3760812638a6696c8f27392673c9e9bb178e086b8fcc344b3db42bb9fe02ae23757ea201c8f3b5d4e03f466c6a524368df4778 SHA512 5a9e3ec8b2303c5d61cbc08cddacfe978140f9db3c5b1a2b72b896c6a61c408e6f22bcdb0a0d4e7542d946397a11878d1ca38c2e9e6cf211ad3b45eb1a45f914
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
deleted file mode 100644
index 8d341e0d5d79..000000000000
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
-IUSE="dga dmx xinerama"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	dga? ( x11-libs/libXxf86dga )
-	dmx? ( x11-libs/libdmx )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--without-xf86misc
-		$(use_with dga)
-		$(use_with dmx)
-		$(use_with xinerama)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
index a05b200648aa..fa38684215ac 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE="dga dmx xinerama"
 
 RDEPEND="