From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- dev-libs/libgpg-error/Manifest | 7 ++- .../files/libgpg-error-1.42-cross_compile.patch | 32 +++++++++++ dev-libs/libgpg-error/libgpg-error-1.39.ebuild | 59 ------------------- dev-libs/libgpg-error/libgpg-error-1.41.ebuild | 2 +- dev-libs/libgpg-error/libgpg-error-1.42.ebuild | 66 ++++++++++++++++++++++ 5 files changed, 103 insertions(+), 63 deletions(-) create mode 100644 dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch delete mode 100644 dev-libs/libgpg-error/libgpg-error-1.39.ebuild create mode 100644 dev-libs/libgpg-error/libgpg-error-1.42.ebuild (limited to 'dev-libs/libgpg-error') diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest index 9b80d77b3e72..0c5aa4286545 100644 --- a/dev-libs/libgpg-error/Manifest +++ b/dev-libs/libgpg-error/Manifest @@ -1,10 +1,11 @@ AUX libgpg-error-1.37-remove_broken_check.patch 786 BLAKE2B 38c3b7039d17de117ba876c11377fe765e39a4630d2dbda21d07aa6a0e027b5ee0e4f2da225d7d6847b5086c7f4aebe378c82a259ec9d82e7ecaac1f77413959 SHA512 6b9087cfa21d844f2306aca0e5575a03b9409ae8e5ea55158734560abd135af265512bec3de8c943210ade60b6334ea1798aa517ba5738cb9fe6720b3cb3c68f AUX libgpg-error-1.38-cross_compile.patch 1415 BLAKE2B 6cd0453ef8bd77bf945600c738aec60e3c271109fcbf85af95eaeec372d3a5295dbaa46a28c9d02bde9a9340885a710baaf52b3c76d60fecd0f4ae79118020fd SHA512 99b9ade767fd02bce4f7388d1a4c615ed1b959fe0416d1d49880ae3708482144de7219fed4aa5ef4f7ef18ec7fa047e05da6da53a13a2cab8a42f8298600b061 +AUX libgpg-error-1.42-cross_compile.patch 785 BLAKE2B 91dcb2dd4d44776dbf0f1bd0b7bb7df2d8855625e1de306583cb42a14f74b2daa015605a8af46fd2a659a81da9f312d20d02f49ff6042ec9ce8ab40f42b9776a SHA512 76a9bdfa85de81ba60eac771022f0b1daedc97097e281ca954381ed54b30a00e84ca2f0970f252ee735b1ef6f1ea2071a4df25ae1fbef0d380d964c577e2fd22 DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca9136e019fc647183456593df27473eb79af1d79e803984dd2b93166c286809b376968584cc320679de95fcfbba SHA512 d60999a08f70f5bcf1b66099c5d7b5f715dbd881bd0d75dbdde3a8932e9b064166f0524a45ae88b5b182c620aee526e14095ffdee68403b5d3b087b4dc4c0c2c DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de -DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42 DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5 +DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4 EBUILD libgpg-error-1.38.ebuild 2150 BLAKE2B 912412e589136e6b537967940954c084339726c43700f4dff5a5bb69e0792fe6a0b8832339ad81aa2df44555d7f95bdac7ad1e9a3b79ed9df9818bcad5d2aa42 SHA512 a301494ab2e81d6e94a6134124b047f1fbf37e448f1b141ea97d6c1bfbaab29b2b168fecaea683c63b42393626cd8487ac0aa2a9e26e6a5d4d5e5afc22846440 -EBUILD libgpg-error-1.39.ebuild 1722 BLAKE2B 4bfb541b61ec0b52d760b7ed80115c388754f2540d5256374409646dd26ab0377d899cfa2aba566f625006529c8b7ff3900c93bd50f342cf1936f0d09493ae72 SHA512 e82c9f0af8be9838e873b84260d7bbec05dd427763d5d22add627a5f3ca4d2f937a55e142e9a84349603aa284b75b683e33d922b01a12a387c99031e621f6027 -EBUILD libgpg-error-1.41.ebuild 1874 BLAKE2B 3ac41aac960f6e82388ab269a4c2eb29f34640d799dacc49efd648f9077ad0d84ca83510661001397f3a23c66513a6171955b8874ef95100c62a4b8787f2bc92 SHA512 be25c1a8e12ad3a2c0af586375096ad0a0f8b7fa14fa6f03b47e914c6345a62fcded6f0538329777ebc5b678cce39ae8806311ec7c4d610aac11ea8d737a0ed9 +EBUILD libgpg-error-1.41.ebuild 1869 BLAKE2B 07a8a532fc812e2fc3305a33151345c4be5644341642fcacde218d5fe9b103ff369a148bb02231a7381bb59c506f3c62388a22c6ded3089a698a4dcb6a16c02c SHA512 4aa2ef0af8471449d3070917793dfcbb81f5d0f1f4458a703c72c4f83ddfb22d5e8d07a6561e0c402ed8fa539d03935db29e3e29acc41559422c87ad4bd650f0 +EBUILD libgpg-error-1.42.ebuild 1914 BLAKE2B 1426f8dd59c37ce476f8955119aa8437e77435035a8842a23be1074c7a39d22c690136451992f74ebe92ad2e23c20f4c1f5031084b9e79f2ac1c4c1c136167dd SHA512 bbf1e315fe8d87f46c5b10a83833779cfcc925849b6535b87e3f4b107867f4b7e0b51763e3168971443b632b643d2a23d0a95654f4ad7d63685ec6aa86962469 MISC metadata.xml 413 BLAKE2B 52ac9e1edfca8673904a9c73c51f1d46bc844db1cd320291f90dc53c89aedb24a4e1a27f01b1fe0b517cd00468300e54aec95632b453c0cb52a54ddfb5bf55d9 SHA512 6334af8e8e833c43414adb35635f42163d9f87e7a0659b03e5a51c8250ec8a1f1b72c13617050ab75e9eac0ed0377919424aec0c3bc13cc5efac32cf863f8948 diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch b/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch new file mode 100644 index 000000000000..78d98dd7b3d1 --- /dev/null +++ b/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch @@ -0,0 +1,32 @@ +From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001 +From: David Michael +Date: Fri, 26 Mar 2021 16:06:50 +0900 +Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross + build. + +* src/gen-lock-obj.sh: Capture echo output with quotes. + +-- + +Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374 +Signed-off-by: David Michael +--- + src/gen-lock-obj.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh +index a710f0c..258eec6 100755 +--- a/src/gen-lock-obj.sh ++++ b/src/gen-lock-obj.sh +@@ -38,7 +38,7 @@ + # AWK=gawk ./gen-lock-obj.sh + # + +-if test -n `echo -n`; then ++if test -n "`echo -n`"; then + ECHO_C='\c' + ECHO_N='' + else +-- +2.11.0 + diff --git a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild deleted file mode 100644 index 548ddb2954c2..000000000000 --- a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 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="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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 - # 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) - --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 -} diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild index c6202ddd30fc..1edca981c296 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~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" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" diff --git a/dev-libs/libgpg-error/libgpg-error-1.42.ebuild b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild new file mode 100644 index 000000000000..2d6c54abbf78 --- /dev/null +++ b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 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="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 ~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" + +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" + "${FILESDIR}/${P}-cross_compile.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) + --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 +} -- cgit v1.2.3