gentoo resync : 17.05.2018

4 files changed, 131 insertions, 2 deletions

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 326f86675530..817613faafc1 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,5 +1,8 @@
+AUX makefile.patch 2336 BLAKE2B 6ec251c24e174a360c3c183d44a335cdceba6a9be084b94a2abd9327397b87dacc3badda8a94330d6a6a5a32810fb31af8bafceb2079b53f11452e8ad0b31ba2 SHA512 8f2d477a66774b94c04c41ea86a86980d1050ea8cb7fa901d629b3eebcf23446d2f6db0af4e9a01ced531ffb9cbc543678bef78b32cadab4c93f56876900ca25
 DIST stress-ng-0.05.12.tar.gz 280758 BLAKE2B 0d25a0ecddf75cfd19a0bd26c2ca7390d8d999d8e0de4735e71dcda52de9fbce33800475a8137985469eeadad21f57d14530f69bdd2284f82e6df487b5f8ec32 SHA512 ee622b1d8fd1b3ddee6119f5a43cedb427e3524bb6ef10f7ac96c305567c9919574e9103949825e2bea3391c302b6e2b5871667bc8f8609844765b64ec760bc8
 DIST stress-ng-0.06.00.tar.gz 311761 BLAKE2B 725e902344602a9922b2d39a247a7b6c4d88cd69506addb9b8910221a5d6aa438b69cc1f3ac5c8265de2be7e0973b9dfbc4f93493f4437ee23d4f84c8712cd5d SHA512 a23a3f020e1fa777c6141db8f9d91833b9758172974be0db341c757eb7b407520b80bc9889eb7b6348cfa64d8f8976ba6ad8761a5fbc31055accd8fbceb8de66
+DIST stress-ng-0.09.27.tar.xz 344456 BLAKE2B 4609f438372c6d52e0e7e7f5ed1a29e1a32282c8cd2c978e9599d396fbb3c9da0fde6c3814f13ec4519e8d3d9c020171757d66cec12257195b5436598223493c SHA512 15295a7e2dbd2fc89d66fae57902b182ae4f84dac8a4aa5c0f80a81789ca2e04459aa9adba6f9b6735e05d687fedef1bc0d77ff9269044a46c8dca612bff883a
 EBUILD stress-ng-0.05.12.ebuild 418 BLAKE2B ad82794d9f12a4e558805ff30b489aaccdcd0b130a1bf2f43665fc83db760241f6e3d7d0bdfd645b40599e29056747be690fe16fa76b2466355c490ad1698101 SHA512 c4ce319d581ff494cdeca68b754d7cc4747edadffcc945637d43290414163409be98839c1dd484bc3264217f4f7e655e8fea5c1d2f62dd1da4d7bf99f852191d
 EBUILD stress-ng-0.06.00.ebuild 468 BLAKE2B 0a24271ea732c9175813c278ec841411a5c549e196f0c50c18bca9cf1606cc233531e97e7f432e7e06169e3f17f8a4f29c54168d762be5b7cd9bd2837eaa617a SHA512 b8cff039db84fc870cc889f27cc1a2023ced0effc4d7fb44efac4c7729767d1bce614f089941e7043bfc2d361eacfba46a53a50566ab4d3082a5a51185a42706
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD stress-ng-0.09.27.ebuild 697 BLAKE2B 26cb1dff138f8e6ca4609f75244766e4229ecd291b344edb3ffb3464f066b9ce9efa1a5a8b1220c87e57fdbdf13890bd5694cfe38c6c3e7f69f0db7a09397005 SHA512 b8b7972a2dc310fa78f64bf4156d04c1896add2f11fa022f4acc86a655dbd18dc34360a42793d110472233bec39f5b8309c074595c2685ae51e1cac1ad65539e
+MISC metadata.xml 796 BLAKE2B 746809bd51f5512246e29a1e15d9b41f3cf0df968b2e2655dcaef7bb839aff27ce2cefd4818e79fec18b9f12c7902bdd0440c634f9480da2352108950554d636 SHA512 47472bafada342a449ad7d3632c2b0859ee56f2eef31ca3ca9e7af1e106126ec7858862c67baa6b8d16611e2dd3ac166ecd931bab3491c875088e4bd66499aa6
diff --git a/app-benchmarks/stress-ng/files/makefile.patch b/app-benchmarks/stress-ng/files/makefile.patch
new file mode 100644
index 000000000000..eecb12cad5b4
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/makefile.patch
@@ -0,0 +1,81 @@
+--- a/Makefile	2018-04-27 17:02:16.000000000 +0200
++++ b/Makefile	2018-05-13 20:54:08.741008488 +0200
+@@ -21,7 +21,7 @@
+ # Codename "portable pressure producer"
+ #
+ 
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"'
+ 
+ #
+ # Pedantic flags
+@@ -314,12 +314,9 @@
+ .o: stress-ng.h Makefile
+ 
+ .c.o: stress-ng.h Makefile $(SRC)
+-	@echo "CC $<"
+-	@$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-ng: info $(OBJS)
+-	@echo "LD $@"
+-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
+ 	@sync
+ 
+ .PHONY: info
+@@ -339,8 +336,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) $(CFLAGS) $(CPPFLAGS) -c apparmor-data.c -o apparmor-data.o
+ 	@rm -rf apparmor-data.c
+ 
+ #
+@@ -353,20 +349,15 @@
+ stress-personality.c: personality.h
+ 
+ perf.o: perf.c perf-event.c
+-	@$(CC) -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) $(CPPFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ stress-vecmath.o: stress-vecmath.c
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -fno-builtin -c -o $@ $<
+ 	@touch stress-ng.c
+ 
+ $(OBJS): stress-ng.h Makefile
+ 
+-stress-ng.1.gz: stress-ng.1
+-	gzip -c $< > $@
+-
+ .PHONY: dist
+ dist:
+ 	rm -rf stress-ng-$(VERSION)
+@@ -386,7 +377,7 @@
+ 
+ .PHONY: clean
+ clean:
+-	@rm -f stress-ng $(OBJS) stress-ng.1.gz stress-ng.pdf
++	@rm -f stress-ng $(OBJS) stress-ng.pdf
+ 	@rm -f stress-ng-$(VERSION).tar.xz
+ 	@rm -f personality.h
+ 	@rm -f perf-event.h
+@@ -398,10 +389,10 @@
+ 	STRESS_NG=./stress-ng debian/tests/fast-test-all
+ 
+ .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 6f49eba8f496..2fbf8ab09005 100644
--- a/app-benchmarks/stress-ng/metadata.xml
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Stress-ng will stress test a computer system in various selectable ways.
+		It was designed to exercise various physical subsystems of a computer
+		as well as the various operating system kernel interfaces.
+		It features 200 stress tests, 70 CPU specific stress tests,
+		that exercise floating point, integer, bit manipulation and control flow
+		and over 20 virtual memory stress tests.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.27.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.27.ebuild
new file mode 100644
index 000000000000..125fd0edb3e2
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.27.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}/makefile.patch" )
+
+QA_WX_LOAD="usr/bin/stress-ng"