From da52a858f0b8ee9d3cbe35d51fd7c89deb34cdeb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 16 Jun 2025 07:06:58 +0000 Subject: [PATCH] app-crypt/argon2: Sync with Gentoo It's from Gentoo commit 01d2ebd6d79c47de310f70609a261eee425ca769. --- .../portage-stable/app-crypt/argon2/Manifest | 2 +- .../argon2/argon2-20190702-r1.ebuild | 31 +++++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/argon2/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/argon2/Manifest index cc1597d7b3..2e11cd9600 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/argon2/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/argon2/Manifest @@ -1 +1 @@ -DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f +DIST phc-winner-argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/argon2/argon2-20190702-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/argon2/argon2-20190702-r1.ebuild index fd4e03641a..dc19e46635 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/argon2/argon2-20190702-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/argon2/argon2-20190702-r1.ebuild @@ -1,21 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs +MY_P=phc-winner-${P} DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)" -HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2" -SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2/" +SRC_URI=" + https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz + -> ${MY_P}.tar.gz +" +S=${WORKDIR}/${MY_P} LICENSE="|| ( Apache-2.0 CC0-1.0 )" SLOT="0/1" KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="static-libs" -S="${WORKDIR}/phc-winner-${P}" - DOCS=( argon2-specs.pdf CHANGELOG.md README.md ) src_prepare() { @@ -44,16 +47,26 @@ src_prepare() { } src_compile() { - emake OPTTEST="${OPTTEST}" LIBRARY_REL="$(get_libdir)" PREFIX="${EPREFIX}/usr" \ + emake \ + OPTTEST="${OPTTEST}" \ + LIBRARY_REL="$(get_libdir)" \ + PREFIX="${EPREFIX}/usr" \ ARGON2_VERSION="0~${PV}" } src_test() { - emake OPTTEST="${OPTTEST}" test + emake \ + OPTTEST="${OPTTEST}" \ + test } src_install() { - emake OPTTEST="${OPTTEST}" DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install + emake \ + OPTTEST="${OPTTEST}" \ + DESTDIR="${ED}" \ + LIBRARY_REL="$(get_libdir)" \ + install + einstalldocs doman man/argon2.1 }