From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE1471396D0 for ; Tue, 15 Aug 2017 13:41:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F5771FC002; Tue, 15 Aug 2017 13:41:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0D751FC002 for ; Tue, 15 Aug 2017 13:41:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABD903417E1 for ; Tue, 15 Aug 2017 13:41:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 669447842 for ; Tue, 15 Aug 2017 13:41:40 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1502804355.e3e81354aebe234f21608cf498b40df7f05ff8dd.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh/libssh-0.7.5-r1.ebuild X-VCS-Directories: net-libs/libssh/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e3e81354aebe234f21608cf498b40df7f05ff8dd X-VCS-Branch: master Date: Tue, 15 Aug 2017 13:41:40 +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: 292d8ab8-ee78-481f-9d1b-920c53c19aec X-Archives-Hash: 3ddc96a9b908c48c796c4faf4dff077a commit: e3e81354aebe234f21608cf498b40df7f05ff8dd Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 15 13:39:15 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 15 13:39:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3e81354 net-libs/libssh: Sort IUSE, drop unused eclass, patches before sed Package-Manager: Portage-2.3.7, Repoman-2.3.3 net-libs/libssh/libssh-0.7.5-r1.ebuild | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/net-libs/libssh/libssh-0.7.5-r1.ebuild b/net-libs/libssh/libssh-0.7.5-r1.ebuild index 082de3cdefc..6cf8db76a11 100644 --- a/net-libs/libssh/libssh-0.7.5-r1.ebuild +++ b/net-libs/libssh/libssh-0.7.5-r1.ebuild @@ -4,29 +4,28 @@ EAPI=6 MY_P="${PN}-${PV/_rc/rc}" -inherit eutils cmake-multilib multilib +inherit cmake-multilib DESCRIPTION="Access a working SSH implementation by means of a library" -HOMEPAGE="http://www.libssh.org/" +HOMEPAGE="https://www.libssh.org/" SRC_URI="https://red.libssh.org/attachments/download/218/${MY_P}.tar.xz -> ${P}.tar.xz" LICENSE="LGPL-2.1" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" SLOT="0/4" # subslot = soname major version -IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib" +IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake RDEPEND=" - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) !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}] ) gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) " @@ -42,17 +41,17 @@ PATCHES=( ) src_prepare() { + cmake-utils_src_prepare + # just install the examples do not compile them sed -i \ -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \ CMakeLists.txt || die # keyfile torture test is currently broken - sed \ + sed -i \ -e '/torture_keyfiles/d' \ - -i tests/unittests/CMakeLists.txt || die - - cmake-utils_src_prepare + tests/unittests/CMakeLists.txt || die } multilib_src_configure() {