gentoo resync : 29.05.2018

4 files changed, 2 insertions, 107 deletions

diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 313f9cd149a5..3274d4103fdc 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,10 +1,6 @@
 AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cced8174a65e09f6196fb4fa50128199d462ee62f17c7c8c55e20aabafca1edec2d3ca7edb508dd5e8ac63ed SHA512 26a4f55ac8d57231d9cc137ac8243da4cc33a3efb6b5366891230087c3e4d7555bcf8c20a7608479142589254a8c049f3165807ecf9c0eba0eb72422e04279e8
-DIST siege-3.0.6.tar.gz 496002 BLAKE2B b21ed07a36b3e0ae5b4166f2d1351be790261d149bcac98f4d2795796e42a8697bf618822792f6f7c912be29d926cf5f8d3de443498deab8c553217db359d282 SHA512 621f3f60f2aac70fb051f48819f5673d60f31fc4fc69e4c65d4ae0a285d02112686f1e9b40241d48afc378446a2b296a7dc4bbc6d8ae38e390d380506f4d448b
-DIST siege-3.1.3.tar.gz 527862 BLAKE2B 9cc10b5afa15c5a7682452d8a4020de62c195192abcb222c36d148da871693c1fcf5be2e3d1a3ca1c4a7fd39fda505520f40ee053ca50fd15340441a498e368f SHA512 880b6d8bbe6b8210147ebb26fd724f4c242076740284977471165fbca514b56c49812ace42dcbe23c57be8fd10a2503b129deec10b79991451a9ae83f30a742b
 DIST siege-3.1.4.tar.gz 530149 BLAKE2B 3721387fa1ace745ce7748612849b84c07e84456bd903460930ab407cba1e24f493d4a251bacd3e509aafbc653e5d74e96509bf74f0a2a8066a0ec2b7ad2e9ee SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068
 DIST siege-4.0.4.tar.gz 523102 BLAKE2B 2d69dd37fea7ff35e05b41d500d4efb5b4fe60d9389b7bd98ec360148af781a24b6ebaa213b59ffc36cfcc8421efea14d8ec9f5742a53e019b2221584b5af17e SHA512 a8361ac0e2514626d794e7e4a345b178462409a1f3b53a9318adf171b511c408508acdb07652ad38f34021ac4a614dc5e6d2ea3c6a4ffd261ceef36d3226e573
-EBUILD siege-3.0.6.ebuild 1137 BLAKE2B 1790115533694ff1e028ce8d5487672a3f29a2fffdab53d2a15cef1b8df1e796754c5e85ffc26001f208f36cf546bc470a73aa3f567ad99f54e6c7c983d9bc25 SHA512 51a1a5650f81440fa974b17479acf13e6ab58a96b74708a2169e0d42cdd459e68f7de4e1bc471635b4e28bff5d7a1006db3949a468f91c8af64baa43f986d2e7
-EBUILD siege-3.1.3.ebuild 1192 BLAKE2B 5a8bf0e8cee22e6b8f42bcc161e1cb8e7ae0052dadcb25700185eaf1db455b82ccc31ef39e8fbae12466bf36b4ca4bea191a83184df808f4142c5c5d50c86b2f SHA512 46650e12d37c45bd994ee7806d9130639d1591028fb3d9f3000a55747f177a7521bb666a871741ed9cdd245606d957873d5de77700f573854cf341ae3c613e00
 EBUILD siege-3.1.4.ebuild 1189 BLAKE2B a72e0f000ae78e38e026666e23c7839e57109f8cfeaba90e476bbd34f880da9debd5f904c4e2a9482bb983573af72682fa7ba572a57575155771a8362bc7c640 SHA512 9a4d62ea2072f180eb99195c319f0b1546b31e4a50918db0bbaec8fa9cb9424afc8e18c03d258c7e37d4945046bba18890d68aa931c1d99db6f64195eb1e8c25
-EBUILD siege-4.0.4.ebuild 1126 BLAKE2B 4348e02e13c3534cf0d778e14d8036068d6ec9c333f32462e6608ae89b0efd391775c07581cf156cec713f87dd6721065a1752b373a3581422c2499d2f2a8d3e SHA512 981a9d505a2dddd5eee4f74273d38b9e3dad1dbd38747bf8c2ee99ee38f3d0b0d86eebb7f43cc91f905e72e158e9955b1cd270dffddde8263f540cd9f8f14c98
+EBUILD siege-4.0.4.ebuild 1125 BLAKE2B 743fc12b845f59798a070bc55430aa585841d3290509b9f0ce501504f0927d1b832e38e7be233cdfdcb6dcbbda13d607696a47b97385cb576544c9bb53e3df55 SHA512 16341cb0a02868a8f7472d5792b78581f2410308d62558c92f623987b57adf328eacdc2f8e4fea6da2d8d8097197ee7dc1b1a4a70c1983976c01a2fdc5a48fcd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/siege/siege-3.0.6.ebuild b/app-benchmarks/siege/siege-3.0.6.ebuild
deleted file mode 100644
index 1002d516d110..000000000000
--- a/app-benchmarks/siege/siege-3.0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#WANT_AUTOMAKE=1.9
-
-inherit eutils bash-completion-r1 libtool autotools
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
-SRC_URI="http://www.joedog.org/pub/siege/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ~mips ppc x86 ~x64-macos"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-src_prepare() {
-	# bundled macros break recent libtool
-	sed -i -e 's/AC_PROG_SHELL//' configure.ac || die
-	rm *.m4 || die "failed to remove bundled macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl"
-	econf ${myconf}
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog INSTALL MACHINES README* KNOWNBUGS \
-		doc/siegerc doc/urls.txt
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "An example ~/.siegerc file has been installed in"
-	elog "${EPREFIX}/usr/share/doc/${PF}/"
-}
diff --git a/app-benchmarks/siege/siege-3.1.3.ebuild b/app-benchmarks/siege/siege-3.1.3.ebuild
deleted file mode 100644
index b08e5a9b4f55..000000000000
--- a/app-benchmarks/siege/siege-3.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#WANT_AUTOMAKE=1.9
-
-inherit eutils bash-completion-r1 libtool autotools
-
-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 ~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() {
-	# bundled macros break recent libtool
-	sed -i -e 's/AC_PROG_SHELL//' configure.ac || die
-	rm *.m4 || die "failed to remove bundled macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl"
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog INSTALL README* KNOWNBUGS \
-		doc/siegerc doc/urls.txt
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "An example ~/.siegerc file has been installed in"
-	elog "${EPREFIX}/usr/share/doc/${PF}/"
-}
diff --git a/app-benchmarks/siege/siege-4.0.4.ebuild b/app-benchmarks/siege/siege-4.0.4.ebuild
index 364acb95e137..20d20168d47f 100644
--- a/app-benchmarks/siege/siege-4.0.4.ebuild
+++ b/app-benchmarks/siege/siege-4.0.4.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc x86 ~x64-macos"
 SLOT="0"
 IUSE="libressl ssl"