gentoo resync : 02.02.2022

9 files changed, 93 insertions, 122 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 25991e4eb857..ba17868f3019 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
index bacf2cd95feb..5e7de951ad37 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -2,5 +2,7 @@ AUX bootchart2-0.14.7-sysmacros.patch 898 BLAKE2B 8529bdfc1a4e554a87673113b91e4a
 AUX bootchart2-0.14.8-no-compressed-man.patch 802 BLAKE2B 0d09c6a2de65079c0c928e0b2617e5b493d0decbea9644f844752470942db09b199cea18be052a8160b3a59a8491f849e5bb2dc16b80c8e6f77a69b4bda1d30c SHA512 4e5c48a6a29bef5544f3ae491718531407d8ac47ae0439ccaa7dd0f7009e148437810f5d984a98b6623d9ea7bffbc514a31bd1c19ee57b8a17e02a2f5d2a7394
 AUX bootchart2.init 693 BLAKE2B f91997826a6128f3f496f581d662b3a8c7749f978f442700c9e7f910d0a5d4e62f5f91fac63958f85fcc08f17fcc0710e5553abb36fc0d90f6c70c0191f63b61 SHA512 181ecf9b64c8303ade8544530698a6a217c367927673feaca4d837bb72d13922d47eff9374a482cd225c3189ea80d36ba72ff658aba596f96639f0d1be7a432b
 DIST bootchart2-0.14.8.tar.gz 1175527 BLAKE2B 623ca2269420eda79b09d955ab9d4a37af004e9e97ad0e0c6014e53b4b0c63239661cb5359345306504980b060ccd11488970cb0aa3d832bfb55392724e715dd SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
+DIST bootchart2-0.14.9.tar.gz 1175710 BLAKE2B af472193c7de313e770da1a88baf00e9ee38e36c0d3c900bab2657bfa5d2398dd9edc616ec770f49a6c5fa8e29f738ddf2c0951ea039a48a2a89b0ffd94759fb SHA512 7ee1220b0add027fc39f710cc01119d7aaa22fe11736497b089c26955216cef10552216ed29ca55bf08aa848f92bb11d74deeb3aa69769dfecf3a55aa988e58b
 EBUILD bootchart2-0.14.8-r1.ebuild 1504 BLAKE2B 7e94059446d518143da9777071856eb4a6aa57be301c746ef6ff679bf7db27fead2aa7f6ff4fe4ab132f89628b6329d35221c6df19356fe33a2c85f8e09a9563 SHA512 aa90f3d8658f05e5be84b853e1aba550a713add56ee0cdc0e5af3367a435f2f46942dfa60c028febe75a760869f258900910dea7a49035c883a94e80077735ad
+EBUILD bootchart2-0.14.9-r1.ebuild 2056 BLAKE2B 2a6129375d7f95898f87a397bc1cb980a6298ee44707c70fd62d21176071652fca99c62672fe57c2f906f78ffb69cf5492952228b3ac3e7e35ac9f853e891f6e SHA512 14ce967eb294300416d7eb1f77ab0532de259ecdd113a724a884bf8580723f68d33ffd35a92e5a6b05a4dfaa08d5f517f099b12f77cd441e9236741c50199651
 MISC metadata.xml 254 BLAKE2B b8871c3dd876ef6465e4974848eb79348553a30c6c4de2c9d2ad5b4f8ca0a3b07834f191543a1a5cb20748d5334ed8ec64f823a6da80e6e8066e95b18c5ec880 SHA512 43653fc5ea4f4126f285982b8f9f092e720c4616e5327589a132ce43c67398b9b4e8d3d965c43be2b58c52096ed7d2e010361bc942a582e6887280ecd3a0ac02
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
new file mode 100644
index 000000000000..6cd79686f3af
--- /dev/null
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit linux-info python-single-r1 systemd toolchain-funcs
+
+DESCRIPTION="Performance analysis and visualization of the system boot process"
+HOMEPAGE="https://github.com/xrmx/bootchart"
+SRC_URI="https://github.com/xrmx/bootchart/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cairo"
+
+REQUIRED_USE="cairo? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!cairo? ( test )"
+
+RDEPEND="
+	cairo? ( ${PYTHON_DEPS} $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') )
+	sys-apps/lsb-release
+"
+BDEPEND="cairo? ( ${PYTHON_DEPS} )"
+
+S="${WORKDIR}"/${PN%2}-${PV}
+
+CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.8-no-compressed-man.patch
+)
+
+src_prepare() {
+	default
+	python_setup
+	tc-export CC
+
+	# Redirects systemd unit directory,
+	# as well as disable the built-in python setup.
+	sed -i \
+		-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_systemunitdir):g" \
+		-e "/^install/s:py-install-compile::g" \
+		-e "/pybootchartgui.1/d" \
+		Makefile || die
+
+	sed -i \
+		-e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty:g' \
+		bootchartd.conf bootchartd.in || die
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	export DOCDIR=/usr/share/doc/${PF}
+	default
+
+	if use cairo; then
+		doman pybootchartgui.1
+
+		python_scriptinto /usr/bin
+		python_newscript pybootchartgui{.py,}
+
+		python_domodule pybootchartgui
+		python_optimize
+	fi
+
+	# Note: LIBDIR is hardcoded as /lib in collector/common.h, so we shouldn't
+	# just change it. Since no libraries are installed, /lib is fine.
+	keepdir /lib/bootchart/tmpfs
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+}
+
+pkg_postinst() {
+	elog "If you are using an initrd during boot"
+	elog "please add the init script to your default runlevel"
+	if has_version sys-apps/openrc; then
+		elog "rc-update add bootchart2 default"
+	fi
+}
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index f36e706610d7..a0ce756a55f6 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.13.09.tar.gz 1038381 BLAKE2B 8680bccd0a97a80edaa7995577222b3d90fe3132a99d36c94101fdbfeddfa4a6f02b155cdc59c4abcc71fddba6daeef3a050368cb04fc9d31db921bbb1a9d985 SHA512 a65654f56056ff9876a6afff139e35d9a53a8368122fb24bd372e6a28fdd625f74d0775f6111300161bc36aa9012892cc9a0ed77386b6ba0c10eb17cba90670d
-EBUILD stress-ng-0.13.09.ebuild 1103 BLAKE2B 7215bbf65e925831b51960299b3ab885aa66f132690b3ae5a52e7f510f62672826187861986f0e8ed21af3b0046029de9ddd1fb6adcfd40c341f8d9c85d1db1f SHA512 c3c4b58e363f09c5f625e24d229bbcb807f83c392656259c9440f68ddf6f7e58ee2fadf524d53f7952c5c6fbdff9699daabc2d945dbf5907cde769edc507acae
+DIST stress-ng-0.13.10.tar.gz 1044430 BLAKE2B 2b5c7ad42d31382ea236bfaf9b16ee5a5fb85e10eb9bde6bf2dead4fa1d5e52bb4df006a528b52706f6aa3b605502ac801f8ffcc37528f5233afb98310e9eaeb SHA512 9605545c241ee13bc94781b2676bc2a4e1aa5c94acd3f7e2826fd7a75fd6717f6de6f657aba0566bf66d709e53bcc4f5349496bdbfe9498cf3e1a576858cd8f1
+EBUILD stress-ng-0.13.10.ebuild 1103 BLAKE2B b04dcff6cd3f67445f6626720e536254dc08171bcd869cb8009a93650cc0c1c77acae1b330487be2d7f4d65d3fe99465d6d027f55359a007384d896495ec5b8b SHA512 5d31e87d2c850668ccce711f5a093c76925dbb7e2a8a7b9a3fddaa9b96b6e0ab913c8e9227efb24c023ede4045261a3db108665a94e694a2843b79a21d45b5e7
 MISC metadata.xml 907 BLAKE2B a9669ec80f735f02c77ac78ceba8b49634346d92c1d10a1288559e2440241d8e75d6de970ae232f2d6b42f12258ffa826de513ba862eaba581faf5f44737d4e6 SHA512 12c241b1df81be6527cc5faa80cb177941dd25cfe3bd29ce8b9ba5a90457834a50c11a8d66b7bd6ad27a3959038d4eded4822ed85df924aa2f71bb9b9b667e13
diff --git a/app-benchmarks/stress-ng/stress-ng-0.13.09.ebuild b/app-benchmarks/stress-ng/stress-ng-0.13.10.ebuild
index 9dc84c767ecd..c997ff6e3d0c 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.13.09.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.13.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index d92f5e0bb801..a48244d76c29 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,7 +1,4 @@
-AUX wrk-4.1.0-r100-makefile.patch 1509 BLAKE2B d03fcc70c201777cc0f75e81e827ef941ac9a2128b05118ceae5256c481065ed21f1bf5290b05c304a03fe765b7576a91d882392d376ceed19d2d1fc89c9f894 SHA512 a4d035c7114a8876b10435936db30068ba7232516b5e21f9577832e7ffed28144b0f5864b25e9df72ced0937c6d687117cdee42234fcba2a1cfa20b9bd1e31c0
 AUX wrk-4.2.0-makefile.patch 1277 BLAKE2B a286a0c3b523e0e6cd86607ae7334e1b3981c94ff9f260f6cdfbb71bd34b1f355ac78ec1b5493fea25c4563ba70b23da9012d62f7b9a96c298afbec0e3b622fe SHA512 cb5fbb252ec2867355f09c323d6675814d83388d3b04f23192ae0b2b7e94580574431173d88d79079e07cedaf4aedfc31d7e6d47083618333d6974ace685b823
-DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
 DIST wrk-4.2.0.tar.gz 10973405 BLAKE2B e81698f70017cd7d55ee7adceb050ea48b2ed9d2ef9195e5b2743dafb637f78d54c8003d049c2965f90457f9b7a80620b86bc0b9bb1a259b88e5c66d6af8cc79 SHA512 c356b1314f37b558f39f30d9a9c6a2a9c2f646eaf7c0cb4262325850922528148f89ccbe7c33390c87e40f8fef6fffd704e3cfe75a89e4e9b178101043fa038d
-EBUILD wrk-4.1.0-r100.ebuild 869 BLAKE2B 44d506bcd633613f0d4d1d8e08601f5baa689e5457d5d557e28b6d63b3b545004915a74c44740132562ecbd3767c71543868a268d9e36f97085f2402d0eebd91 SHA512 b1d475081f647b09a579e307aa06cf6ebda8d110516356b6b507323f9791be4261e020d17fff4bee0a5eeb60e08360d98d0bbb237082a00711e7b524a51411cf
-EBUILD wrk-4.2.0.ebuild 873 BLAKE2B cde42694574dcad29b166e6479bc7790cfbafb610e93cd20367f090c1104b0bcce95c9812c4617ddfd215b89cd88e26d05363710e04930c1a2f8aa924e218e46 SHA512 7709ff53c6e32d71eecc06966434cfd47dd78a536b599998ff530f21aaaff9b530785cf8bd632c70bd01dbc6a62677f629f42d42de609a808a1d8eedebb417c7
+EBUILD wrk-4.2.0.ebuild 871 BLAKE2B ab93ebd4b6f3b87f09c2182b82d522f865c96fe46c160ba3eb98b87e4635ed6274940341f323290ff4094bcbd3c7b39782c8e4292eb66ea2a92f2a97ca8ea327 SHA512 17743ada20978a49c89f167aa7484c18871d91452a63ff2798c2c7554a70696cd61671f3739fd5596c3e84c793d9a78fb6c78416d03c48cbf879778a2a371685
 MISC metadata.xml 754 BLAKE2B 5d9f7e4ef536efaaaf5dcc71e908c6e50a3c691acd361cfc5d5abaefb7c193a5d6acf72f70ffad0eca96133cda35e1236f00212ca1deee11a5dfbcedf6f604b3 SHA512 864c4eefd5446d398495645a6cbc73613f28102dff61bcfe2f81e8ebbb005679deb463735e051e0451e23eaa4ab4893092e148abf87071ace9ebc5b2029fd619
diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch
deleted file mode 100644
index d3c838d08003..000000000000
--- a/app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,5 @@
--CFLAGS  += -std=c99 -Wall -O2 -D_REENTRANT
--LIBS    := -lpthread -lm -lssl -lcrypto
-+CFLAGS  += -std=c99 -Wall -D_REENTRANT
-+LIBS    := -lm -lssl -lcrypto -lpthread
- 
- TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
- 
-@@ -24,15 +24,13 @@
- 
- ODIR := obj
- OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o $(ODIR)/version.o
--LIBS := -lluajit-5.1 $(LIBS)
-+LIBS := $(LUA_LIBS) $(LIBS)
- 
- DEPS    :=
- CFLAGS  += -I$(ODIR)/include
--LDFLAGS += -L$(ODIR)/lib
- 
- ifneq ($(WITH_LUAJIT),)
--	CFLAGS  += -I$(WITH_LUAJIT)/include
--	LDFLAGS += -L$(WITH_LUAJIT)/lib
-+	CFLAGS  += $(WITH_LUAJIT)
- else
- 	CFLAGS  += -I$(ODIR)/include/luajit-2.1
- 	DEPS    += $(ODIR)/lib/libluajit-5.1.a
-@@ -40,7 +38,6 @@
- 
- ifneq ($(WITH_OPENSSL),)
- 	CFLAGS  += -I$(WITH_OPENSSL)/include
--	LDFLAGS += -L$(WITH_OPENSSL)/lib
- else
- 	DEPS += $(ODIR)/lib/libssl.a
- endif
-@@ -51,15 +48,14 @@
- 	$(RM) -rf $(BIN) obj/*
- 
- $(BIN): $(OBJ)
--	@echo LINK $(BIN)
--	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- $(OBJ): config.h Makefile $(DEPS) | $(ODIR)
- 
- $(ODIR):
- 	@mkdir -p $@
- 
--$(ODIR)/bytecode.o: src/wrk.lua
-+$(ODIR)/bytecode.c: src/wrk.lua
- 	@echo LUAJIT $<
- 	@$(SHELL) -c 'PATH=obj/bin:$(PATH) luajit -b $(CURDIR)/$< $(CURDIR)/$@'
- 
-@@ -67,8 +63,7 @@
- 	@echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ -
- 
- $(ODIR)/%.o : %.c
--	@echo CC $<
--	@$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 
- # Dependencies
- 
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
deleted file mode 100644
index ae473486ff83..000000000000
--- a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-
-inherit lua-single toolchain-funcs
-
-DESCRIPTION="A HTTP benchmarking tool"
-HOMEPAGE="https://www.github.com/wg/wrk"
-SRC_URI="https://www.github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "CHANGES" "NOTICE" "README.md" "SCRIPTING" )
-
-PATCHES=( "${FILESDIR}/${P}-r100-makefile.patch" )
-
-src_compile() {
-	myemakeargs=(
-		CC="$(tc-getCC)"
-		LUA_LIBS="$(lua_get_LIBS)"
-		VER="${PV}"
-		WITH_LUAJIT="$(lua_get_CFLAGS)"
-		WITH_OPENSSL="/usr"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	dobin wrk
-
-	insinto /usr/share/wrk
-	doins -r scripts
-
-	einstalldocs
-}
diff --git a/app-benchmarks/wrk/wrk-4.2.0.ebuild b/app-benchmarks/wrk/wrk-4.2.0.ebuild
index 93042e4f6647..3dd6e8078816 100644
--- a/app-benchmarks/wrk/wrk-4.2.0.ebuild
+++ b/app-benchmarks/wrk/wrk-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ DESCRIPTION="A HTTP benchmarking tool"
 HOMEPAGE="https://www.github.com/wg/wrk"
 SRC_URI="https://www.github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 REQUIRED_USE="${LUA_REQUIRED_USE}"