gentoo resync : 30.06.2019

3 files changed, 127 insertions, 16 deletions

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index c75b9d01a4cb..159f8303c513 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -2,7 +2,9 @@ AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a28
 AUX libssh-0.8.3-strict-overflow.patch 627 BLAKE2B 81d29d56f91bb5c649f8f2e3706034de59834b859725bddd9243a934335fc20d13dbc2fcb0e8627ba23856072958e1bf06224403ed24a871a38a909af09d38d8 SHA512 06529a3a6145ac4123f48b307b45376441b09c368a6cc89d514180e6a0e7fb5be46c3a1ed118bb2f8aec61a389fadbb7c8b2649d35dfa03bbdfc01befad56fc6
 DIST libssh-0.8.6.tar.xz 433680 BLAKE2B f222e67676a90a2d2431463dc71859ad336a23a519b54e08fe368efe6322d0b9c8e393ec92d5246cb4721cd57bb955856fa6a2d92ffe71b6c35e2c94cde28762 SHA512 e91d1f4c1343aa232ade0fe4b5e9a92ca65e3716f4ebe2ec25b04def4fae5a3774349f05a6919836551f66fb0288ed6a3e19e0ab786c081616218be973356522
 DIST libssh-0.8.7.tar.xz 430104 BLAKE2B 8ad9455d81120726434a418abb74bfee53279040541cda50117909d43088ea992b9dbc7164b079dbe970b4348b967ed0d3f6352df98f60d1e6d9f14a086b5a40 SHA512 13c3dccad81d521edf29c8a5e2c5f7fdd90507a0eda652b2b040a0a17bab88860873e089a46e181907ea3f449ca1847b1c84453b1960f456e391eefe5be983c5
+DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
 EBUILD libssh-0.8.6.ebuild 2937 BLAKE2B df427590602299e1c2fb18583c83d554f083db3ad474307002474793313a0aedf5d2108ad8116934fc4ebcc748391d16d6fab87f42b42aa56ca659031111ec26 SHA512 a7fe530b3714b126fab464b0acff0cb4321ea9c2594f8862eb184b6378a5febcf93042a6a18e329e3f5d39891ef335f2f9aac783ab4485ca6d9c18359a7a5f71
 EBUILD libssh-0.8.7.ebuild 3091 BLAKE2B ebd0ec869401d1dccab35911777e785afa7700969bd2ac0ca4f9e8e53685b36f0f4af952e1544a77fadd3708f5a5e7f4811a68ca35a87168bf7b0920dfe938c9 SHA512 930688de59ddbef12c114005e2e7e5cc39b3b1066463433a68486030d64ecd43382d2483fe0eb93f7378849a111bf37d5a05d8c4e4f4b2b78e7417a206a2994a
-EBUILD libssh-9999.ebuild 3090 BLAKE2B ec389c91318025f582a7639e6abf61082d8ffeb81c91e861100ccd13dc13ff940710379079165f826524ecd761fecd29cd0e09c5a789e473a262a95eba01eace SHA512 2c8a24d0037737ee7125e505ff8e4c0a0a256e42ebd5f6ed0544ff8c171e1622bbdd2ebf07547a07e337fae3a225fbc1037979287f5edb399dba0a58fd88782f
+EBUILD libssh-0.9.0.ebuild 3130 BLAKE2B 1d2083b1ba792c5e2e4309a2d9538f2c338a2e861d6fc35c57fe17ef6e1cd05295b4a2cf14e07efdc47f6425575fe2844c150bb9dabfa6a4a17178ea8103b343 SHA512 6f41f5577cfbe3937cc8e155f2b8ab623d648a6a3b1c45839d955208c67cb74fb8102c10feb801f803c715b8f0c1fca77e4a5e63e1f9de1b12ab525724c7ec6a
+EBUILD libssh-9999.ebuild 3130 BLAKE2B 1d2083b1ba792c5e2e4309a2d9538f2c338a2e861d6fc35c57fe17ef6e1cd05295b4a2cf14e07efdc47f6425575fe2844c150bb9dabfa6a4a17178ea8103b343 SHA512 6f41f5577cfbe3937cc8e155f2b8ab623d648a6a3b1c45839d955208c67cb74fb8102c10feb801f803c715b8f0c1fca77e4a5e63e1f9de1b12ab525724c7ec6a
 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
new file mode 100644
index 000000000000..19777b48ff39
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -0,0 +1,112 @@
+# 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-fbsd ~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 )"
+
+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}
+	doc? ( app-doc/doxygen[dot] )
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+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)"
+		-DWITH_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
+}
+
+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
+	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-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index d88693448ce5..19777b48ff39 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-MY_P="${PN}-${PV/_rc/rc}"
 inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
@@ -13,7 +12,7 @@ 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)/${MY_P}.tar.xz"
+	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
 
@@ -43,8 +42,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS README ChangeLog )
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
 src_prepare() {
@@ -54,34 +51,34 @@ src_prepare() {
 	cmake_comment_add_subdirectory examples
 
 	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
+	sed -e "/torture_keyfiles/d" \
+		-i tests/unittests/CMakeLists.txt || die
 
 	# disable tests that take too long (bug #677006)
 	if use sparc; then
-		sed -i \
-			-e '/torture_threads_pki_rsa/d' \
-			-e '/torture_pki_dsa/d' \
-			tests/unittests/CMakeLists.txt || die
+		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=(
-		-DUNIT_TESTING="$(usex test)"
+		-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_NACL=no
 		-DWITH_PCAP="$(usex pcap)"
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
+		-DUNIT_TESTING="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"
 	)