1 |
commit: c6f1839827402dac6aa38cd2db521bbb7f5050af |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 23 21:31:04 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 23 21:31:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f18398 |
7 |
|
8 |
gnome-extra/evolution-data-server: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
gnome-extra/evolution-data-server/Manifest | 1 - |
14 |
.../evolution-data-server-3.30.5-r1.ebuild | 153 --------------------- |
15 |
.../files/3.30.5-collection-auth.patch | 35 ----- |
16 |
3 files changed, 189 deletions(-) |
17 |
|
18 |
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest |
19 |
index 928b0930da7..7f1ce22c577 100644 |
20 |
--- a/gnome-extra/evolution-data-server/Manifest |
21 |
+++ b/gnome-extra/evolution-data-server/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST evolution-data-server-3.30.5.tar.xz 4582264 BLAKE2B 96303da0fcd285dffc2a56bab0828b2011238a0970dc50df005f690a76c432abad27afd74569b1cc6ff2ddc56f1dbde003241d53609b0222a474941724e46910 SHA512 b841b23343745afdc59f42ee384911ae24be6b1518095d52099ce5b657def17e5b4e1fe1e61fc1e03e4856b0d26c6a1abac3d9ee5530da84c645d07c69b8d859 |
24 |
DIST evolution-data-server-3.32.4.tar.xz 4585396 BLAKE2B d89b71beaf24deb89e510e318050a8a3146b8a6804c148c62d4cb2c0cfb3b50a3767cfc213db05b44c6b5b99e578a24d3c272daccadb4e950b2d103639ce9797 SHA512 fccbad5989e6366840c50dacf2e81510f65c8640c9309ca0446c1b236df99f43a310fcadd377e205d0a94f0e3f9b53b83c41c042c3244e05bfda0d6df090d0c7 |
25 |
DIST evolution-data-server-3.32.5.tar.xz 4588900 BLAKE2B f14d0782c00e9cead10e9e5dd6c5686d4c8a292d70027a08dbac027ba92b998bcea1b219447847284d225096480e373c89369e12198fdf2516ca5b622f81cbb2 SHA512 a1bc350a7223dc2e3d369f0ac8fb3ab210b6b1cc25311daf1ddae6926168f7bd1c3fab69ab261e442e3c30f9b43754e2f8e38ac2a5c32a714223d9741045a1b6 |
26 |
|
27 |
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index 38777837678..00000000000 |
30 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,153 +0,0 @@ |
33 |
-# Copyright 1999-2019 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy ) |
38 |
-VALA_USE_DEPEND="vapigen" |
39 |
- |
40 |
-inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx |
41 |
- |
42 |
-DESCRIPTION="Evolution groupware backend" |
43 |
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" |
44 |
- |
45 |
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". |
46 |
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" |
47 |
-SLOT="0/62" # subslot = libcamel-1.2 soname version |
48 |
- |
49 |
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather" |
50 |
-REQUIRED_USE="vala? ( introspection )" |
51 |
- |
52 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" |
53 |
- |
54 |
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks |
55 |
-# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512 |
56 |
-# >=libical-3.0.2 present at build-time ensures less memory usage by calendar backend |
57 |
-gdata_depend=">=dev-libs/libgdata-0.17.7:=" |
58 |
-RDEPEND=" |
59 |
- >=app-crypt/gcr-3.4 |
60 |
- >=app-crypt/libsecret-0.5[crypt] |
61 |
- >=dev-db/sqlite-3.7.17:= |
62 |
- >=dev-libs/glib-2.46:2 |
63 |
- >=dev-libs/libical-3.0.2:= |
64 |
- >=dev-libs/libxml2-2 |
65 |
- >=dev-libs/nspr-4.4:= |
66 |
- >=dev-libs/nss-3.9:= |
67 |
- >=net-libs/libsoup-2.42:2.4 |
68 |
- |
69 |
- dev-libs/icu:= |
70 |
- sys-libs/zlib:= |
71 |
- virtual/libiconv |
72 |
- |
73 |
- berkdb? ( >=sys-libs/db-4:= ) |
74 |
- gtk? ( |
75 |
- >=app-crypt/gcr-3.4[gtk] |
76 |
- >=x11-libs/gtk+-3.10:3 |
77 |
- >=media-libs/libcanberra-0.25[gtk3] |
78 |
- ) |
79 |
- oauth? ( |
80 |
- >=dev-libs/json-glib-1.0.4 |
81 |
- >=net-libs/webkit-gtk-2.11.91:4 |
82 |
- ${gdata_depend} |
83 |
- ) |
84 |
- gnome-online-accounts? ( |
85 |
- >=net-libs/gnome-online-accounts-3.8:= |
86 |
- ${gdata_depend} ) |
87 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) |
88 |
- kerberos? ( virtual/krb5:= ) |
89 |
- ldap? ( >=net-nds/openldap-2:= ) |
90 |
- weather? ( >=dev-libs/libgweather-3.10:2= ) |
91 |
-" |
92 |
-DEPEND="${RDEPEND} |
93 |
- ${PYTHON_DEPS} |
94 |
- dev-util/gdbus-codegen |
95 |
- dev-util/glib-utils |
96 |
- dev-util/gperf |
97 |
- gtk-doc? ( >=dev-util/gtk-doc-1.14 ) |
98 |
- >=dev-util/intltool-0.35.5 |
99 |
- >=sys-devel/gettext-0.18.3 |
100 |
- virtual/pkgconfig |
101 |
- vala? ( $(vala_depend) ) |
102 |
-" |
103 |
- |
104 |
-# Some tests fail due to missing locales. |
105 |
-# Also, dbus tests are flaky, bugs #397975 #501834 |
106 |
-# It looks like a nightmare to disable those for now. |
107 |
-RESTRICT="test !test? ( test )" |
108 |
- |
109 |
-pkg_setup() { |
110 |
- python-any-r1_pkg_setup |
111 |
-} |
112 |
- |
113 |
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call |
114 |
-src_prepare() { |
115 |
- eapply "${FILESDIR}"/${PV}-collection-auth.patch # Prerequisite for evolution-ews cert checking fix |
116 |
- use vala && vala_src_prepare |
117 |
- cmake-utils_src_prepare |
118 |
- gnome2_src_prepare |
119 |
- |
120 |
- # Make CMakeLists versioned vala enabled |
121 |
- sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \ |
122 |
- -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \ |
123 |
- -i "${S}"/CMakeLists.txt || die |
124 |
-} |
125 |
- |
126 |
-src_configure() { |
127 |
- # /usr/include/db.h is always db-1 on FreeBSD |
128 |
- # so include the right dir in CPPFLAGS |
129 |
- use berkdb && append-cppflags "-I$(db_includedir)" |
130 |
- |
131 |
- local google_enable |
132 |
- if use oauth || use gnome-online-accounts; then |
133 |
- google_enable="ON" |
134 |
- else |
135 |
- google_enable="OFF" |
136 |
- fi |
137 |
- |
138 |
- # phonenumber does not exist in tree |
139 |
- local mycmakeargs=( |
140 |
- -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc |
141 |
- -DENABLE_GTK_DOC=$(usex gtk-doc) |
142 |
- -DWITH_PRIVATE_DOCS=$(usex gtk-doc) |
143 |
- -DENABLE_SCHEMAS_COMPILE=OFF |
144 |
- -DENABLE_INTROSPECTION=$(usex introspection) |
145 |
- -DWITH_KRB5=$(usex kerberos) |
146 |
- -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "") |
147 |
- -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "") |
148 |
- -DWITH_OPENLDAP=$(usex ldap) |
149 |
- -DWITH_PHONENUMBER=OFF |
150 |
- -DENABLE_SMIME=ON |
151 |
- -DENABLE_GTK=$(usex gtk) |
152 |
- -DENABLE_CANBERRA=$(usex gtk) |
153 |
- -DENABLE_OAUTH2=$(usex oauth) |
154 |
- -DENABLE_EXAMPLES=OFF |
155 |
- -DENABLE_GOA=$(usex gnome-online-accounts) |
156 |
- -DENABLE_UOA=OFF |
157 |
- -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF) |
158 |
- # ENABLE_BACKTRACES requires libdwarf ? |
159 |
- -DENABLE_IPV6=$(usex ipv6) |
160 |
- -DENABLE_WEATHER=$(usex weather) |
161 |
- -DENABLE_GOOGLE=${google_enable} |
162 |
- -DENABLE_LARGEFILE=ON |
163 |
- -DENABLE_VALA_BINDINGS=$(usex vala) |
164 |
- ) |
165 |
- |
166 |
- cmake-utils_src_configure |
167 |
-} |
168 |
- |
169 |
-src_compile() { |
170 |
- cmake-utils_src_compile |
171 |
-} |
172 |
- |
173 |
-src_test() { |
174 |
- virtx cmake-utils_src_test |
175 |
-} |
176 |
- |
177 |
-src_install() { |
178 |
- cmake-utils_src_install |
179 |
- |
180 |
- if use ldap; then |
181 |
- insinto /etc/openldap/schema |
182 |
- doins "${FILESDIR}"/calentry.schema |
183 |
- dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema |
184 |
- fi |
185 |
-} |
186 |
|
187 |
diff --git a/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch b/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch |
188 |
deleted file mode 100644 |
189 |
index 5d1c2780162..00000000000 |
190 |
--- a/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch |
191 |
+++ /dev/null |
192 |
@@ -1,35 +0,0 @@ |
193 |
-From 6672b8236139bd6ef41ecb915f4c72e2a052dba5 Mon Sep 17 00:00:00 2001 |
194 |
-From: Milan Crha <mcrha@××××××.com> |
195 |
-Date: Tue, 4 Dec 2018 18:19:30 +0100 |
196 |
-Subject: [PATCH] Let child source with 'none' authentication method use |
197 |
- collection source authentication |
198 |
- |
199 |
-That might be the same as having set NULL authentication method. |
200 |
- |
201 |
-Related to https://gitlab.gnome.org/GNOME/evolution-ews/issues/27 |
202 |
---- |
203 |
- src/libedataserver/e-data-server-util.c | 4 +++- |
204 |
- 1 file changed, 3 insertions(+), 1 deletion(-) |
205 |
- |
206 |
-diff --git a/src/libedataserver/e-data-server-util.c b/src/libedataserver/e-data-server-util.c |
207 |
-index 47fd4d2ec..bd209c980 100644 |
208 |
---- a/src/libedataserver/e-data-server-util.c |
209 |
-+++ b/src/libedataserver/e-data-server-util.c |
210 |
-@@ -3259,11 +3259,13 @@ e_util_can_use_collection_as_credential_source (ESource *collection_source, |
211 |
- if (can_use_collection) { |
212 |
- gchar *method_source, *method_collection; |
213 |
- |
214 |
-- /* Also check the method; if different, then rather not use the collection */ |
215 |
-+ /* Also check the method; if different, then rather not use the collection. |
216 |
-+ Consider 'none' method on the child as the same as the collection method. */ |
217 |
- method_source = e_source_authentication_dup_method (auth_source); |
218 |
- method_collection = e_source_authentication_dup_method (auth_collection); |
219 |
- |
220 |
- can_use_collection = !method_source || !method_collection || |
221 |
-+ g_ascii_strcasecmp (method_source, "none") == 0 || |
222 |
- g_ascii_strcasecmp (method_source, method_collection) == 0; |
223 |
- |
224 |
- g_free (method_source); |
225 |
--- |
226 |
-2.17.0 |
227 |
- |