From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AB58913825A for ; Fri, 13 May 2016 21:47:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5B0521C09B; Fri, 13 May 2016 21:46:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7159121C097 for ; Fri, 13 May 2016 21:46:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E0DC3403C1 for ; Fri, 13 May 2016 21:46:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59A9A967 for ; Fri, 13 May 2016 21:46:24 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1463175966.b98c423ff1a1db16491be784451ae56827e19324.mrueg@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openvpn/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openvpn/openvpn-9999.ebuild X-VCS-Directories: net-misc/openvpn/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: b98c423ff1a1db16491be784451ae56827e19324 X-VCS-Branch: master Date: Fri, 13 May 2016 21:46:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 216da269-02b1-4921-a43a-dbc32b58fb01 X-Archives-Hash: f5e4bd60128db83cdbe696c751a4f71f commit: b98c423ff1a1db16491be784451ae56827e19324 Author: Manuel Rüger gentoo org> AuthorDate: Fri May 13 21:45:55 2016 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Fri May 13 21:46:06 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98c423f net-misc/openvpn: Sync live ebuild Package-Manager: portage-2.2.28 net-misc/openvpn/openvpn-9999.ebuild | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-misc/openvpn/openvpn-9999.ebuild index bcfcb96..bbaf8aa 100644 --- a/net-misc/openvpn/openvpn-9999.ebuild +++ b/net-misc/openvpn/openvpn-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 -inherit multilib autotools flag-o-matic user git-2 +inherit multilib autotools flag-o-matic user linux-info git-2 DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes" EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git" @@ -13,10 +13,11 @@ HOMEPAGE="http://openvpn.net/" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD" +IUSE="examples down-root iproute2 libressl +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD" REQUIRED_USE="static? ( !plugins !pkcs11 ) - polarssl? ( ssl ) + polarssl? ( ssl !libressl ) + pkcs11? ( ssl ) !plugins? ( !pam !down-root )" DEPEND=" @@ -25,7 +26,11 @@ DEPEND=" ) pam? ( virtual/pam ) ssl? ( - !polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 ) + !polarssl? ( + !libressl? ( >=dev-libs/openssl-0.9.7:* ) + libressl? ( dev-libs/libressl ) + ) + polarssl? ( >=net-libs/polarssl-1.3.8 ) ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) @@ -34,6 +39,12 @@ RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-openvpn ) " +CONFIG_CHECK="~TUN" + +pkg_setup() { + linux-info_pkg_setup +} + src_prepare() { eautoreconf }