gentoo resync : 15.06.2021

4 files changed, 46 insertions, 29 deletions

diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index 74f7ac38f2aa..d5a92945f985 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,5 +1,7 @@
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
-EBUILD sysprof-capture-3.36.0-r1.ebuild 897 BLAKE2B ffcc34d5ba95dfeeed50f42634e7404905d6022600e79215e6008e8f200382e224358de100aae1f3488ba1951377b219ddd04d1a2bb616bacafa23e7657d9027 SHA512 8dd4ef1baa437e1b68a6a3e2399bb147153f670ad521a31df2b2ef783e4434c9bbead188891d621f1cf9a096072f8d9bc776665bd345900f5382045e0c154709
-EBUILD sysprof-capture-3.38.1-r1.ebuild 943 BLAKE2B 16e2d25430e0c5c412aa2e7036c9620925e30583fc90614c66c9a6ab39c1fbef4496b3edb3ead2ea73c7e1421b93a6104ccf0125c98739d97e1b1688b8f25dc2 SHA512 1f9786c23ba4699572a4926b4e178c1a0b18a8d421f60646b1f39b9ec07905840d0f5f7ca887c1b6605fb892d725dbbc4fde8e987732ca1cc721d8d00c6adc44
+DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
+EBUILD sysprof-capture-3.36.0-r1.ebuild 754 BLAKE2B bab0ff01030d72f2ab0df460e5972b32cfc72a16f5e924a85575e060ff1f796ddf3fdb4f67670204988088dfe838c561888d47486cfe93aaffa2c128501857d4 SHA512 9d7cf4c5d7e569d751a097d1d71e6451b7bff42993bc88c5d0e136d3422b6e30780bfd93fdaaa5477a17df3a5da6503c162f16e6adfc0e775d8c22041125ed40
+EBUILD sysprof-capture-3.38.1-r1.ebuild 800 BLAKE2B 41dfaec309c88fcb5a57ccdccea37654cdc2eab647468c63dc1538e5cf63337d62001e576e35ffc5fdc7c6b049af1d6a66830f04ddfd6ff8e66b120896d4eb1f SHA512 cd4f32df882d07dc5d68619028f7e3e1be635e3b952408bac904b45ead90efa0cca5322f0f4179ea873c37e1df8a8a5f0f98393005999c460ca997ea9df635cf
+EBUILD sysprof-capture-3.40.1.ebuild 800 BLAKE2B 41dfaec309c88fcb5a57ccdccea37654cdc2eab647468c63dc1538e5cf63337d62001e576e35ffc5fdc7c6b049af1d6a66830f04ddfd6ff8e66b120896d4eb1f SHA512 cd4f32df882d07dc5d68619028f7e3e1be635e3b952408bac904b45ead90efa0cca5322f0f4179ea873c37e1df8a8a5f0f98393005999c460ca997ea9df635cf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild
index 9eade9326177..7e9b683b3d3f 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 GNOME_ORG_MODULE="sysprof"
 
-inherit gnome.org meson multilib-minimal systemd
+inherit gnome.org meson-multilib systemd
 
 DESCRIPTION="Static library for sysprof capture data generation"
 HOMEPAGE="http://sysprof.com/"
@@ -35,15 +35,3 @@ multilib_src_configure() {
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
index 8675bfec8026..0c08f4b82662 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 GNOME_ORG_MODULE="sysprof"
 
-inherit gnome.org meson multilib-minimal systemd
+inherit gnome.org meson-multilib systemd
 
 DESCRIPTION="Static library for sysprof capture data generation"
 HOMEPAGE="http://sysprof.com/"
@@ -37,15 +37,3 @@ multilib_src_configure() {
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild
new file mode 100644
index 000000000000..0c08f4b82662
--- /dev/null
+++ b/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="sysprof"
+
+inherit gnome.org meson-multilib systemd
+
+DESCRIPTION="Static library for sysprof capture data generation"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="!=dev-util/sysprof-3.34.1-r0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Denable_gtk=false
+		-Dlibsysprof=false
+		-Dwith_sysprofd=none
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+		-Dhelp=false
+		-Dlibunwind=false
+		-Denable_tools=false
+		-Denable_tests=false
+		-Denable_examples=false
+	)
+	meson_src_configure
+}