gentoo resync : 15.12.2019

4 files changed, 9 insertions, 96 deletions

diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 9a6635f090e4..a14283f3a338 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,11 +1,8 @@
-AUX gatling-0.12-compile.patch 764 BLAKE2B bb36241c2aae2a6bd11d5055652bdcc087a9a38f1f936c9012a2d56ecae64547a50c7d80f0fd0865c4e585e1ce846ba0c1951bfa6a65a10259d0dcc14cd326f3 SHA512 c734018a9c052ae3cb79e86be2229c222079d87665a32e5de679df9e12361ba2f023043b6ec73506788bbdb00e8a8f7a97a90f779ca12ff93abf96a91144e580
 AUX gatling-0.13-compile.patch 255 BLAKE2B 08de101796184625542dd339b96e246477a0cb8aaa40bac8640f0d442b9fba09389ada09bd4f852736487bfda30915f0ca562e1ea6aed0bee8d0104cb65a9c63 SHA512 77e35689b80a4d1b9598bf31cc14c3572a7b92d49ffeb98442552f58eeb04a196ce5c8215941d07e197191c349548d23baadac3b84854d6eb93d26632555c699
 AUX gatling.confd 659 BLAKE2B ac3a2bc798e8ee9172f7c807c7e80f5bc7ad12e1830f296f097078887e609facfcb6087c6d5cdaa162fd747d7f03d208a28ec30e12fb67e7dc938ed0e65f766b SHA512 e903cd9afbb575226c6de0da8ad673d4650a53cac7442505422c98c32a00457f3d48f2853355cd76ea0f83671cb973ddf90df900d86a15172291317109481fb3
 AUX gatling.initd 1915 BLAKE2B 8f0954d855759b6abe90d6ea823fb2e14bddcc36d45a20bbb731aaeb0a4efa2b3bfdc454d9ae1c127634057a33032dd73086d6f7f8c99678bf79c6bf602bcc19 SHA512 7992a44fc61408eef740bd94fd127240b85a27954c6217b44e7be01a6b95256acc8f61962b661eaeecd6321b958403430aae673b9e88656bb11883b577a3d9a6
 AUX gatling.initd-2 1970 BLAKE2B 6c964b6fba4bf576efbbf659fc027b336fe82ada1f822242fd62964dfb64efb71af4adda687bb406b78234b4a01ac6bd0e419e5a7d638b42c7833515e78b1996 SHA512 916b19712c51564bb38167262de1358289202894b80b948c1d10463c74fea0de9bcddc33a8dd804a08f5a07d1762e0cd21bfe6a404dbfe3fd49138248384dbfc
 AUX gatling.initd-3 1970 BLAKE2B ba48e796b4fca2cd165756b3ef781feb47be18e43043d834e028d80b522f1fe6482db79bb89a7a7e57c1fdd80f6cdbb525ec0153af8600daf848d7408aa4ff6e SHA512 3b198ed6728add5f30e8ec16171cc7086d315448821b3a5487be1cf7b318735a77f0881d9aca0a5af179a2b8aff75fd0c0ce80836172a26c439cba2859c6ab1f
-DIST gatling-0.13.tar.bz2 108128 BLAKE2B a8226bb9c608dd77491e4a922a79c310a40e155afcb28602a0cf279e45919bd86a0e93e58d7f33a3551820de20ae219e7af75bc0402eab27c95ba0530575f4c0 SHA512 b9fa604aa8bb8c5d40d9c3eaaa536ed5e73d0ed93eccb41ca4744316ad893dc6fe92fe2c1f0247de82d4eda63b0ab7ab338355d9963fb58f23d39a2c678a1db8
 DIST gatling-0.15.tar.xz 121804 BLAKE2B 7df5f6d4fc823e8a1252bacca2b57d0848dd3a920216d1d3185d5f471f786eee1eb36396114b367660ead816bd4ee6c734099bbb9bdb5ffbd5b70a59e0fb0667 SHA512 b76d220a0644f1e6e7ea966a4eff409964c564fc4a31c4efdb764e5f7b5857bc58c26bc31e860fe35df932cbd60fb2b0f4f21c75cb5aa56427e8a2a453684716
-EBUILD gatling-0.13-r1.ebuild 1517 BLAKE2B c07ee1269d3cd89c342309f74977f9b08d0cc8d11967805d49ad49365318019f5be857bf9c8d74d0b68a046f8a77c9d8a3522cc33b6b2605a70c8d4ede3dc993 SHA512 b946510624a7154271a78460e50235a1e7d1f2b3aa897efe3bbb378221adb2de296584f02a6c033794a6af27ddbbd1ec1b015059122aab36bdab248b6e3cced1
-EBUILD gatling-0.15.ebuild 1547 BLAKE2B a5e6e2d04fef5bb646debd50ba69d47f7d065cf44a3ba0021efc0f5bcadf056cb03fe1cfcb91b1a38f1e83a357da0c375e4ad198b6a8ea6cb37244fbedd65578 SHA512 409f89a283ac591c3ca06b9140de4e906064de750a76cac70d5abcf632704e23ef72281f3b213b054e43aa019c5f0a9264d21f922144831bf48c1b1b86c16984
+EBUILD gatling-0.15.ebuild 1309 BLAKE2B c70f35d0d7ec361cb2c69eea8e6372e839c86e91242e2eb347534917d390c5131000fe601c8541486a9ea918508680152dd2e387a9f1738985a35731ebd80e07 SHA512 6269217a4998b6684ea2cb2a7a31c1784f57c214ad6b141ce2664071e50bc38128fc6a809692b5a28e20b28a6c11ba26812b07a50a7da854ab02f1a40e728c7b
 MISC metadata.xml 444 BLAKE2B dd65d9cb3f9b6babebc0e45c67e8bda05f48d49d8902f6a0da4d1d75f38ba2e1d627f0a1e9e35dac77466fd7edfe43435b7b99d7ee394268df1e4f5cc5b53ab5 SHA512 0f829523b85ea9fcd62743f72f7a985e532685d4989b0083191286cbc9a99db398fde3c63f86ad9bdeb6e75d559a777e85cf2df037456e5b0960b15c2511815a
diff --git a/www-servers/gatling/files/gatling-0.12-compile.patch b/www-servers/gatling/files/gatling-0.12-compile.patch
deleted file mode 100644
index db609836332b..000000000000
--- a/www-servers/gatling/files/gatling-0.12-compile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- GNUmakefile	2012-04-10 04:31:14.505474482 +0200
-+++ GNUmakefile	2012-04-10 04:31:53.821982958 +0200
-@@ -64,7 +64,7 @@
- acc: acc.c
- 	$(CC) -o $@ $< $(CFLAGS) $(LDFLAGS) -lowfat
- 
--CC:=$(DIET) $(CC)
-+override CC:=$(DIET) $(CC)
- 
- pthreadbench: pthreadbench.o
- 	$(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS) -lpthread
-@@ -80,7 +80,7 @@
- $(OBJS) https.o gatling.o: gatling.h version.h gatling_features.h
- 
- tlsgatling: gatling.c ssl.o $(HTTPS_OBJS)
--	-$(CC) -o $@ gatling.c ssl.o $(HTTPS_OBJS) $(CFLAGS) -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS)
-+	$(CC) -o $@ gatling.c ssl.o $(HTTPS_OBJS) $(CFLAGS) -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS)
- 
- gatling: gatling.o $(OBJS) md5lib
- 	$(CC) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LDLIBS) `cat md5lib`
diff --git a/www-servers/gatling/gatling-0.13-r1.ebuild b/www-servers/gatling/gatling-0.13-r1.ebuild
deleted file mode 100644
index 45cbd5827819..000000000000
--- a/www-servers/gatling/gatling-0.13-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="High performance web server"
-HOMEPAGE="http://www.fefe.de/gatling/"
-SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="libressl ssl diet"
-REQUIRED_USE="ssl? ( !diet )"
-
-DEPEND=">=dev-libs/libowfat-0.25[diet=]
-	diet? ( dev-libs/dietlibc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm Makefile  # leaves us with GNUmakefile
-	epatch "${FILESDIR}/${P}-compile.patch"
-}
-
-src_compile() {
-	local DIET=
-	use diet && DIET='/usr/bin/diet'
-
-	local targets='gatling'
-	use ssl && targets+=' tlsgatling'
-
-	emake DIET="${DIET}" CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \
-			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \
-			|| die "emake ${targets} failed"
-}
-
-src_install() {
-	doman gatling.1 || die "installing manpage failed"
-
-	newconfd "${FILESDIR}/gatling.confd" gatling || die
-	newinitd "${FILESDIR}/gatling.initd-2" gatling || die
-	dodoc README.{ftp,http} || die "installing docs failed"
-
-	dobin gatling || die "installing gatling binary failed"
-	use ssl && {
-		dodoc README.tls || die "installing docs failed"
-		dobin tlsgatling || die "installing tlsgatling binary failed"
-	}
-}
-
-pkg_setup() {
-	ebegin "Creating gatling user and group"
-	enewgroup gatling
-	enewuser ${PN} -1 -1 /var/www/localhost ${PN}
-}
diff --git a/www-servers/gatling/gatling-0.15.ebuild b/www-servers/gatling/gatling-0.15.ebuild
index b404cfd8a5c9..ba78c1bb2f64 100644
--- a/www-servers/gatling/gatling-0.15.ebuild
+++ b/www-servers/gatling/gatling-0.15.ebuild
@@ -41,21 +41,20 @@ src_compile() {
 
 	emake DIET="${DIET}" CC="$(tc-getCC)" \
 			CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \
-			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \
-			|| die "emake ${targets} failed"
+			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets}
 }
 
 src_install() {
-	doman gatling.1 || die "installing manpage failed"
+	doman gatling.1
 
-	newconfd "${FILESDIR}/gatling.confd" gatling || die
-	newinitd "${FILESDIR}/gatling.initd-3" gatling || die
-	dodoc README.{ftp,http} || die "installing docs failed"
+	newconfd "${FILESDIR}/gatling.confd" gatling
+	newinitd "${FILESDIR}/gatling.initd-3" gatling
+	dodoc README.{ftp,http}
 
-	dobin gatling || die "installing gatling binary failed"
+	dobin gatling
 	use ssl && {
-		dodoc README.tls || die "installing docs failed"
-		dobin tlsgatling || die "installing tlsgatling binary failed"
+		dodoc README.tls
+		dobin tlsgatling
 	}
 }