commit: 841ff7e99bfac023d1e7ba80b21afd1c85fcadc8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 29 18:06:14 2026 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 18:06:14 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=841ff7e9
dev-libs/libgcrypt: fix libgcrypt-config --libs in 1.12.0
Sorry, I'd meant to handle this before but forgot to get back to it.
Fixes: f6cc38929e20c38ba4c3de9b71d148258a722596
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libgcrypt-1.12.0-multilib-syspath.patch | 18 ++++++++++++++++++
...gcrypt-1.12.0.ebuild => libgcrypt-1.12.0-r1.ebuild} | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.12.0-multilib-syspath.patch
b/dev-libs/libgcrypt/files/libgcrypt-1.12.0-multilib-syspath.patch
new file mode 100644
index 000000000000..1b8ba46927fc
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.12.0-multilib-syspath.patch
@@ -0,0 +1,18 @@
+--- a/src/libgcrypt-config.in
++++ b/src/libgcrypt-config.in
+@@ -166,9 +166,12 @@ if test "$echo_libs" = "yes"; then
+ libs_final="$libs"
+
+ # Set up `libdirs'.
+- if test "x$libdir" != "x/usr/lib" && test "x$libdir" != "x/lib"; then
+- libdirs="-L$libdir"
+- fi
++ case "$libdir" in
++ /usr/lib|/usr/lib64|/lib|/lib64) ;;
++ *)
++ libdirs="-L$libdir"
++ ;;
++ esac
+
+ # Set up `libs_final'.
+ libs_final="$libs_final $gpg_error_libs"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.12.0.ebuild
b/dev-libs/libgcrypt/libgcrypt-1.12.0-r1.ebuild
similarity index 99%
rename from dev-libs/libgcrypt/libgcrypt-1.12.0.ebuild
rename to dev-libs/libgcrypt/libgcrypt-1.12.0-r1.ebuild
index cb7c492242be..9e9d7fb63e22 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.12.0.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.12.0-r1.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
"
PATCHES=(
- #"${FILESDIR}"/${PN}-multilib-syspath.patch
+ "${FILESDIR}"/${PN}-1.12.0-multilib-syspath.patch
"${FILESDIR}"/${PN}-powerpc-darwin.patch
)
