Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
Date: Sat, 30 Mar 2019 09:59:57
Message-Id: 1553939902.b8998a9bbdb89e01d0e0d5bb722ff7b5705f46d6.asturm@gentoo
1 commit: b8998a9bbdb89e01d0e0d5bb722ff7b5705f46d6
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 29 21:14:40 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 30 09:58:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8998a9b
7
8 dev-libs/libical: Drop vulnerable 2.0.0-r3
9
10 Bug: https://bugs.gentoo.org/587572
11 Package-Manager: Portage-2.3.62, Repoman-2.3.12
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 dev-libs/libical/Manifest | 1 -
15 ...ical-2.0.0-libical.pc-fix-libdir-location.patch | 28 ----------
16 ...cal-2.0.0-libical.pc-icu-move-to-requires.patch | 47 -----------------
17 ...al-2.0.0-libical.pc-icu-remove-full-paths.patch | 44 ----------------
18 ...libical-2.0.0-libical.pc-set-full-version.patch | 19 -------
19 dev-libs/libical/files/libical-2.0.0-tests.patch | 38 --------------
20 dev-libs/libical/libical-2.0.0-r3.ebuild | 60 ----------------------
21 7 files changed, 237 deletions(-)
22
23 diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
24 index bcd8bbd027d..d0547e218f6 100644
25 --- a/dev-libs/libical/Manifest
26 +++ b/dev-libs/libical/Manifest
27 @@ -1,2 +1 @@
28 -DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
29 DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
30
31 diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch
32 deleted file mode 100644
33 index 6044d133749..00000000000
34 --- a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch
35 +++ /dev/null
36 @@ -1,28 +0,0 @@
37 -This is a patch for Gentoo bug 560572, provided by Georgi Georgiev.
38 -
39 -diff --git a/CMakeLists.txt b/CMakeLists.txt
40 -index 773cf0c..e282ce4 100644
41 ---- a/CMakeLists.txt
42 -+++ b/CMakeLists.txt
43 -@@ -336,7 +336,7 @@ endif()
44 - set(VERSION "${PROJECT_VERSION}")
45 - set(prefix "${CMAKE_INSTALL_PREFIX}")
46 - set(exec_prefix "\${prefix}")
47 --set(libdir "\${exec_prefix}/lib")
48 -+set(libdir "${LIB_INSTALL_DIR}")
49 - set(includedir "\${prefix}/include")
50 - set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
51 -
52 -diff --git a/libical.pc.in b/libical.pc.in
53 -index 7774dce..bf88476 100644
54 ---- a/libical.pc.in
55 -+++ b/libical.pc.in
56 -@@ -8,8 +8,8 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
57 - Name: libical
58 - Description: An implementation of basic iCAL protocols
59 - Version: @LIBICAL_LIB_VERSION_STRING@
60 --Libs: -L${libdir} -lical -licalss -licalvcal
61 -+Libs: -lical -licalss -licalvcal
62 - Libs.private: @PTHREAD_LIBS@
63 - @REQUIRES_PRIVATE_ICU@
64 - Cflags: -I${includedir}
65
66 diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch
67 deleted file mode 100644
68 index e19dc037902..00000000000
69 --- a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch
70 +++ /dev/null
71 @@ -1,47 +0,0 @@
72 -commit f70a26aaf836da0f9e242945151b49190d682d95
73 -Author: Allen Winter <allen.winter@××××.com>
74 -Date: Sat Dec 3 11:11:48 2016 -0500
75 -
76 - CMakeLists.txt, libical.pc.in - ICU must appear as Requires in pkgconfig
77 - issue#244
78 -
79 -diff --git a/CMakeLists.txt b/CMakeLists.txt
80 -index b3d49d0d..0f6dfc34 100644
81 ---- a/CMakeLists.txt
82 -+++ b/CMakeLists.txt
83 -@@ -145,7 +145,7 @@ endif()
84 - # RSCALE info at http://tools.ietf.org/html/rfc7529
85 - find_package(ICU)
86 - if(ICU_FOUND)
87 -- set(ICUUC_LIBS "-licuuc") #for libical.pc
88 -+ set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc
89 - set(HAVE_LIBICU 1)
90 - if(ICU_MAJOR_VERSION VERSION_GREATER 50)
91 - set(HAVE_ICU_DANGI TRUE)
92 -@@ -155,7 +155,6 @@ if(ICU_FOUND)
93 - endif()
94 - if(ICU_I18N_FOUND)
95 - set(HAVE_LIBICU_I18N 1)
96 -- set(ICUI18N_LIBS "-licui18n") #for libical.pc
97 - endif()
98 -
99 - # MSVC specific definitions
100 -diff --git a/libical.pc.in b/libical.pc.in
101 -index 8899f430..c07eb52a 100644
102 ---- a/libical.pc.in
103 -+++ b/libical.pc.in
104 -@@ -2,11 +2,11 @@ prefix=@prefix@
105 - exec_prefix=@exec_prefix@
106 - libdir=@libdir@
107 - includedir=@includedir@
108 --threadslib=@PTHREAD_LIBS@
109 --iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
110 -
111 - Name: libical
112 - Description: An implementation of basic iCAL protocols
113 - Version: @LIBICAL_LIB_VERSION_STRING@
114 --Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
115 -+Libs: -L${libdir} -lical -licalss -licalvcal
116 -+Libs.private: @PTHREAD_LIBS@
117 -+@REQUIRES_PRIVATE_ICU@
118 - Cflags: -I${includedir}
119
120 diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch
121 deleted file mode 100644
122 index 08cf51f9408..00000000000
123 --- a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch
124 +++ /dev/null
125 @@ -1,44 +0,0 @@
126 -commit 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d
127 -Author: Allen Winter <allen.winter@××××.com>
128 -Date: Sat Sep 3 16:56:29 2016 -0400
129 -
130 - CMakeLists.txt, libical.pc.in - fix iculibs (remove full path)
131 - ISSUE: 227
132 -
133 -diff --git a/CMakeLists.txt b/CMakeLists.txt
134 -index 0173e1a8..0c903ee5 100644
135 ---- a/CMakeLists.txt
136 -+++ b/CMakeLists.txt
137 -@@ -145,6 +145,7 @@ endif()
138 - # RSCALE info at http://tools.ietf.org/html/rfc7529
139 - find_package(ICU)
140 - if(ICU_FOUND)
141 -+ set(ICUUC_LIBS "-licuuc") #for libical.pc
142 - set(HAVE_LIBICU 1)
143 - if(ICU_MAJOR_VERSION VERSION_GREATER 50)
144 - set(HAVE_ICU_DANGI TRUE)
145 -@@ -154,6 +155,7 @@ if(ICU_FOUND)
146 - endif()
147 - if(ICU_I18N_FOUND)
148 - set(HAVE_LIBICU_I18N 1)
149 -+ set(ICUI18N_LIBS "-licui18n") #for libical.pc
150 - endif()
151 -
152 - # MSVC specific definitions
153 -diff --git a/libical.pc.in b/libical.pc.in
154 -index 5c2debd8..8899f430 100644
155 ---- a/libical.pc.in
156 -+++ b/libical.pc.in
157 -@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
158 - libdir=@libdir@
159 - includedir=@includedir@
160 - threadslib=@PTHREAD_LIBS@
161 --iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
162 -+iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
163 -
164 - Name: libical
165 - Description: An implementation of basic iCAL protocols
166 - Version: @LIBICAL_LIB_VERSION_STRING@
167 --Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
168 -+Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
169 - Cflags: -I${includedir}
170
171 diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch
172 deleted file mode 100644
173 index 403ee84cd65..00000000000
174 --- a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch
175 +++ /dev/null
176 @@ -1,19 +0,0 @@
177 -commit cdc85e9e7a14932808471f823bc974031a0c4842
178 -Author: Allen Winter <allen.winter@××××.com>
179 -Date: Mon Jan 25 14:57:20 2016 -0500
180 -
181 - libical.pc.in - set the version to the full major.minor.patch
182 - as requested by Milan.
183 -
184 -diff --git a/libical.pc.in b/libical.pc.in
185 -index 7774dce2..5c2debd8 100644
186 ---- a/libical.pc.in
187 -+++ b/libical.pc.in
188 -@@ -7,6 +7,6 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
189 -
190 - Name: libical
191 - Description: An implementation of basic iCAL protocols
192 --Version: @VERSION@
193 -+Version: @LIBICAL_LIB_VERSION_STRING@
194 - Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
195 - Cflags: -I${includedir}
196
197 diff --git a/dev-libs/libical/files/libical-2.0.0-tests.patch b/dev-libs/libical/files/libical-2.0.0-tests.patch
198 deleted file mode 100644
199 index a274382b315..00000000000
200 --- a/dev-libs/libical/files/libical-2.0.0-tests.patch
201 +++ /dev/null
202 @@ -1,38 +0,0 @@
203 -From b1081cccb90fbe4cd859d3280a0470c30dce5cac Mon Sep 17 00:00:00 2001
204 -From: Allen Winter <allen.winter@××××.com>
205 -Date: Thu, 24 Mar 2016 16:28:02 -0400
206 -Subject: [PATCH] recur.c, testvcal.c - use TEST_DATADIR to point to the test
207 - data thereby fixing in-source building ISSUE#228
208 - https://bugs.gentoo.org/show_bug.cgi?id=532296
209 -
210 ----
211 - src/test/recur.c | 2 +-
212 - src/test/testvcal.c | 2 +-
213 - 2 files changed, 2 insertions(+), 2 deletions(-)
214 -
215 -diff --git a/src/test/recur.c b/src/test/recur.c
216 -index d427137a..873ec48a 100644
217 ---- a/src/test/recur.c
218 -+++ b/src/test/recur.c
219 -@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
220 - #endif
221 -
222 - if (argc <= 1) {
223 -- file = "../../test-data/recur.txt";
224 -+ file = TEST_DATADIR "/recur.txt";
225 - } else if (argc == 2) {
226 - file = argv[1];
227 - } else {
228 -diff --git a/src/test/testvcal.c b/src/test/testvcal.c
229 -index feee8147..024bbe99 100644
230 ---- a/src/test/testvcal.c
231 -+++ b/src/test/testvcal.c
232 -@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
233 - char *file;
234 -
235 - if (argc != 2) {
236 -- file = "../../test-data/user-cal.vcf";
237 -+ file = TEST_DATADIR "/user-cal.vcf";
238 - } else {
239 - file = argv[1];
240 - }
241
242 diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
243 deleted file mode 100644
244 index f92f67e5d8c..00000000000
245 --- a/dev-libs/libical/libical-2.0.0-r3.ebuild
246 +++ /dev/null
247 @@ -1,60 +0,0 @@
248 -# Copyright 1999-2018 Gentoo Foundation
249 -# Distributed under the terms of the GNU General Public License v2
250 -
251 -EAPI=6
252 -
253 -inherit cmake-utils
254 -
255 -DESCRIPTION="An implementation of basic iCAL protocols"
256 -HOMEPAGE="https://github.com/libical/libical"
257 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
258 -
259 -LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
260 -SLOT="0/2"
261 -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
262 -IUSE="doc examples static-libs"
263 -
264 -# The GOBJECT_INTROSPECTION build is broken, and upstream has given up
265 -# on it at the moment (it's disabled in Travis). It will probably come
266 -# back in v2.0.1 or later.
267 -# This snippet belongs to RDEPEND:
268 -# introspection? ( dev-libs/gobject-introspection )"
269 -RDEPEND="dev-libs/icu:="
270 -DEPEND="${RDEPEND}
271 - dev-lang/perl"
272 -
273 -DOCS=(
274 - AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
275 - doc/{AddingOrModifyingComponents,UsingLibical}.txt
276 -)
277 -
278 -PATCHES=(
279 - "${FILESDIR}/${P}-libical.pc-set-full-version.patch"
280 - "${FILESDIR}/${P}-libical.pc-icu-remove-full-paths.patch"
281 - "${FILESDIR}/${P}-libical.pc-icu-move-to-requires.patch"
282 - "${FILESDIR}/${P}-libical.pc-fix-libdir-location.patch"
283 - "${FILESDIR}/${P}-tests.patch" #bug 532296
284 -)
285 -
286 -src_configure() {
287 - # See above, introspection is disabled for v2.0.0 at least.
288 - #local mycmakeargs=(
289 - # -DGOBJECT_INTROSPECTION=$(usex introspection true false)
290 - #)
291 - use static-libs || mycmakeargs+=( -DSHARED_ONLY=ON )
292 - cmake-utils_src_configure
293 -}
294 -
295 -src_test() {
296 - local myctestargs=( -j1 )
297 - cmake-utils_src_test
298 -}
299 -
300 -src_install() {
301 - cmake-utils_src_install
302 -
303 - if use examples; then
304 - rm examples/CMakeLists.txt || die
305 - dodoc -r examples
306 - fi
307 -}