1 |
commit: 1a720b41737ae88adc368418b296bcd26a0eb742 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 7 14:20:19 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 7 14:20:19 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a720b41 |
7 |
|
8 |
dev-libs/libverto: fix runtime breakage with non-bash |
9 |
|
10 |
Thanks-to: Nick Bowler <nbowler <AT> draconx.ca> |
11 |
Closes: https://bugs.gentoo.org/762823 |
12 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
.../libverto/files/libverto-0.3.1-non-bash.patch | 133 +++++++++++++++++++++ |
16 |
...verto-0.3.1.ebuild => libverto-0.3.1-r1.ebuild} | 10 +- |
17 |
2 files changed, 140 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch b/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..df7162e21a7 |
22 |
--- /dev/null |
23 |
+++ b/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch |
24 |
@@ -0,0 +1,133 @@ |
25 |
+Strips bashisms from configure.ac causing breakage in net-nds/gssproxy |
26 |
+https://bugs.gentoo.org/762823 |
27 |
+--- a/configure.ac |
28 |
++++ b/configure.ac |
29 |
+@@ -91,22 +91,22 @@ AC_ARG_WITH([tevent], |
30 |
+ |
31 |
+ # Ensure that if a builtin is chosen only one is built |
32 |
+ BUILTIN_MODULE= |
33 |
+-if test x$WITH_GLIB == xbuiltin; then |
34 |
++if test x$WITH_GLIB = xbuiltin; then |
35 |
+ BUILTIN_MODULE=glib |
36 |
+ WITH_LIBEV=no |
37 |
+ WITH_LIBEVENT=no |
38 |
+ WITH_TEVENT=no |
39 |
+-elif test x$WITH_LIBEV == xbuiltin; then |
40 |
++elif test x$WITH_LIBEV = xbuiltin; then |
41 |
+ BUILTIN_MODULE=libev |
42 |
+ WITH_LIBGLIB=no |
43 |
+ WITH_LIBEVENT=no |
44 |
+ WITH_TEVENT=no |
45 |
+-elif test x$WITH_LIBEVENT == xbuiltin; then |
46 |
++elif test x$WITH_LIBEVENT = xbuiltin; then |
47 |
+ BUILTIN_MODULE=libevent |
48 |
+ WITH_LIBGLIB=no |
49 |
+ WITH_LIBEV=no |
50 |
+ WITH_TEVENT=no |
51 |
+-elif test x$WITH_TEVENT == xbuiltin; then |
52 |
++elif test x$WITH_TEVENT = xbuiltin; then |
53 |
+ BUILTIN_MODULE=tevent |
54 |
+ WITH_GLIB=no |
55 |
+ WITH_LIBEV=no |
56 |
+@@ -118,29 +118,29 @@ if test x$BUILTIN_MODULE != x; then |
57 |
+ fi |
58 |
+ |
59 |
+ # Ensure that there is only one default (convert duplicate default to yes) |
60 |
+-if test x$WITH_GLIB == xdefault; then |
61 |
++if test x$WITH_GLIB = xdefault; then |
62 |
+ AC_DEFINE([DEFUALT_MODULE], [glib]) |
63 |
+- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes |
64 |
+- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes |
65 |
+- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes |
66 |
++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes |
67 |
++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes |
68 |
++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes |
69 |
+ fi |
70 |
+-if test x$WITH_LIBEV == xdefault; then |
71 |
++if test x$WITH_LIBEV = xdefault; then |
72 |
+ AC_DEFINE([DEFUALT_MODULE], [libev]) |
73 |
+- test x$WITH_LIBGLIB == xdefault && WITH_GLIB=yes |
74 |
+- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes |
75 |
+- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes |
76 |
++ test x$WITH_LIBGLIB = xdefault && WITH_GLIB=yes |
77 |
++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes |
78 |
++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes |
79 |
+ fi |
80 |
+-if test x$WITH_LIBEVENT == xdefault; then |
81 |
++if test x$WITH_LIBEVENT = xdefault; then |
82 |
+ AC_DEFINE([DEFUALT_MODULE], [libevent]) |
83 |
+- test x$WITH_GLIB == xdefault && WITH_GLIB=yes |
84 |
+- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes |
85 |
+- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes |
86 |
++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes |
87 |
++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes |
88 |
++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes |
89 |
+ fi |
90 |
+-if test x$WITH_TEVENT == xdefault; then |
91 |
++if test x$WITH_TEVENT = xdefault; then |
92 |
+ AC_DEFINE([DEFUALT_MODULE], [tevent]) |
93 |
+- test x$WITH_GLIB == xdefault && WITH_GLIB=yes |
94 |
+- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes |
95 |
+- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes |
96 |
++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes |
97 |
++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes |
98 |
++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes |
99 |
+ fi |
100 |
+ |
101 |
+ BUILD_GLIB=no |
102 |
+@@ -151,7 +151,7 @@ BUILD_TEVENT=no |
103 |
+ if test x$WITH_GLIB != xno; then |
104 |
+ PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB], |
105 |
+ [test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")]) |
106 |
+- if test x$BUILD_GLIB == xauto; then |
107 |
++ if test x$BUILD_GLIB = xauto; then |
108 |
+ BUILD_GLIB=yes |
109 |
+ fi |
110 |
+ fi |
111 |
+@@ -165,7 +165,7 @@ if test x$WITH_LIBEV != xno; then |
112 |
+ ), |
113 |
+ [test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")] |
114 |
+ ) |
115 |
+- if test x$BUILD_LIBEV == xauto; then |
116 |
++ if test x$BUILD_LIBEV = xauto; then |
117 |
+ BUILD_LIBEV=yes |
118 |
+ fi |
119 |
+ fi |
120 |
+@@ -173,7 +173,7 @@ fi |
121 |
+ if test x$WITH_LIBEVENT != xno; then |
122 |
+ PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT], |
123 |
+ [test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")]) |
124 |
+- if test x$BUILD_LIBEVENT == xauto; then |
125 |
++ if test x$BUILD_LIBEVENT = xauto; then |
126 |
+ BUILD_LIBEVENT=yes |
127 |
+ fi |
128 |
+ fi |
129 |
+@@ -181,19 +181,19 @@ fi |
130 |
+ if test x$WITH_TEVENT != xno; then |
131 |
+ PKG_CHECK_MODULES([tevent], [tevent], [BUILD_TEVENT=$WITH_TEVENT], |
132 |
+ [test x$WITH_TEVENT != xauto && AC_MSG_ERROR("tevent not found")]) |
133 |
+- if test x$BUILD_TEVENT == xauto; then |
134 |
++ if test x$BUILD_TEVENT = xauto; then |
135 |
+ BUILD_TEVENT=yes |
136 |
+ fi |
137 |
+ fi |
138 |
+ |
139 |
+-AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE == x && test x$BUILD_GLIB != xno]) |
140 |
+-AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEV != xno]) |
141 |
+-AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEVENT != xno]) |
142 |
+-AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_TEVENT != xno]) |
143 |
+-AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE == xglib]) |
144 |
+-AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE == xlibev]) |
145 |
+-AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE == xlibevent]) |
146 |
+-AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE == xtevent]) |
147 |
++AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE = x && test x$BUILD_GLIB != xno]) |
148 |
++AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEV != xno]) |
149 |
++AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEVENT != xno]) |
150 |
++AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_TEVENT != xno]) |
151 |
++AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE = xglib]) |
152 |
++AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE = xlibev]) |
153 |
++AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE = xlibevent]) |
154 |
++AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE = xtevent]) |
155 |
+ |
156 |
+ AC_MSG_NOTICE() |
157 |
+ AC_MSG_NOTICE([BUILD CONFIGURATION]) |
158 |
|
159 |
diff --git a/dev-libs/libverto/libverto-0.3.1.ebuild b/dev-libs/libverto/libverto-0.3.1-r1.ebuild |
160 |
similarity index 90% |
161 |
rename from dev-libs/libverto/libverto-0.3.1.ebuild |
162 |
rename to dev-libs/libverto/libverto-0.3.1-r1.ebuild |
163 |
index 8ea4ef46aa1..6964058d33d 100644 |
164 |
--- a/dev-libs/libverto/libverto-0.3.1.ebuild |
165 |
+++ b/dev-libs/libverto/libverto-0.3.1-r1.ebuild |
166 |
@@ -1,4 +1,4 @@ |
167 |
-# Copyright 1999-2020 Gentoo Authors |
168 |
+# Copyright 1999-2021 Gentoo Authors |
169 |
# Distributed under the terms of the GNU General Public License v2 |
170 |
|
171 |
EAPI=7 |
172 |
@@ -13,6 +13,7 @@ LICENSE="MIT" |
173 |
SLOT="0" |
174 |
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" |
175 |
IUSE="glib +libev libevent tevent +threads static-libs" |
176 |
+REQUIRED_USE="|| ( glib libev libevent tevent ) " |
177 |
|
178 |
DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
179 |
libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] ) |
180 |
@@ -21,10 +22,13 @@ DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
181 |
|
182 |
RDEPEND="${DEPEND}" |
183 |
|
184 |
-REQUIRED_USE="|| ( glib libev libevent tevent ) " |
185 |
- |
186 |
DOCS=( AUTHORS ChangeLog NEWS INSTALL README ) |
187 |
|
188 |
+PATCHES=( |
189 |
+ # Runtime breakage caused by bashisms, bug #762823 |
190 |
+ "${FILESDIR}/${PN}-0.3.1-non-bash.patch" |
191 |
+) |
192 |
+ |
193 |
src_prepare() { |
194 |
default |
195 |
# known problem uptream with tevent write test. tevent does not fire a |