gentoo resync : 05.12.2021

3 files changed, 2 insertions, 41 deletions

diff --git a/x11-apps/xrestop/Manifest b/x11-apps/xrestop/Manifest
index 460c1f6b5eb3..d17478646f71 100644
--- a/x11-apps/xrestop/Manifest
+++ b/x11-apps/xrestop/Manifest
@@ -1,6 +1,4 @@
 AUX xrestop-0.4-tinfo.patch 291 BLAKE2B b96d892c87a8133987baa94e5cb4917bc5d743c24ec11a2ec67afafc7206654b88c17f54377f2d1bf0c9fb92df8de16c99e4d0f9a15ff80a9417da2de31bc6fa SHA512 21993ada033d4ec744b55faa71afd736a99423f12071a64e1445958de979631ce42a908e14ef194e819de98766c92a2c2470b2c88d172879ec5fc4c20212566f
-DIST xrestop-0.4.tar.gz 92308 BLAKE2B 5bfe6e9ccd49038e7884be8379e79f3de2bc960588dc21fbbe40d2acb89c6505efd78a9415e0ba8feb24986f11f066ce641b9c933f241776bbc1b3e59fd520f0 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6
 DIST xrestop-0.5.tar.bz2 135537 BLAKE2B cbb58870ff16148a34468231478c723fc41932c1e17156304a1885b52c17d870339c88bc4acde16d28cdd22cb227c2190b6b33bd472b047a82261924e681c889 SHA512 f50e1fcba2fdb6167f93b9edae721556bc411232a9d7cc1df853e588cd92608c9ca652bee1aaf5cfe3750d6c60db6c6cd1c6797e282841cc535051e78b2c4c1d
-EBUILD xrestop-0.4.ebuild 675 BLAKE2B aebbfd7d106196078ef2a4538e519ed5a34ea1e6653a64ffbe4e81a46dae9c1b73b192e49996bfc962819bcf2f4c6e649967325f4ee5c7ba22703743da146a81 SHA512 db62ccd4b3af85a582f3b6c9851ee2fb762a5ed5a6f74feac39e42a8638ceb4f5a057161aff96757e95af00dec57b049450f769bea54c436755084a426a63319
-EBUILD xrestop-0.5.ebuild 595 BLAKE2B 8e30e43e1aebfe1250fe0369ab2f470a6ce8c90388417f1486f602a7b97c726fcec104f404c599cd8d9711dc73f1f2ad23ed323bdd2726ad94df5519983de6b6 SHA512 4f9252923eb2f7fa9c5ccd39b0ff191f73522636afdd80aac6987dbd02dc73244aa13275973af7694d6f6932e998306522c6424968ccbcc7f29c39592d13ec26
+EBUILD xrestop-0.5.ebuild 593 BLAKE2B f1a76d65b471b96a5f5884a72b593baced76cc4ccaa5f38824810b7565d4126a594ded9300d742649109aceb1393be50e3be25bfec0008bbf8722caccbcee533 SHA512 62d6f731fdaabcd41ecee86ce17927521d33cb340b21645139311f7f342b1ef6940a02970ecab5073de9f95c93939bc745b3ed8c20a26039fe63aba6bde1acb7
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xrestop/xrestop-0.4.ebuild b/x11-apps/xrestop/xrestop-0.4.ebuild
deleted file mode 100644
index 42d0def453a2..000000000000
--- a/x11-apps/xrestop/xrestop-0.4.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 autotools
-
-DESCRIPTION="'Top' like statistics of X11 client's server side resource usage"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xrestop"
-SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXt
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/x11-apps/xrestop/xrestop-0.5.ebuild b/x11-apps/xrestop/xrestop-0.5.ebuild
index 95e2ca8dce98..7c812b8ad115 100644
--- a/x11-apps/xrestop/xrestop-0.5.ebuild
+++ b/x11-apps/xrestop/xrestop-0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xrestop"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	sys-libs/ncurses:=