gentoo resync : 03.03.2019

12 files changed, 95 insertions, 113 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 3491bfa6416c..88165c30c8fe 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 3c4a680db2f1..792ac4200ce3 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.3.0.ebuild 1110 BLAKE2B 75bed80d0373b6ebdf8db6a1c469f743b58df189b5d3bb049cd8ceaf49a68927d1c03ae1353b1a6539705fd759a1a9028f5908dbdd148905e7a51ad453ce183e SHA512 82a80408f62efa96b5a233b5e92604c9c512fe3ec633097fd64f2a54d293446068f539d7822b41b2dcba9bcaa9dfdbc172d13496d30951940920d46186c864ed
-EBUILD geekbench-4.3.3.ebuild 1115 BLAKE2B 5667d9ce9e1ed9c33f3065d98bce49ca2fb162d843a0460784d1993013af943da3c05523234d9046eb17397880bcc9ee81beb0912495d86953bf0681289ebb4c SHA512 4718961d26a778515f1790b39efb24ace997dc35c1ae77ae64c3e60d443f4a979b0712ceaac50a7d6d6179bad8d7c5d9a1f491b0feef917ac199a2401f0bcd2d
+EBUILD geekbench-4.3.3.ebuild 1113 BLAKE2B fd8422df54e2b7d46308f565a49986a4fb828b27ce9716d0e7b8e57b4dd6d4288f55d596d325518d084d10f1af02d1097bf4e387b8d268ce48d5425d46e8f4d5 SHA512 dc86f331e2ce84e80b80abcf8928a863fbc3723cb8e7fff8238a1f6bec61aa99796d16f6c1eb0278aa8185399a0f09be9b1971b2df73df9e6638c2b9a93a1798
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/app-benchmarks/geekbench/geekbench-4.3.3.ebuild b/app-benchmarks/geekbench/geekbench-4.3.3.ebuild
index e9e4197b56ba..4c5b3c5b523d 100644
--- a/app-benchmarks/geekbench/geekbench-4.3.3.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.3.3.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/interbench/Manifest b/app-benchmarks/interbench/Manifest
new file mode 100644
index 000000000000..5356cc6907aa
--- /dev/null
+++ b/app-benchmarks/interbench/Manifest
@@ -0,0 +1,4 @@
+AUX interbench-0.31-makefile.patch 449 BLAKE2B 3c9c0dcbc35c8294ab87e8ba4bd72c5fec4a01a49857de753a95b4eb436bc72657e569ed4f9dfbb759c078a053b47830a65a2e0d72747166815cb99ba54ac8af SHA512 2f4b648bcc879bd67dca83e22198cb18ac267ecf6e923cf23fbbc00b29cf36b57d37844e8095ae6c05c74f9ed538b3ee746e0f8d391349921f4514918a71f36a
+DIST interbench-0.31.tar.gz 38791 BLAKE2B 8f5605c763be6be0fcb5b240d5022c578af98d470a8bdf61f0ebc2abe56e6439fa37b5ac4e3eae16c7aab902cc08fab25f0cb34a92c0eea05b287b7bef2abbb4 SHA512 ccad7f5a7ea10c3c56809725145bad17970c4fa8aafc4b962e4e79c56bfa05025fee140e5b70ec407158aca59bba47e6bbff14329516d9383801ffe4c0797a23
+EBUILD interbench-0.31.ebuild 607 BLAKE2B a510bbc056fda151fc77623c4c0a31308bba1ed52598627d534486a2dbcca00f33ecac961a9205daea2bad2a4fd25fb8bdf43a2be5540b01cbfdd7992c8c84be SHA512 b834ff22c11eebe0082b54071e3641d23dc7998dca6db360a84f08a9046ea621c30441516b6bfc0525be7a57475bcd54b59eec25c2a968aa1accb19eec95e3dc
+MISC metadata.xml 872 BLAKE2B fcccf6de8afd8bc7e50413fd70a604d790ed698b8cb45a2687e4e5e12b7820055d6c4bce8f355561605037331b9211a5e2f0346a663a54b4b7ba68355a5147c5 SHA512 12a54c9af0464b5732dd771eb67f52480161f7755de3c0e80975c90ba2d2887be3fcee82d6d4d8193e1a8929d1553acd9f9c9b2d892271c6bfbeffefafcc18bf
diff --git a/app-benchmarks/interbench/files/interbench-0.31-makefile.patch b/app-benchmarks/interbench/files/interbench-0.31-makefile.patch
new file mode 100644
index 000000000000..712c54f482c8
--- /dev/null
+++ b/app-benchmarks/interbench/files/interbench-0.31-makefile.patch
@@ -0,0 +1,16 @@
+--- a/Makefile	2016-10-21 04:28:00.000000000 +0200
++++ b/Makefile	2018-11-01 16:56:36.000000000 +0100
+@@ -1,8 +1,9 @@
+-CC=gcc
+-CFLAGS=-W -Wall -g -O2 -s -pipe
+-LDFLAGS=-lrt -lm -pthread
++CC ?= gcc
++CFLAGS+=-W -Wall
++LDFLAGS+=-lrt -lm -pthread
+ 
+-interbench: interbench.o hackbench.o -lm
++interbench: interbench.o hackbench.o
++	$(CC) $(CFLAGS) -o interbench interbench.o hackbench.o $(LDFLAGS)
+ interbench.o: interbench.c
+ hackbench.o: hackbench.c
+ 
diff --git a/app-benchmarks/interbench/interbench-0.31.ebuild b/app-benchmarks/interbench/interbench-0.31.ebuild
new file mode 100644
index 000000000000..bab121c0d448
--- /dev/null
+++ b/app-benchmarks/interbench/interbench-0.31.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Linux interactivity benchmark"
+HOMEPAGE="
+	http://interbench.kolivas.org/
+	https://github.com/ckolivas/interbench/
+"
+SRC_URI="https://github.com/ckolivas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+
+DOCS=(
+	"readme"
+	"readme.interactivity"
+)
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	dobin interbench
+	doman interbench.8
+
+	einstalldocs
+}
diff --git a/app-benchmarks/interbench/metadata.xml b/app-benchmarks/interbench/metadata.xml
new file mode 100644
index 000000000000..f86ed635b546
--- /dev/null
+++ b/app-benchmarks/interbench/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<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>
+		This benchmark application is designed to benchmark interactivity in Linux.
+		It is designed to measure the effect of changes in Linux kernel design or system
+		configuration changes such as CPU, I/O scheduler and filesystem changes and options.
+		With careful benchmarking, different hardware can be compared.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/ckolivas/interbench/issues</bugs-to>
+		<remote-id type="github">ckolivas/interbench</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index d8ae3fe1d31f..d0f5a5137c3e 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,7 +1,4 @@
-AUX stress-ng-0.09.47-makefile.patch 1719 BLAKE2B ec889073ac77ee3109d9abbd039388acb2c3924af141a9111b2411e6ca5a721af2f331be03009913bae7aea39044fc1fc5ed7f2cff83b386df8a15c7edab8162 SHA512 f5a567ab766ef4bd473e0e2324cada9b4d63601ce27c310fcf1f24ca051286c72b8f41e666f148542e97ca95691828bd66ee55cbc801e4b8effcf0be46c976d6
-AUX stress-ng-0.09.50-makefile.patch 1714 BLAKE2B 214f285b898da3b004ccd2fb8e7bdee328509aa1a9254aeb196ac836b0fdd04942968f639948a5a2a5d2c18066b6d426020135e11d3663acaaedf12c6fe153b7 SHA512 c83d5e216a5cdd568be1755836b4a385ead1136500c4b4704ad338472de483b5aeb8234f1a9ed184de067e6ec42b864013aec7300a5256bfd953ee7153ac0aca
-DIST stress-ng-0.09.49.tar.xz 369304 BLAKE2B 48b11df90563ec7d09e84e441039366bfca9788af5079ce9bc921370d78371638ff9a9fbaa7e623eefb343b5c19b55a5e4b9bb9688898733c0452b3e2b9549e4 SHA512 b4eb93dc2d015766da1361840e4880db83a9e9297d4272383abdfcaeb26dc8437c3dc0b007efa5c12585bfaacaa2ae255ed52c693f9e8f6595a7294db48bc68a
-DIST stress-ng-0.09.50.tar.xz 372592 BLAKE2B 430e4e8feefb358d6e9445d2418356d306c978ae0e6521a8fa6f216cd2fd031569ce9359236080784682991d81a3d9aacc4cef54709fbed2d9a99d7154d9e6b0 SHA512 b52a2e52011d6fcc7c72ad12c6173c7e7e77028e6c90d2aef170235bfb5b9b0ffe7422b178e58d68c0239dc85cce59edb6a58b9edfea84aba2b24c995321d5d4
-EBUILD stress-ng-0.09.49.ebuild 683 BLAKE2B 37f2aedf2c4949e54bbfa4003473149abd6c65bc1c74f15fb0226cf94feef64c7537c5cb76312cfe9a2273484f3678fdcf647bce0590a6aac0c7f9801840868c SHA512 f83fe0332935dcbd91dd017fccda51d1a7f54bc5c27dd0e14956dfe6f217422fc78109db61081063e7fd081348cb19b7ff2ef7dd4aa3892ffb9e578e1b328fb1
-EBUILD stress-ng-0.09.50.ebuild 676 BLAKE2B af3c24528ca7f3b29a01a08dd49fcd4d0dcf682bfd932180e201c36d86c82254ab6f6bba72b3298b4f8883eaa7eff86a26d8684789cb9c20835c17abb995c4bf SHA512 b2f7a1d4c9fb9122f7bc08415e5615e3c77a0369a07930acf5f5122f7462409b50f59ab23ffb1e572bdd07e1dc28d57c1e3f7bffd04e5e8245e68f3999af1b21
+AUX stress-ng-0.09.53-makefile.patch 1736 BLAKE2B f96cf408d2158f435e25c66270062903e1efb435bf48fa2f8198b99d625f1a70f29e71c5deba1a05549ab6e91d6a1e579e7176d4f172f073d5fe5e71b8ad17ba SHA512 72a607a2a569ac7b390067e63c7c5da6d6f15661e6cdc1a723c3f5eee03f156155ed5977045d1b1bbd9ab7d8eef5f5588018cd10107ccacd3a1fddf3e71a9609
+DIST stress-ng-0.09.53.tar.xz 383408 BLAKE2B 3893bd4683c0b7b57c2a8809ca0889d4a06131465e099609e96954b6fd980fb9dcd1a2c517de3a70100815c5493a61fdb166cc5c493bcbd0c5b0d622b2a18e79 SHA512 fb83a849259aa0e376c2ae8d51bd018e3fbdd7beadf2770471039b4cf34f7827cdcf2492ad7ef79359de5750fffcc78bfc18171e429d2cb38d5bbde82e0e70f2
+EBUILD stress-ng-0.09.53.ebuild 674 BLAKE2B c361fb796b632471adf0909d082f759b2d32aec9e39e9d713e992d917c60fa518836ea7bef0541e63da1778b7f1beef24496974134a7f42342359a02a9ddddf6 SHA512 da694bbe558f22a6428c5e964dcbe87448e5d8a84ccc9d24f6ccaede86fedfaeae6e085cbc40194d378f19ec49956df4e19a2f9d8e0c9b4f6d05d46010b45e23
 MISC metadata.xml 953 BLAKE2B c10dbe55ea86af30a97975174565c3c9bbc76bf029f1582a5fbe8a98f79afb80a509543730294673d5b51ddf4a32fc93e8017f8ba0b26cac119c1e97e8fd025a SHA512 7975ca315e447e9d6c2d551fcf396b2a03d71661c4bd33843dba0413ea7b119dd1d3f59aaa91298bb5be2a17f377f7cae96cc7413531f30a88e2f401ef76f0bb
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.47-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.47-makefile.patch
deleted file mode 100644
index 9458a005c314..000000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.47-makefile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/Makefile	2018-11-21 18:06:08.000000000 +0100
-+++ b/Makefile	2018-11-27 23:43:41.000000000 +0100
-@@ -21,7 +21,7 @@
- # Codename "portable pressure producer"
- #
- 
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
- 
- #
- # Pedantic flags
-@@ -343,12 +343,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) -o $@
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
- 	@sync
- 
- makeconfig:
-@@ -369,8 +367,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
- 
- #
-@@ -385,12 +382,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
-@@ -438,6 +433,6 @@
- 	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/files/stress-ng-0.09.50-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
index 791f599118b7..cf08858d361b 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.50-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
@@ -1,15 +1,15 @@
---- a/Makefile	2019-01-02 18:19:15.000000000 +0100
-+++ b/Makefile	2019-01-27 15:09:56.000000000 +0100
+--- a/Makefile	2019-02-15 13:06:01.000000000 +0100
++++ b/Makefile	2019-02-19 21:44:10.000000000 +0100
 @@ -21,7 +21,7 @@
  # Codename "portable pressure producer"
  #
  
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 -g
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
 +CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
  
  #
  # Pedantic flags
-@@ -344,12 +344,10 @@
+@@ -347,12 +347,10 @@
  .o: stress-ng.h Makefile
  
  .c.o: stress-ng.h Makefile $(SRC)
@@ -24,7 +24,7 @@
  	@sync
  
  makeconfig:
-@@ -370,7 +368,7 @@
+@@ -373,7 +371,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
@@ -33,10 +33,10 @@
  	@$(CC) -c apparmor-data.c -o apparmor-data.o
  	@rm -rf apparmor-data.c apparmor-data.bin
  
-@@ -386,12 +384,12 @@
- 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
+@@ -389,12 +387,12 @@
+ core-perf.o: core-perf.c core-perf-event.c
+ 	@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
+ 	awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
 -	@echo CC $<
 -	@$(CC) $(CFLAGS) -c -o $@ $<
 +	echo CC $<
@@ -50,7 +50,7 @@
  	@touch stress-ng.c
  
  $(OBJS): stress-ng.h Makefile
-@@ -439,6 +437,6 @@
+@@ -442,6 +440,6 @@
  	mkdir -p ${DESTDIR}${BINDIR}
  	cp stress-ng ${DESTDIR}${BINDIR}
  	mkdir -p ${DESTDIR}${MANDIR}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild
deleted file mode 100644
index 0dd8c5303f6c..000000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://kernel.ubuntu.com/~cking/stress-ng/"
-SRC_URI="https://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}/${P}-makefile.patch" )
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.49.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.53.ebuild
index 6cd26a164223..0eb983a1b75d 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.09.49.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.53.ebuild
@@ -27,4 +27,4 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${PN}-0.09.47-makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )