gentoo resync : 20.03.2021

4 files changed, 14 insertions, 67 deletions

diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index c5389573b180..336c7454b49a 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,8 +1,6 @@
 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 1275 BLAKE2B c576911dadc810da8459e1c7d87be18b41da2275a9d445b2fbd15eaedea616db81bc11aeedb119c28df74322ef28fb9a92fc2248ae8025756dd2096f38ee5c44 SHA512 1aa8ad1f8d47675fa6284c02bc3db4b086c04bfb5cddc3c0566fdd1fb82fd2ee8b56f9e6bb08781d3844415c3bd4fba21e098b83c676a4a4c95c1ccb5a2f7883
+DIST siege-4.0.8.tar.gz 525619 BLAKE2B 4c0b570810c4c1f3f13374aa1f33dc1624f989096280fd672a2c3deee7827099d790215e2583670fa58862df35b4db8998cf57c3c864354e8bd8aa8093c66724 SHA512 34239d761c1fff2a6048b59a98b64e87da065257ca4d62eb899f600573d920f5503bbdad8f5c5d31b4052c64857394c7899a9bda5384c00be8652ce4c98845ca
 EBUILD siege-4.0.7.ebuild 1279 BLAKE2B 20c50d6ce94ab0ecaa8f17252206c021dd986797f607851cb7377b40a906e671636d4768049a1fb4781a6ca4ce6c47c41da50601070d0d986b039e23c35c353f SHA512 2b1f0a85963f39a1b972627d3c1873db513e1bb7da99dad36cbaca994d57b1f07a7ea91e3f14b3752925754278f1f92889a15a1984016ebe16c889c1f0fb48d7
-MISC metadata.xml 832 BLAKE2B f56d0661ec0f81d5f155be79e6b52712bead41876a1ad2049e9597ba8923b7c0583d1176b64d4f6c76d18adc84f8eba244170e218f4987c6e499138334295be5 SHA512 7f0697daa7194a1a4565f83cb8654272b4e6ed630f41f7be83dd9a972c93ed2f1267f5ddd9f3063f39445b7a02f4c9645e0c0e4239262a98b536b28f96a11266
+EBUILD siege-4.0.8.ebuild 1282 BLAKE2B e90fbda64fe3a679ffb870245a1fd460892b878b1459701f101741ec5ef64435eaaf3217837d4d5d305a5ea21ea31cf31dec4307e7b23deddddd903adec1b38e SHA512 f77ded5a9f0c59a9a33db4a0002334cf6ba2e403677d95812e6e1b7347eacbecb2aadbc262c1a56499eda057be4777dc712f7a1a14ea2d654a6fe928f9cdfb0b
+MISC metadata.xml 855 BLAKE2B 4dfaca82343517227a9fe3f2507863665e5d966bead652ce7700a2a2aa86363750df02e6fb1dfa2ca86d781cca3cb02611325c6def60461692cb2213d5c78d65 SHA512 09a8da39fde59f4eb9e93d39c7e2dc3414e6bc24d0b4c24e7bcef5878f5987221ab7fc3e7285dbbf1be619ab1663a1aabd267ef00bfea9c4b3addd52473a0679
diff --git a/app-benchmarks/siege/metadata.xml b/app-benchmarks/siege/metadata.xml
index 67ce38b8d2d8..a29b53a23697 100644
--- a/app-benchmarks/siege/metadata.xml
+++ b/app-benchmarks/siege/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-benchmarks/siege/siege-4.0.4.ebuild b/app-benchmarks/siege/siege-4.0.4.ebuild
deleted file mode 100644
index ebd14cfce9e5..000000000000
--- a/app-benchmarks/siege/siege-4.0.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="https://www.joedog.org/siege-home/"
-SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-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}
-	sys-devel/libtool"
-
-src_prepare() {
-	default
-	# bundled macros break recent libtool
-	sed -i -e '/AC_PROG_SHELL/d' 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="${D}" 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}/"
-}
diff --git a/app-benchmarks/siege/siege-4.0.5.ebuild b/app-benchmarks/siege/siege-4.0.8.ebuild
index 48cafb2e2b8d..3b1feaf8f88a 100644
--- a/app-benchmarks/siege/siege-4.0.5.ebuild
+++ b/app-benchmarks/siege/siege-4.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ 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"
 
@@ -25,11 +25,10 @@ src_prepare() {
 	# 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
-
+		-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
 }
@@ -42,7 +41,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 
 	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt