gentoo resync : 28.11.2020

4 files changed, 75 insertions, 3 deletions

diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 63c87a3d5254..31511eb79c31 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,6 +1,8 @@
 AUX gatling-0.13-compile.patch 255 BLAKE2B 08de101796184625542dd339b96e246477a0cb8aaa40bac8640f0d442b9fba09389ada09bd4f852736487bfda30915f0ca562e1ea6aed0bee8d0104cb65a9c63 SHA512 77e35689b80a4d1b9598bf31cc14c3572a7b92d49ffeb98442552f58eeb04a196ce5c8215941d07e197191c349548d23baadac3b84854d6eb93d26632555c699
+AUX gatling-0.15-ar.patch 754 BLAKE2B 08ebd3714234ced36751d0ddcb0d3391aa8cbc0f91b215c87d1539f738b9aa7da53495e9171d24554a4a8e3afbfc6553a333228f5867efa18e387deb9f1293a3 SHA512 050bf557c8bbeed9245046d3f938a40c2b2a2d544c0c422deca5ecdea6683dd342a8cca6fcff2419af128c8c0caece33e4848cf2f3e754ebf225ca800f70820c
+AUX gatling-0.15-gcc10.patch 811 BLAKE2B 8d081b41df919e6cfc41113e24526e1ab59ea457cb46fe9da2ef6224965f3b89bf635e5c68533ad497ca8f7e4094d01a8167fa6f8ebc994108fc41375251d205 SHA512 409f683ae8ef25050e122e1e448fc0bf04ab1d7caafa37f040960f1143aa7c9c3c4a722229c9243301da21c9216e32da37ce4e4b9bbb8cbc65cc256b8e41bdc5
 AUX gatling.confd 659 BLAKE2B ac3a2bc798e8ee9172f7c807c7e80f5bc7ad12e1830f296f097078887e609facfcb6087c6d5cdaa162fd747d7f03d208a28ec30e12fb67e7dc938ed0e65f766b SHA512 e903cd9afbb575226c6de0da8ad673d4650a53cac7442505422c98c32a00457f3d48f2853355cd76ea0f83671cb973ddf90df900d86a15172291317109481fb3
 AUX gatling.initd-3 1970 BLAKE2B ba48e796b4fca2cd165756b3ef781feb47be18e43043d834e028d80b522f1fe6482db79bb89a7a7e57c1fdd80f6cdbb525ec0153af8600daf848d7408aa4ff6e SHA512 3b198ed6728add5f30e8ec16171cc7086d315448821b3a5487be1cf7b318735a77f0881d9aca0a5af179a2b8aff75fd0c0ce80836172a26c439cba2859c6ab1f
 DIST gatling-0.15.tar.xz 121804 BLAKE2B 7df5f6d4fc823e8a1252bacca2b57d0848dd3a920216d1d3185d5f471f786eee1eb36396114b367660ead816bd4ee6c734099bbb9bdb5ffbd5b70a59e0fb0667 SHA512 b76d220a0644f1e6e7ea966a4eff409964c564fc4a31c4efdb764e5f7b5857bc58c26bc31e860fe35df932cbd60fb2b0f4f21c75cb5aa56427e8a2a453684716
-EBUILD gatling-0.15.ebuild 1309 BLAKE2B c70f35d0d7ec361cb2c69eea8e6372e839c86e91242e2eb347534917d390c5131000fe601c8541486a9ea918508680152dd2e387a9f1738985a35731ebd80e07 SHA512 6269217a4998b6684ea2cb2a7a31c1784f57c214ad6b141ce2664071e50bc38128fc6a809692b5a28e20b28a6c11ba26812b07a50a7da854ab02f1a40e728c7b
+EBUILD gatling-0.15.ebuild 1370 BLAKE2B b8b28f23d4d301228dfcd147557060faaba81fac381c675366410aefb910025ee2d24b82d8c29043687d2dfd34aa636d031e15ad612cd5f0052b917ea404cf90 SHA512 68701a95f1c86be6a5892d714c814756bdd00ac7c5da9945a2f87dabb4bc828f8259aeae8ac4d9e5513b97959c49287311d0d25c96c8b0d73b6355b30a83772b
 MISC metadata.xml 444 BLAKE2B dd65d9cb3f9b6babebc0e45c67e8bda05f48d49d8902f6a0da4d1d75f38ba2e1d627f0a1e9e35dac77466fd7edfe43435b7b99d7ee394268df1e4f5cc5b53ab5 SHA512 0f829523b85ea9fcd62743f72f7a985e532685d4989b0083191286cbc9a99db398fde3c63f86ad9bdeb6e75d559a777e85cf2df037456e5b0960b15c2511815a
diff --git a/www-servers/gatling/files/gatling-0.15-ar.patch b/www-servers/gatling/files/gatling-0.15-ar.patch
new file mode 100644
index 000000000000..84b13293e426
--- /dev/null
+++ b/www-servers/gatling/files/gatling-0.15-ar.patch
@@ -0,0 +1,30 @@
+From 64933921d28aa96cbece18e43723117661a8056d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 28 Nov 2020 20:33:21 +0100
+Subject: [PATCH] GNUmakefile: Respect variable AR
+
+GNU make comes with AR predefined:
+$ make -f <(echo $'.PHONY: all\nall:\n\t@echo "AR is \\"$(AR)\\"."')
+AR is "ar".
+
+Original bug report at https://bugs.gentoo.org/756850
+---
+ GNUmakefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 6af7b35..e6b32fe 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -195,7 +195,7 @@ dummy.c:
+ 	touch $@
+ 
+ libsocketkludge.a: libsocket libiconv dummy.o
+-	ar q $@ dummy.o
++	$(AR) q $@ dummy.o
+ 	-ranlib $@
+ 
+ LDLIBS+=`cat libsocket libiconv libcrypt`
+-- 
+2.27.0
+
diff --git a/www-servers/gatling/files/gatling-0.15-gcc10.patch b/www-servers/gatling/files/gatling-0.15-gcc10.patch
new file mode 100644
index 000000000000..446ea5cffdec
--- /dev/null
+++ b/www-servers/gatling/files/gatling-0.15-gcc10.patch
@@ -0,0 +1,38 @@
+From b815fc02179e8f25a6bea2bc1ee7306ffea37258 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 26 Nov 2020 16:05:26 +0100
+Subject: [PATCH] Fix build with -fno-common or GCC 10
+
+---
+ dirfd.c | 1 +
+ dirfd.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dirfd.c b/dirfd.c
+index 6a0217e..792bd29 100644
+--- a/dirfd.c
++++ b/dirfd.c
+@@ -34,6 +34,7 @@ struct hashtable dc;
+ 
+ #ifdef __linux__
+ int rootwd;
++int ifd;
+ #endif
+ 
+ /* initialize a hashtable as empty */
+diff --git a/dirfd.h b/dirfd.h
+index cdfc4a3..a76c5d8 100644
+--- a/dirfd.h
++++ b/dirfd.h
+@@ -21,7 +21,7 @@
+  * given dir, and it will return the fd or -1 on error. */
+ 
+ #ifdef __linux__
+-int ifd;	/* inotify fd */
++extern int ifd;	/* inotify fd */
+ #endif
+ 
+ struct dircacheentry {
+-- 
+2.27.0
+
diff --git a/www-servers/gatling/gatling-0.15.ebuild b/www-servers/gatling/gatling-0.15.ebuild
index ba78c1bb2f64..c18fb7fe8684 100644
--- a/www-servers/gatling/gatling-0.15.ebuild
+++ b/www-servers/gatling/gatling-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="libressl ssl diet"
 REQUIRED_USE="ssl? ( !diet )"
 
-DEPEND=">=dev-libs/libowfat-0.25[diet=]
+DEPEND=">=dev-libs/libowfat-0.32-r2[diet=]
 	diet? ( dev-libs/dietlibc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0 )
@@ -25,6 +25,8 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.13-compile.patch"
+	"${FILESDIR}/${P}-ar.patch"
+	"${FILESDIR}/${P}-gcc10.patch"
 )
 
 src_prepare() {