From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- net-libs/libssh2/Manifest | 4 +- net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild | 59 ++++++++++++++++++++++ net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild | 59 ---------------------- net-libs/libssh2/libssh2-9999.ebuild | 4 +- 4 files changed, 63 insertions(+), 63 deletions(-) create mode 100644 net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild delete mode 100644 net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild (limited to 'net-libs/libssh2') diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest index 6fbd90c1d80b..e3735d19e58e 100644 --- a/net-libs/libssh2/Manifest +++ b/net-libs/libssh2/Manifest @@ -1,5 +1,5 @@ AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871 SHA512 fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d -EBUILD libssh2-1.9.0_p20200614.ebuild 1492 BLAKE2B b5f394530cdba3400546e3c787b94cbf64f87b3600fdfb83c654c7fd49cd9b14e15e340c92db10fdd4f5d8196a66476533e1502913d57e26edff62a258674778 SHA512 e69128f29f65e750a2ccce48543f4d889135cdd4edb71031dfe57efc17cf146588e7532555bdbe8403263aaea77a26e0046a2a443c25958d8905f7e6b3b22432 -EBUILD libssh2-9999.ebuild 1250 BLAKE2B a76d19e2dfba73b98e161d959b686be14b985b6b9833a88c6eb9700590126b290db4c12ade2eea580051e5811108c72b1ce24329dee4aa6dc0fc51f228165f8c SHA512 c40f416a3913e5f452ef2cf6392989cd7a5b87bfe7d35f36cb8e9750cec67056d22b8a41b16920be182827ec4b64a137dbfc097cbd76f83db8eab062de6edcd4 +EBUILD libssh2-1.9.0_p20200614-r1.ebuild 1495 BLAKE2B 162fe67f78e6b6fcc778b8c1669e21a84ba2207a49bb99d904ba1daa69529ef86f331fb3a63161ce5d9df19057a972af9328d4581d216bf7fb702e389c4bc95c SHA512 19eccd133c45ed716f361c313010ddeeb5eca78a56e0d4c28a3a87a94a55111ffe6dd4a0a675206f788c9cd67c83724d6a8c8b74b67798fc301ee3177975ac29 +EBUILD libssh2-9999.ebuild 1253 BLAKE2B 749f87eca997579814b3fccb96001407335f8c8f38c047d9eff7c74c80fad0fb2c6444f6157a6f27eeda3588d1a77f83f8eeb533efa906bf291f7ce012f666ca SHA512 acc1d8d82e90e46163d0a947bffb4128de39d80d59ba9d203911012b1417a3ff3ce08a86b1729763546e8a8c8129c4576ee2c31c5c30dd173b3a20ee3f953811 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960 diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild new file mode 100644 index 000000000000..3e48a3afea49 --- /dev/null +++ b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +CMAKE_ECLASS=cmake +inherit cmake-multilib + +EGIT_COMMIT=6c7769dcc422250d14af1b06fce378b6ee009440 +DESCRIPTION="Library implementing the SSH2 protocol" +HOMEPAGE="https://www.libssh2.org" +SRC_URI="https://github.com/libssh2/libssh2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-${EGIT_COMMIT} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +IUSE="gcrypt libressl mbedtls zlib" +REQUIRED_USE="?? ( gcrypt mbedtls )" +RESTRICT="test" + +RDEPEND=" + gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) + !gcrypt? ( + mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] ) + !mbedtls? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + ) + ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +DEPEND=" + ${RDEPEND} +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch +) + +multilib_src_configure() { + local crypto_backend=OpenSSL + if use gcrypt; then + crypto_backend=Libgcrypt + elif use mbedtls; then + crypto_backend=mbedTLS + fi + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DCRYPTO_BACKEND=${crypto_backend} + -DENABLE_ZLIB_COMPRESSION=$(usex zlib) + ) + cmake_src_configure +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild deleted file mode 100644 index edff9820da9c..000000000000 --- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CMAKE_ECLASS=cmake -inherit cmake-multilib - -EGIT_COMMIT=6c7769dcc422250d14af1b06fce378b6ee009440 -DESCRIPTION="Library implementing the SSH2 protocol" -HOMEPAGE="https://www.libssh2.org" -SRC_URI="https://github.com/libssh2/libssh2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -S=${WORKDIR}/${PN}-${EGIT_COMMIT} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="gcrypt libressl mbedtls zlib" -REQUIRED_USE="?? ( gcrypt mbedtls )" -RESTRICT="test" - -RDEPEND=" - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) - !gcrypt? ( - mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) - !mbedtls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - ) - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch -) - -multilib_src_configure() { - local crypto_backend=OpenSSL - if use gcrypt; then - crypto_backend=Libgcrypt - elif use mbedtls; then - crypto_backend=mbedTLS - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DCRYPTO_BACKEND=${crypto_backend} - -DENABLE_ZLIB_COMPRESSION=$(usex zlib) - ) - cmake_src_configure -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild index ecb95eb5807f..9144d2576661 100644 --- a/net-libs/libssh2/libssh2-9999.ebuild +++ b/net-libs/libssh2/libssh2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ RESTRICT="test" RDEPEND=" gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) !gcrypt? ( - mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] ) !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) -- cgit v1.2.3