commit: 85e38db4c5e8e99d4ae22d62fd96f4307de5ec8a Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Tue Apr 11 23:38:42 2023 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Wed Apr 12 02:07:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=85e38db4
net-libs/libssh2: Merge ::gentoo changes The live ebuild works with the ::gentoo repo. Closes: https://github.com/gentoo/libressl/pull/524 Signed-off-by: orbea <orbea <AT> riseup.net> net-libs/libssh2/libssh2-1.10.0.ebuild | 5 ++--- net-libs/libssh2/metadata.xml | 25 ++++++++++++++----------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild b/net-libs/libssh2/libssh2-1.10.0.ebuild index 843cfe6..b3eaa02 100644 --- a/net-libs/libssh2/libssh2-1.10.0.ebuild +++ b/net-libs/libssh2/libssh2-1.10.0.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CMAKE_ECLASS=cmake inherit cmake-multilib DESCRIPTION="Library implementing the SSH2 protocol" @@ -11,7 +10,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz"; LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="gcrypt mbedtls zlib" REQUIRED_USE="?? ( gcrypt mbedtls )" # Tests try to set containers up using docker (and fail for some reason). diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml index f072d71..1f00f91 100644 --- a/net-libs/libssh2/metadata.xml +++ b/net-libs/libssh2/metadata.xml @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="project"> -<email>net...@gentoo.org</email> -</maintainer> -<maintainer type="person"> - <email>mgo...@gentoo.org</email> - <name>Michał Górny</name> -</maintainer> -<use> - <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag> - <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> instead of <pkg>dev-libs/openssl</pkg></flag> -</use> + <maintainer type="project"> + <email>net...@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>mgo...@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> + <use> + <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag> + <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> instead of <pkg>dev-libs/openssl</pkg></flag> + </use> + <upstream> + <remote-id type="github">libssh2/libssh2</remote-id> + </upstream> </pkgmetadata>
