gentoo resync : 18.03.2018

3 files changed, 2 insertions, 33 deletions

diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 8a5fa01aaa74..4283e8b872b9 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,3 @@
-DIST libgtop-2.34.2.tar.xz 725720 BLAKE2B fc69a6d64f86e16490f417748937b196c090de7afb68052a42258c06b7b65b686edb41abbf69ad42065a44b5811def0776969c2caa01009c2087355e9b1b2e9f SHA512 22ae4792236c47fda265f1b16f66f8685122f84a76e14adf2fd9e5e669c1f9776a58a2ec00564e37add98084d7e3cea621b38b8ad09b15e348f9c74f5345f19a
 DIST libgtop-2.36.0.tar.xz 727072 BLAKE2B 46f24573bde0bcfeb2210ea08446f6e6590fadc5697745178133ce5f3aec2e464cbce8446d2dbddb9f05d4a16eb7daf110c4554778a28573116b2b59edcf556f SHA512 2768c628fa3e872a940246042b2c78ad4618612ecb2cf2b95fb70343a4f1a01bb558d0ce9e5b3468f395349f338ca33d460e1d91f2c123ad39243cd0ff20d5e5
-EBUILD libgtop-2.34.2.ebuild 695 BLAKE2B 721a1692bcc264ba0b3c70a283b522f15e02a24d03c8b96086e51729c0c19932259c0f90542c0ed05b7225bb4f0a1733492535c6d33e78a246c475c4b7205ae6 SHA512 748d1283986bc38c5ab86e5d91996c1149e02f31339898cc39c8eab2b72c056e8569854a751487bd1d8c54d4f7fe8c03b6ed8fbe3cbb63a1a6d95dd1ded42e77
-EBUILD libgtop-2.36.0.ebuild 771 BLAKE2B 7f66e2de8eb6a0486be1a2065684649ad500c16534ddbc52a4aeb7c186b04103cc6d11bc614d8dbdf186f7b9a5bcd5755262943c86dfaa117a9213ad1a0a9d09 SHA512 da6d2b29ad74243612e44943699889e59b7213303678f35af28cc889251f7cdc672dc943dbb36ec87e18839a28fb0ec8aa499c54aeddb2e4471176ecd7b4f601
+EBUILD libgtop-2.36.0.ebuild 769 BLAKE2B b5247d7371184e217fa7f0242305577a009969c6ea9c2c67a45fa2646fa0441a5ff26c7d2e73b3f54b27347b1c9d7e76dd4afa3e64d5fa3d3a76a008e8503728 SHA512 525471e9a3d833b559a4cc5a963d9b6e8a7b25cceb8839c716ea2b6e764cd5b03756d767a434913940ab8542f62481d7b7b1aabe0d6f979f1987534211089a83
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.34.2.ebuild b/gnome-base/libgtop/libgtop-2.34.2.ebuild
deleted file mode 100644
index acafa2277c42..000000000000
--- a/gnome-base/libgtop/libgtop-2.34.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A library that provides top functionality to applications"
-HOMEPAGE="https://git.gnome.org/browse/libgtop"
-
-LICENSE="GPL-2"
-SLOT="2/10" # libgtop soname version
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
diff --git a/gnome-base/libgtop/libgtop-2.36.0.ebuild b/gnome-base/libgtop/libgtop-2.36.0.ebuild
index 62d491bdc2fe..dd04cae7630b 100644
--- a/gnome-base/libgtop/libgtop-2.36.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2"
 SLOT="2/10" # libgtop soname version
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="+introspection"
 
 RDEPEND="