3 files changed, 11 insertions, 75 deletions
diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
deleted file mode 100644
index e51689e6a0e3..000000000000
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal toolchain-funcs
-
-DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
-HOMEPAGE="https://github.com/BLAKE2/libb2"
-GITHASH="73d41c8255a991ed2adea41c108b388d9d14b449"
-SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs native-cflags openmp"
-
-DEPEND="
-	openmp? (
-		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${GITHASH}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && ! tc-has-openmp; then
-		ewarn "You are using a compiler without OpenMP support"
-		die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_prepare() {
-	default
-	# fix bashism
-	sed -i -e 's/ == / = /' configure.ac || die
-	# https://github.com/BLAKE2/libb2/pull/28
-	echo 'libb2_la_LDFLAGS = -no-undefined' >> src/Makefile.am || die
-	eautoreconf  # upstream doesn't make releases
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable native-cflags native) \
-		$(use_enable openmp)
-}
-
-do_make() {
-	# respect our CFLAGS when native-cflags is not in effect
-	local openmp=$(use openmp && echo -fopenmp)
-	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS} ${openmp}" "$@"
-}
-
-multilib_src_compile() {
-	do_make
-}
-
-multilib_src_test() {
-	do_make check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
index 3470ad02948c..f810cc600ecf 100644
--- a/app-crypt/libb2/libb2-0.98.1-r3.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
@@ -26,11 +26,12 @@ S=${WORKDIR}/${PN}-${GITHASH}
 
 PATCHES=( "${FILESDIR}"/${P}-distcc.patch )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && ! tc-has-openmp; then
-		ewarn "You are using a compiler without OpenMP support"
-		die "Need an OpenMP capable compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
diff --git a/app-crypt/libb2/metadata.xml b/app-crypt/libb2/metadata.xml
index 76fd7590acbb..1b45c3a4d19a 100644
--- a/app-crypt/libb2/metadata.xml
+++ b/app-crypt/libb2/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>grobian@gentoo.org</email>
@@ -18,4 +18,7 @@
 		set in make.conf or similar.
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">BLAKE2/libb2</remote-id>
+	</upstream>
 </pkgmetadata>