1 |
commit: 26c986d5418f063a1398b64ed1c7b4c546a945b0 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 6 16:55:17 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 6 17:03:48 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c986d5 |
7 |
|
8 |
dev-libs/libical: Drop 3.0.3 |
9 |
|
10 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-libs/libical/Manifest | 1 - |
14 |
.../files/libical-3.0.3-findicu-pkgconfig.patch | 58 -------------- |
15 |
dev-libs/libical/libical-3.0.3.ebuild | 90 ---------------------- |
16 |
3 files changed, 149 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest |
19 |
index f74908e452e..bcd8bbd027d 100644 |
20 |
--- a/dev-libs/libical/Manifest |
21 |
+++ b/dev-libs/libical/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f |
24 |
-DIST libical-3.0.3.tar.gz 866624 BLAKE2B 6d7c11aeb80dbd6b72001484a0ad89ff9b0f892c9400cec3f0d131d1edbabdafa8ef9717d1fed92c4999ba0934e8676e5cc58ebb3cb74fdbb8e5f5c816cc97bb SHA512 319a9e02b34835eb222728cb691b18e4f490b21f7faa55d266f298c07dafb5e15a492fb2105e2c3ab6d60d2affcf430b5b248cc38abc1e3bc29143662676fe70 |
25 |
DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9 |
26 |
|
27 |
diff --git a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch b/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch |
28 |
deleted file mode 100644 |
29 |
index 7f0ffc4b428..00000000000 |
30 |
--- a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch |
31 |
+++ /dev/null |
32 |
@@ -1,58 +0,0 @@ |
33 |
-From 5c682db0dd1cfd7090dd191e89613ad5fb9fc078 Mon Sep 17 00:00:00 2001 |
34 |
-From: Allen Winter <allen.winter@××××.com> |
35 |
-Date: Sat, 26 May 2018 09:06:10 -0400 |
36 |
-Subject: [PATCH] cmake/modules/FindICU.cmake - allow pkgconfig to get is a |
37 |
- hint |
38 |
- |
39 |
---- |
40 |
- cmake/modules/FindICU.cmake | 13 ++++++------- |
41 |
- 1 file changed, 6 insertions(+), 7 deletions(-) |
42 |
- |
43 |
-diff --git a/cmake/modules/FindICU.cmake b/cmake/modules/FindICU.cmake |
44 |
-index 12a1812d..53213efe 100644 |
45 |
---- a/cmake/modules/FindICU.cmake |
46 |
-+++ b/cmake/modules/FindICU.cmake |
47 |
-@@ -23,16 +23,12 @@ if(WIN32) |
48 |
- file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) |
49 |
- endif() |
50 |
- |
51 |
--if(ICU_INCLUDE_DIR AND ICU_LIBRARY) |
52 |
-- # Already in cache, be silent |
53 |
-- set(ICU_FIND_QUIETLY TRUE) |
54 |
--endif() |
55 |
-- |
56 |
--#set the root from the ICU_BASE environment |
57 |
- file(TO_NATIVE_PATH "$ENV{ICU_BASE}" icu_root) |
58 |
--#override the root from ICU_BASE defined to cmake |
59 |
- if(DEFINED ICU_BASE) |
60 |
- file(TO_NATIVE_PATH "${ICU_BASE}" icu_root) |
61 |
-+else() |
62 |
-+ find_package(PkgConfig QUIET) |
63 |
-+ pkg_check_modules(PC_LibICU QUIET icu-i18n) |
64 |
- endif() |
65 |
- |
66 |
- # Look for the header file. |
67 |
-@@ -42,6 +38,7 @@ find_path( |
68 |
- HINTS |
69 |
- ${icu_root}/include |
70 |
- ${_program_FILES_DIR}/icu/include |
71 |
-+ ${PC_LibICU_INCLUDEDIR} |
72 |
- /usr/local/opt/icu4c/include |
73 |
- DOC "Include directory for the ICU library" |
74 |
- ) |
75 |
-@@ -56,6 +53,7 @@ find_library( |
76 |
- ${icu_root}/lib/ |
77 |
- ${_program_FILES_DIR}/icu/lib64/ |
78 |
- ${_program_FILES_DIR}/icu/lib/ |
79 |
-+ ${PC_LibICU_LIBDIR} |
80 |
- /usr/local/opt/icu4c/lib/ |
81 |
- DOC "Libraries to link against for the common parts of ICU" |
82 |
- ) |
83 |
-@@ -98,6 +96,7 @@ if(ICU_INCLUDE_DIR AND ICU_LIBRARY) |
84 |
- HINTS |
85 |
- ${icu_root}/lib/ |
86 |
- ${_program_FILES_DIR}/icu/lib/ |
87 |
-+ ${PC_LibICU_LIBDIR} |
88 |
- /usr/local/opt/icu4c/lib/ |
89 |
- DOC "Libraries to link against for ICU internationalization" |
90 |
- ) |
91 |
|
92 |
diff --git a/dev-libs/libical/libical-3.0.3.ebuild b/dev-libs/libical/libical-3.0.3.ebuild |
93 |
deleted file mode 100644 |
94 |
index fe0236af8a4..00000000000 |
95 |
--- a/dev-libs/libical/libical-3.0.3.ebuild |
96 |
+++ /dev/null |
97 |
@@ -1,90 +0,0 @@ |
98 |
-# Copyright 1999-2018 Gentoo Foundation |
99 |
-# Distributed under the terms of the GNU General Public License v2 |
100 |
- |
101 |
-EAPI=6 |
102 |
- |
103 |
-PYTHON_COMPAT=( python3_{4,5,6} ) |
104 |
-inherit cmake-utils python-any-r1 |
105 |
- |
106 |
-DESCRIPTION="An implementation of basic iCAL protocols" |
107 |
-HOMEPAGE="https://github.com/libical/libical" |
108 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
109 |
- |
110 |
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )" |
111 |
-SLOT="0/3" |
112 |
-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" |
113 |
-IUSE="berkdb doc examples static-libs test" |
114 |
- |
115 |
-# TODO: disabled until useful |
116 |
-# glib? ( |
117 |
-# dev-libs/glib:2 |
118 |
-# dev-libs/libxml2:2 |
119 |
-# ) |
120 |
-# introspection? ( dev-libs/gobject-introspection:= ) |
121 |
-COMMON_DEPEND=" |
122 |
- dev-libs/icu:= |
123 |
- berkdb? ( sys-libs/db:= ) |
124 |
-" |
125 |
-DEPEND="${COMMON_DEPEND} |
126 |
- dev-lang/perl |
127 |
- virtual/pkgconfig |
128 |
- doc? ( app-doc/doxygen ) |
129 |
- test? ( ${PYTHON_DEPS} ) |
130 |
-" |
131 |
-RDEPEND="${COMMON_DEPEND} |
132 |
- sys-libs/timezone-data |
133 |
-" |
134 |
- |
135 |
-DOCS=( |
136 |
- AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO |
137 |
- doc/{AddingOrModifyingComponents,UsingLibical}.txt |
138 |
-) |
139 |
- |
140 |
-PATCHES=( |
141 |
- "${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch" |
142 |
- "${FILESDIR}/${P}-findicu-pkgconfig.patch" |
143 |
-) |
144 |
- |
145 |
-pkg_setup() { |
146 |
- use test && python-any-r1_pkg_setup |
147 |
-} |
148 |
- |
149 |
-src_prepare() { |
150 |
- cmake-utils_src_prepare |
151 |
- use examples || cmake_comment_add_subdirectory examples |
152 |
-} |
153 |
- |
154 |
-src_configure() { |
155 |
- local mycmakeargs=( |
156 |
- -DICAL_GLIB=OFF |
157 |
- -DGOBJECT_INTROSPECTION=OFF |
158 |
- $(cmake-utils_use_find_package berkdb BDB) |
159 |
- -DICAL_BUILD_DOCS=$(usex doc) |
160 |
- -DSHARED_ONLY=$(usex !static-libs) |
161 |
- ) |
162 |
-# TODO: disabled until useful |
163 |
-# -DICAL_GLIB=$(usex glib) |
164 |
-# -DGOBJECT_INTROSPECTION=$(usex introspection) |
165 |
- cmake-utils_src_configure |
166 |
-} |
167 |
- |
168 |
-src_compile() { |
169 |
- cmake-utils_src_compile |
170 |
- use doc && cmake-utils_src_compile docs |
171 |
-} |
172 |
- |
173 |
-src_test() { |
174 |
- local myctestargs=( -j1 ) |
175 |
- cmake-utils_src_test |
176 |
-} |
177 |
- |
178 |
-src_install() { |
179 |
- use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) |
180 |
- |
181 |
- cmake-utils_src_install |
182 |
- |
183 |
- if use examples; then |
184 |
- rm examples/CMakeLists.txt || die |
185 |
- dodoc -r examples |
186 |
- fi |
187 |
-} |