commit: 5943c110287a4ce78de8e7a58448c6d4f2f0e64c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 01:28:36 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 01:28:36 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5943c110
www-servers/pshs: add libressl support
Package-Manager: portage-2.2.20.1
.../pshs/{pshs-9999.ebuild => pshs-0.3-r1.ebuild} | 21 +++++----------------
www-servers/pshs/pshs-9999.ebuild | 8 +++++---
2 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/www-servers/pshs/pshs-9999.ebuild
b/www-servers/pshs/pshs-0.3-r1.ebuild
similarity index 75%
copy from www-servers/pshs/pshs-9999.ebuild
copy to www-servers/pshs/pshs-0.3-r1.ebuild
index 6d71ea0..d07609f 100644
--- a/www-servers/pshs/pshs-9999.ebuild
+++ b/www-servers/pshs/pshs-0.3-r1.ebuild
@@ -1,15 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-#if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-
-inherit autotools git-r3
-#endif
-
DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
HOMEPAGE="https://bitbucket.org/mgorny/pshs/"
SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
@@ -17,26 +11,21 @@
SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+magic +netlink qrcode ssl upnp"
+IUSE="libressl +magic +netlink qrcode ssl upnp"
RDEPEND=">=dev-libs/libevent-2:0=
magic? ( sys-apps/file:0= )
qrcode? ( media-gfx/qrencode:0= )
ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
- dev-libs/openssl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
upnp? ( net-libs/miniupnpc:0= )"
DEPEND="${RDEPEND}
netlink? ( sys-apps/iproute2
>=sys-kernel/linux-headers-2.6.27 )"
# libnetlink is static only ATM
-#if LIVE
-KEYWORDS=
-SRC_URI=
-
-src_prepare() { eautoreconf; }
-#endif
-
src_configure() {
local myconf=(
$(use_enable magic libmagic)
diff --git a/www-servers/pshs/pshs-9999.ebuild
b/www-servers/pshs/pshs-9999.ebuild
index 6d71ea0..8e23ff2 100644
--- a/www-servers/pshs/pshs-9999.ebuild
+++ b/www-servers/pshs/pshs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,13 +17,15 @@
SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+magic +netlink qrcode ssl upnp"
+IUSE="libressl +magic +netlink qrcode ssl upnp"
RDEPEND=">=dev-libs/libevent-2:0=
magic? ( sys-apps/file:0= )
qrcode? ( media-gfx/qrencode:0= )
ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
- dev-libs/openssl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
upnp? ( net-libs/miniupnpc:0= )"
DEPEND="${RDEPEND}
netlink? ( sys-apps/iproute2