commit: 0e5abdb838cacb1d804dce26fb8639c6bd55b0f9 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Tue Nov 10 06:26:07 2015 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Tue Nov 10 06:32:02 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5abdb8
net-misc/socat: Add USE=libressl (bug #565244 by Marek Behun). Package-Manager: portage-2.2.24 ...socat-2.0.0_beta8.ebuild => socat-1.7.3.0-r1.ebuild} | 17 +++++++++-------- net-misc/socat/socat-2.0.0_beta8.ebuild | 9 ++++++--- net-misc/socat/socat-9999.ebuild | 9 ++++++--- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/net-misc/socat/socat-2.0.0_beta8.ebuild b/net-misc/socat/socat-1.7.3.0-r1.ebuild similarity index 69% copy from net-misc/socat/socat-2.0.0_beta8.ebuild copy to net-misc/socat/socat-1.7.3.0-r1.ebuild index eb67355..6c441a2 100644 --- a/net-misc/socat/socat-2.0.0_beta8.ebuild +++ b/net-misc/socat/socat-1.7.3.0-r1.ebuild @@ -3,7 +3,6 @@ # $Id$ EAPI=5 - inherit eutils flag-o-matic toolchain-funcs DESCRIPTION="Multipurpose relay (SOcket CAT)" @@ -14,12 +13,15 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="ssl readline ipv6 tcpd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="libressl ssl readline ipv6 tcpd" DEPEND=" - ssl? ( >=dev-libs/openssl-0.9.6 ) - readline? ( >=sys-libs/readline-4.1 ) + ssl? ( + !libressl? ( dev-libs/openssl:* ) + libressl? ( dev-libs/libressl ) + ) + readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) " RDEPEND="${DEPEND}" @@ -31,12 +33,11 @@ DOCS=( ) src_prepare() { - epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch - touch doc/${PN}.1 || die + epatch "${FILESDIR}"/${P}-filan-build.patch } src_configure() { - filter-flags -Wall '-Wno-error*' #293324 + filter-flags '-Wno-error*' #293324 tc-export AR econf \ $(use_enable ssl openssl) \ diff --git a/net-misc/socat/socat-2.0.0_beta8.ebuild b/net-misc/socat/socat-2.0.0_beta8.ebuild index eb67355..783b5eb 100644 --- a/net-misc/socat/socat-2.0.0_beta8.ebuild +++ b/net-misc/socat/socat-2.0.0_beta8.ebuild @@ -15,11 +15,14 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"; LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="ssl readline ipv6 tcpd" +IUSE="libressl ssl readline ipv6 tcpd" DEPEND=" - ssl? ( >=dev-libs/openssl-0.9.6 ) - readline? ( >=sys-libs/readline-4.1 ) + ssl? ( + !libressl? ( dev-libs/openssl:* ) + libressl? ( dev-libs/libressl:= ) + ) + readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) " RDEPEND="${DEPEND}" diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild index e931a19..999d4ac 100644 --- a/net-misc/socat/socat-9999.ebuild +++ b/net-misc/socat/socat-9999.ebuild @@ -14,11 +14,14 @@ EGIT_REPO_URI="git://repo.or.cz/${PN}.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="ssl readline ipv6 tcpd" +IUSE="libressl ssl readline ipv6 tcpd" RDEPEND=" - ssl? ( >=dev-libs/openssl-0.9.6 ) - readline? ( >=sys-libs/readline-4.1 ) + ssl? ( + !libressl? ( dev-libs/openssl:* ) + libressl? ( dev-libs/libressl ) + ) + readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) " DEPEND="
