From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C3835138334 for ; Mon, 23 Dec 2019 21:34:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4024E09DF; Mon, 23 Dec 2019 21:34:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB5E9E09DF for ; Mon, 23 Dec 2019 21:34:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AFC334DB05 for ; Mon, 23 Dec 2019 21:34:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 901A67B133 for ; Mon, 23 Dec 2019 21:34:33 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1577136664.c6f1839827402dac6aa38cd2db521bbb7f5050af.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/evolution-data-server/Manifest gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch X-VCS-Directories: gnome-extra/evolution-data-server/files/ gnome-extra/evolution-data-server/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: c6f1839827402dac6aa38cd2db521bbb7f5050af X-VCS-Branch: master Date: Mon, 23 Dec 2019 21:34:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a6e10303-505c-4763-a58a-51fcb8a1c5a8 X-Archives-Hash: bd12a16411e16987855236e0dd90e999 commit: c6f1839827402dac6aa38cd2db521bbb7f5050af Author: Mart Raudsepp gentoo org> AuthorDate: Mon Dec 23 21:31:04 2019 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Mon Dec 23 21:31:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f18398 gnome-extra/evolution-data-server: remove old Package-Manager: Portage-2.3.79, Repoman-2.3.12 Signed-off-by: Mart Raudsepp gentoo.org> gnome-extra/evolution-data-server/Manifest | 1 - .../evolution-data-server-3.30.5-r1.ebuild | 153 --------------------- .../files/3.30.5-collection-auth.patch | 35 ----- 3 files changed, 189 deletions(-) diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index 928b0930da7..7f1ce22c577 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,3 +1,2 @@ -DIST evolution-data-server-3.30.5.tar.xz 4582264 BLAKE2B 96303da0fcd285dffc2a56bab0828b2011238a0970dc50df005f690a76c432abad27afd74569b1cc6ff2ddc56f1dbde003241d53609b0222a474941724e46910 SHA512 b841b23343745afdc59f42ee384911ae24be6b1518095d52099ce5b657def17e5b4e1fe1e61fc1e03e4856b0d26c6a1abac3d9ee5530da84c645d07c69b8d859 DIST evolution-data-server-3.32.4.tar.xz 4585396 BLAKE2B d89b71beaf24deb89e510e318050a8a3146b8a6804c148c62d4cb2c0cfb3b50a3767cfc213db05b44c6b5b99e578a24d3c272daccadb4e950b2d103639ce9797 SHA512 fccbad5989e6366840c50dacf2e81510f65c8640c9309ca0446c1b236df99f43a310fcadd377e205d0a94f0e3f9b53b83c41c042c3244e05bfda0d6df090d0c7 DIST evolution-data-server-3.32.5.tar.xz 4588900 BLAKE2B f14d0782c00e9cead10e9e5dd6c5686d4c8a292d70027a08dbac027ba92b998bcea1b219447847284d225096480e373c89369e12198fdf2516ca5b622f81cbb2 SHA512 a1bc350a7223dc2e3d369f0ac8fb3ab210b6b1cc25311daf1ddae6926168f7bd1c3fab69ab261e442e3c30f9b43754e2f8e38ac2a5c32a714223d9741045a1b6 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 deleted file mode 100644 index 38777837678..00000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6} pypy ) -VALA_USE_DEPEND="vapigen" - -inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" -SLOT="0/62" # subslot = libcamel-1.2 soname version - -IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" - -# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks -# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512 -# >=libical-3.0.2 present at build-time ensures less memory usage by calendar backend -gdata_depend=">=dev-libs/libgdata-0.17.7:=" -RDEPEND=" - >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5[crypt] - >=dev-db/sqlite-3.7.17:= - >=dev-libs/glib-2.46:2 - >=dev-libs/libical-3.0.2:= - >=dev-libs/libxml2-2 - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - >=net-libs/libsoup-2.42:2.4 - - dev-libs/icu:= - sys-libs/zlib:= - virtual/libiconv - - berkdb? ( >=sys-libs/db-4:= ) - gtk? ( - >=app-crypt/gcr-3.4[gtk] - >=x11-libs/gtk+-3.10:3 - >=media-libs/libcanberra-0.25[gtk3] - ) - oauth? ( - >=dev-libs/json-glib-1.0.4 - >=net-libs/webkit-gtk-2.11.91:4 - ${gdata_depend} - ) - gnome-online-accounts? ( - >=net-libs/gnome-online-accounts-3.8:= - ${gdata_depend} ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - kerberos? ( virtual/krb5:= ) - ldap? ( >=net-nds/openldap-2:= ) - weather? ( >=dev-libs/libgweather-3.10:2= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gperf - gtk-doc? ( >=dev-util/gtk-doc-1.14 ) - >=dev-util/intltool-0.35.5 - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -# Some tests fail due to missing locales. -# Also, dbus tests are flaky, bugs #397975 #501834 -# It looks like a nightmare to disable those for now. -RESTRICT="test !test? ( test )" - -pkg_setup() { - python-any-r1_pkg_setup -} - -# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call -src_prepare() { - eapply "${FILESDIR}"/${PV}-collection-auth.patch # Prerequisite for evolution-ews cert checking fix - use vala && vala_src_prepare - cmake-utils_src_prepare - gnome2_src_prepare - - # Make CMakeLists versioned vala enabled - sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \ - -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \ - -i "${S}"/CMakeLists.txt || die -} - -src_configure() { - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - use berkdb && append-cppflags "-I$(db_includedir)" - - local google_enable - if use oauth || use gnome-online-accounts; then - google_enable="ON" - else - google_enable="OFF" - fi - - # phonenumber does not exist in tree - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DENABLE_GTK_DOC=$(usex gtk-doc) - -DWITH_PRIVATE_DOCS=$(usex gtk-doc) - -DENABLE_SCHEMAS_COMPILE=OFF - -DENABLE_INTROSPECTION=$(usex introspection) - -DWITH_KRB5=$(usex kerberos) - -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "") - -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "") - -DWITH_OPENLDAP=$(usex ldap) - -DWITH_PHONENUMBER=OFF - -DENABLE_SMIME=ON - -DENABLE_GTK=$(usex gtk) - -DENABLE_CANBERRA=$(usex gtk) - -DENABLE_OAUTH2=$(usex oauth) - -DENABLE_EXAMPLES=OFF - -DENABLE_GOA=$(usex gnome-online-accounts) - -DENABLE_UOA=OFF - -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF) - # ENABLE_BACKTRACES requires libdwarf ? - -DENABLE_IPV6=$(usex ipv6) - -DENABLE_WEATHER=$(usex weather) - -DENABLE_GOOGLE=${google_enable} - -DENABLE_LARGEFILE=ON - -DENABLE_VALA_BINDINGS=$(usex vala) - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - virtx cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - if use ldap; then - insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema - dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema - fi -} 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 deleted file mode 100644 index 5d1c2780162..00000000000 --- a/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6672b8236139bd6ef41ecb915f4c72e2a052dba5 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 4 Dec 2018 18:19:30 +0100 -Subject: [PATCH] Let child source with 'none' authentication method use - collection source authentication - -That might be the same as having set NULL authentication method. - -Related to https://gitlab.gnome.org/GNOME/evolution-ews/issues/27 ---- - src/libedataserver/e-data-server-util.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/libedataserver/e-data-server-util.c b/src/libedataserver/e-data-server-util.c -index 47fd4d2ec..bd209c980 100644 ---- a/src/libedataserver/e-data-server-util.c -+++ b/src/libedataserver/e-data-server-util.c -@@ -3259,11 +3259,13 @@ e_util_can_use_collection_as_credential_source (ESource *collection_source, - if (can_use_collection) { - gchar *method_source, *method_collection; - -- /* Also check the method; if different, then rather not use the collection */ -+ /* Also check the method; if different, then rather not use the collection. -+ Consider 'none' method on the child as the same as the collection method. */ - method_source = e_source_authentication_dup_method (auth_source); - method_collection = e_source_authentication_dup_method (auth_collection); - - can_use_collection = !method_source || !method_collection || -+ g_ascii_strcasecmp (method_source, "none") == 0 || - g_ascii_strcasecmp (method_source, method_collection) == 0; - - g_free (method_source); --- -2.17.0 -