1 |
commit: e7f868b0c457f496f66a8791eba1cd440d9f1ff2 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 27 20:05:05 2019 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 27 20:05:05 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=e7f868b0 |
7 |
|
8 |
dev-libs/libgpg-error: not needed here anymore |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
dev-libs/libgpg-error/Manifest | 1 - |
13 |
.../files/libgpg-error-1.36-gawk5-2.patch | 13 ---- |
14 |
.../files/libgpg-error-1.36-gawk5.patch | 74 ---------------------- |
15 |
dev-libs/libgpg-error/libgpg-error-1.36.ebuild | 53 ---------------- |
16 |
dev-libs/libgpg-error/metadata.xml | 11 ---- |
17 |
5 files changed, 152 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest |
20 |
deleted file mode 100644 |
21 |
index 7c18d4d..0000000 |
22 |
--- a/dev-libs/libgpg-error/Manifest |
23 |
+++ /dev/null |
24 |
@@ -1 +0,0 @@ |
25 |
-DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346 |
26 |
|
27 |
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-2.patch b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-2.patch |
28 |
deleted file mode 100644 |
29 |
index 5684921..0000000 |
30 |
--- a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-2.patch |
31 |
+++ /dev/null |
32 |
@@ -1,13 +0,0 @@ |
33 |
-diff --git a/src/Makefile.in b/src/Makefile.in |
34 |
-index 9ffb29d..83e6659 100644 |
35 |
---- a/src/Makefile.in |
36 |
-+++ b/src/Makefile.in |
37 |
-@@ -1449,7 +1449,7 @@ code-from-errno.h: mkerrcodes Makefile |
38 |
- |
39 |
- errnos-sym.h: Makefile mkstrtable.awk errnos.in |
40 |
- $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ |
41 |
-- -v prefix=GPG_ERR_ -v namespace=errnos_ \ |
42 |
-+ -v prefix=GPG_ERR_ -v libgpg_error_namespace=errnos_ \ |
43 |
- $(srcdir)/errnos.in >$@ |
44 |
- |
45 |
- mkheader: mkheader.c Makefile |
46 |
|
47 |
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5.patch b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5.patch |
48 |
deleted file mode 100644 |
49 |
index 2ea2b6e..0000000 |
50 |
--- a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5.patch |
51 |
+++ /dev/null |
52 |
@@ -1,74 +0,0 @@ |
53 |
-From 55b9550de790126856666ad8cb78a75c5ae48220 Mon Sep 17 00:00:00 2001 |
54 |
-From: Lars Wendler <polynomial-c@g.o> |
55 |
-Date: Sat, 13 Apr 2019 19:59:45 +0200 |
56 |
-Subject: [PATCH] Fixed build with gawk-5 |
57 |
- |
58 |
-gawk-5 has the word "namespace" reserved which results in an error when |
59 |
-building libgpg-error: |
60 |
- |
61 |
- gawk: fatal: cannot use gawk builtin `namespace' as variable name |
62 |
- |
63 |
-Fixed this by renaming "namespace" to "libgpg_error_namespace". |
64 |
- |
65 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
66 |
---- |
67 |
- src/Makefile.am | 2 +- |
68 |
- src/mkstrtable.awk | 8 ++++---- |
69 |
- 2 files changed, 5 insertions(+), 5 deletions(-) |
70 |
- |
71 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
72 |
-index ce1b882..b329242 100644 |
73 |
---- a/src/Makefile.am |
74 |
-+++ b/src/Makefile.am |
75 |
-@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile |
76 |
- |
77 |
- errnos-sym.h: Makefile mkstrtable.awk errnos.in |
78 |
- $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ |
79 |
-- -v prefix=GPG_ERR_ -v namespace=errnos_ \ |
80 |
-+ -v prefix=GPG_ERR_ -v libgpg_error_namespace=errnos_ \ |
81 |
- $(srcdir)/errnos.in >$@ |
82 |
- |
83 |
- |
84 |
-diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk |
85 |
-index c9de9c1..5b5307b 100644 |
86 |
---- a/src/mkstrtable.awk |
87 |
-+++ b/src/mkstrtable.awk |
88 |
-@@ -77,7 +77,7 @@ |
89 |
- # |
90 |
- # The variable prefix can be used to prepend a string to each message. |
91 |
- # |
92 |
--# The variable namespace can be used to prepend a string to each |
93 |
-+# The variable libgpg_error_namespace can be used to prepend a string to each |
94 |
- # variable and macro name. |
95 |
- |
96 |
- BEGIN { |
97 |
-@@ -102,7 +102,7 @@ header { |
98 |
- print "/* The purpose of this complex string table is to produce"; |
99 |
- print " optimal code with a minimum of relocations. */"; |
100 |
- print ""; |
101 |
-- print "static const char " namespace "msgstr[] = "; |
102 |
-+ print "static const char " libgpg_error_namespace "msgstr[] = "; |
103 |
- header = 0; |
104 |
- } |
105 |
- else |
106 |
-@@ -150,7 +150,7 @@ END { |
107 |
- else |
108 |
- print " gettext_noop (\"" last_msgstr "\");"; |
109 |
- print ""; |
110 |
-- print "static const int " namespace "msgidx[] ="; |
111 |
-+ print "static const int " libgpg_error_namespace "msgidx[] ="; |
112 |
- print " {"; |
113 |
- for (i = 0; i < coded_msgs; i++) |
114 |
- print " " pos[i] ","; |
115 |
-@@ -158,7 +158,7 @@ END { |
116 |
- print " };"; |
117 |
- print ""; |
118 |
- print "static GPG_ERR_INLINE int"; |
119 |
-- print namespace "msgidxof (int code)"; |
120 |
-+ print libgpg_error_namespace "msgidxof (int code)"; |
121 |
- print "{"; |
122 |
- print " return (0 ? 0"; |
123 |
- |
124 |
--- |
125 |
-2.21.0 |
126 |
- |
127 |
|
128 |
diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild |
129 |
deleted file mode 100644 |
130 |
index 93ea2b5..0000000 |
131 |
--- a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild |
132 |
+++ /dev/null |
133 |
@@ -1,53 +0,0 @@ |
134 |
-# Copyright 1999-2019 Gentoo Authors |
135 |
-# Distributed under the terms of the GNU General Public License v2 |
136 |
- |
137 |
-EAPI=7 |
138 |
- |
139 |
-inherit libtool multilib-minimal toolchain-funcs |
140 |
- |
141 |
-DESCRIPTION="Contains error handling functions used by GnuPG software" |
142 |
-HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error" |
143 |
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
144 |
- |
145 |
-LICENSE="GPL-2 LGPL-2.1" |
146 |
-SLOT="0" |
147 |
-KEYWORDS="~riscv" |
148 |
-IUSE="common-lisp nls static-libs" |
149 |
- |
150 |
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" |
151 |
-DEPEND="${RDEPEND}" |
152 |
-BDEPEND="nls? ( sys-devel/gettext )" |
153 |
- |
154 |
-MULTILIB_CHOST_TOOLS=( |
155 |
- /usr/bin/gpg-error-config |
156 |
-) |
157 |
-MULTILIB_WRAPPED_HEADERS=( |
158 |
- /usr/include/gpg-error.h |
159 |
- /usr/include/gpgrt.h |
160 |
-) |
161 |
- |
162 |
-PATCHES=( |
163 |
- "${FILESDIR}/${P}-gawk5.patch" |
164 |
- "${FILESDIR}/${P}-gawk5-2.patch" |
165 |
-) |
166 |
- |
167 |
-src_prepare() { |
168 |
- default |
169 |
- elibtoolize |
170 |
-} |
171 |
- |
172 |
-multilib_src_configure() { |
173 |
- ECONF_SOURCE="${S}" econf \ |
174 |
- $(multilib_is_native_abi || echo --disable-languages) \ |
175 |
- $(use_enable common-lisp languages) \ |
176 |
- $(use_enable nls) \ |
177 |
- $(use_enable static-libs static) \ |
178 |
- --enable-threads \ |
179 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" \ |
180 |
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
181 |
-} |
182 |
- |
183 |
-multilib_src_install_all() { |
184 |
- einstalldocs |
185 |
- find "${D}" -name '*.la' -delete || die |
186 |
-} |
187 |
|
188 |
diff --git a/dev-libs/libgpg-error/metadata.xml b/dev-libs/libgpg-error/metadata.xml |
189 |
deleted file mode 100644 |
190 |
index 89e9849..0000000 |
191 |
--- a/dev-libs/libgpg-error/metadata.xml |
192 |
+++ /dev/null |
193 |
@@ -1,11 +0,0 @@ |
194 |
-<?xml version="1.0" encoding="UTF-8"?> |
195 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
196 |
-<pkgmetadata> |
197 |
- <maintainer type="project"> |
198 |
- <email>crypto@g.o</email> |
199 |
- <name>Crypto</name> |
200 |
- </maintainer> |
201 |
- <use> |
202 |
- <flag name="common-lisp">Install common-lisp files</flag> |
203 |
- </use> |
204 |
-</pkgmetadata> |