Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

4 files changed, 2 insertions, 114 deletions

diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 8a0f75d4d79d..b0c2f10f748d 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,5 +1,4 @@
 AUX 3.28.1-fix-nosystemd-build.patch 1336 BLAKE2B f6292baad803ceca64be6a3b32793ecc4c1f99a946f247af7e79ef3ec421657230a7c473b219e9286a385c5ca25826aa192275ad1a3e1b78f2badb45a97e2c80 SHA512 d9a5c46b778835ba15c349e8458cb2dc6d950f1ad3008d0d089b5bb2235b15c4e461f9bbeb54a76085f59bf53873e671cdfcbf09c5f6f9c99251abef236b2aa1
-AUX 3.30.2-elogind.patch 1055 BLAKE2B c25d6b83d75d8155ef09d1aa5cdd8dead79a1fe796028cec79166e24ae8a579af83c396c7f4e91948a56bb2215cb180657728c35d84ee8ed09134d4ee72a17cf SHA512 6ed6fcf43238378486f430bf653cc6f209f6bd42136e14f0888b8b190a63058bfcec8777a6df0f1f454b14ef91c6075d342585a8c339a11604ffc3e712057017
 DIST sysprof-3.24.1.tar.xz 595920 BLAKE2B 90582eab3fc12a0169c151ce0fad20b839841f77a31e5858f8d660f9b0f2630396bec3b239dd88baa3f6e3dd936bdd6d63a652e491a1d32f966a755f9099f160 SHA512 5d323bcb9923c511065132711963dc8856c4d837b4d7ccfae5cc5794be5ac8ad1dc42504025469199f4bfd6a6fad4d8f49b7b21cab6f0c9a954820182e75c7d0
 DIST sysprof-3.26.1.tar.xz 609076 BLAKE2B fd10ce27b224100558ff5bb9c75cfffcb76b2331d2c4056bd73a9ace1ea155e61d705240acf6fefa805fba2333f6d439369d5b1cc16e0c537ab9fed408bf6d85 SHA512 ee03360e4971cd91129bac3cc9d2cf292d29aafe1cdacd078e404ee15c3ff02bcd0c0159502605c00eb2abd3a46917cf70458ad05e48b594eeb2835ead55c34c
 DIST sysprof-3.28.1.tar.xz 380720 BLAKE2B 0a3b93659e421b717230bff6e90d20b28f8abc8491fddb51bc3f106b6cd8b038254e1fd0260c6eee2c2b83d77765be43f394d49bd34c054c36d6427ef419fefa SHA512 ca75c279bcb8cb37bffdba51d5b3481c3ece104847b64c0b8cb534468c9350a96c7224bf261ef892817e53aff2cff90a2b808f5db5a9afd6230721664b83809b
@@ -7,6 +6,5 @@ DIST sysprof-3.30.2.tar.xz 393420 BLAKE2B 5e86a78c231d2d2c601198e066c463d8bec95a
 EBUILD sysprof-3.24.1.ebuild 1762 BLAKE2B 2af5ed24c22b41c66be0e4526b8e1627f1215320444c23559e6e553125700e31df955ec542b9ee04ec9a12a0bd4a669eb23cd4fbf96de6fb8d3562cb2c258c2b SHA512 24b82366648690bd9a4a03e04dc14e88d23c177c75dcca745a816213cf018ea4a959bb733da54ae0b1cbe85706df63cfc79140744716300a457c348eeb57982b
 EBUILD sysprof-3.26.1.ebuild 1764 BLAKE2B c3afd518bfb3a05f88c51a4f2f43834ddacaf6ce62701a4ec828623d3adb733a59b4d67f5952f740a72ff261e6a27464bd521fdc941cf83386d1c583c28e8453 SHA512 6c627f3dfb0f5bf32576489b6a03be94c54faf192df73be2fc39fc5bccb98e2c19a99f5d303e1b663e28d2df5348a411d40f633b259f1244e9b63857293db2e3
 EBUILD sysprof-3.28.1.ebuild 2125 BLAKE2B 3b0c90203488837b33015d2048cbd066bf7b0800f1135f04c810885c6d336ee9bab33b0e7e7730e01681a4cea77101b87865e9c85a5c51a85496d408519f80ff SHA512 02a7727f8a58712bf3fc9c91c41a0a5ddedeaa513c69ab9d5a0c5487c10d9afcaa8cbc35065b5d477378c71a919bafbebfe5fc1ce9cba1ed64e072f130c902f8
-EBUILD sysprof-3.30.2-r1.ebuild 2213 BLAKE2B 746f85bb79f993ef84c21c1e882fbc74ad2b0eced6c5b7e5a1ee1c495ae9ca49cc08ed2022638f4798bb8178ae0e6b87214993d5f7ba2b0f700c81db27e7ace5 SHA512 4ee7b8b74ba7f3a23f3020a3860e79b8078b80bc0fc4f9f995ecf760b3bbe12eed7a5bf71be82ddea97df79650e05c1187ef37203d4d3f70c2f980925280b620
 EBUILD sysprof-3.30.2.ebuild 2078 BLAKE2B 16e63e53f4669f64be0e1d1d9e1dafbc5d04f65962a3f3e4ddd3015cb87dde0c1f53ea78cea895ccbf222926c05620fd2650149c701e0743326f5d6a88ab5777 SHA512 376ade85ba12c517d755535c16c23181dbe4b8ecb383bdf511d94074b8c09809d791a90a96bd42cadd571af6dd96e3b3005c6c0a8dea8d6d6ece05ef26bf92fd
-MISC metadata.xml 886 BLAKE2B 31416bfe6eb56d58ae1c1953d19cc59ee0cff0c0aa7d6c28f6b95b7b4c9038ea9a8af5025e64f29612b6b919953671eb4940ff60d6baf1c79b8d33bdfae2beff SHA512 5514125c6a2dcb55a06bc81e52bb6c94a804b0dc41ce7d7c83e9ee94f06ddcd585716c12887a6428e1afe3a9268cdc4cd0596d7a036de08f0e70ae3d6366f502
+MISC metadata.xml 729 BLAKE2B 06e0c5194be5a6241062ee78bad2d2b5d0c58643657b2626c644d9f4aa14880b97340e2c87480a3e23eb297c3c3d08bba74ad45cee4b15d248bd0bb647cc7bac SHA512 4aa6b8b04ba7f008bc5e4de81cfed88efe2714c4330ce3d02433fde3d253063f5a7e17e6384ba2213d0e6421f15875943133d670b6ba5effb739d81914b3f0de
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 70135f654431..5ea946de4371 100644
--- a/dev-util/sysprof/metadata.xml
+++ b/dev-util/sysprof/metadata.xml
@@ -12,9 +12,7 @@
 	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>
+		Relies on <pkg>sys-apps/systemd</pkg> running as the init system.</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-util/sysprof/sysprof-3.30.2-r1.ebuild b/dev-util/sysprof/sysprof-3.30.2-r1.ebuild
deleted file mode 100644
index 11bffd1beddd..000000000000
--- a/dev-util/sysprof/sysprof-3.30.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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= )
-"
-# libxml2 required for glib-compile-resources; appstream-glib for appdata.xml developer_name tag translation
-DEPEND="${RDEPEND}
-	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}"/${PV}-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
-}