public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/pshs/
Date: Mon, 12 Oct 2015 01:23:04 +0000 (UTC)	[thread overview]
Message-ID: <1444613316.5943c110287a4ce78de8e7a58448c6d4f2f0e64c.blueness@gentoo> (raw)

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


             reply	other threads:[~2015-10-12  1:23 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-12  1:23 Anthony G. Basile [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-29 16:58 [gentoo-commits] repo/gentoo:master commit in: www-servers/pshs/ Michał Górny
2024-06-29  8:25 Sam James
2024-06-29  8:25 Sam James
2024-06-11 18:04 Michał Górny
2024-06-11 18:04 Michał Górny
2024-06-11 18:04 Michał Górny
2023-07-25 21:00 Conrad Kostecki
2023-05-26 11:23 Michał Górny
2023-05-26  3:39 Michał Górny
2021-05-02 20:26 Mikle Kolyada
2020-11-18  9:12 Michał Górny
2020-11-17 19:17 Agostino Sarubbo
2020-11-16 22:51 Sam James
2020-09-26 11:37 Michał Górny
2020-09-26 11:37 Michał Górny
2020-09-26 10:55 Michał Górny
2020-09-26 10:55 Michał Górny
2020-09-24  6:59 Agostino Sarubbo
2020-09-23 10:58 Agostino Sarubbo
2020-09-18  9:38 Michał Górny
2020-07-11 20:15 Michał Górny
2018-03-26 16:14 Michał Górny
2018-02-27 16:19 Michał Górny
2017-05-21 19:20 Michał Górny
2017-05-21 19:20 Michał Górny
2016-07-10  7:49 Michał Górny
2016-07-10  7:49 Michał Górny
2016-07-10  7:49 Michał Górny
2016-07-10  7:49 Michał Górny
2015-10-02  8:43 Michał Górny
2015-08-12 20:36 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444613316.5943c110287a4ce78de8e7a58448c6d4f2f0e64c.blueness@gentoo \
    --to=blueness@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox