gentoo resync : 16.06.2018

5 files changed, 10 insertions, 111 deletions

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 9e6bb7617b91..431bd17fc3c0 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -5,8 +5,7 @@ AUX libssh-0.7.5-fix-config-parsing.patch 1076 BLAKE2B f710d58d36ec529c9390647b1
 AUX libssh-0.7.5-fix-internal-algo-selection.patch 4711 BLAKE2B 04d61ee7ab3eba651342ac2b3dba52ef191271de37e741b2cb82da11c2f9cfb19d64a6befe9ebbab8d8525bd75c9213dee56c32023340db92e046827835df7ae SHA512 29bf9b43c8ee2f65c65040163fc9f250f35d5ca77ace5db2782eb8478dc14d9d16c0cf0e991025443a701d3d60124f83134a35e7cde6fae20932e3d2ff4b6732
 DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
 DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
-EBUILD libssh-0.7.4.ebuild 2478 BLAKE2B 86cdd0d7445a37fbff25a82b79cd910645525a668e534abcf96a6e4ca9846d5d20fbe8c4891bd4878f0bfb315a283b3a970565963c59fe6a51d5d56d9382994a SHA512 1c7b902fd9dbd2e4826be08c9d326dd3bf858e8ebedfe489ddcef917c888f225742967b93cdf8d647bb42ff4e5938b463e3e7526afd76986b7561399ffb10079
-EBUILD libssh-0.7.5-r1.ebuild 2584 BLAKE2B 21ee1d5dcb7013d613bc1573ee2a0fd0f56e762cb85e382cfae0e8571fb6bd83d2b9c474245855e70db063644d6e0cf26d33cb32dac543d9ed877f8564208166 SHA512 5d6f02c98c35d7477a230fd9e1612c53deb410bc095e874df73ae2b58f67698cb1e22d8a321c56b3ab55be2fb0a6d993f52e073f27b4aa35dae3f2429d9d5b15
-EBUILD libssh-0.7.5-r2.ebuild 2688 BLAKE2B 24ee9e7b170e2f071bc6c73690ca837c3329be3285865ef11b6c7d080017c8e78df929e048b6cbf83258f945db036278a61c671cf6e062bc7c9b2f9ba24a8540 SHA512 2cd5aaca158fc73d945e6a992d6526097d2e7b6bb8880266d14459ab2bfa681283a1db38b1926252561cbe79842061177c51ab01cf81de7b772a9682ff90a18a
-EBUILD libssh-9999.ebuild 2128 BLAKE2B 394967b5e90dbeddbfa8f2fc9fcf17afc0f2c282bf25c5efc8a0e3786573dd9750bcdc63732610bc87e9b779c29014753acc95d239d6b9c3b67a412f908d09a9 SHA512 49e17db7bce80cc8b70ac3ba51f874007e0f09b8407a7e2af3cde79c5d2ec713aed317d258b4cefb7b753b790219c882931cc06154187683dacc83e2a5ab7cb5
+EBUILD libssh-0.7.4.ebuild 2481 BLAKE2B da53e49934deb1984710a1a10f5955fa25b4b0c953566d287ff11e7a90f1991f4f5d58784cb78dc620fc522b0713be1ded8545898909a19bf18cae79e5f6e569 SHA512 e89b9b43fcef2b218cf099dbdee607fbddec3d25ffb11371029b98492ed151dc84d4f0c53050f10b48330c29066c898c83f233858edb2b19fdfa95acc1f6a369
+EBUILD libssh-0.7.5-r2.ebuild 2691 BLAKE2B bd987e06bd7418f27ddd0bec9917df13958547bde473965ac53928d68802e311c6e26a023c0de0a81c01e8861b9c8acf5553a508538e2ab09da6df826ffd644a SHA512 4c64f74e75efe58acfcb5bd75de8341428c50a837441416719fae63dee449405aeb8df2d4bbd83725aba8df35e1b63715501049f730397a55200fcbc0d83c2ee
+EBUILD libssh-9999.ebuild 2131 BLAKE2B 86c8166af0d50df56a128723a3069e8e0e87f49c0209f967a3b5d926927cdb8c9bfa00bceeb16f8d6166f348c3bc0d79b74bbaaf54eeda6f8a3e44200c5ea945 SHA512 f222add792f72ba6e09e1bac8f82d1fda31623a5c47b9a6a65926a63381c5dc7ecd6d80fb91efe4fb102ae492fccc856b99d71ad681fe48fe9bf064ac6d63bb5
 MISC metadata.xml 648 BLAKE2B bd4e4be029fdb3ef1e5ce2e16b6f5b922bf43c32ff4ecd50a67db98f9f7669022caf96d965fc85065b5ea8ac65b5547bc3d62d1da6bebdbc5a9a877be5a23c18 SHA512 4e99644645a43ccf7c479c6808ecb2dfe9f9aba69518ab1e2a1289732b926d853ff5554c69fff71e4bb572d12af298ebe19ecb1086da2e8675153b5c42faf589
diff --git a/net-libs/libssh/libssh-0.7.4.ebuild b/net-libs/libssh/libssh-0.7.4.ebuild
index a11813cc768b..3b45d1fa582c 100644
--- a/net-libs/libssh/libssh-0.7.4.ebuild
+++ b/net-libs/libssh/libssh-0.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,8 +19,8 @@ IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-li
 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}] )
+		!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}] )
diff --git a/net-libs/libssh/libssh-0.7.5-r1.ebuild b/net-libs/libssh/libssh-0.7.5-r1.ebuild
deleted file mode 100644
index f6f7e67c1413..000000000000
--- a/net-libs/libssh/libssh-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/"
-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-fbsd ~amd64-linux ~x86-linux"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 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}] )
-	)
-	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}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-tests.patch
-	"${FILESDIR}"/${P}-fix-config-parsing.patch
-	"${FILESDIR}"/${P}-fix-config-buffer-underflow.patch
-)
-
-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 -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-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)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi && use doc ; then
-		docinto html
-		dodoc -r doc/html/.
-	fi
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.7.5-r2.ebuild b/net-libs/libssh/libssh-0.7.5-r2.ebuild
index f35df2773082..ea3291593f7f 100644
--- a/net-libs/libssh/libssh-0.7.5-r2.ebuild
+++ b/net-libs/libssh/libssh-0.7.5-r2.ebuild
@@ -18,8 +18,8 @@ IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-li
 
 RDEPEND="
 	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		!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}] )
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 2e283ca1245c..7c520c85c87c 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -17,8 +17,8 @@ IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-li
 
 RDEPEND="
 	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		!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}] )