net-libs/libssh: Synced live ebuild.

Package-Manager: Portage-2.3.45, Repoman-2.3.10

diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 7c520c85c87c501a99cb507e1168004408f4d57b..f29e2283d91c595ce6a4039cdaf21340486bb0b4 100644 (file)
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -3,25 +3,36 @@
 
 EAPI=6
 
-inherit cmake-multilib git-r3
+MY_P="${PN}-${PV/_rc/rc}"
+inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
 HOMEPAGE="https://www.libssh.org/"
-EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+
+if [[ "${PV}" == *9999 ]] ; then
+       inherit git-r3
+       EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+else
+       inherit eapi7-ver
+       SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="LGPL-2.1"
-KEYWORDS=""
-SLOT="0"
-IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-libs test zlib"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 RDEPEND="
        !gcrypt? (
-               !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-               libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+               !mbedtls? (
+                       !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}] )
+       mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
        zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
@@ -29,9 +40,15 @@ DEPEND="${RDEPEND}
        test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
 "
 
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+
 DOCS=( AUTHORS README ChangeLog )
 
-EGIT_MIN_CLONE_TYPE=single
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-0.8.0-tests.patch"
+)
 
 src_prepare() {
        cmake-utils_src_prepare
@@ -41,22 +58,26 @@ src_prepare() {
                -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
                CMakeLists.txt || die
 
+       # keyfile torture test is currently broken
+       sed -i \
+               -e '/torture_keyfiles/d' \
+               tests/unittests/CMakeLists.txt || die
 }
 
 multilib_src_configure() {
        local mycmakeargs=(
+               -DUNIT_TESTING="$(usex test)"
                -DWITH_DEBUG_CALLTRACE="$(usex debug)"
                -DWITH_DEBUG_CRYPTO="$(usex debug)"
                -DWITH_GCRYPT="$(usex gcrypt)"
                -DWITH_GSSAPI="$(usex gssapi)"
+               -DWITH_MBEDTLS="$(usex mbedtls)"
                -DWITH_NACL=no
                -DWITH_PCAP="$(usex pcap)"
                -DWITH_SERVER="$(usex server)"
                -DWITH_SFTP="$(usex sftp)"
-               -DWITH_SSH1="$(usex ssh1)"
                -DWITH_STATIC_LIB="$(usex static-libs)"
                -DWITH_STATIC_LIB="$(usex test)"
-               -DWITH_TESTING="$(usex test)"
                -DWITH_ZLIB="$(usex zlib)"
        )