1 |
commit: 146cefcc9ff2b2aa092083017afc238b19835b4e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 15 18:10:56 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 15 18:11:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146cefcc |
7 |
|
8 |
dev-libs/libical: Drop 3.0.8 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-libs/libical/Manifest | 1 - |
14 |
dev-libs/libical/files/libical-3.0.8-icu-68.patch | 44 --------- |
15 |
dev-libs/libical/libical-3.0.8.ebuild | 105 ---------------------- |
16 |
3 files changed, 150 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest |
19 |
index 86f7efb8be5..bea4b2139f4 100644 |
20 |
--- a/dev-libs/libical/Manifest |
21 |
+++ b/dev-libs/libical/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0 |
24 |
-DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b |
25 |
DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268 |
26 |
|
27 |
diff --git a/dev-libs/libical/files/libical-3.0.8-icu-68.patch b/dev-libs/libical/files/libical-3.0.8-icu-68.patch |
28 |
deleted file mode 100644 |
29 |
index 1974db76b0a..00000000000 |
30 |
--- a/dev-libs/libical/files/libical-3.0.8-icu-68.patch |
31 |
+++ /dev/null |
32 |
@@ -1,44 +0,0 @@ |
33 |
-From a90657f5bbc5e2eb45fa419e7f43889aeccd4c39 Mon Sep 17 00:00:00 2001 |
34 |
-From: Lars Wendler <polynomial-c@g.o> |
35 |
-Date: Fri, 30 Oct 2020 11:24:34 +0100 |
36 |
-Subject: [PATCH] Fix build with icu-68.1 |
37 |
- |
38 |
-icu-68.1 removed public macro definitions for TRUE and FALSE |
39 |
- |
40 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
41 |
---- |
42 |
- src/libical/icalrecur.c | 5 +++-- |
43 |
- 1 file changed, 3 insertions(+), 2 deletions(-) |
44 |
- |
45 |
-diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c |
46 |
-index 91522161..159163c5 100644 |
47 |
---- a/src/libical/icalrecur.c |
48 |
-+++ b/src/libical/icalrecur.c |
49 |
-@@ -143,6 +143,7 @@ |
50 |
- #include <stdlib.h> |
51 |
- |
52 |
- #if defined(HAVE_LIBICU) |
53 |
-+#include <stdbool.h> |
54 |
- #include <unicode/ucal.h> |
55 |
- #include <unicode/ustring.h> |
56 |
- #else |
57 |
-@@ -1079,7 +1080,7 @@ icalarray *icalrecurrencetype_rscale_supported_calendars(void) |
58 |
- |
59 |
- calendars = icalarray_new(sizeof(const char **), 20); |
60 |
- |
61 |
-- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status); |
62 |
-+ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status); |
63 |
- while ((cal = uenum_next(en, NULL, &status))) { |
64 |
- cal = icalmemory_tmp_copy(cal); |
65 |
- icalarray_append(calendars, &cal); |
66 |
-@@ -1472,7 +1473,7 @@ static int initialize_rscale(icalrecur_iterator *impl) |
67 |
- } |
68 |
- |
69 |
- /* Check if specified calendar is supported */ |
70 |
-- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status); |
71 |
-+ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status); |
72 |
- while ((cal = uenum_next(en, NULL, &status))) { |
73 |
- if (!strcmp(cal, rule.rscale)) { |
74 |
- is_hebrew = !strcmp(rule.rscale, "hebrew"); |
75 |
--- |
76 |
-2.29.2 |
77 |
|
78 |
diff --git a/dev-libs/libical/libical-3.0.8.ebuild b/dev-libs/libical/libical-3.0.8.ebuild |
79 |
deleted file mode 100644 |
80 |
index 0c4155a9bb5..00000000000 |
81 |
--- a/dev-libs/libical/libical-3.0.8.ebuild |
82 |
+++ /dev/null |
83 |
@@ -1,105 +0,0 @@ |
84 |
-# Copyright 1999-2021 Gentoo Authors |
85 |
-# Distributed under the terms of the GNU General Public License v2 |
86 |
- |
87 |
-EAPI=7 |
88 |
- |
89 |
-PYTHON_COMPAT=( python3_{7,8} ) |
90 |
-VALA_USE_DEPEND="vapigen" |
91 |
-inherit cmake python-any-r1 vala |
92 |
- |
93 |
-DESCRIPTION="An implementation of basic iCAL protocols" |
94 |
-HOMEPAGE="https://github.com/libical/libical" |
95 |
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" |
96 |
- |
97 |
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )" |
98 |
-SLOT="0/3" |
99 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" |
100 |
-IUSE="berkdb doc examples +glib +introspection static-libs test vala" |
101 |
- |
102 |
-REQUIRED_USE="introspection? ( glib ) vala? ( introspection )" |
103 |
- |
104 |
-RESTRICT="!test? ( test )" |
105 |
- |
106 |
-BDEPEND=" |
107 |
- dev-lang/perl |
108 |
- virtual/pkgconfig |
109 |
- doc? ( app-doc/doxygen ) |
110 |
- introspection? ( dev-libs/gobject-introspection ) |
111 |
- test? ( ${PYTHON_DEPS} ) |
112 |
- vala? ( $(vala_depend) ) |
113 |
-" |
114 |
-COMMON_DEPEND=" |
115 |
- dev-libs/icu:= |
116 |
- berkdb? ( sys-libs/db:= ) |
117 |
- glib? ( dev-libs/glib:2 ) |
118 |
-" |
119 |
-DEPEND="${COMMON_DEPEND} |
120 |
- glib? ( dev-libs/libxml2:2 ) |
121 |
-" |
122 |
-RDEPEND="${COMMON_DEPEND} |
123 |
- sys-libs/timezone-data |
124 |
-" |
125 |
- |
126 |
-DOCS=( |
127 |
- AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO |
128 |
- doc/{AddingOrModifyingComponents,UsingLibical}.txt |
129 |
-) |
130 |
- |
131 |
-PATCHES=( |
132 |
- "${FILESDIR}/${PN}-3.0.4-tests.patch" |
133 |
- "${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch" |
134 |
- "${FILESDIR}/${P}-icu-68.patch" # pending upstream PR #448, bug #751928 |
135 |
-) |
136 |
- |
137 |
-pkg_setup() { |
138 |
- use test && python-any-r1_pkg_setup |
139 |
-} |
140 |
- |
141 |
-src_prepare() { |
142 |
- cmake_src_prepare |
143 |
- use examples || cmake_comment_add_subdirectory examples |
144 |
- use vala && vala_src_prepare |
145 |
-} |
146 |
- |
147 |
-src_configure() { |
148 |
- local mycmakeargs=( |
149 |
- $(cmake_use_find_package berkdb BDB) |
150 |
- -DICAL_BUILD_DOCS=$(usex doc) |
151 |
- -DICAL_GLIB=$(usex glib) |
152 |
- -DGOBJECT_INTROSPECTION=$(usex introspection) |
153 |
- -DSHARED_ONLY=$(usex !static-libs) |
154 |
- -DLIBICAL_BUILD_TESTING=$(usex test) |
155 |
- -DICAL_GLIB_VAPI=$(usex vala) |
156 |
- ) |
157 |
- if use vala; then |
158 |
- mycmakeargs+=( |
159 |
- -DVALAC="${VALAC}" |
160 |
- -DVAPIGEN="${VAPIGEN}" |
161 |
- ) |
162 |
- fi |
163 |
- cmake_src_configure |
164 |
-} |
165 |
- |
166 |
-src_compile() { |
167 |
- cmake_src_compile |
168 |
- use doc && cmake_src_compile docs |
169 |
-} |
170 |
- |
171 |
-src_test() { |
172 |
- local myctestargs=( |
173 |
- -E "(icalrecurtest|icalrecurtest-r)" # bug 660282 |
174 |
- ) |
175 |
- |
176 |
- cmake_src_test |
177 |
-} |
178 |
- |
179 |
-src_install() { |
180 |
- use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) |
181 |
- |
182 |
- cmake_src_install |
183 |
- |
184 |
- if use examples; then |
185 |
- rm examples/CMakeLists.txt || die |
186 |
- dodoc -r examples |
187 |
- fi |
188 |
-} |