commit: 6f7954fe90f7e1ed85533a614b89726fad18fd68 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Fri Jun 3 08:35:03 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri Jun 3 08:35:03 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f7954fe
app-benchmarks/siege: add libressl support Package-Manager: portage-2.2.28 app-benchmarks/siege/Manifest | 1 - app-benchmarks/siege/siege-3.1.0.ebuild | 50 --------------------------------- app-benchmarks/siege/siege-3.1.3.ebuild | 9 ++++-- app-benchmarks/siege/siege-3.1.4.ebuild | 9 ++++-- 4 files changed, 12 insertions(+), 57 deletions(-) diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest index 3bac6da..5408862 100644 --- a/app-benchmarks/siege/Manifest +++ b/app-benchmarks/siege/Manifest @@ -1,4 +1,3 @@ DIST siege-3.0.6.tar.gz 496002 SHA256 78b79964e3d6772e532c6008a084700f830a02a00ca80b44f3e71380b4908c5b SHA512 621f3f60f2aac70fb051f48819f5673d60f31fc4fc69e4c65d4ae0a285d02112686f1e9b40241d48afc378446a2b296a7dc4bbc6d8ae38e390d380506f4d448b WHIRLPOOL 0c94eb828681b2ab67cab13bbaf802f25804e976f4f1eac6cb3cb45160ee6dd2f73d726c39f9ab6be6e4243ac4c6c79d76f406eba72d3fe4a929fb24838b1de0 -DIST siege-3.1.0.tar.gz 502444 SHA256 f6a104cb2a3ac6c0efb2699649e8c4f8da2b548147bbbb7af2483089e4940e7f SHA512 b5c0ed75795096dd6c78856747acd1cb778f54ece4ee7b735e676edc898677dd0d23fa544ae249fa6ed9e7780a118936372c271ff24b73f2a54402a94cc0a67a WHIRLPOOL 9a79b0a58fc54c7005406319494acc14fa80c2b98c7c519a39fea92dcded3d330351fa2da7830ff8d52de91744a8646d62b89f8330cf184e7539c86f60065aa0 DIST siege-3.1.3.tar.gz 527862 SHA256 4d3932ea23cbf6d1d22df7c7ee6e7a6bc9f591b604ab582393eeb62f393f5a33 SHA512 880b6d8bbe6b8210147ebb26fd724f4c242076740284977471165fbca514b56c49812ace42dcbe23c57be8fd10a2503b129deec10b79991451a9ae83f30a742b WHIRLPOOL 48e9bb9cd6c66005d17fc8bde1de62d18148114aca48700f26fd3b4710d6dd912dd2e022bbacb3b9adc636fb7003c2a6f561340794aef8142f33fcfe29baa8d9 DIST siege-3.1.4.tar.gz 530149 SHA256 0436970ca81ade76eb419bc42d3f8460b475079eb5d8f199d2fa83328893099d SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068 WHIRLPOOL 2081e4661a1272d99f16ff350d241c4ba26a6cec7ba34a0968d8db94e2195e0d3f9b1b5b47b5c0575b6b9af0d02d386b020dbcc46ebccdff47bed8e9cd5bd8eb diff --git a/app-benchmarks/siege/siege-3.1.0.ebuild b/app-benchmarks/siege/siege-3.1.0.ebuild deleted file mode 100644 index f3cdef5..0000000 --- a/app-benchmarks/siege/siege-3.1.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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="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() { - emake 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 index f8d6138..7cf9aaa 100644 --- a/app-benchmarks/siege/siege-3.1.3.ebuild +++ b/app-benchmarks/siege/siege-3.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,9 +15,12 @@ SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"; LICENSE="GPL-2" KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x64-macos" SLOT="0" -IUSE="ssl" +IUSE="libressl ssl" -RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6d:= )" +RDEPEND="ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" DEPEND="${RDEPEND} sys-devel/libtool" diff --git a/app-benchmarks/siege/siege-3.1.4.ebuild b/app-benchmarks/siege/siege-3.1.4.ebuild index f8d6138..7cf9aaa 100644 --- a/app-benchmarks/siege/siege-3.1.4.ebuild +++ b/app-benchmarks/siege/siege-3.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,9 +15,12 @@ SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"; LICENSE="GPL-2" KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x64-macos" SLOT="0" -IUSE="ssl" +IUSE="libressl ssl" -RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6d:= )" +RDEPEND="ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" DEPEND="${RDEPEND} sys-devel/libtool"
