[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgpg-error/files/, dev-libs/libgpg-error/

2024-02-27 Thread Sam James 
commit: 9e541e3005d9eb544ea94da5488d53838d13d3f4
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 27 21:44:08 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 27 21:44:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e541e30

dev-libs/libgpg-error: add 1.48

Signed-off-by: Sam James  gentoo.org>

 dev-libs/libgpg-error/Manifest |  2 +
 .../libgpg-error-1.48-remove_broken_check.patch| 20 +
 dev-libs/libgpg-error/libgpg-error-1.48.ebuild | 86 ++
 3 files changed, 108 insertions(+)

diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index d4f01bcd4f1b..24f9363b0288 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,2 +1,4 @@
 DIST libgpg-error-1.47.tar.bz2 1020862 BLAKE2B 
bc04efa0686b1b7d7cdce045fc080c090c1abec60349b673c2e1ce27900483aea090eb6ebcb3fb49a4eed36f18156a12413d5446f739475632f4ed2a2481ff27
 SHA512 
bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30
 DIST libgpg-error-1.47.tar.bz2.sig 119 BLAKE2B 
d23ea6c38621407c8f9f0c6bde71abd0e50c136d2e5de9a6cef64627f5d398c344a3438995a2405c4ef148ad8638ef7125f34670819957acd7d597370f1630e5
 SHA512 
09343016eaf7fcc455f8ce533847153a8a9b7c36f375a8ebe71ef5fc2923edf7b70842f834f52c51874e427869487b74a2286ea0112cffad0d72f79cb6d4eceb
+DIST libgpg-error-1.48.tar.bz2 1080417 BLAKE2B 
4ced63058586558f4d001bcc468f4bd419b8ec29fbd7dbcaa1a21f959d847c9e12c10c548a0038fd4eac0bdfc9907b61e9f6be71c95fc61c964c649e2415dfd7
 SHA512 
3e9ea99cfb7d706791eb3349a9356b6bc44a53ef8bfa9a4e89afb5203dad5af3f466a039a1764361c0c7f697a6fa668a21d05ceaeb8e44ec5a11d6468998adf2
+DIST libgpg-error-1.48.tar.bz2.sig 119 BLAKE2B 
36e74c520df1740d48630584cb7093413c7974157038dd0e732cb821d6e3b3386a331be9e94a7f19ea10256bd2902d778d52fe1eeab68065ef9dc2625ac2902c
 SHA512 
302091beddab877acf4355f913fae4bd0a795f0a032f47e0e17c58fe1049833116a743d3470669cff59eab2f6d184b143689763cbb4d0f2f9bcab598e09dc12c

diff --git 
a/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch 
b/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch
new file mode 100644
index ..7ccdb2223a57
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch
@@ -0,0 +1,20 @@
+This breaks our multilib builds:
+
+  Confirm gpg-error-config works... no
+  ***  Please report to  with gpg-error-config-test.log
+
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -318,12 +318,4 @@ gpgrt.h: gpg-error.h
+   cp gpg-error.h gpgrt.h
+ 
+ gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh
+-  @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  with 
gpg-error-config-test.log"; \
+-exit 1; \
+-  fi
+   cp gpg-error-config-old $@

diff --git a/dev-libs/libgpg-error/libgpg-error-1.48.ebuild 
b/dev-libs/libgpg-error/libgpg-error-1.48.ebuild
new file mode 100644
index ..0939b629b21f
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.48.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+inherit autotools multilib-minimal toolchain-funcs verify-sig
+
+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"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-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 )
+   verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/gpg-error.h
+   /usr/include/gpgrt.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/gpg-error-config
+   /usr/bin/gpgrt-config
+)
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.48-remove_br

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgpg-error/files/, dev-libs/libgpg-error/

2022-09-22 Thread Sam James 
commit: 147747a18555b8ccbc669e40fd41b19cef2b69fa
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 23 02:07:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 23 02:08:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=147747a1

dev-libs/libgpg-error: drop 1.42, 1.44

Signed-off-by: Sam James  gentoo.org>

 dev-libs/libgpg-error/Manifest |  2 -
 .../libgpg-error-1.37-remove_broken_check.patch| 22 
 .../files/libgpg-error-1.42-cross_compile.patch| 32 ---
 dev-libs/libgpg-error/libgpg-error-1.42.ebuild | 66 --
 dev-libs/libgpg-error/libgpg-error-1.44.ebuild | 65 -
 5 files changed, 187 deletions(-)

diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 942639a59c70..230fc5c9a47a 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,3 +1 @@
-DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B 
eb3381ec7106cfe5dca91f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8
 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

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
deleted file mode 100644
index 2919a9d73be0..
--- a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This breaks our multilib builds:
-
-  Confirm gpg-error-config works... no
-  ***  Please report to  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  with 
gpg-error-config-test.log"; \
--exit 1; \
--  fi
-   cp gpg-error-config-old $@
- 
- install-data-local:

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
deleted file mode 100644
index 78d98dd7b3d1..
--- a/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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.42.ebuild 
b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
deleted file mode 100644
index 2168705cf76b..
--- a/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~spar

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgpg-error/files/, dev-libs/libgpg-error/

2021-11-04 Thread Lars Wendler 
commit: 283868e52a50f0e39478a5a16b94758fee0f8c33
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Nov  4 17:22:54 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Nov  4 17:23:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=283868e5

dev-libs/libgpg-error: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 dev-libs/libgpg-error/Manifest |  3 -
 .../files/libgpg-error-1.38-cross_compile.patch| 40 -
 dev-libs/libgpg-error/libgpg-error-1.38.ebuild | 68 --
 dev-libs/libgpg-error/libgpg-error-1.41.ebuild | 65 -
 4 files changed, 176 deletions(-)

diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index fd3a84d69f8..5ddde2c0447 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,5 +1,2 @@
-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.41.tar.bz2 967117 BLAKE2B 
9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0
 SHA512 
578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
 DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B 
eb3381ec7106cfe5dca91f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8
 SHA512 
f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
 DIST libgpg-error-1.43.tar.bz2 999006 BLAKE2B 
22c5491ebd43b8010cdd4e82a58443fb8d19d51de9a033d0bb44634a82f033916d5d9fcfe47eb47e64a513521b01ff088838a8979f488cde74e5944c28dec0aa
 SHA512 
36769a62d0b4b219a6d58195bed692e34d3b0313f628b1036055ca34b69332edbe6bcdace9855a60d06e7be5998dc13bf1305d0b2bb211a4d8f701e85040961c

diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch 
b/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch
deleted file mode 100644
index 7ddd51f9a57..000
--- a/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: David Michael 
-Date: Mon, 1 Jun 2020 14:24:53 + (-0400)
-Subject: build: Fix cross-compiling into a separate build dir.
-X-Git-Url: 
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=013720333c6ec1d38791689bc49ba039d98e16b3
-
-build: Fix cross-compiling into a separate build dir.
-
-* configure.ac: Create the src directory before writing into it.
-* src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh.
-
---
-
-Signed-off-by: David Michael 

-
-diff --git a/configure.ac b/configure.ac
-index 6bd634b..1dd6489 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then
-   case $host in
- *-*-linux*)
- lock_obj_h_generated=yes
-+mkdir src
- LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \
- CC=$CC OBJDUMP=$host_alias-objdump \
- ac_ext=$ac_ext ac_objext=$ac_objext \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7e36d69..b2bffd2 100644
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in 
err-codes.h.in \
-   gpg-error.vers gpg-error.def.in \
- versioninfo.rc.in gpg-error.w32-manifest.in \
-   gpg-error-config-test.sh gpg-error.pc.in \
--  $(lock_obj_pub)
-+  gen-lock-obj.sh $(lock_obj_pub)
- 
- BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \
-   code-to-errno.h code-from-errno.h \

diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild 
b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
deleted file mode 100644
index e5d788d1421..000
--- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-   
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;hb=libgpg-error-1.38
 -> gen-lock-obj-1.38.sh"
-
-LICENSE="GPL-2 LGPL-