gentoo resync : 18.11.2018

5 files changed, 12 insertions, 101 deletions

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" )