commit: 90124741cb1c79e5f4cb96f64508ec786ea0a6e4 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun Jun 7 14:29:11 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun Jun 7 14:29:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=90124741
dev-libs/libgpg-error-1.38: sync with gx86 Package-Manager: Portage-2.3.84-prefix, Repoman-2.3.22 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> dev-libs/libgpg-error/Manifest | 1 + .../libgpg-error-1.37-remove_broken_check.patch | 22 +++++++ dev-libs/libgpg-error/libgpg-error-1.38.ebuild | 67 ++++++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest index 7c18d4d33b..913b6d8dc4 100644 --- a/dev-libs/libgpg-error/Manifest +++ b/dev-libs/libgpg-error/Manifest @@ -1 +1,2 @@ DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346 +DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch new file mode 100644 index 0000000000..2919a9d73b --- /dev/null +++ b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch @@ -0,0 +1,22 @@ +This breaks our multilib builds: + + Confirm gpg-error-config works... no + *** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log + +--- libgpg-error-1.37/src/Makefile.am ++++ libgpg-error-1.37/src/Makefile.am +@@ -338,14 +338,6 @@ + cp gpg-error.h gpgrt.h + + gpg-error-config: gpgrt-config gpg-error-config-old +- @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)" +- @if ./gpg-error-config-test.sh --old-new; then \ +- echo "good"; \ +- else \ +- echo "no"; \ +- echo "*** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \ +- exit 1; \ +- fi + cp gpg-error-config-old $@ + + install-data-local: diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild new file mode 100644 index 0000000000..7f36c7a267 --- /dev/null +++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools libtool multilib-minimal toolchain-funcs prefix + +DESCRIPTION="Contains error handling functions used by GnuPG software" +HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"; +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="common-lisp nls static-libs" + +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.37-remove_broken_check.patch" ) + +src_prepare() { + default + + # don't hardcode /usr/xpg4/bin/sh as shell on Solaris + sed -i -e 's/solaris\*/disabled/' configure.ac || die + + # 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 + + # upstream seems not interested in trying to understand (#584330) + # https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032671.html + # again reported as https://dev.gnupg.org/T4474 + einfo "Forcing -no-undefined libtool flag ..." + sed -i -e 's/\$(no_undefined)/-no-undefined/' src/Makefile.in + eend $? || die +} + +multilib_src_configure() { + local myeconfargs=( + $(multilib_is_native_abi || echo --disable-languages) + $(use_enable common-lisp languages) + $(use_enable nls) + $(use_enable static-libs static) + --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 +}
