gentoo resync : 23.09.2020

3 files changed, 68 insertions, 6 deletions

diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 0ce88c7222e9..9eaa0213acbd 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,6 +1,8 @@
 AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cced8174a65e09f6196fb4fa50128199d462ee62f17c7c8c55e20aabafca1edec2d3ca7edb508dd5e8ac63ed SHA512 26a4f55ac8d57231d9cc137ac8243da4cc33a3efb6b5366891230087c3e4d7555bcf8c20a7608479142589254a8c049f3165807ecf9c0eba0eb72422e04279e8
 DIST siege-4.0.4.tar.gz 523102 BLAKE2B 2d69dd37fea7ff35e05b41d500d4efb5b4fe60d9389b7bd98ec360148af781a24b6ebaa213b59ffc36cfcc8421efea14d8ec9f5742a53e019b2221584b5af17e SHA512 a8361ac0e2514626d794e7e4a345b178462409a1f3b53a9318adf171b511c408508acdb07652ad38f34021ac4a614dc5e6d2ea3c6a4ffd261ceef36d3226e573
 DIST siege-4.0.5.tar.gz 525122 BLAKE2B 6d7410255d9682eeb6755bbf2eb6fd189d1c6e5e4c8bf4ed430e0ad4157ee6af9148a1bfe554167b74a6250b4897a3d34eb1c6c10cc91ff2352419769b9db975 SHA512 61f1b0a9fb4f9738f51932d5203a0ee6435aa413975dc3f5c7afafd74ec206e1ec20f5134171f740f55465e6c015df8bdac1775bc04be50bb10d0516e1a62d53
+DIST siege-4.0.7.tar.gz 525654 BLAKE2B b97c7309d33387d15327dc39ae115bebdfe64fa0debea2da87590ce801d2f590622392ea1ecc6be9f2973ff9b37dfc0f5f0fef232a4593410c4503db6c78771f SHA512 2dcccc50a2d8cd0d6c18efe776b871b999f6918c078898845fec34bb2b1b8ec03e0b95792dd963aaefb054e4f4e27f604ed95c0de5f8a34cbf738f66a2307abc
 EBUILD siege-4.0.4.ebuild 1123 BLAKE2B 8af237cd30a38f95543ab429ccd143bd336c46c4ffe6dac966219cf95c20fe73b74dbab4d576f0574c3f3f3d2fd02883b351e2492ef7da480b3ba6c025b5b6cf SHA512 19470077886d58d05d1e63d067137e3816af44639d49a59bc81f685be077790bcd927e27297ec7205173472edccf692cb7fb249af7404c6ab037baa588228d7d
-EBUILD siege-4.0.5.ebuild 1135 BLAKE2B a0d486d3a9f85d5dae41faf19ded9aa1f9bb7c765d60be4ea41a62b5b0fd26c5b35cac8a19df4178be9b3fe17802a9c643eb69d2b2bb4c9162b8de3e8c6994ee SHA512 302f746de07fb11e71d0710424b47a7e0918b56ab91b6063e2a5cd80c2a7f0d10798fbb9bf59bf45cc041ae316374afca623ca42b5dd233629117862d1d6aadd
+EBUILD siege-4.0.5.ebuild 1277 BLAKE2B 18208c06d48102279ea68343a8e8768c3616550c8dd54effeb2be921ff2b337963222f1b8d94ca2e518a6891c1d78bc75f235aa1820ec1e67f97e1a6fc6a1440 SHA512 8143ad1853240372c969891f865a4018c974a34091d4fbf167dca8a00fa2e3a915ef9c78ea64eb28c61d0386626859c3010ceb6a2858fd0e0f83bd5205cf37d5
+EBUILD siege-4.0.7.ebuild 1282 BLAKE2B 06bf17a997e3574e38bf042de960a15841370e5b45e81cf614b98e0bff0455fe34947af29b0382a69f4283c275a080358310630c9daf32f6a766bb6cac0b1c61 SHA512 208fe4e9dc1affd93862373c2c5ee4531a9ab9f1510d7548c9773ea4bb4c22998117547818374f7740c56853d9a119b8297c6542c35fbd489f27eb02676627cc
 MISC metadata.xml 832 BLAKE2B f56d0661ec0f81d5f155be79e6b52712bead41876a1ad2049e9597ba8923b7c0583d1176b64d4f6c76d18adc84f8eba244170e218f4987c6e499138334295be5 SHA512 7f0697daa7194a1a4565f83cb8654272b4e6ed630f41f7be83dd9a972c93ed2f1267f5ddd9f3063f39445b7a02f4c9645e0c0e4239262a98b536b28f96a11266
diff --git a/app-benchmarks/siege/siege-4.0.5.ebuild b/app-benchmarks/siege/siege-4.0.5.ebuild
index 57c3d85b8fec..d4311b3e0f5b 100644
--- a/app-benchmarks/siege/siege-4.0.5.ebuild
+++ b/app-benchmarks/siege/siege-4.0.5.ebuild
@@ -10,20 +10,26 @@ HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
 SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc x86 ~x64-macos"
 SLOT="0"
 IUSE="libressl ssl"
 
 RDEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+)"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
 	# bundled macros break recent libtool
-	sed -i -e '/AC_PROG_SHELL/d' configure.ac || die
+	# remove /usr/lib from LDFLAGS, bug #732886
+	sed -i \
+	-e '/AC_PROG_SHELL/d' \
+	-e 's/SSL_LDFLAGS="-L.*lib"/SSL_LDFLAGS=""/g' \
+	-e 's/Z_LDFLAGS="-L.*lib"/Z_LDFLAGS=""/g' \
+	configure.ac || die
+
 	rm *.m4 || die "failed to remove bundled macros"
 	eautoreconf
 }
diff --git a/app-benchmarks/siege/siege-4.0.7.ebuild b/app-benchmarks/siege/siege-4.0.7.ebuild
new file mode 100644
index 000000000000..7309c86336a0
--- /dev/null
+++ b/app-benchmarks/siege/siege-4.0.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
+SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="libressl ssl"
+
+RDEPEND="ssl? (
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# bundled macros break recent libtool
+	# remove /usr/lib from LDFLAGS, bug #732886
+	sed -i \
+		-e '/AC_PROG_SHELL/d' \
+		-e 's/SSL_LDFLAGS="-L.*lib"/SSL_LDFLAGS=""/g' \
+		-e 's/Z_LDFLAGS="-L.*lib"/Z_LDFLAGS=""/g' \
+		configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with ssl ssl "${EPREFIX}/usr")
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}