summaryrefslogtreecommitdiff
path: root/net-libs/libssh
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
commit21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
treee1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-libs/libssh
parent7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
gentoo resync : 15.01.2020
Diffstat (limited to 'net-libs/libssh')
-rw-r--r--net-libs/libssh/Manifest8
-rw-r--r--net-libs/libssh/libssh-0.9.0.ebuild11
-rw-r--r--net-libs/libssh/libssh-0.9.2.ebuild116
-rw-r--r--net-libs/libssh/libssh-0.9.3.ebuild19
-rw-r--r--net-libs/libssh/libssh-9999.ebuild17
5 files changed, 30 insertions, 141 deletions
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index f6922e46fc47..7c42a74e06e2 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,10 +1,8 @@
AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
AUX libssh-0.9.0-libressl.patch 923 BLAKE2B 997f909b6576e52a9104cf9dd821a42e7a00fb0c934b35d9f6775080db84e3d6a52ccb973c07d94b37f0182caeb8e0ca47330d042ec286692a59014b731fc006 SHA512 d7fdfb19bbf552de9d17bdd09ee28e8f4dcfb1bc94415249fafca52ea0dba9075fd36fef063a1e3be2ec165baae35c0c224c4a30799c7b30a9f749e0639ce91b
DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
-DIST libssh-0.9.2.tar.xz 495876 BLAKE2B 82bdf6edcd99b49717c0f0d01c308422e0c7838828efd4958bb62516dd504069df09f007ab38fcac6fe501eb8270728691944f868cc285a63ddbc2adf6f2cb79 SHA512 93b689cd7f3bd32716d7821219e25f91214f71be3867c622ae0ae73cdb2d20af2daa9c3c8180b71434915154f2bc374df7193b3a67a9b9e8bf06e955419285d0
DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2 SHA512 6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3bbbbc69b679b6775edc21dec158d241b076c6f
-EBUILD libssh-0.9.0.ebuild 3204 BLAKE2B 763653c92388856812aaca0156eaad868834bd82be1415374fbfd02a83044e870f4ef9a8f9a15301433216af2ee9e1ee583e0342047b0257a89e213933017851 SHA512 f66ab27de1c903236736119d536280d41e0ba39dbcac3a2e81a53f791cd9ecd38fb62e1a98a2408f85ded21222b2416ce07931046cfacb8866173a1542705f28
-EBUILD libssh-0.9.2.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee
-EBUILD libssh-0.9.3.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee
-EBUILD libssh-9999.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee
+EBUILD libssh-0.9.0.ebuild 3193 BLAKE2B 4ea062ff425b559bba985433021519040d72616e9931fcd648bb8b9525d772f3ed1c1b3e26433c00d50b95e5ef6bcc49cbcdab362ebf5045d5664399728b4ce4 SHA512 e0f16a42922d386b525e9cbfc78712ecf297a030e83d7f9a6e784414d0e4683aca6190bf4271741f2d5b9424a8e7d8870cf38d70c16309cff7f0f7ff7354c7e3
+EBUILD libssh-0.9.3.ebuild 3187 BLAKE2B c0a9582f41c08e46ea83495229ddd7c72bbe206b450f183a1d2d97b09f9bca0bc7e1d30f5f07665a07fb9fa4810e0be9a771c861176b22675003bf4b26232922 SHA512 dbdb6eca437b738d0a2cb68306c568913c2f62c00921eb2de85dda9f70a22c51791f3f4ffc1d64014ffdd0577a6506641ea2358a52d2e94386aeff9c6950c120
+EBUILD libssh-9999.ebuild 3196 BLAKE2B 4234affee1dc97b83d04eb02d7314abb12f7888c3b61a9549397c60e8bde496fe30c9b87ca0ea8f4dd810ef1a11820e452edcd141167759c5c146632d8bd8035 SHA512 80088d91442782770866421e7d7f069dc8e1fff21a24529a38fe5d2c82564c89df89aea84a5b0ef447cc1d58b7f17a1af222929a0f9cb13987637524bc651046
MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild
index b13f672c4840..759da6a2fc09 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
inherit cmake-multilib
DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -49,7 +50,7 @@ PATCHES=(
)
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# just install the examples, do not compile them
cmake_comment_add_subdirectory examples
@@ -88,16 +89,16 @@ multilib_src_configure() {
multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
- cmake-utils_src_configure
+ cmake_src_configure
}
multilib_src_compile() {
- cmake-utils_src_compile
- multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+ cmake_src_compile
+ multilib_is_native_abi && use doc && cmake_src_compile docs
}
multilib_src_install() {
- cmake-utils_src_install
+ cmake_src_install
multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
# compatibility symlink until all consumers have been updated
diff --git a/net-libs/libssh/libssh-0.9.2.ebuild b/net-libs/libssh/libssh-0.9.2.ebuild
deleted file mode 100644
index dc04b6aee9da..000000000000
--- a/net-libs/libssh/libssh-0.9.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
- 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-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-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
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-BDEPEND="
- doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
- !gcrypt? (
- !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}
- test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # just install the examples, do not compile them
- cmake_comment_add_subdirectory examples
-
- # keyfile torture test is currently broken
- sed -e "/torture_keyfiles/d" \
- -i tests/unittests/CMakeLists.txt || die
-
- # disable tests that take too long (bug #677006)
- if use sparc; then
- sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
- -i tests/unittests/CMakeLists.txt || die
- fi
-
- sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
- -i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DWITH_NACL=OFF
- -DWITH_STACK_PROTECTOR=OFF
- -DWITH_STACK_PROTECTOR_STRONG=OFF
- -DWITH_DEBUG_CALLTRACE="$(usex debug)"
- -DWITH_DEBUG_CRYPTO="$(usex debug)"
- -DWITH_GCRYPT="$(usex gcrypt)"
- -DWITH_GSSAPI="$(usex gssapi)"
- -DWITH_MBEDTLS="$(usex mbedtls)"
- -DWITH_PCAP="$(usex pcap)"
- -DWITH_SERVER="$(usex server)"
- -DWITH_SFTP="$(usex sftp)"
- -DBUILD_SHARED_LIBS="$(usex !static-libs)"
- -DUNIT_TESTING="$(usex test)"
- -DWITH_ZLIB="$(usex zlib)"
- )
-
- multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
- cmake-utils_src_install
- multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
- # compatibility symlink until all consumers have been updated
- # to no longer use libssh_threads.so
- dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
- use mbedtls && DOCS+=( README.mbedtls )
- einstalldocs
-
- if use examples; then
- docinto examples
- dodoc examples/*.{c,h,cpp}
- fi
-}
diff --git a/net-libs/libssh/libssh-0.9.3.ebuild b/net-libs/libssh/libssh-0.9.3.ebuild
index dc04b6aee9da..d7405a073d55 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.3.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
inherit cmake-multilib
DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -13,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
else
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-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="LGPL-2.1"
@@ -21,7 +22,7 @@ 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
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
BDEPEND="
doc? ( app-doc/doxygen[dot] )
@@ -49,7 +50,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
RESTRICT+=" !test? ( test )"
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# just install the examples, do not compile them
cmake_comment_add_subdirectory examples
@@ -81,25 +82,27 @@ multilib_src_configure() {
-DWITH_PCAP="$(usex pcap)"
-DWITH_SERVER="$(usex server)"
-DWITH_SFTP="$(usex sftp)"
- -DBUILD_SHARED_LIBS="$(usex !static-libs)"
+ -DBUILD_STATIC_LIB="$(usex static-libs)"
-DUNIT_TESTING="$(usex test)"
-DWITH_ZLIB="$(usex zlib)"
)
multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
- cmake-utils_src_configure
+ cmake_src_configure
}
multilib_src_compile() {
- cmake-utils_src_compile
- multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+ cmake_src_compile
+ multilib_is_native_abi && use doc && cmake_src_compile docs
}
multilib_src_install() {
- cmake-utils_src_install
+ cmake_src_install
multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ use static-libs && dolib.a src/libssh.a
+
# compatibility symlink until all consumers have been updated
# to no longer use libssh_threads.so
dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index dc04b6aee9da..8ddb3caa00db 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
inherit cmake-multilib
DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -21,7 +22,7 @@ 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
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
BDEPEND="
doc? ( app-doc/doxygen[dot] )
@@ -49,7 +50,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
RESTRICT+=" !test? ( test )"
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# just install the examples, do not compile them
cmake_comment_add_subdirectory examples
@@ -81,25 +82,27 @@ multilib_src_configure() {
-DWITH_PCAP="$(usex pcap)"
-DWITH_SERVER="$(usex server)"
-DWITH_SFTP="$(usex sftp)"
- -DBUILD_SHARED_LIBS="$(usex !static-libs)"
+ -DBUILD_STATIC_LIB="$(usex static-libs)"
-DUNIT_TESTING="$(usex test)"
-DWITH_ZLIB="$(usex zlib)"
)
multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
- cmake-utils_src_configure
+ cmake_src_configure
}
multilib_src_compile() {
- cmake-utils_src_compile
- multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+ cmake_src_compile
+ multilib_is_native_abi && use doc && cmake_src_compile docs
}
multilib_src_install() {
- cmake-utils_src_install
+ cmake_src_install
multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ use static-libs && dolib.a src/libssh.a
+
# compatibility symlink until all consumers have been updated
# to no longer use libssh_threads.so
dosym libssh.so /usr/$(get_libdir)/libssh_threads.so