[gentoo-commits] proj/genkernel:master commit in: gkbuilds/

[Thomas Deutschmann]

commit:     bd268279a58eaa2761829bd5113a79cb82d9528a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 03:37:29 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 03:43:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bd268279

gkbuilds/libgpg-error: do not install gpg-error-config or gpgrt-config anymore

The new gpgrt-config wrapper clashes with buildroot environment.
Instead of patch gpgrt-config, libgcrypt has been patched to
use pkg-config instead of gpg-error-config or gpgrt-config helper.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/libgpg-error.gkbuild | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/gkbuilds/libgpg-error.gkbuild b/gkbuilds/libgpg-error.gkbuild
index 9c6193b..5d38e33 100644
--- a/gkbuilds/libgpg-error.gkbuild
+++ b/gkbuilds/libgpg-error.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_prepare() {
@@ -59,24 +59,8 @@ src_install() {
 
        rm -rf \
                "${D}"/usr/bin/gpg-error \
+               "${D}"/usr/bin/gpg-error-config \
                "${D}"/usr/bin/gpgrt-config \
                "${D}"/usr/bin/yat2m \
                "${D}"/usr/share
-
-       mv "${D}"/usr/bin/gpg-error-config "${D}"/usr/bin/gpg-error-config.ori \
-               || die "Failed to rename '${D}/usr/bin/gpg-error-config' to 
'${D}/usr/bin/gpg-error-config.ori'!"
-
-       cat >"${D}"/usr/bin/gpg-error-config <<-EOF
-       #!/bin/sh
-
-       SYSROOT=\$(dirname "\$(dirname "\$(dirname "\$(readlink -fm "\$0")")")")
-
-       exec "\${SYSROOT}"/usr/bin/gpg-error-config.ori "\$@" | sed -e 
's#/#'\${SYSROOT}'/#'
-       EOF
-
-       chmod +x "${D}"/usr/bin/gpg-error-config \
-               || die "Failed to chmod of '${D}/bin/gpg-error-config'!"
-
-       ln -s gpg-error-config "${D}"/usr/bin/gpgrt-config \
-               || die "Failed to symlink '${D}/bin/gpgrt-config' to 
'${D}/bin/gpg-error-config'!"
 }