gentoo resync : 18.11.2018

15 files changed, 83 insertions, 115 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 40f8f51f8614..45ba98c69edb 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/cpuburn/Manifest b/app-benchmarks/cpuburn/Manifest
index d80546c1e1f2..8f98cfab8c2c 100644
--- a/app-benchmarks/cpuburn/Manifest
+++ b/app-benchmarks/cpuburn/Manifest
@@ -1,6 +1,7 @@
-AUX 01-variables.patch 879 BLAKE2B b1ede6e0c0086caf3b87bd13753a120b47079339aa8d898661119afa2f9c90c4074c2e05e16a5980afcdc31370867b2a72c53d737c7fe66541cb2c8a998bc5e4 SHA512 eef2f5dfc3a49712568001a273be117126beac27560b6e4386e89893ef30acda76c956b96a9a86bf1a0a424003f3eb9214a8a4a1c828fcbbf809eed82a5a7af7
 AUX cpuburn-1.4a-flags.patch 250 BLAKE2B 68e402e16d1b1ce3f278ee580175ddf459993f908e2d8ad1a823b5df619cd0f52b20d2ec56966141ebbd422013b180e4d5602742b3bdb8fec00e87e554dd512e SHA512 6e786ae47148385003529984da314b56918653d36002dcfa10f995a0568703bb269ddb0b4623693e35659415c12ab2ffc641b799389377863b2df0edcc8fe668
+AUX cpuburn-1.4a-variables.patch 879 BLAKE2B b1ede6e0c0086caf3b87bd13753a120b47079339aa8d898661119afa2f9c90c4074c2e05e16a5980afcdc31370867b2a72c53d737c7fe66541cb2c8a998bc5e4 SHA512 eef2f5dfc3a49712568001a273be117126beac27560b6e4386e89893ef30acda76c956b96a9a86bf1a0a424003f3eb9214a8a4a1c828fcbbf809eed82a5a7af7
 DIST cpuburn-1.4a.tar.gz 9277 BLAKE2B f362380d0f57fd888ee5e5cf8fdf1809ffbc44fc3c3935b64adbd2c29ad0b3f93e5c032fdc265355574625417e7f5f9e9012e6f637c87fe0ae5e2043258f0822 SHA512 db84cabe70af0b6b3579c746f6df08c268b7145c9521fc609ce5b4cfd497dbb0639e52ab55f34110cff297ec23cf1413db28c6bff4e6f81a69722626886df7ce
-EBUILD cpuburn-1.4a-r1.ebuild 719 BLAKE2B 7c9565035030ed64abfba774264d371652b7e43358baef7dcfcfaf2f56ffc2828ccf5d84c28499d3be1f489637fe2883e4649c6b7a6bdafc55bbded0c7601ba6 SHA512 0516ac5c4b275e6a62269827271d321c259894540e558c9f4e15615d7b63496b8e3a75b36d69aeb2bf8558c5903e86381a3b7af64e2c17812e176b35a4fc726a
-EBUILD cpuburn-1.4a-r2.ebuild 1373 BLAKE2B 17b046c45cefc55b3083d4c16776ee68017376f38a9a066104bcc74959744cd490c069f072c10423fc5a29d48f369cbabb1e405b2700523b0868fdacd5b5e299 SHA512 2f98f322e6b5f68ed2212ddc8c92e0976b67c6660d47b48efae1175b6e14a46a75982a1ba3c5bd8874f32451e0d142c31b288d43b3793493b37197c6a8c1275f
+EBUILD cpuburn-1.4a-r1.ebuild 718 BLAKE2B 7b51ec50d043083c1a427b2cf6b4aacccfc1823c2ec5223ce1a00bb4cb43a36f9275ca15c2a22f13601bd52e2336ec348025a5cd1956b25432cdadd15489bea6 SHA512 03bcaceb4adfba9e916949bafdd978f5fc5785906cf71e2ddd594ef3d7f1d0a70399d984050d81c567e673be2fa479b4f5a26002087007ec2f9567a77e4728ed
+EBUILD cpuburn-1.4a-r2.ebuild 1372 BLAKE2B 18d9d8be980af968f1485711315921192edf8e3cc218ed0fc5a9e49256ba9c8e0749112d6752bcb2d69c70f0694d7df21144f9cace2f5bdd9ef64265936f37b7 SHA512 3819753d39addc60cf62d8f86abdc82c409b0ecb9721e57e575a4c3976ca1cb008d8fc603183631c69b8c22b543d164995e55230d449d4d04228875556b1745a
+EBUILD cpuburn-1.4a-r3.ebuild 1368 BLAKE2B 1d4afba883229c1d71a22a5989865257219e3be2aad09223d7d95a889a1947331f53483af3f8a9d0655fd6c35538324ebdcd5f3e09e625df2b73750b9f27fbb0 SHA512 cfdf5f9b8e4731e3732c6f4e00a5d4b71e41d2107d3e39738371a7807e97843d7953382d2b2d70a336958c61ea4001aaca5e09291503c04df6585862a33f423e
 MISC metadata.xml 602 BLAKE2B eda46ae4cc60f92470dc83b419169c6daa3703f32f20a56b5c3764b7eef525a733898322f734739ca3cff379c568ffaa4754f996f5a7fe4637f7c7a3fcd23bf8 SHA512 2c6c59071ca30a6159222e37991b6b3367ba4ac6bc30e583b0ebbf537b9fac007df830fad046bc7904b0aa8e95c6e147fd983c219f97a921e5fd1d40dd593b12
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
index 3a72f5ced7c5..10c2bf9df23b 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ IUSE=""
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/01-variables.patch
+		"${FILESDIR}"/${P}-variables.patch
 	use amd64 && append-flags -m32 #65719
 	tc-export CC
 }
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
index db1f520822b5..ae6d819bc65f 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ KEYWORDS="-* ~amd64 ~arm ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/01-variables.patch" )
+PATCHES=( "${FILESDIR}/${P}-variables.patch" )
 
 QA_FLAGS_IGNORED="usr/bin/burnBX
 	usr/bin/burnK6
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
new file mode 100644
index 000000000000..1933ce1f6a64
--- /dev/null
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/./_}"
+
+DESCRIPTION="CPU testing utilities in optimized assembler for maximum loading"
+HOMEPAGE="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/"
+SRC_URI="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/${PN}_${MY_PV}_tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="-* ~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${P}-variables.patch" )
+
+QA_FLAGS_IGNORED="
+	usr/bin/burnBX
+	usr/bin/burnK6
+	usr/bin/burnK7
+	usr/bin/burnMMX
+	usr/bin/burnP5
+	usr/bin/burnP6
+"
+
+QA_TEXTRELS="${QA_FLAGS_IGNORED}"
+
+src_prepare() {
+	default
+
+	# Respect users compiler and users CFLAGS and LDFLAGS on x86/amd64
+	# Must be always compiled in 32-bit on amd64 arch
+	# See https://bugs.gentoo.org/65719
+	sed -i -e 's/gcc -s/$(CC) $(CFLAGS) -m32 $(LDFLAGS)/' Makefile || die
+
+	# Respect users compiler, CFLAGS and LDFLAGS on arm
+	sed -i -e '/CC :=/d' -e 's/^.*-mfloat-abi=softfp/	$(CC) $(CFLAGS) -nostdlib $(LDFLAGS)/' ARM/Makefile || die
+}
+
+src_compile() {
+	if use arm; then
+		cd "${S}"/ARM || die
+	fi
+
+	default
+}
+
+src_install() {
+	if use arm; then
+		dobin ARM/burnCortexA8 ARM/burnCortexA9
+		local DOCS=( "ARM/Design" "README" )
+	else
+		dobin burnBX burnK6 burnK7 burnMMX burnP5 burnP6
+		local DOCS=( "Design" "README" )
+	fi
+
+	einstalldocs
+}
diff --git a/app-benchmarks/cpuburn/files/01-variables.patch b/app-benchmarks/cpuburn/files/cpuburn-1.4a-variables.patch
index 3e8b666c29ec..3e8b666c29ec 100644
--- a/app-benchmarks/cpuburn/files/01-variables.patch
+++ b/app-benchmarks/cpuburn/files/cpuburn-1.4a-variables.patch
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index c3c8c9099f26..aba74d0aae68 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -7,5 +7,5 @@ EBUILD geekbench-2.4.2.ebuild 1060 BLAKE2B 4700a2c4c82d5e829bf7b254c1a94a5bf47e1
 EBUILD geekbench-2.4.3.ebuild 1122 BLAKE2B 70fba3ad954717c01cefd5b2df1ce40294001ad82f25dc82a3b5ba05650fc98bddc5e2c060f6cddd44a9e1028cf2fa8b908a3343491d6fe3b966ddfcad4d6f2f SHA512 3c6b303ea5459f9777bec75ea555a2794d7bbdc4d0da8a5881181e3dc5c8b6796191fb86c9536576c3ad43a7d4613ba22792e9a333cdde4de862a786f53b5e21
 EBUILD geekbench-3.4.2.ebuild 1122 BLAKE2B 8f4d72914a7333869104cac7f97a61c759699405c6f9bde61c95ca38a3804c4538ed8c679665537a380ed2892c685a9e365faa7ef54f1e8e0cae13a659d0cf0e SHA512 caf0856adbd7a3420f89ef5dcbc66629241c891f1129dce540832da224c34ac1d66a9b594503650566ff802683bd6c5f170ae31d95c2ecc147bf8dc64ae79c6e
 EBUILD geekbench-4.2.3.ebuild 1111 BLAKE2B 819573e558d88206121c461935c424e85e85f811e3c00669627daa0434cd5505ea0fc0621ad0b93677ad19023c5a78a9203319d4160952a72f9b1bbf2b9c6f53 SHA512 c51a31b124940476742ba26497652e0cced23f2cab230222246be02ddc2f90359580cb517374f8498b63bcab5e66dc82a8bec0c3b6cc5d0bbaf1d3a182900f5c
-EBUILD geekbench-4.3.0.ebuild 1111 BLAKE2B 611400494f0377d36432e1fb005f5250076899db669ad0823ed69a88424b43bf0cfb6b34d6c0730f97db07e51243bb5490d58bc995308c83103f695360972d4e SHA512 859cc25d3d2f637a69405df11986eccd29f61fbdb8454513ad8634925af3d5579bab324b87cfb5aaf4f6809e38416f565caf684ab3004e310c36804a2b1e0771
+EBUILD geekbench-4.3.0.ebuild 1110 BLAKE2B 75bed80d0373b6ebdf8db6a1c469f743b58df189b5d3bb049cd8ceaf49a68927d1c03ae1353b1a6539705fd759a1a9028f5908dbdd148905e7a51ad453ce183e SHA512 82a80408f62efa96b5a233b5e92604c9c512fe3ec633097fd64f2a54d293446068f539d7822b41b2dcba9bcaa9dfdbc172d13496d30951940920d46186c864ed
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/app-benchmarks/geekbench/geekbench-4.3.0.ebuild b/app-benchmarks/geekbench/geekbench-4.3.0.ebuild
index e11f0c21646d..1b832c5609d4 100644
--- a/app-benchmarks/geekbench/geekbench-4.3.0.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.3.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windo
 HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
 
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="4"
 
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 78df7f783492..5db8b12ed908 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,7 +1,4 @@
-AUX stress-ng-0.09.40-makefile.patch 1885 BLAKE2B 63eb0580af258cb6bd1085b40c6c124611ce86b23509c696ac99a2f9d12ff30aa33ff5ecbd34be048ed86b4c71c7729f1b27f9d41dbb7194f59ec5630b656471 SHA512 ebc40864b2c66fe60dc0525ab29b2b458b5d518aa5495f7335f1fb97ba7920764f527b4ed75ce54229c4145c89bd63c8a3abe3440b9ffe9625b993ca0be59086
 AUX stress-ng-0.09.42-makefile.patch 1877 BLAKE2B c8eb60af4ed9d3ba6cb3bb0484788b3428922a64bad53e7273f6be6a9965318a57262c35259ae611d11211a1a6ef694402d13874dbc054941eb1dc6662750cb1 SHA512 efac4c89672c8277d04da7de8cb8fd628847871dd37fb6d915737caf4682af5a7c68335e47d80ab8bdc15d1915bb4a614e58cffef61930620093f3d35f4c6ec5
-DIST stress-ng-0.09.41.tar.xz 359760 BLAKE2B d57d9350744db29d3e61201f146cd6569efae599743cf3e5971d645beba5de99b4162ec735e0f143c1c3cd8cc9e318441bfd97dfcf5db1b26cd7e4543bfcc918 SHA512 d1e2a6442c208d5d32ab688460475a59a2edd73220e44402632650eee022faf5728d282a374f22bcb86ce83662122823a7ba72f9824058d86d9b22a3c1791524
-DIST stress-ng-0.09.42.tar.xz 360452 BLAKE2B fa5ad15f066d8e762fb08cdcd4fe58ea6604890edf2384e0676e6c35645a6fd84c568369dc966d23527820630a0b44ab9b8969f3e170c876b03a194ea72384af SHA512 e209a8777331f91b3ec5fca9f6f664513498b21b5b31338e0882cc6c79674524906e8d0d4a8931ab5b382feac65e15639989fc0672e408aaa2eb84c72a059258
-EBUILD stress-ng-0.09.41.ebuild 681 BLAKE2B 2ac7829b587f3b29ef3607e18f2a51eed4d70be7bf422e1d8e4694e959a398434e05f3c7b6be0473acfe5a4775edef245096104e7109919213c260e6ae726f4f SHA512 fc9de4f122b1a92bff7aaf9d360da1d7ab67627ebc94a8bbd7cd0960c950a13302e43379a260d6d4846c70e62b2d7fc02b3aacd717274bc6ecc9d2b20c8fe1f8
-EBUILD stress-ng-0.09.42.ebuild 669 BLAKE2B cbc61ccdcc5c7cc726e2948b264ec7166d89c2a5122243d436d08c51bdd6bb903f7b59fee177baaca22b60a2d401ff53c5a8f9af19cae53dec338868a48710f0 SHA512 b69a8eaccad6f6f6c399374b3467cea5b61bbb2fe57103222cdcfe7aada8f31f11157a2056d62e5390d5e763453085d89bd5a92cb283e487044c8fd9125d531f
-MISC metadata.xml 796 BLAKE2B 746809bd51f5512246e29a1e15d9b41f3cf0df968b2e2655dcaef7bb839aff27ce2cefd4818e79fec18b9f12c7902bdd0440c634f9480da2352108950554d636 SHA512 47472bafada342a449ad7d3632c2b0859ee56f2eef31ca3ca9e7af1e106126ec7858862c67baa6b8d16611e2dd3ac166ecd931bab3491c875088e4bd66499aa6
+DIST stress-ng-0.09.44.tar.xz 361396 BLAKE2B 28458eeb9b1f8b296242d42af682537f2018dfedd3faea299e04b3e5141bb52bedd09452802ec5459130a6e5791d4f3383f2a8a338c289c51f306cfb722bf780 SHA512 74d1ffff789e96e9d38481abaa06f1232cdd6b92fd792abb078d690cfb5fbff188c738b1cc1c342b9d9e729dc97a6218641464eac4ab90f51e1e801a54b0767a
+EBUILD stress-ng-0.09.44.ebuild 681 BLAKE2B 20b66bb672ffcf92772c75147ace49f70461e5767465ad2c655afc27b19599e034f36d82acdfdf1566d6a208c498d7b07e5dabf17807ead18fad701657bc6e1f SHA512 88340d82f7612d49eb5fe8ffeb4f5ce4e39725b7529392a90445532814ca7e23cbabb041a95a2edccf908acaf78dc5ea705782118b64011fdb5a859b0c09c30d
+MISC metadata.xml 953 BLAKE2B c10dbe55ea86af30a97975174565c3c9bbc76bf029f1582a5fbe8a98f79afb80a509543730294673d5b51ddf4a32fc93e8017f8ba0b26cac119c1e97e8fd025a SHA512 7975ca315e447e9d6c2d551fcf396b2a03d71661c4bd33843dba0413ea7b119dd1d3f59aaa91298bb5be2a17f377f7cae96cc7413531f30a88e2f401ef76f0bb
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch
deleted file mode 100644
index e3478e8ced84..000000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/Makefile	2018-09-12 18:12:22.000000000 +0200
-+++ b/Makefile	2018-09-16 02:06:13.000000000 +0200
-@@ -21,7 +21,7 @@
- # Codename "portable pressure producer"
- #
- 
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 -pipe
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
- 
- #
- # Pedantic flags
-@@ -338,12 +338,10 @@
- .o: stress-ng.h Makefile
- 
- .c.o: stress-ng.h Makefile $(SRC)
--	@echo "CC $<"
--	@$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 
- stress-ng: $(OBJS)
--	@echo "LD $@"
--	@$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
- 	@sync
- 
- makeconfig:
-@@ -364,8 +362,7 @@
- 		sed '$$ s/.$$//' >> apparmor-data.c
- 	@echo "};" >> apparmor-data.c
- 	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
--	@echo "CC $<"
--	@$(CC) -c apparmor-data.c -o apparmor-data.o
-+	$(CC) -c apparmor-data.c -o apparmor-data.o
- 	@rm -rf apparmor-data.c apparmor-data.bin
- 
- #
-@@ -380,12 +377,10 @@
- perf.o: perf.c perf-event.c
- 	@$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
- 	awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
--	@echo CC $<
--	@$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 
- stress-vecmath.o: stress-vecmath.c
--	@echo CC $<
--	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
-+	$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
- 	@touch stress-ng.c
- 
- $(OBJS): stress-ng.h Makefile
-@@ -429,10 +424,10 @@
- 	./stress-ng --seq 0 -t 15 --pathological --verbose --times --tz --metrics
- 
- .PHONY: install
--install: stress-ng stress-ng.1.gz
-+install: stress-ng
- 	mkdir -p ${DESTDIR}${BINDIR}
- 	cp stress-ng ${DESTDIR}${BINDIR}
- 	mkdir -p ${DESTDIR}${MANDIR}
--	cp stress-ng.1.gz ${DESTDIR}${MANDIR}
-+	cp stress-ng.1 ${DESTDIR}${MANDIR}
- 	mkdir -p ${DESTDIR}${JOBDIR}
- 	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml
index 2fbf8ab09005..41c8fd9db167 100644
--- a/app-benchmarks/stress-ng/metadata.xml
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -17,4 +17,8 @@
 		that exercise floating point, integer, bit manipulation and control flow
 		and over 20 virtual memory stress tests.
 	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/ColinIanKing/stress-ng/issues</bugs-to>
+		<remote-id type="github">ColinIanKing/stress-ng</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.41.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.41.ebuild
deleted file mode 100644
index 3e47f3a64c77..000000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.09.41.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Stress test for a computer system with various selectable ways"
-HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"
-SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/libaio
-	dev-libs/libbsd
-	dev-libs/libgcrypt:0=
-	net-misc/lksctp-tools
-	sys-apps/attr
-	sys-apps/keyutils
-	sys-libs/libapparmor
-	sys-libs/libcap
-	sys-libs/zlib:="
-
-RDEPEND="${DEPEND}"
-
-DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-
-PATCHES=( "${FILESDIR}/${PN}-0.09.40-makefile.patch" )
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.42.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.44.ebuild
index 59b29c72c00c..70abac3e8dc7 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.09.42.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.44.ebuild
@@ -11,7 +11,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-libs/libaio
+DEPEND="
+	dev-libs/libaio
 	dev-libs/libbsd
 	dev-libs/libgcrypt:0=
 	net-misc/lksctp-tools
@@ -19,10 +20,11 @@ DEPEND="dev-libs/libaio
 	sys-apps/keyutils
 	sys-libs/libapparmor
 	sys-libs/libcap
-	sys-libs/zlib:="
+	sys-libs/zlib:=
+"
 
 RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.09.42-makefile.patch" )
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 782b8dbf86c9..5d6314c69ae2 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -6,4 +6,4 @@ DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34
 EBUILD wrk-3.1.2.ebuild 749 BLAKE2B a7c575317dd0df7a3b3ccb010d9ad399b96e59c35e485888c8f134a0ca8898ec113199ccca4defaf77521d5ec41b53027bdbb07e7db04d5d8c0df51f1c79b52b SHA512 3621a749c2b9c4b3768332f2eb3c95a3979b6d9aed8cdbb1ca3267fcdeec8cb288bcbb2f31c8eb7070d6b86ae9c0e647ee087bc959831bc26047055a2c8e2432
 EBUILD wrk-4.0.2.ebuild 693 BLAKE2B 65b7d0c203adf4fb345c19a0e822fcb32f36b2ac187468620decfa1eae188a921002433d1be909b9f90b4fb68103e7596594d62c94aaa162d12fa8f2bafdbacd SHA512 07431134cff46cbfff1971d7dc82bf59c2d6b326bb7dac4df413bd2c819713229808927c0277c95756952ecbb743c35a8111f59b478c64ffa5c1608039642f95
 EBUILD wrk-4.1.0.ebuild 770 BLAKE2B c99ff47bb3aa4bd343cd28d52aecd2161dbc2e29d92c8f3b6a4c6e9e00a0d0f0b610dc8916db02a119bd19a0311f5a424513f3fbd1abb84d1bce795cfcbe887b SHA512 12f5adaff8ab03cec4fdad6b9866eb83e3890e7e62b4916076dbfbdc63726e0d42e65fb10320f2ede539b3aed2ad0285de8e864129baef521442bd1f71adfbfc
-MISC metadata.xml 718 BLAKE2B 0bea8e46c5ea180b770e62fca780e09e60d4f174c8d28470c4116027cddc54807d89cace134d8569a07ba10c6fda357b1bffb6a010808aab443f1dba1ce95a1f SHA512 8d1b5953eecc786c73122b1267ca72b57367b00452171db8224536dcd21d2841eee752e0b821530daca0443a1abe6ad860e99dad7127198f17cd32671b3b9e3e
+MISC metadata.xml 619 BLAKE2B 025e8d125d50edf96e0153f5a93af687f2e7910b52632fbf9f8baeff41d62547c36d32ac2824a8aa877afa1457abe0078aae1648c30eba5868b6e401975c2061 SHA512 a754b725e8cbfaeb3d6db3101a3d3c47548254b8d34404f84d1acad776f998709fec925eb702258a43a8ba45234367f3c5a9b11bb9f9ce65932e320909361db1
diff --git a/app-benchmarks/wrk/metadata.xml b/app-benchmarks/wrk/metadata.xml
index 991df185e6e9..d7936a9dcc5b 100644
--- a/app-benchmarks/wrk/metadata.xml
+++ b/app-benchmarks/wrk/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vikraman@gentoo.org</email>
-		<name>Vikraman Choudhury (vikraman)</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 		wrk is a modern HTTP benchmarking tool capable of generating
 		significant load when run on a single multi-core CPU. It combines a