diff options
Diffstat (limited to 'dev-libs/libgpg-error')
-rw-r--r-- | dev-libs/libgpg-error/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/libgpg-error/files/libgpg-error-1.45-gpgrt_config_libdir.patch | 56 | ||||
-rw-r--r-- | dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild | 68 |
3 files changed, 126 insertions, 0 deletions
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest index 4a59eb34e1ae..739fa45061f6 100644 --- a/dev-libs/libgpg-error/Manifest +++ b/dev-libs/libgpg-error/Manifest @@ -1,10 +1,12 @@ AUX libgpg-error-1.37-remove_broken_check.patch 786 BLAKE2B 38c3b7039d17de117ba876c11377fe765e39a4630d2dbda21d07aa6a0e027b5ee0e4f2da225d7d6847b5086c7f4aebe378c82a259ec9d82e7ecaac1f77413959 SHA512 6b9087cfa21d844f2306aca0e5575a03b9409ae8e5ea55158734560abd135af265512bec3de8c943210ade60b6334ea1798aa517ba5738cb9fe6720b3cb3c68f AUX libgpg-error-1.42-cross_compile.patch 785 BLAKE2B 91dcb2dd4d44776dbf0f1bd0b7bb7df2d8855625e1de306583cb42a14f74b2daa015605a8af46fd2a659a81da9f312d20d02f49ff6042ec9ce8ab40f42b9776a SHA512 76a9bdfa85de81ba60eac771022f0b1daedc97097e281ca954381ed54b30a00e84ca2f0970f252ee735b1ef6f1ea2071a4df25ae1fbef0d380d964c577e2fd22 AUX libgpg-error-1.44-remove_broken_check.patch 811 BLAKE2B ff90643ba8afe80393ae0328590ba161c5a68c6b1d6e3ab771a9b295e2827d4cb02d620315e0437647d36698d539c911aa572a9d57393feed9818986440dd437 SHA512 29dbad17b3626eab56ecc352479f55aeb54958245558716134e1da5c8581c0713d53463caa778ebd6c33ea3281072d7aa2d6fd62630bfa973a41bd3e76ca1a57 +AUX libgpg-error-1.45-gpgrt_config_libdir.patch 1663 BLAKE2B c127cd45accd61e1a4b47980a6b269059911831cddfc33de79b3f8989b67f3ea7bdd8fd73fc4f83e1509c32b1addf9979d9eef305fe05cb30bfa336a34953f69 SHA512 493471dfae869710ed1c8fe0765f7e83dd675e3d4a32dd8c1e12389e3ffce24310742c78e7552057da7d4361c01242d01a48800499baca686cc4addddf931937 DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4 DIST libgpg-error-1.44.tar.bz2 1014475 BLAKE2B dc101769510bc9edff38048216a961df8b08373a0b6d04b13c882bbcb43c4d0e05ecfdfd7788c89b5799082f4d15386efac5eb1762a48ae1ab70b554d0bfbb36 SHA512 a0eef310b9d44532d1ae6e7266226ea3e82d908aa31f775a026e56a7f8303b78adfdceb3ae5a40f7d242987635e764c539a024ce8dc0d66590e1a3fa50f6b784 DIST libgpg-error-1.45.tar.bz2 1015954 BLAKE2B 277892df6691ff2807335954fa786c1d452d58e6f15aa2f73bffd1ddc97b9276646afe8831c0b67107ac768e0590f046030da6d370eb2871e94154f50dabf67b SHA512 882f2dd617e89137d7a9d61b60488dac32321dd4fdb699e9687b6bd9380c056c027da502837f4482289c0fe00e7de01210e804428f05a0843ae2ca23fdcc6457 EBUILD libgpg-error-1.42.ebuild 1898 BLAKE2B 05436135f19c5e2422f08274f1f3ad755b8683fcd9dfa56914ed8822b816e070cf910c92a6dc385e824ead0f5e85cc89e9fc4f4652e4119a2a5a5571b2cc7666 SHA512 fe0532eaa898e8a39c79651121593e907cc0fca3ddf5db54dcc2889309c2980055e52a54438452d320c38e3f45ff705327185962d4c6c7fb40cca7013c311cab EBUILD libgpg-error-1.44.ebuild 1866 BLAKE2B 0071a99bf76003193009345c97d685e4030495c529e5b5bc74b0e5cbf29c73c3bbe4290acaecf09d2a9818b2a7331b264c6e430cad84822ffa31ca441372ec41 SHA512 7c12fca0e1fd6ba8f446de4d1234c90ee7afa836a38bb81ba0712ba337ce9a3a5d84a37341d8a96ada56912a1044d0bc0176116dcfdaa2bb1c2cc06212b2d31c +EBUILD libgpg-error-1.45-r1.ebuild 1984 BLAKE2B fb622e43f183e520c376009b177e1d55c7c6c50d6eb147ab8d58dfaa11f0b208c76216b61574e1413b648d05860d389af940349b98d76885f3f42344170ae0da SHA512 3911ee0d4b74853adc1dbf19c7e7d717639bbf6b5033cf9f54314923167ecd30f258f57082b430e05fab6cc4785b8b359fc46211fa7b3a71240b740379727cc3 EBUILD libgpg-error-1.45.ebuild 1924 BLAKE2B a082e0038c6372f379492fbbd381fff2c1ede5eb56077b14eeba019fdde88cd3978c35d4f08bcf31e3f814c25cd95b1db91511f57d1c3be691d7b61a23803354 SHA512 a0f50c1e76f2ecf9c1550e2b95dd27d888ffa96bf3cf13abe5a0f4514ef973534ff75fe6e3449c7624ac23dff32dfd1d925ffe0e40c69dae02fef57d39df43ce MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305 diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.45-gpgrt_config_libdir.patch b/dev-libs/libgpg-error/files/libgpg-error-1.45-gpgrt_config_libdir.patch new file mode 100644 index 000000000000..a7db0e4d4b64 --- /dev/null +++ b/dev-libs/libgpg-error/files/libgpg-error-1.45-gpgrt_config_libdir.patch @@ -0,0 +1,56 @@ +Upstream: +https://dev.gnupg.org/rE4615816f71e91f4c3bb8b0e4122dd153ec7c1927 +https://dev.gnupg.org/T6136 + +From 4615816f71e91f4c3bb8b0e4122dd153ec7c1927 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Thu, 25 Aug 2022 15:30:07 +0900 +Subject: [PATCH] gpgrt-config: Strip system paths for --cflags and --libs. + +* src/gpgrt-config.in: Strip -I and -L with system paths. + +-- + +This behavior is more compatible to pkg-config. + +GnuPG-bug-id: 6136 +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> + +diff --git a/src/gpgrt-config.in b/src/gpgrt-config.in +index 3aaa243..85d21b4 100644 +--- a/src/gpgrt-config.in ++++ b/src/gpgrt-config.in +@@ -1,6 +1,6 @@ + #!@INSTALLSHELLPATH@ + # -*- mode: shell-script; sh-shell: "/bin/sh" -*- +-# Copyright (C) 2018, 2021 g10 Code GmbH ++# Copyright (C) 2018, 2021, 2022 g10 Code GmbH + # + # This file is free software; as a special exception the author gives + # unlimited permission to copy and/or distribute it, with or without +@@ -193,9 +193,14 @@ list_only_once () { + __arg="" + + for __arg; do +- if not_listed_yet $__arg $__result; then +- __result="$__result${__result:+ }$__arg" +- fi ++ case "$__arg" in ++ -I/usr/include|-I/include) ;; ++ *) ++ if not_listed_yet $__arg $__result; then ++ __result="$__result${__result:+ }$__arg" ++ fi ++ ;; ++ esac + done + + echo $__result +@@ -210,6 +215,7 @@ list_only_once_for_libs () { + # the resulted list is in reverse order + for __arg; do + case "$__arg" in ++ -L/usr/lib|-L/usr/lib64|-L/lib|-L/lib64) ;; + -l*) + # As-is + __rev_list="$__arg${__rev_list:+ }$__rev_list" diff --git a/dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild new file mode 100644 index 000000000000..9d47ab1f8c4a --- /dev/null +++ b/dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal toolchain-funcs prefix + +DESCRIPTION="Contains error handling functions used by GnuPG software" +HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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="common-lisp nls static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gpg-error-config +) +MULTILIB_WRAPPED_HEADERS=( + /usr/include/gpg-error.h + /usr/include/gpgrt.h +) + +PATCHES=( + "${FILESDIR}/${PN}-1.44-remove_broken_check.patch" + "${FILESDIR}/${PN}-1.45-gpgrt_config_libdir.patch" +) + +src_prepare() { + default + + if use prefix ; then + # don't hardcode /usr/xpg4/bin/sh as shell on Solaris + sed -i -e 's/solaris\*/disabled/' configure.ac || die + fi + + # only necessary for as long as we run eautoreconf, configure.ac + # uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is + # not a pure /bin/sh script, so it fails on some hosts + hprefixify -w 1 autogen.sh + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + $(multilib_is_native_abi || echo --disable-languages) + $(use_enable common-lisp languages) + $(use_enable nls) + # required for sys-power/suspend[crypt], bug 751568 + $(use_enable static-libs static) + $(use_enable test tests) + --enable-threads + CC_FOR_BUILD="$(tc-getBUILD_CC)" + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die +} |