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: Thu, 20 Jan 2022 13:26:50
Message-Id: 1642685062.92cd6a2cdca7df563587ca6256557cae41c45eb4.asturm@gentoo
1 commit: 92cd6a2cdca7df563587ca6256557cae41c45eb4
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 20 12:58:46 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 20 13:24:22 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92cd6a2c
7
8 dev-libs/libical: Drop 3.0.10
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-libs/libical/Manifest | 1 -
14 .../files/libical-3.0.5-pkgconfig-libdir.patch | 44 --------
15 dev-libs/libical/libical-3.0.10.ebuild | 114 ---------------------
16 3 files changed, 159 deletions(-)
17
18 diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
19 index ef9795f06c6d..0af2bda6d07c 100644
20 --- a/dev-libs/libical/Manifest
21 +++ b/dev-libs/libical/Manifest
22 @@ -1,2 +1 @@
23 -DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0
24 DIST libical-3.0.12.tar.gz 883537 BLAKE2B a67cbf767f5dba7717c80b2ed90f257025544b6fbbd85e4d10712fb63ec5d750c00e9a1d664b0c75f7e833847aeee2fc1412866bf4b599ead663132b3665835f SHA512 e97aec11895d4c51fcb1fe32598f5fc23bbffc26274d1f46e74d1b9a365bea65446563224b852d13a763334eab0375e77cabb5ba535d3b2f89b652bbe24b4517
25
26 diff --git a/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
27 deleted file mode 100644
28 index a3a80e9f76f5..000000000000
29 --- a/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
30 +++ /dev/null
31 @@ -1,44 +0,0 @@
32 -Fix pkgconfig libdir paths.
33 -
34 ---- a/CMakeLists.txt
35 -+++ b/CMakeLists.txt
36 -@@ -336,7 +336,7 @@
37 - set(VERSION "${PROJECT_VERSION}")
38 - set(prefix "${CMAKE_INSTALL_PREFIX}")
39 - set(exec_prefix "\${prefix}")
40 --set(libdir "\${exec_prefix}/lib")
41 -+set(libdir "${LIB_INSTALL_DIR}")
42 - set(includedir "\${prefix}/include")
43 - set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
44 -
45 ---- a/libical.pc.in
46 -+++ b/libical.pc.in
47 -@@ -8,7 +8,7 @@
48 - Name: libical
49 - Description: An implementation of basic iCAL protocols
50 - Version: @LIBICAL_LIB_VERSION_STRING@
51 --Libs: -L${libdir} -lical -licalss -licalvcal
52 -+Libs: -lical -licalss -licalvcal
53 - Libs.private: @PTHREAD_LIBS@
54 - @REQUIRES_PRIVATE_ICU@
55 - Cflags: -I${includedir}
56 ---- a/src/libical-glib/CMakeLists.txt
57 -+++ b/src/libical-glib/CMakeLists.txt
58 -@@ -233,7 +233,7 @@
59 -
60 - set(prefix "${CMAKE_INSTALL_PREFIX}")
61 - set(exec_prefix "\${prefix}")
62 --set(libdir "\${exec_prefix}/lib")
63 -+set(libdir "${LIB_INSTALL_DIR}")
64 - set(includedir "\${prefix}/include")
65 -
66 - configure_file(
67 ---- a/src/libical-glib/libical-glib.pc.in
68 -+++ b/src/libical-glib/libical-glib.pc.in
69 -@@ -8,4 +8,4 @@
70 - Version: @LIBICAL_LIB_VERSION_STRING@
71 - Requires: glib-2.0, gobject-2.0, libical
72 - Cflags: -I${includedir}
73 --Libs: -L${libdir} -lical-glib
74 -+Libs: -lical-glib
75 -
76
77 diff --git a/dev-libs/libical/libical-3.0.10.ebuild b/dev-libs/libical/libical-3.0.10.ebuild
78 deleted file mode 100644
79 index 3efd1ffc1495..000000000000
80 --- a/dev-libs/libical/libical-3.0.10.ebuild
81 +++ /dev/null
82 @@ -1,114 +0,0 @@
83 -# Copyright 1999-2021 Gentoo Authors
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI=7
87 -
88 -PYTHON_COMPAT=( python3_{8..10} )
89 -VALA_USE_DEPEND="vapigen"
90 -inherit cmake python-any-r1 vala
91 -
92 -DESCRIPTION="Implementation of basic iCAL protocols"
93 -HOMEPAGE="https://github.com/libical/libical"
94 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
95 -
96 -LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
97 -SLOT="0/3"
98 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
99 -IUSE="berkdb doc examples +glib +introspection static-libs test vala"
100 -
101 -REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
102 -
103 -RESTRICT="!test? ( test )"
104 -
105 -COMMON_DEPEND="
106 - dev-libs/icu:=
107 - berkdb? ( sys-libs/db:= )
108 - glib? ( dev-libs/glib:2 )
109 -"
110 -DEPEND="${COMMON_DEPEND}
111 - glib? ( dev-libs/libxml2:2 )
112 -"
113 -RDEPEND="${COMMON_DEPEND}
114 - sys-libs/timezone-data
115 -"
116 -BDEPEND="
117 - dev-lang/perl
118 - virtual/pkgconfig
119 - doc? (
120 - app-doc/doxygen
121 - glib? ( dev-util/gtk-doc )
122 - )
123 - introspection? ( dev-libs/gobject-introspection )
124 - test? (
125 - ${PYTHON_DEPS}
126 - glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
127 - )
128 - vala? ( $(vala_depend) )
129 -"
130 -
131 -DOCS=(
132 - AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
133 - doc/{AddingOrModifyingComponents,UsingLibical}.txt
134 -)
135 -
136 -PATCHES=(
137 - "${FILESDIR}/${PN}-3.0.4-tests.patch"
138 - "${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
139 -)
140 -
141 -python_check_deps() {
142 - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
143 -}
144 -
145 -pkg_setup() {
146 - use test && python-any-r1_pkg_setup
147 -}
148 -
149 -src_prepare() {
150 - cmake_src_prepare
151 - use examples || cmake_comment_add_subdirectory examples
152 - use vala && vala_src_prepare
153 -}
154 -
155 -src_configure() {
156 - local mycmakeargs=(
157 - $(cmake_use_find_package berkdb BDB)
158 - -DICAL_BUILD_DOCS=$(usex doc)
159 - -DICAL_GLIB=$(usex glib)
160 - -DGOBJECT_INTROSPECTION=$(usex introspection)
161 - -DSHARED_ONLY=$(usex !static-libs)
162 - -DLIBICAL_BUILD_TESTING=$(usex test)
163 - -DICAL_GLIB_VAPI=$(usex vala)
164 - )
165 - if use vala; then
166 - mycmakeargs+=(
167 - -DVALAC="${VALAC}"
168 - -DVAPIGEN="${VAPIGEN}"
169 - )
170 - fi
171 - cmake_src_configure
172 -}
173 -
174 -src_compile() {
175 - cmake_src_compile
176 - use doc && cmake_src_compile docs
177 -}
178 -
179 -src_test() {
180 - local myctestargs=(
181 - -E "(icalrecurtest|icalrecurtest-r)" # bug 660282
182 - )
183 -
184 - cmake_src_test
185 -}
186 -
187 -src_install() {
188 - use doc && local HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
189 -
190 - cmake_src_install
191 -
192 - if use examples; then
193 - rm examples/CMakeLists.txt || die
194 - dodoc -r examples
195 - fi
196 -}