diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
| commit | b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch) | |
| tree | 16fe44748708acacd909d4e2e160a09a7f6d936a /net-libs/libssh | |
| parent | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff) | |
gentoo resync : 18.11.2019
Diffstat (limited to 'net-libs/libssh')
| -rw-r--r-- | net-libs/libssh/Manifest | 6 | ||||
| -rw-r--r-- | net-libs/libssh/libssh-0.9.2.ebuild (renamed from net-libs/libssh/libssh-0.9.1.ebuild) | 8 | ||||
| -rw-r--r-- | net-libs/libssh/libssh-9999.ebuild | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index 21be5d8893e4..22146459db13 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,8 +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.1.tar.xz 1246696 BLAKE2B 3be87c3020930ddfb67b6eb2ded91e805fd17ec5493e443064ec1e7cb23797fc5128c4e39ff9c3067c3026ae370eebbdcc7706bd886a2a644b34b66cb494b6c4 SHA512 7776db347acb2d2d2ef3c19bc8ac61a4b18a4e61c1d7c2814fe44d3b7716e36d5440cdf170fb151af6c2bd9491921911b7f84732d781992c064667ea2ac3cab2 +DIST libssh-0.9.2.tar.xz 495876 BLAKE2B 82bdf6edcd99b49717c0f0d01c308422e0c7838828efd4958bb62516dd504069df09f007ab38fcac6fe501eb8270728691944f868cc285a63ddbc2adf6f2cb79 SHA512 93b689cd7f3bd32716d7821219e25f91214f71be3867c622ae0ae73cdb2d20af2daa9c3c8180b71434915154f2bc374df7193b3a67a9b9e8bf06e955419285d0 EBUILD libssh-0.9.0.ebuild 3177 BLAKE2B 1d91789cacbab261b57ab0c1c07f67a4688b8711d0ce9522ec2692135daa3d5426663e9dddaef065af4ce419512e4d12461eb1861080a7049b31f182e9c2e6fd SHA512 70e1e4a45a841b2f99c4b12cf3f6ad7c5c5ef5cd2780ca8b526029b0d6ae6baa6bbc29036ec356cdb582c7cc9276948f28f42e5379f3c5da911ea6b504f5c61d -EBUILD libssh-0.9.1.ebuild 3144 BLAKE2B c0183a15ff0cde6e171d3a94650de9153df7304706636f58b4722632007b0e8aabead5ff028cdd64dc402afca53d0b2c69c05c9bab9790b84739f5cbf813524d SHA512 53f5935246b021b559684bff22dc6aacfff9186d816f654b9f579797b90c8bb35b6f86cdb81b5cd612306c5411b9fcc1ebe0aae7aae28c5515fc76b95d722e8e -EBUILD libssh-9999.ebuild 3144 BLAKE2B c0183a15ff0cde6e171d3a94650de9153df7304706636f58b4722632007b0e8aabead5ff028cdd64dc402afca53d0b2c69c05c9bab9790b84739f5cbf813524d SHA512 53f5935246b021b559684bff22dc6aacfff9186d816f654b9f579797b90c8bb35b6f86cdb81b5cd612306c5411b9fcc1ebe0aae7aae28c5515fc76b95d722e8e +EBUILD libssh-0.9.2.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee +EBUILD libssh-9999.ebuild 3189 BLAKE2B 6ea9694d118c717ca9a24d861ad830484ea0592216e7ab26fbf549fa2490452ecc3bfa7c052ed34f52a9f6fc472e0de8f3aba2fdc009bb9275ef26a057d9561c SHA512 da30eed00950dee161638b9349782bf89edb588c16c37dc6cd7906591e1a73f2aa253e3e1b3626c6c561b335a034dc01a611281febd09018aca6e1f4a1fe22ee MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474 diff --git a/net-libs/libssh/libssh-0.9.1.ebuild b/net-libs/libssh/libssh-0.9.2.ebuild index 7731aab23884..dc04b6aee9da 100644 --- a/net-libs/libssh/libssh-0.9.1.ebuild +++ b/net-libs/libssh/libssh-0.9.2.ebuild @@ -23,6 +23,9 @@ IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )" +BDEPEND=" + doc? ( app-doc/doxygen[dot] ) +" RDEPEND=" !gcrypt? ( !mbedtls? ( @@ -36,7 +39,6 @@ RDEPEND=" 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}] ) " @@ -44,6 +46,8 @@ DOCS=( AUTHORS README ChangeLog ) PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) +RESTRICT+=" !test? ( test )" + src_prepare() { cmake-utils_src_prepare @@ -77,7 +81,7 @@ multilib_src_configure() { -DWITH_PCAP="$(usex pcap)" -DWITH_SERVER="$(usex server)" -DWITH_SFTP="$(usex sftp)" - -DWITH_STATIC_LIB="$(usex static-libs)" + -DBUILD_SHARED_LIBS="$(usex !static-libs)" -DUNIT_TESTING="$(usex test)" -DWITH_ZLIB="$(usex zlib)" ) diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index 7731aab23884..dc04b6aee9da 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -23,6 +23,9 @@ IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )" +BDEPEND=" + doc? ( app-doc/doxygen[dot] ) +" RDEPEND=" !gcrypt? ( !mbedtls? ( @@ -36,7 +39,6 @@ RDEPEND=" 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}] ) " @@ -44,6 +46,8 @@ DOCS=( AUTHORS README ChangeLog ) PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) +RESTRICT+=" !test? ( test )" + src_prepare() { cmake-utils_src_prepare @@ -77,7 +81,7 @@ multilib_src_configure() { -DWITH_PCAP="$(usex pcap)" -DWITH_SERVER="$(usex server)" -DWITH_SFTP="$(usex sftp)" - -DWITH_STATIC_LIB="$(usex static-libs)" + -DBUILD_SHARED_LIBS="$(usex !static-libs)" -DUNIT_TESTING="$(usex test)" -DWITH_ZLIB="$(usex zlib)" ) |