From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- net-libs/libssh2/Manifest | 5 +- net-libs/libssh2/files/libssh2-1.9.0-libdir.patch | 17 ------- net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild | 60 ----------------------- net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild | 59 ++++++++++++++++++++++ 4 files changed, 61 insertions(+), 80 deletions(-) delete mode 100644 net-libs/libssh2/files/libssh2-1.9.0-libdir.patch delete mode 100644 net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild create 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 4a4d51efa594..6fbd90c1d80b 100644 --- a/net-libs/libssh2/Manifest +++ b/net-libs/libssh2/Manifest @@ -1,6 +1,5 @@ AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a -AUX libssh2-1.9.0-libdir.patch 573 BLAKE2B 5464910fdb5a9461ad4ad6e94c0c682bb1106d437a47a035cb107c9dbec6d2d9e89f791b4f7309fdba307b898f229dff8bba5b5af5b8c6af2ca6ddc21d949695 SHA512 5b389312a4b0bdb6d724f54ce9659612b11f86add4b185b10ee4277b641b26c63256264e11225ea5f28775f0ac9367b391fe77470f34851aeca2e3b5e3408446 -DIST libssh2-1.9.0_p20190913.tar.gz 467616 BLAKE2B 2df7569aa118cf339340f32a106a547265a777af5834e0e22d18ac71946747e708c48d3125489b277b5c266d66cb35e7e224425bfc6a9b2e37e5d267fd7792b2 SHA512 0e095770b059b28aebd47a1219873bfe3b6e5775bbee5d526a7b6a287090e474ceac91c03b1b8a619a2a77916a110d8d20db22edc3cbfd1772190fb394a53f8a -EBUILD libssh2-1.9.0_p20190913.ebuild 1532 BLAKE2B 2ac72fed78fd2d1510ca14872a7063b5ade8dfb575e08c81ad467b0ed30219c34d08cb56a510cb93729edf6e08d06bbb16fd5f2b1ce99316a1c239a8e21b1999 SHA512 e24826c6a106467e144e60786b70a43246bc8d1fb90f1dd49ce74bb5079b55344b490f0346073182f3657ec1f6e2a4ba6240736f7e82d1168d27321ae34db557 +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 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960 diff --git a/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch b/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch deleted file mode 100644 index e04acb0904ba..000000000000 --- a/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -392,7 +392,7 @@ - ## During package installation, install Libssh2Config.cmake - install(EXPORT Libssh2Config - NAMESPACE Libssh2:: -- DESTINATION lib/cmake/libssh2) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2) - - ## During build, register directly from build tree - # create Libssh2Config.cmake -@@ -424,4 +424,4 @@ - COMPATIBILITY SameMajorVersion) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/Libssh2ConfigVersion.cmake -- DESTINATION lib/cmake/libssh2) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2) diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild deleted file mode 100644 index 9850017d5700..000000000000 --- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild +++ /dev/null @@ -1,60 +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=336bd86d2ca4030b808d76e56a0387914982e289 -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 - "${FILESDIR}"/${PN}-1.9.0-libdir.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 new file mode 100644 index 000000000000..edff9820da9c --- /dev/null +++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild @@ -0,0 +1,59 @@ +# 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 +} -- cgit v1.2.3