From 878132b91d1f8a9e14aca3392500352dcf40233f Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Tue, 7 Dec 2021 19:32:57 +0000
Subject: app-crypt/argon2: revbump for fixed pkg-config file

Closes: https://bugs.gentoo.org/703976
Signed-off-by: Sam James <sam@gentoo.org>
---
 app-crypt/argon2/argon2-20190702-r1.ebuild | 59 ++++++++++++++++++++++++++++++
 app-crypt/argon2/argon2-20190702.ebuild    | 59 ------------------------------
 2 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 app-crypt/argon2/argon2-20190702-r1.ebuild
 delete mode 100644 app-crypt/argon2/argon2-20190702.ebuild

diff --git a/app-crypt/argon2/argon2-20190702-r1.ebuild b/app-crypt/argon2/argon2-20190702-r1.ebuild
new file mode 100644
index 000000000000..b8456fce50bf
--- /dev/null
+++ b/app-crypt/argon2/argon2-20190702-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+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"
+
+LICENSE="|| ( Apache-2.0 CC0-1.0 )"
+SLOT="0/1"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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() {
+	default
+	if ! use static-libs; then
+		sed -i -e '/LIBRARIES =/s/\$(LIB_ST)//' Makefile || die
+	fi
+	sed -i \
+		-e 's/-O3//' \
+		-e 's/-g//' \
+		-e 's/-march=\$(OPTTARGET)//' \
+		Makefile || die
+
+	tc-export CC
+
+	OPTTEST=1
+	if use amd64 || use x86; then
+		$(tc-getCPP) ${CFLAGS} ${CPPFLAGS} -P - <<-EOF &>/dev/null && OPTTEST=0
+			#if defined(__SSE2__)
+			true
+			#else
+			#error false
+			#endif
+		EOF
+	fi
+}
+
+src_compile() {
+	emake OPTTEST="${OPTTEST}" LIBRARY_REL="$(get_libdir)" \
+		ARGON2_VERSION="0~${PV}"
+}
+
+src_test() {
+	emake OPTTEST="${OPTTEST}" test
+}
+
+src_install() {
+	emake OPTTEST="${OPTTEST}" DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install
+	einstalldocs
+	doman man/argon2.1
+}
diff --git a/app-crypt/argon2/argon2-20190702.ebuild b/app-crypt/argon2/argon2-20190702.ebuild
deleted file mode 100644
index b8456fce50bf..000000000000
--- a/app-crypt/argon2/argon2-20190702.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-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"
-
-LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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() {
-	default
-	if ! use static-libs; then
-		sed -i -e '/LIBRARIES =/s/\$(LIB_ST)//' Makefile || die
-	fi
-	sed -i \
-		-e 's/-O3//' \
-		-e 's/-g//' \
-		-e 's/-march=\$(OPTTARGET)//' \
-		Makefile || die
-
-	tc-export CC
-
-	OPTTEST=1
-	if use amd64 || use x86; then
-		$(tc-getCPP) ${CFLAGS} ${CPPFLAGS} -P - <<-EOF &>/dev/null && OPTTEST=0
-			#if defined(__SSE2__)
-			true
-			#else
-			#error false
-			#endif
-		EOF
-	fi
-}
-
-src_compile() {
-	emake OPTTEST="${OPTTEST}" LIBRARY_REL="$(get_libdir)" \
-		ARGON2_VERSION="0~${PV}"
-}
-
-src_test() {
-	emake OPTTEST="${OPTTEST}" test
-}
-
-src_install() {
-	emake OPTTEST="${OPTTEST}" DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install
-	einstalldocs
-	doman man/argon2.1
-}
-- 
cgit v1.2.3-18-g5258