gentoo resync : 25.11.2020

3 files changed, 2 insertions, 18 deletions

diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index 3d2830f079e1..d6b28b15f312 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,4 +1,3 @@
 DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
-EBUILD xmessage-1.0.5-r1.ebuild 466 BLAKE2B da8d63b5ca87054ad3dd0281ea29d3d5b38ab074fe665662c2b7798ad3d2933bc9a6cbc47266a45a0b1fa7b084ac1fc6c3a06466ee6f810f798f000a68a13bf5 SHA512 6ef414f5fa4fbbcc0921b14c2baed35e10e4117b1c0b0a01e2a959021f3261ea0d0c54bbe25ea27bd8807206ee891ac1edff1d4da0a6737754a820ca71506300
-EBUILD xmessage-1.0.5.ebuild 465 BLAKE2B d1a59adab2833e5f41f30199f6248803c1afa2cd92e8450670be1793ff91615eab4fec15c513fb4b4c116b0c115c8334ebf59d562f5754525d493d9bbf2daf38 SHA512 3bfe38dfb10ec1a58565fe93bbaeecd67f56bf99479612e77b946b8021e0d106455e09c4d23d7779ee29b6347f894fe7e7d1628767be32a9d48c66f4ac9f4e4a
+EBUILD xmessage-1.0.5-r1.ebuild 457 BLAKE2B 04a85183235e60d5b104c05dc3d654ae7ebd5d2461f3b5bf43038be5234f3d24d6a11a29c3d342e21dc1ecb3aa5a264d663fa1ebd25f0c08d05166b59dd1fbad SHA512 e944856c2bef6ba396328b372143d6a73298a290ad01f81b949b18d0b3d28ff51868a9f9dffe0e8f5782363b1db94376c0291183ef1e8f2d7b696962054a0ce5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild b/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
index 105102080dd2..16f7afb30a76 100644
--- a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXt"
diff --git a/x11-apps/xmessage/xmessage-1.0.5.ebuild b/x11-apps/xmessage/xmessage-1.0.5.ebuild
deleted file mode 100644
index 85c7a1a2fde4..000000000000
--- a/x11-apps/xmessage/xmessage-1.0.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"