7 files changed, 63 insertions, 98 deletions
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 907624d3255f..b76f741df088 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,2 +1,2 @@
-DIST libmd-1.0.3.tar.xz 258584 BLAKE2B 35b732800a4b0a7b8d0a88eeff5e7e80fe55ab5ed05b7a7a1ffe866e156cc6dc6daca95f865a56297857b10b1bdfc9815b5bf0b198e8284f217498265c08fcc9 SHA512 f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966
 DIST libmd-1.0.4.tar.xz 264472 BLAKE2B ddc2da74635f5cc009c66a58ae82b83e6e0930e18af8a6b0ecec7cbf378246707b493a99fb97d3491d0d626a0d5ef068baea6a3ba2ec311c5a1516ba5b4e2fd5 SHA512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3
+DIST libmd-1.1.0.tar.xz 271228 BLAKE2B a4dc72be4a46609d41453b19ba3110043e74fd0810d59f872e11151dbe87b0bdab203ef72c9d19255db32493b229bc0d33549e787979a42db08c838a810e1cdc SHA512 5d0da3337038e474fae7377bbc646d17214e72dc848a7aadc157f49333ce7b5ac1456e45d13674bd410ea08477c6115fc4282fed6c8e6a0bf63537a418c0df96
diff --git a/app-crypt/libmd/files/libmd-1.0.3-out-of-source.patch b/app-crypt/libmd/files/libmd-1.0.3-out-of-source.patch
deleted file mode 100644
index 77edac0115f0..000000000000
--- a/app-crypt/libmd/files/libmd-1.0.3-out-of-source.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -41,7 +41,7 @@
- 	$(nil)
- 
- $(md2_FUNCS): md2.3
--	$(LN_S) -f $< $(DESTDIR)$(man3dir)/$@.3
-+	cd "$(DESTDIR)$(man3dir)" && $(LN_S) -f md2.3 $@.3
- 
- md4_FUNCS = \
- 	MD4Transform \
-@@ -56,7 +56,7 @@
- 	$(nil)
- 
- $(md4_FUNCS): md4.3
--	$(LN_S) -f $< $(DESTDIR)$(man3dir)/$@.3
-+	cd "$(DESTDIR)$(man3dir)" && $(LN_S) -f md4.3 $@.3
- 
- md5_FUNCS = \
- 	MD5Transform \
-@@ -71,7 +71,7 @@
- 	$(nil)
- 
- $(md5_FUNCS): md5.3
--	$(LN_S) -f $< $(DESTDIR)$(man3dir)/$@.3
-+	cd "$(DESTDIR)$(man3dir)" && $(LN_S) -f md5.3 $@.3
- 
- rmd160_FUNCS = \
- 	RMD160Transform \
-@@ -86,7 +86,7 @@
- 	$(nil)
- 
- $(rmd160_FUNCS): rmd160.3
--	$(LN_S) -f $< $(DESTDIR)$(man3dir)/$@.3
-+	cd "$(DESTDIR)$(man3dir)" && $(LN_S) -f rmd160.3 $@.3
- 
- sha1_FUNCS = \
- 	SHA1Transform \
-@@ -101,7 +101,7 @@
- 	$(nil)
- 
- $(sha1_FUNCS): sha1.3
--	$(LN_S) -f $< $(DESTDIR)$(man3dir)/$@.3
-+	cd "$(DESTDIR)$(man3dir)" && $(LN_S) -f sha1.3 $@.3
- 
- sha2_FUNCS = \
- 	SHA256Init \
-@@ -134,7 +134,7 @@
- 	$(nil)
- 
- $(sha2_FUNCS): sha2.3
--	$(LN_S) -f $< $(DESTDIR)$(man3dir)/$@.3
-+	cd "$(DESTDIR)$(man3dir)" && $(LN_S) -f sha2.3 $@.3
- 
- digest_FUNCS = \
- 	$(md2_FUNCS) \
diff --git a/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch b/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch
new file mode 100644
index 000000000000..bcee3a06611f
--- /dev/null
+++ b/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch
@@ -0,0 +1,38 @@
+From e408786075b9540f76783f5c3ce87f6d1ece13cf Mon Sep 17 00:00:00 2001
+From: Guillem Jover <guillem@hadrons.org>
+Date: Sun, 12 Feb 2023 23:55:09 +0100
+Subject: [PATCH] build: Fix version script linker support detection
+
+When the linker uses --no-undefined-version either specified by the user
+or as the default behavior (such as with newer clang >= 16 releases), a missing symbol definition will cause a linker error if that symbol is
+listed in the version script.
+
+
+Bug: https://bugs.gentoo.org/894010
+Upstream issue: https://gitlab.freedesktop.org/libbsd/libmd/-/issues/1
+Upstream commit: https://gitlab.freedesktop.org/libbsd/libmd/-/commit/e408786075b9540f76783f5c3ce87f6d1ece13cf
+
+---
+ m4/libmd-linker.m4 | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/m4/libmd-linker.m4 b/m4/libmd-linker.m4
+index 7d1236a..3d6edcd 100644
+--- a/m4/libmd-linker.m4
++++ b/m4/libmd-linker.m4
+@@ -8,7 +8,11 @@ AC_DEFUN([LIBMD_LINKER_VERSION_SCRIPT], [
+     save_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
+     AC_LINK_IFELSE([
+-      AC_LANG_PROGRAM([], [])
++      AC_LANG_PROGRAM([[
++extern int symbol(void);
++int symbol(void) { return 0; }
++]], [[
++]])
+     ], [
+       libmd_cv_version_script=yes
+     ], [
+-- 
+GitLab
+
diff --git a/app-crypt/libmd/libmd-1.0.4.ebuild b/app-crypt/libmd/libmd-1.0.4.ebuild
index b6e1a48767c5..1cae95fb395f 100644
--- a/app-crypt/libmd/libmd-1.0.4.ebuild
+++ b/app-crypt/libmd/libmd-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Message Digest functions from BSD systems"
 HOMEPAGE="https://www.hadrons.org/software/libmd/"
@@ -11,7 +11,18 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-version-script-linker-support-detection.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop on next release, only needed for lld patch
+	eautoreconf
+}
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
diff --git a/app-crypt/libmd/libmd-1.0.3-r2.ebuild b/app-crypt/libmd/libmd-1.1.0.ebuild
index fc1811f2948b..3d3edc297844 100644
--- a/app-crypt/libmd/libmd-1.0.3-r2.ebuild
+++ b/app-crypt/libmd/libmd-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Message Digest functions from BSD systems"
 HOMEPAGE="https://www.hadrons.org/software/libmd/"
@@ -11,14 +11,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${P}-out-of-source.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
diff --git a/app-crypt/libmd/libmd-9999.ebuild b/app-crypt/libmd/libmd-9999.ebuild
deleted file mode 100644
index b28c93edaff6..000000000000
--- a/app-crypt/libmd/libmd-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal git-r3
-
-DESCRIPTION="Message Digest functions from BSD systems"
-HOMEPAGE="https://www.hadrons.org/software/libmd/"
-EGIT_REPO_URI="https://git.hadrons.org/git/libmd.git"
-
-LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
-SLOT="0"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/app-crypt/libmd/metadata.xml b/app-crypt/libmd/metadata.xml
index 85e4ed814fa2..0c7ca90940c4 100644
--- a/app-crypt/libmd/metadata.xml
+++ b/app-crypt/libmd/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">libbsd/libmd</remote-id>
+	</upstream>
 </pkgmetadata>