Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 683254 | Differences between
and this patch

Collapse All | Expand All

(-)a/dev-libs/libgpg-error/Manifest (+4 lines)
Line 0 Link Here
1
AUX libgpg-error-1.36-gawk5-support.patch 4306 BLAKE2B 60bca612d1ce3b69facd0d27daac6275ad1f33ea1a514c762fdd4ff28c55a5e9725c2cd83429e1c2368b42fa6e9850400ffa668a6ce160cdbbc289e421d53c02 SHA512 69cd5219f47193a4b350661fde2d3dcf639ac38dacb6e076ae1d49bd1989562e034f5a238db3fa8af6fb1b80c22d5a6a7fa3f20a2fed95fe756e1a7840a1d886
2
DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
3
EBUILD libgpg-error-1.36.ebuild 1488 BLAKE2B c199c9046dcbd1e288a776752a34661010dad2073084dacc067b1b16b0d99dc001ef1c662b612186dcefc0d73412100d91098e25c1d244f61e4a8af4cd5d68f5 SHA512 7e7a714ffe229b189316e4ea606c7659cb1644332dbbeac1f589fb3534a0301f1d09b6f706f9f8b71110cae8f5e12fc39c80c939d425a91791aed0f44ef9ee43
4
MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
(-)a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch (+158 lines)
Line 0 Link Here
1
From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
2
From: NIIBE Yutaka <gniibe@fsij.org>
3
Date: Mon, 15 Apr 2019 15:10:44 +0900
4
Subject: [PATCH] awk: Prepare for Gawk 5.0.
5
6
* src/Makefile.am: Use pkg_namespace (instead of namespace).
7
* src/mkerrnos.awk: Likewise.
8
* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
9
* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
10
11
--
12
13
In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
14
which only allows escaping specific characters.
15
16
GnuPG-bug-id: 4459
17
Reported-by: Marius Schamschula
18
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
19
---
20
 lang/cl/mkerrcodes.awk |  2 +-
21
 src/Makefile.am        |  2 +-
22
 src/mkerrcodes.awk     |  2 +-
23
 src/mkerrcodes1.awk    |  2 +-
24
 src/mkerrcodes2.awk    |  2 +-
25
 src/mkerrnos.awk       |  2 +-
26
 src/mkstrtable.awk     | 10 +++++-----
27
 7 files changed, 11 insertions(+), 11 deletions(-)
28
29
diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
30
index ae29043..9a1fc18 100644
31
--- a/lang/cl/mkerrcodes.awk
32
+++ b/lang/cl/mkerrcodes.awk
33
@@ -122,7 +122,7 @@ header {
34
 }
35
 
36
 !header {
37
-  sub (/\#.+/, "");
38
+  sub (/#.+/, "");
39
   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
40
 
41
   if (/^$/)
42
diff --git a/src/Makefile.am b/src/Makefile.am
43
index ce1b882..f2590cb 100644
44
--- a/src/Makefile.am
45
+++ b/src/Makefile.am
46
@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
47
 
48
 errnos-sym.h: Makefile mkstrtable.awk errnos.in
49
 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
50
-		-v prefix=GPG_ERR_ -v namespace=errnos_ \
51
+		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
52
 		$(srcdir)/errnos.in >$@
53
 
54
 
55
diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
56
index 46d436c..e9c857c 100644
57
--- a/src/mkerrcodes.awk
58
+++ b/src/mkerrcodes.awk
59
@@ -85,7 +85,7 @@ header {
60
 }
61
 
62
 !header {
63
-  sub (/\#.+/, "");
64
+  sub (/#.+/, "");
65
   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
66
 
67
   if (/^$/)
68
diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
69
index a771a73..4578e29 100644
70
--- a/src/mkerrcodes1.awk
71
+++ b/src/mkerrcodes1.awk
72
@@ -81,7 +81,7 @@ header {
73
 }
74
 
75
 !header {
76
-  sub (/\#.+/, "");
77
+  sub (/#.+/, "");
78
   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
79
 
80
   if (/^$/)
81
diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
82
index ea58503..188f7a4 100644
83
--- a/src/mkerrcodes2.awk
84
+++ b/src/mkerrcodes2.awk
85
@@ -91,7 +91,7 @@ header {
86
 }
87
 
88
 !header {
89
-  sub (/\#.+/, "");
90
+  sub (/#.+/, "");
91
   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
92
 
93
   if (/^$/)
94
diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
95
index f79df66..15b1aad 100644
96
--- a/src/mkerrnos.awk
97
+++ b/src/mkerrnos.awk
98
@@ -83,7 +83,7 @@ header {
99
 }
100
 
101
 !header {
102
-  sub (/\#.+/, "");
103
+  sub (/#.+/, "");
104
   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
105
 
106
   if (/^$/)
107
diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
108
index c9de9c1..285e45f 100644
109
--- a/src/mkstrtable.awk
110
+++ b/src/mkstrtable.awk
111
@@ -77,7 +77,7 @@
112
 #
113
 # The variable prefix can be used to prepend a string to each message.
114
 #
115
-# The variable namespace can be used to prepend a string to each
116
+# The variable pkg_namespace can be used to prepend a string to each
117
 # variable and macro name.
118
 
119
 BEGIN {
120
@@ -102,7 +102,7 @@ header {
121
       print "/* The purpose of this complex string table is to produce";
122
       print "   optimal code with a minimum of relocations.  */";
123
       print "";
124
-      print "static const char " namespace "msgstr[] = ";
125
+      print "static const char " pkg_namespace "msgstr[] = ";
126
       header = 0;
127
     }
128
   else
129
@@ -110,7 +110,7 @@ header {
130
 }
131
 
132
 !header {
133
-  sub (/\#.+/, "");
134
+  sub (/#.+/, "");
135
   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
136
 
137
   if (/^$/)
138
@@ -150,7 +150,7 @@ END {
139
   else
140
     print "  gettext_noop (\"" last_msgstr "\");";
141
   print "";
142
-  print "static const int " namespace "msgidx[] =";
143
+  print "static const int " pkg_namespace "msgidx[] =";
144
   print "  {";
145
   for (i = 0; i < coded_msgs; i++)
146
     print "    " pos[i] ",";
147
@@ -158,7 +158,7 @@ END {
148
   print "  };";
149
   print "";
150
   print "static GPG_ERR_INLINE int";
151
-  print namespace "msgidxof (int code)";
152
+  print pkg_namespace "msgidxof (int code)";
153
   print "{";
154
   print "  return (0 ? 0";
155
 
156
-- 
157
2.21.0
158
(-)a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild (+51 lines)
Line 0 Link Here
1
# Copyright 1999-2018 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
3
4
EAPI=7
5
6
inherit autotools libtool multilib-minimal toolchain-funcs
7
8
DESCRIPTION="Contains error handling functions used by GnuPG software"
9
HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
10
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
11
12
LICENSE="GPL-2 LGPL-2.1"
13
SLOT="0"
14
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
15
IUSE="common-lisp nls static-libs"
16
17
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
18
DEPEND="${RDEPEND}"
19
BDEPEND="nls? ( sys-devel/gettext )"
20
21
MULTILIB_CHOST_TOOLS=(
22
	/usr/bin/gpg-error-config
23
)
24
MULTILIB_WRAPPED_HEADERS=(
25
	/usr/include/gpg-error.h
26
	/usr/include/gpgrt.h
27
)
28
29
PATCHES=( "${FILESDIR}/${PN}-1.36-gawk5-support.patch" )
30
31
src_prepare() {
32
	default
33
	eautomake
34
	elibtoolize
35
}
36
37
multilib_src_configure() {
38
	ECONF_SOURCE="${S}" econf \
39
		$(multilib_is_native_abi || echo --disable-languages) \
40
		$(use_enable common-lisp languages) \
41
		$(use_enable nls) \
42
		$(use_enable static-libs static) \
43
		--enable-threads \
44
		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
45
		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
46
}
47
48
multilib_src_install_all() {
49
	einstalldocs
50
	find "${D}" -name '*.la' -delete || die
51
}
(-)a/dev-libs/libgpg-error/metadata.xml (-1 / +11 lines)
Line 0 Link Here
0
- 
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3
<pkgmetadata>
4
	<maintainer type="project">
5
		<email>crypto@gentoo.org</email>
6
		<name>Crypto</name>
7
	</maintainer>
8
	<use>
9
		<flag name="common-lisp">Install common-lisp files</flag>
10
	</use>
11
</pkgmetadata>

Return to bug 683254