Gentoo Archives: gentoo-commits

From: Michael Haubenwallner <haubi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/libgpg-error/files/, dev-libs/libgpg-error/
Date: Tue, 30 Apr 2019 14:39:27
Message-Id: 1556635155.f884bb34f6e9685f130a2f4480d6ebea6c6c4e62.haubi@gentoo
1 commit: f884bb34f6e9685f130a2f4480d6ebea6c6c4e62
2 Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 30 14:37:40 2019 +0000
4 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 30 14:39:15 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f884bb34
7
8 dev-libs/libgpg-error: sync
9
10 Package-Manager: Portage-2.3.62-prefix, Repoman-2.3.12
11 Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>
12
13 dev-libs/libgpg-error/Manifest | 1 +
14 .../files/libgpg-error-1.36-gawk5-support.patch | 158 +++++++++++++++++++++
15 dev-libs/libgpg-error/libgpg-error-1.36.ebuild | 57 ++++++++
16 3 files changed, 216 insertions(+)
17
18 diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
19 index 499efc3321..ec9af617bd 100644
20 --- a/dev-libs/libgpg-error/Manifest
21 +++ b/dev-libs/libgpg-error/Manifest
22 @@ -2,3 +2,4 @@ DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3
23 DIST libgpg-error-1.29-solaris.patch 1445 BLAKE2B 5c7cc0babe2e4bc883991691d95eddb2c96d71972ae05e875fa9c2c8fa964489c6a0f542e1ea4bd5f8efd9df18da4787d4be337657225c0060c8e380370bc84b SHA512 6071e3dc6f280f94a96453d953baa21caac1ff0c7a258d0a2d4e3ca272b664be6fe260ed619a66a6e5d87a7cf22e877e9c30189c641b37a401d84255a2e1add1
24 DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
25 DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
26 +DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
27
28 diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch
29 new file mode 100644
30 index 0000000000..17e8816453
31 --- /dev/null
32 +++ b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch
33 @@ -0,0 +1,158 @@
34 +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
35 +From: NIIBE Yutaka <gniibe@××××.org>
36 +Date: Mon, 15 Apr 2019 15:10:44 +0900
37 +Subject: [PATCH] awk: Prepare for Gawk 5.0.
38 +
39 +* src/Makefile.am: Use pkg_namespace (instead of namespace).
40 +* src/mkerrnos.awk: Likewise.
41 +* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
42 +* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
43 +
44 +--
45 +
46 +In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
47 +which only allows escaping specific characters.
48 +
49 +GnuPG-bug-id: 4459
50 +Reported-by: Marius Schamschula
51 +Signed-off-by: NIIBE Yutaka <gniibe@××××.org>
52 +---
53 + lang/cl/mkerrcodes.awk | 2 +-
54 + src/Makefile.am | 2 +-
55 + src/mkerrcodes.awk | 2 +-
56 + src/mkerrcodes1.awk | 2 +-
57 + src/mkerrcodes2.awk | 2 +-
58 + src/mkerrnos.awk | 2 +-
59 + src/mkstrtable.awk | 10 +++++-----
60 + 7 files changed, 11 insertions(+), 11 deletions(-)
61 +
62 +diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
63 +index ae29043..9a1fc18 100644
64 +--- a/lang/cl/mkerrcodes.awk
65 ++++ b/lang/cl/mkerrcodes.awk
66 +@@ -122,7 +122,7 @@ header {
67 + }
68 +
69 + !header {
70 +- sub (/\#.+/, "");
71 ++ sub (/#.+/, "");
72 + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
73 +
74 + if (/^$/)
75 +diff --git a/src/Makefile.am b/src/Makefile.am
76 +index ce1b882..f2590cb 100644
77 +--- a/src/Makefile.am
78 ++++ b/src/Makefile.am
79 +@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
80 +
81 + errnos-sym.h: Makefile mkstrtable.awk errnos.in
82 + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
83 +- -v prefix=GPG_ERR_ -v namespace=errnos_ \
84 ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
85 + $(srcdir)/errnos.in >$@
86 +
87 +
88 +diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
89 +index 46d436c..e9c857c 100644
90 +--- a/src/mkerrcodes.awk
91 ++++ b/src/mkerrcodes.awk
92 +@@ -85,7 +85,7 @@ header {
93 + }
94 +
95 + !header {
96 +- sub (/\#.+/, "");
97 ++ sub (/#.+/, "");
98 + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
99 +
100 + if (/^$/)
101 +diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
102 +index a771a73..4578e29 100644
103 +--- a/src/mkerrcodes1.awk
104 ++++ b/src/mkerrcodes1.awk
105 +@@ -81,7 +81,7 @@ header {
106 + }
107 +
108 + !header {
109 +- sub (/\#.+/, "");
110 ++ sub (/#.+/, "");
111 + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
112 +
113 + if (/^$/)
114 +diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
115 +index ea58503..188f7a4 100644
116 +--- a/src/mkerrcodes2.awk
117 ++++ b/src/mkerrcodes2.awk
118 +@@ -91,7 +91,7 @@ header {
119 + }
120 +
121 + !header {
122 +- sub (/\#.+/, "");
123 ++ sub (/#.+/, "");
124 + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
125 +
126 + if (/^$/)
127 +diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
128 +index f79df66..15b1aad 100644
129 +--- a/src/mkerrnos.awk
130 ++++ b/src/mkerrnos.awk
131 +@@ -83,7 +83,7 @@ header {
132 + }
133 +
134 + !header {
135 +- sub (/\#.+/, "");
136 ++ sub (/#.+/, "");
137 + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
138 +
139 + if (/^$/)
140 +diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
141 +index c9de9c1..285e45f 100644
142 +--- a/src/mkstrtable.awk
143 ++++ b/src/mkstrtable.awk
144 +@@ -77,7 +77,7 @@
145 + #
146 + # The variable prefix can be used to prepend a string to each message.
147 + #
148 +-# The variable namespace can be used to prepend a string to each
149 ++# The variable pkg_namespace can be used to prepend a string to each
150 + # variable and macro name.
151 +
152 + BEGIN {
153 +@@ -102,7 +102,7 @@ header {
154 + print "/* The purpose of this complex string table is to produce";
155 + print " optimal code with a minimum of relocations. */";
156 + print "";
157 +- print "static const char " namespace "msgstr[] = ";
158 ++ print "static const char " pkg_namespace "msgstr[] = ";
159 + header = 0;
160 + }
161 + else
162 +@@ -110,7 +110,7 @@ header {
163 + }
164 +
165 + !header {
166 +- sub (/\#.+/, "");
167 ++ sub (/#.+/, "");
168 + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
169 +
170 + if (/^$/)
171 +@@ -150,7 +150,7 @@ END {
172 + else
173 + print " gettext_noop (\"" last_msgstr "\");";
174 + print "";
175 +- print "static const int " namespace "msgidx[] =";
176 ++ print "static const int " pkg_namespace "msgidx[] =";
177 + print " {";
178 + for (i = 0; i < coded_msgs; i++)
179 + print " " pos[i] ",";
180 +@@ -158,7 +158,7 @@ END {
181 + print " };";
182 + print "";
183 + print "static GPG_ERR_INLINE int";
184 +- print namespace "msgidxof (int code)";
185 ++ print pkg_namespace "msgidxof (int code)";
186 + print "{";
187 + print " return (0 ? 0";
188 +
189 +--
190 +2.21.0
191 +
192
193 diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
194 new file mode 100644
195 index 0000000000..2de6b0cda0
196 --- /dev/null
197 +++ b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
198 @@ -0,0 +1,57 @@
199 +# Copyright 1999-2019 Gentoo Authors
200 +# Distributed under the terms of the GNU General Public License v2
201 +
202 +EAPI=7
203 +
204 +inherit autotools libtool multilib-minimal toolchain-funcs
205 +
206 +DESCRIPTION="Contains error handling functions used by GnuPG software"
207 +HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
208 +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
209 +
210 +LICENSE="GPL-2 LGPL-2.1"
211 +SLOT="0"
212 +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"
213 +IUSE="common-lisp nls static-libs"
214 +
215 +RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
216 +DEPEND="${RDEPEND}"
217 +BDEPEND="nls? ( sys-devel/gettext )"
218 +
219 +MULTILIB_CHOST_TOOLS=(
220 + /usr/bin/gpg-error-config
221 +)
222 +MULTILIB_WRAPPED_HEADERS=(
223 + /usr/include/gpg-error.h
224 + /usr/include/gpgrt.h
225 +)
226 +
227 +PATCHES=( "${FILESDIR}/${PN}-1.36-gawk5-support.patch" )
228 +
229 +src_prepare() {
230 + default
231 + eautoreconf
232 +
233 + # upstream seems not interested in trying to understand (#584330)
234 + # https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032671.html
235 + # again reported as https://dev.gnupg.org/T4474
236 + einfo "Forcing -no-undefined libtool flag ..."
237 + sed -i -e 's/\$(no_undefined)/-no-undefined/' src/Makefile.in
238 + eend $? || die
239 +}
240 +
241 +multilib_src_configure() {
242 + ECONF_SOURCE="${S}" econf \
243 + $(multilib_is_native_abi || echo --disable-languages) \
244 + $(use_enable common-lisp languages) \
245 + $(use_enable nls) \
246 + $(use_enable static-libs static) \
247 + --enable-threads \
248 + CC_FOR_BUILD="$(tc-getBUILD_CC)" \
249 + $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
250 +}
251 +
252 +multilib_src_install_all() {
253 + einstalldocs
254 + find "${D}" -name '*.la' -delete || die
255 +}