gentoo Easter resync : 12.04.2020

5 files changed, 78 insertions, 4 deletions

diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index cb92db337f3f..0687effdc6c6 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,8 @@
+AUX 2.40.0-sandbox-workaround.patch 890 BLAKE2B b231acfa4f15b04d5148864da0ef32f08c65fd4ddcda940cd39d832bc30d46edb8f48633e08974521abee126251e5e80693bb224f0630f17065e7c5580ba9439 SHA512 ec5b1f9e9b8174dee576370ccfeb2d758ad5369c1ffacc7d8840f9936046fbedfd0d3e1e2b024606d33a32da59c65cdf204ba98fb108a92dcff660b0769d71b6
 DIST libgtop-2.38.0.tar.xz 729700 BLAKE2B 2296741d6c6bd1c9eb17be10e480dabd732e956826c859c176cbc6f8f03259a3b2f2f04d6c55d1c562b082f7e880bb4b7a3f07a66d7f24660085387dce078879 SHA512 96586b7f12a2b63c5ec7f69c51b6e28361a7458f24f20270fc589213bfae43ae99d1e39efb6101d189741bba084c887554f745131e99d8ed90b7db6d53c36e1d
+DIST libgtop-2.40.0-patchset.tar.xz 9700 BLAKE2B 0d7e42b12fe0989df8e5abd1d45578acb97981c05c43aeeea57ba38f526e61aaa9507cd9520a20634f4559b4dfe60efd368d343f2d1ac6803e33bc5dc4832522 SHA512 15b5a81f4ec7a3e921a2c114e8f57dcca194e38849e09080c55a3a16078a8ec706f8efef6d4b22931927e7ab7789596e85054ccd85f37d6dd3206c962734960b
 DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861
-EBUILD libgtop-2.38.0.ebuild 758 BLAKE2B 1f34cb208a28312fbe4fcadd1c2b82d97f173b8a3d0fe6f9fbc1e39332193e404b74cdd477187395362d99bfef8669557fd4382cc2f4666f172d1f7def31e46d SHA512 cb863280bcd41cb4ee196971b9ae57f6ee5e44211f882a618c40210033744ea0250a173b7aa4517a1c83b0906797654ae17ec1e7aee06c20c40a8fc63cc7e249
-EBUILD libgtop-2.40.0.ebuild 765 BLAKE2B 063797e84c04aaf42e1a9ae8430128e8aac6fb8e7ba7ae867fc5ed7597fc8ce3566c2c64982c18eb3b952aa2db07083e196c54d39dd0b43cc3d2ab9e78271d1a SHA512 be1e76881efb0e6ee66b70c4bfffdca56235a041bf51130be68ee716d0bfec005f9d8562a05f7cf6df90380d382b9433ac402538d174f19f3808422ab77347e6
+EBUILD libgtop-2.38.0.ebuild 761 BLAKE2B 1c15a9838e4be517757bed073fe6b196b862047cd6ab2595a5611601bc810c416870090caf0a0f94752115dfc2cf229857d9f61d7f1b96e9fa628b3e55622c40 SHA512 6fdbf12fb10459af5e96b82caf0cac4d6927e3ec6669742c453d2b7f127e272cfbae68b87b71125563bce4ecbf2354d201a3076435ed728462aedf401e17e53e
+EBUILD libgtop-2.40.0-r1.ebuild 1217 BLAKE2B 558ede544a5e1a0e07dc94f8e27b0aaabb408e6dce876e415fb02e2a9b912fc5b3ed60071e1da47872955f882c6bb4610c661442c72b11636c03490853a76b73 SHA512 bb7eb055f726d20e61c2cd584bed56c496e2ad748ed1d387d198969fc7d4db9945c46c87f2d96b6e7f958f8925b68ecfe9a3dcb1351d3dbfa63daee307221c30
+EBUILD libgtop-2.40.0.ebuild 761 BLAKE2B 63576898daf4d2182c963c49160f78e21329edf2b79d23b9c733178e352b74040515c06453164088c87c40597841061edd1b381bebc44f5409b1733a0d0c58e6 SHA512 f0d7d73ac5d1d579fdef4ffdfbff6ef3e7a3dfaa522b8bb5c8429bb29586d2870f9b35ec0eae1d06fd09e1e3e8b79428753c0b8a2616b0a20c61fa118e9435d3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/files/2.40.0-sandbox-workaround.patch b/gnome-base/libgtop/files/2.40.0-sandbox-workaround.patch
new file mode 100644
index 000000000000..86184f9d0a9b
--- /dev/null
+++ b/gnome-base/libgtop/files/2.40.0-sandbox-workaround.patch
@@ -0,0 +1,27 @@
+From 9a0067e0fa4636efa37212d7d56376f8ec02a802 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 21 Mar 2020 18:40:09 +0200
+Subject: [PATCH] build: Workaround chmod on root filesystem sandbox issue
+
+Just delete this again, but keep the server enabling from
+commit ec662d01dac16b81; the suid part has to be handled at
+package level instead.
+---
+ libgtop-sysdeps.m4 | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libgtop-sysdeps.m4 b/libgtop-sysdeps.m4
+index b363dae0..81aa5350 100644
+--- a/libgtop-sysdeps.m4
++++ b/libgtop-sysdeps.m4
+@@ -36,7 +36,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+ 	  libgtop_need_server=yes
+ 	  libgtop_sysdeps_private_mountlist=yes
+ 	  libgtop_sysdeps_private_fsusage=yes
+-	  libgtop_postinstall='chown root $(bindir)/libgtop_server2 && chmod 4755 $(bindir)/libgtop_server2'
+ 	  ;;
+ 	netbsd*|bsdi*)
+ 	  libgtop_sysdeps_dir=bsd
+-- 
+2.20.1
+
diff --git a/gnome-base/libgtop/libgtop-2.38.0.ebuild b/gnome-base/libgtop/libgtop-2.38.0.ebuild
index f472a1c51181..8c03243348ea 100644
--- a/gnome-base/libgtop/libgtop-2.38.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2+"
 SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
new file mode 100644
index 000000000000..2dfe607887a5
--- /dev/null
+++ b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+inherit flag-o-matic gnome2
+
+DESCRIPTION="A library that provides top functionality to applications"
+HOMEPAGE="https://git.gnome.org/browse/libgtop"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2/11" # libgtop soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+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.6
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${WORKDIR}"/patches # patches from master (not stable branch) that seem safe and fix potential eautoreconf problems
+	"${FILESDIR}"/${PV}-sandbox-workaround.patch # requires suid handling in ebuild - https://gitlab.gnome.org/GNOME/libgtop/issues/48
+)
+
+src_configure() {
+	# Add explicit stdc, bug #628256
+	append-cflags "-std=c99"
+
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+	chmod 4755 "${ED}"/usr/bin/libgtop_server2 || die
+}
diff --git a/gnome-base/libgtop/libgtop-2.40.0.ebuild b/gnome-base/libgtop/libgtop-2.40.0.ebuild
index 5413e13da05b..4950f22ebfce 100644
--- a/gnome-base/libgtop/libgtop-2.40.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.40.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2+"
 SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection"
 
 RDEPEND="