gentoo resync : 14.12.2020

3 files changed, 10 insertions, 53 deletions

diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 31511eb79c31..3395efb63754 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,8 +1,7 @@
 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 1370 BLAKE2B b8b28f23d4d301228dfcd147557060faaba81fac381c675366410aefb910025ee2d24b82d8c29043687d2dfd34aa636d031e15ad612cd5f0052b917ea404cf90 SHA512 68701a95f1c86be6a5892d714c814756bdd00ac7c5da9945a2f87dabb4bc828f8259aeae8ac4d9e5513b97959c49287311d0d25c96c8b0d73b6355b30a83772b
+DIST gatling-0.16.tar.xz 126844 BLAKE2B 33dd2e93833b216ffadae4dbd5650af87b23ed5d62caf181d8005acb4dce889b86d1afb711676377ba2b7c4fe08b8f2350a32965cf6292a268281b28c4310c27 SHA512 9446ea0ae862509b1a892e5bdef14d3a2320c3c3e846362b4679c0834aa906ab5b16ef54e4a7c8e7ee839d30317436dd411e891e3105035a9ee31b0facc0b8c1
+EBUILD gatling-0.16-r1.ebuild 1256 BLAKE2B d7bdc41661762a0eb8ba0d7d276b591f8e6fb2d71b6f74169e0aa435921beabe6b4fefda3dd6dd189494a87c3a2b36e7d7b3bc1884cd26f33b52ee14f6612772 SHA512 59ed22e6882620b42ed5512a59ebdacb2476ab35e96ec60d5f62d5bab256f8bfe7f84e500799a69d7d5621d3ad5cf55a14ff07caafa6404649443b68760d7aea
 MISC metadata.xml 444 BLAKE2B dd65d9cb3f9b6babebc0e45c67e8bda05f48d49d8902f6a0da4d1d75f38ba2e1d627f0a1e9e35dac77466fd7edfe43435b7b99d7ee394268df1e4f5cc5b53ab5 SHA512 0f829523b85ea9fcd62743f72f7a985e532685d4989b0083191286cbc9a99db398fde3c63f86ad9bdeb6e75d559a777e85cf2df037456e5b0960b15c2511815a
diff --git a/www-servers/gatling/files/gatling-0.15-gcc10.patch b/www-servers/gatling/files/gatling-0.15-gcc10.patch
deleted file mode 100644
index 446ea5cffdec..000000000000
--- a/www-servers/gatling/files/gatling-0.15-gcc10.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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.16-r1.ebuild
index c18fb7fe8684..6616e0b4eca0 100644
--- a/www-servers/gatling/gatling-0.15.ebuild
+++ b/www-servers/gatling/gatling-0.16-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eutils toolchain-funcs user
+inherit eutils toolchain-funcs
 
 DESCRIPTION="High performance web server"
 HOMEPAGE="https://www.fefe.de/gatling/"
@@ -21,12 +21,14 @@ DEPEND=">=dev-libs/libowfat-0.32-r2[diet=]
 		!libressl? ( dev-libs/openssl:0 )
 		libressl? ( dev-libs/libressl )
 	)"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	acct-group/gatling
+	acct-user/gatling
+	"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.13-compile.patch"
-	"${FILESDIR}/${P}-ar.patch"
-	"${FILESDIR}/${P}-gcc10.patch"
+	"${FILESDIR}/${PN}-0.15-ar.patch"
 )
 
 src_prepare() {
@@ -42,7 +44,7 @@ src_compile() {
 	use ssl && targets+=' tlsgatling'
 
 	emake DIET="${DIET}" CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \
+			CFLAGS="${CFLAGS} -I${ROOT}/usr/include/libowfat" \
 			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets}
 }
 
@@ -59,9 +61,3 @@ src_install() {
 		dobin tlsgatling
 	}
 }
-
-pkg_setup() {
-	ebegin "Creating gatling user and group"
-	enewgroup gatling
-	enewuser ${PN} -1 -1 /var/www/localhost ${PN}
-}