gentoo resync : 25.04.2020

6 files changed, 3 insertions, 196 deletions

diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 896e57c42c92..5d061adde5c1 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,7 +1,3 @@
-AUX 3.30.2-elogind.patch 1055 BLAKE2B c25d6b83d75d8155ef09d1aa5cdd8dead79a1fe796028cec79166e24ae8a579af83c396c7f4e91948a56bb2215cb180657728c35d84ee8ed09134d4ee72a17cf SHA512 6ed6fcf43238378486f430bf653cc6f209f6bd42136e14f0888b8b190a63058bfcec8777a6df0f1f454b14ef91c6075d342585a8c339a11604ffc3e712057017
-DIST sysprof-3.32.0.tar.xz 296052 BLAKE2B f409c64d40bd3451037e601683f270ff93ea2a60a2c104d22edc6bad5ff3f5c974f80137776b6329dae932852fa0871f2b7b9960a282147ddef5402ad840d9ef SHA512 7b9d84ac241d376a5e545082b1224e7db96af26ae0ee297d5f0b2d45abc4676e23009dbd560085e5d4879378a8dd79eefb4449df3961fbfd09238bd2056061d0
 DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
-EBUILD sysprof-3.32.0.ebuild 2223 BLAKE2B 12c03c2a1ea0a43e3445a1ec80eb95d5f2132eae1128d003fa4e004f30797b3f9d741ced16262a61240f0483361b8d620abb33e272651b201568a39eeda07453 SHA512 26a2a6ff561ac905236cb494517b65d70e6682098e043166e8ad274adc25452e9b75ea36c8cd1651972b80b31b5a84730186007f286180f34bbad51a41cfa0a0
-EBUILD sysprof-3.34.1-r1.ebuild 2180 BLAKE2B a7cfdf09e34a1b11b85f360d55338fe42a0753222e25b4ec6136646d9458d3b61c5e551a821dc3644147d518e7022092f24e8ead3af810144675bd0f9b4b9cf6 SHA512 bed8b1be866d6809e0c37e058091a3a3c669dfc68ea43fbcda84df59d1f1077b7861c01e5b5e4a57cc23dc1dba337556e26dbbb4398ff82b23afb46b1d633c03
-EBUILD sysprof-3.34.1.ebuild 1985 BLAKE2B f5f934464afac97c3581e0a37a3fc9caaa8ed7c1ac6f5f65dc93b71ce13a3050791f85b397670ecb1f63e748e969aa1ca701cc2869698761ab26fd10a695f31b SHA512 375c224e1d484025bd31e67e257bf60e7aa379eb4f9b750970bbcbe1a192884d56f3f8b3add88f29cda1bac5863c47f33863afe94fd3699473a468d055354e78
-MISC metadata.xml 960 BLAKE2B 0124f087a9539768f3ed80994f361428eb2edc9944536c6f4d3eb2792358d025a4c872379dbcbc38d43070fa6ef4842536deddbebe599e6ebffe7dbdc5d181ce SHA512 24378a4a329547aa1064b04574015c7c55134522ea9b3b84fccc297734c5cde55a6085e01f4365f0f8d57b8e5d85e41c1719c88af5a5c4c167799cb69278235f
+EBUILD sysprof-3.34.1-r1.ebuild 2178 BLAKE2B c7af4fa12f96de0aff7639364be3fd34574646a1345c27210b3ec6275a3fec64e002c43479dc290906983a673b319b68481469ccf954a270a74c0269290c43ca SHA512 3ef91c9ebe8d26f96bc0ecde85ca9c171c573c6c29a7050554301e4933ab5bb214a9069bb459129bbdc2b99c16b45197c69b4603ebf7270f648ff3d96dcd7681
+MISC metadata.xml 609 BLAKE2B 804eb6dc6f75b570561942eac147e34e4831e9993a4b40d474b75f87a5746c8ab7f3527021d872c69111a28b1837b5b069d11c9edcc7e21f6a2da18c84b4272a SHA512 358d3c0a3083bf578bd67404ff9e62d4c327e04bbaa88b28ac0cf18b8ff9939d0cb8b0d27a2179ede473c471d31e365b6112e809e8aa8c2d774cf710b6d54348
diff --git a/dev-util/sysprof/files/3.30.2-elogind.patch b/dev-util/sysprof/files/3.30.2-elogind.patch
deleted file mode 100644
index 2a57fff3a9c6..000000000000
--- a/dev-util/sysprof/files/3.30.2-elogind.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b30057251d3f2b5860b36505fed440a6bebe0359 Mon Sep 17 00:00:00 2001
-From: Shiba <not@telling.you>
-Date: Wed, 19 Dec 2018 00:37:57 +0100
-Subject: [PATCH] elogind support
-
----
- daemon/meson.build | 11 ++++++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/meson.build b/daemon/meson.build
-index d0cf87c..c7f85d7 100644
---- a/daemon/meson.build
-+++ b/daemon/meson.build
-@@ -11,8 +11,17 @@ sysprofd_sources = [
- # NOTE: This is used in data/meson.build
- pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'sysprof')
- 
-+# Check for sd-bus support either by systemd or elogind
-+sdbus_dep = dependency('libsystemd', version: '>=222', required: false)
-+if not sdbus_dep.found()
-+  sdbus_dep = dependency('libelogind', version: '>=239.3', required: false)
-+  if not sdbus_dep.found()
-+    error('sysprofd requires sd-bus but neither systemd nor elogind were found')
-+  endif
-+endif
-+
- sysprofd_deps = [
--  dependency('libsystemd', version: '>=222'),
-+  sdbus_dep,
-   dependency('glib-2.0'),
- ]
- 
--- 
-2.18.1
-
diff --git a/dev-util/sysprof/metadata.xml b/dev-util/sysprof/metadata.xml
index 2511f1c94370..7b2b574988e8 100644
--- a/dev-util/sysprof/metadata.xml
+++ b/dev-util/sysprof/metadata.xml
@@ -11,12 +11,6 @@
 	Sysprof handles shared libraries and applications do not need to be recompiled.
 	In fact they don't even have to be restarted.
 </longdescription>
-<use>
-	<flag name="elogind">Build the sysprofd daemon service, required to run the UI without root permissions.
-		Relies on <pkg>sys-auth/elogind</pkg> for sd-bus API.</flag>
-	<flag name="systemd">Build the sysprofd daemon service, required to run the UI without root permissions.
-		Relies on <pkg>sys-apps/systemd</pkg> for sd-bus API.</flag>
-</use>
 <slots>
 	<subslots>sysprof and sysprof-ui API version</subslots>
 </slots>
diff --git a/dev-util/sysprof/sysprof-3.32.0.ebuild b/dev-util/sysprof/sysprof-3.32.0.ebuild
deleted file mode 100644
index 0dd5b9278923..000000000000
--- a/dev-util/sysprof/sysprof-3.32.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="elogind gtk systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	sys-auth/polkit
-	gtk? ( >=x11-libs/gtk+-3.22.0:3 )
-	elogind? ( >=sys-auth/elogind-239.3 )
-	systemd? ( >=sys-apps/systemd-222:0= )
-"
-DEPEND="${RDEPEND}"
-# libxml2 required for glib-compile-resources; appstream-glib for appdata.xml developer_name tag translation
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/3.30.2-elogind.patch )
-
-src_configure() {
-	# -Dwith_sysprofd=host currently unavailable from ebuild
-	local emesonargs=(
-		$(meson_use gtk enable_gtk)
-		-Dwith_sysprofd=$(usex systemd bundled $(usex elogind bundled none))
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-	if ! use systemd && ! use elogind; then
-		elog ""
-		elog "Without systemd or elogind, sysprof may not function when launched as a"
-		elog "regular user, thus suboptimal running from root account may be necessary."
-		if use gtk; then
-			elog "Under wayland, that limits the recording usage to sysprof-cli utility."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/sysprof/sysprof-3.34.1-r1.ebuild b/dev-util/sysprof/sysprof-3.34.1-r1.ebuild
index e4924b71fee3..834dacd878d4 100644
--- a/dev-util/sysprof/sysprof-3.34.1-r1.ebuild
+++ b/dev-util/sysprof/sysprof-3.34.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 LICENSE="GPL-3+ GPL-2+"
 API_VERSION="3"
 SLOT="0/${API_VERSION}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/dev-util/sysprof/sysprof-3.34.1.ebuild b/dev-util/sysprof/sysprof-3.34.1.ebuild
deleted file mode 100644
index 069a3186fe30..000000000000
--- a/dev-util/sysprof/sysprof-3.34.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-API_VERSION="3"
-SLOT="0/${API_VERSION}"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.61.3:2
-	gtk? (
-		>=x11-libs/gtk+-3.22.0:3
-		>=dev-libs/libdazzle-3.30.0
-	)
-	>=sys-auth/polkit-0.114
-	dev-util/sysprof-capture:${API_VERSION}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	# These are installed by dev-util/sysprof-capture
-	sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
-	sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
-}
-
-src_configure() {
-	# -Dwith_sysprofd=host currently unavailable from ebuild
-	local emesonargs=(
-		$(meson_use gtk enable_gtk)
-		-Dlibsysprof=true
-		-Dwith_sysprofd=bundled
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-		-Dhelp=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}