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 177EA1384AE for ; Sun, 20 Sep 2015 16:40:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E382121C008; Sun, 20 Sep 2015 16:39:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2C1121C028 for ; Sun, 20 Sep 2015 16:39:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E325340861 for ; Sun, 20 Sep 2015 16:39:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77DDD209 for ; Sun, 20 Sep 2015 16:39:47 +0000 (UTC) From: "Julian Ospald" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julian Ospald" Message-ID: <1442767081.334a5ba9db9c620e265d3c4848a2e8afa4a3b3d2.hasufell@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh2/libssh2-1.6.0-r1.ebuild net-libs/libssh2/libssh2-9999.ebuild X-VCS-Directories: net-libs/libssh2/ X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald X-VCS-Revision: 334a5ba9db9c620e265d3c4848a2e8afa4a3b3d2 X-VCS-Branch: master Date: Sun, 20 Sep 2015 16:39:47 +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: 4768d066-3b12-432b-b183-c39e8cc77aae X-Archives-Hash: 56752c01d11b518378a49e9b22cefdee commit: 334a5ba9db9c620e265d3c4848a2e8afa4a3b3d2 Author: Julian Ospald gentoo org> AuthorDate: Sun Sep 20 14:51:22 2015 +0000 Commit: Julian Ospald gentoo org> CommitDate: Sun Sep 20 16:38:01 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=334a5ba9 net-libs/libssh2: add libressl support .../{libssh2-9999.ebuild => libssh2-1.6.0-r1.ebuild} | 16 +++++++++------- net-libs/libssh2/libssh2-9999.ebuild | 8 ++++++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-1.6.0-r1.ebuild similarity index 65% copy from net-libs/libssh2/libssh2-9999.ebuild copy to net-libs/libssh2/libssh2-1.6.0-r1.ebuild index a41ca40..631d0ba 100644 --- a/net-libs/libssh2/libssh2-9999.ebuild +++ b/net-libs/libssh2/libssh2-1.6.0-r1.ebuild @@ -5,19 +5,22 @@ EAPI=5 AUTOTOOLS_AUTORECONF=true -EGIT_REPO_URI="https://github.com/libssh2/libssh2" -inherit autotools-multilib git-r3 +inherit autotools-multilib DESCRIPTION="Library implementing the SSH2 protocol" HOMEPAGE="http://www.libssh2.org/" -SRC_URI="" +SRC_URI="http://www.${PN}.org/download/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="" -IUSE="gcrypt static-libs test zlib" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +IUSE="gcrypt libressl static-libs test zlib" -DEPEND="!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) +DEPEND=" + !gcrypt? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" @@ -28,7 +31,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.4.2-pkgconfig.patch ) src_prepare() { sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die - ln -s ../src/libssh2_config.h.in example/libssh2_config.h.in || die autotools-multilib_src_prepare } diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild index a41ca40..8d3718b 100644 --- a/net-libs/libssh2/libssh2-9999.ebuild +++ b/net-libs/libssh2/libssh2-9999.ebuild @@ -15,9 +15,13 @@ SRC_URI="" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="gcrypt static-libs test zlib" +IUSE="gcrypt libressl static-libs test zlib" -DEPEND="!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) +DEPEND=" + !gcrypt? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}"