From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E3DC21384B4 for ; Mon, 9 Nov 2015 14:12:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0D3FE07F2; Mon, 9 Nov 2015 14:12:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A9DFE07F2 for ; Mon, 9 Nov 2015 14:12:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0FE61340042 for ; Mon, 9 Nov 2015 14:12:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29B4C239A for ; Mon, 9 Nov 2015 11:25:46 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1447068328.c0bf3076c3014a6ee19a094a0b93bcb4b2fa6a4d.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/evolution-data-server/Manifest gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch X-VCS-Directories: gnome-extra/evolution-data-server/files/ gnome-extra/evolution-data-server/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: c0bf3076c3014a6ee19a094a0b93bcb4b2fa6a4d X-VCS-Branch: master Date: Mon, 9 Nov 2015 11:25:46 +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-Archives-Salt: d7add0ad-cefe-411b-8b95-80bb12ed8896 X-Archives-Hash: 480038e3798316b057143a227c509799 commit: c0bf3076c3014a6ee19a094a0b93bcb4b2fa6a4d Author: Pacho Ramos gentoo org> AuthorDate: Mon Nov 9 11:01:41 2015 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Mon Nov 9 11:25:28 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0bf3076 gnome-extra/evolution-data-server: Drop old Package-Manager: portage-2.2.24 gnome-extra/evolution-data-server/Manifest | 2 - .../evolution-data-server-3.12.11.ebuild | 131 -------------------- .../evolution-data-server-3.16.4.ebuild | 137 --------------------- .../evolution-data-server-3.16.4-goa-gmail.patch | 108 ---------------- 4 files changed, 378 deletions(-) diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index fe3626b..e15074f 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,4 +1,2 @@ -DIST evolution-data-server-3.12.11.tar.xz 5288904 SHA256 59023d2cf92e36b69c1f83b2e56a0ba037754982a23cb06f35f6cc5de7a12201 SHA512 851b5ba6384e918593043088ac093c02f31b0b3bcb6852f2ee24159cc0c99e28713db84d76339a40073da8cbe4857222031e7150f0f99dca61eaf910d76b139f WHIRLPOOL c90345f2273ff66156fd266521521fd381e1c8d9e05311067835e729c24d5544a1bf29f0d988c6585e9caf3b7f0107645c781a15fd7b4ca3d9367f45441ce4a4 -DIST evolution-data-server-3.16.4.tar.xz 5364536 SHA256 62af92dd5563d58a2f13eceeee99cbb7201c15a60eb9e6f4f2bf69688aa07a06 SHA512 7dfb5abc663c09f3bf43b8f34dc4eaab0d16107221ae862d6e4c7b2adc8fa16983a9c619020ce4c032866bd846491db693bcf231c8bdd7fdf6bdd75c3cc327cc WHIRLPOOL 41024ce5039189e5261df9f8ed74b860d712ff55ea0d4cc42d804ae052410fd502dc55d4cfffa70640c2a8747695687840905db145630cf7e1b858554d7761de DIST evolution-data-server-3.16.5.tar.xz 5364120 SHA256 e44ad4143402957cab8cab1a6b3d7057d8b111d268c6b9ad4e4008850f5b244c SHA512 7f4fd758175d3d48d249cebd855fe684b808574421f1d09ee90aad16c76da89980f17bb2fa9741187adb44327166ebcb78c5330f28f01b20f3810c36653f78d1 WHIRLPOOL 559b4e2f1de4f26bf5806c1f5cabc3afe6aea910fa0dcf657947d085ea2344250b8b149a7d6760d342abb1893872b937c7d7626648cff2fe12fe531fb52cd3c2 DIST evolution-data-server-3.18.2.tar.xz 5410148 SHA256 5942fc1cf395acdc15425939d83824d861d01c57225ee3fc8c1d77009468ce9b SHA512 b90d7b53048dad2ac94e414e55f99eeb7695475c4db8c7d803206eabfe8a7b2a42a9c5083119e72fbe4ccc6afc8b120087da712dfc40c953bb66cb3bcbefe2f7 WHIRLPOOL 992b262ce926bdf176a5d5cb041e25e61be3609eedee1d35d7232afcc4e576da571bcef98a695cfa908b92c567c128a39846f528eb5ed51967e6535c976c2025 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild deleted file mode 100644 index dc7c25a..0000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 ) -VALA_MIN_API_VERSION="0.22" -VALA_USE_DEPEND="vapigen" - -inherit db-use flag-o-matic gnome2 python-any-r1 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/49" # subslot = libcamel-1.2 soname version -IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" - -RDEPEND=" - >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5[crypt] - >=dev-db/sqlite-3.5:= - >=dev-libs/glib-2.36:2 - >=dev-libs/libgdata-0.10:= - >=dev-libs/libical-0.43:= - >=net-libs/libsoup-2.42:2.4 - >=dev-libs/libxml2-2 - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - >=sys-libs/db-4:= - - dev-libs/icu:= - sys-libs/zlib:= - virtual/libiconv - - gtk? ( - >=app-crypt/gcr-3.4[gtk] - >=x11-libs/gtk+-3.2:3 - ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) - kerberos? ( virtual/krb5:= ) - ldap? ( >=net-nds/openldap-2:= ) - weather? ( >=dev-libs/libgweather-3.8:2= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/gdbus-codegen - dev-util/gperf - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.35.5 - >=gnome-base/gnome-common-3.5.5 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -# eautoreconf needs: -# >=gnome-base/gnome-common-2 - -# Some tests fail due to missings locales. -# Also, dbus tests are flacky, bugs #397975 #501834 -# It looks like a nightmare to disable those for now. -RESTRICT="test" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - use vala && vala_src_prepare - - # Fix relink issues in src_install - ELTCONF="--reverse-deps" - - gnome2_src_prepare - - # Fix compilation flags crazyness, upstream bug #653157 - sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \ - -i configure || die "sed failed" -} - -src_configure() { - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - append-cppflags "-I$(db_includedir)" - - # phonenumber does not exist in tree - gnome2_src_configure \ - $(use_enable api-doc-extras gtk-doc) \ - $(use_with api-doc-extras private-docs) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable gtk) \ - $(use_enable introspection) \ - $(use_enable ipv6) \ - $(use_with kerberos krb5 "${EPREFIX}"/usr) \ - $(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \ - $(use_with ldap openldap) \ - $(use_enable vala vala-bindings) \ - $(use_enable weather) \ - --enable-google \ - --enable-largefile \ - --enable-smime \ - --with-libdb="${EPREFIX}"/usr \ - --without-phonenumber \ - --disable-examples \ - --disable-uoa -} - -src_install() { - gnome2_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 -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - unset ORBIT_SOCKETDIR - unset SESSION_MANAGER - unset DISPLAY - Xemake check -} diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild deleted file mode 100644 index f9c7e62..0000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 ) -VALA_MIN_API_VERSION="0.22" -VALA_USE_DEPEND="vapigen" - -inherit db-use flag-o-matic gnome2 python-any-r1 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/52" # subslot = libcamel-1.2 soname version -IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" - -# sys-libs/db is only required for migrating from <3.13 versions -# gdata-0.15.1 is required for google tasks -RDEPEND=" - >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5[crypt] - >=dev-db/sqlite-3.5:= - >=dev-libs/glib-2.40:2 - >=dev-libs/libgdata-0.10:= - >=dev-libs/libical-0.43:= - >=net-libs/libsoup-2.42:2.4 - >=dev-libs/libxml2-2 - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - >=sys-libs/db-4:= - - dev-libs/icu:= - sys-libs/zlib:= - virtual/libiconv - - gtk? ( - >=app-crypt/gcr-3.4[gtk] - >=x11-libs/gtk+-3.6:3 - ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - kerberos? ( virtual/krb5:= ) - ldap? ( >=net-nds/openldap-2:= ) - weather? ( >=dev-libs/libgweather-3.8:2= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/gdbus-codegen - dev-util/gperf - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.35.5 - >=gnome-base/gnome-common-3.5.5 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -# eautoreconf needs: -# >=gnome-base/gnome-common-2 - -# Some tests fail due to missings locales. -# Also, dbus tests are flacky, bugs #397975 #501834 -# It looks like a nightmare to disable those for now. -RESTRICT="test" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - use vala && vala_src_prepare - - # Fix relink issues in src_install - ELTCONF="--reverse-deps" - - # Honor Google settings as defined in gnome-online-accounts (from 3.16 branch) - epatch "${FILESDIR}"/${P}-goa-gmail.patch - - gnome2_src_prepare - - # Fix compilation flags crazyness, upstream bug #653157 - sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \ - -i configure || die "sed failed" -} - -src_configure() { - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - append-cppflags "-I$(db_includedir)" - - # phonenumber does not exist in tree - gnome2_src_configure \ - $(use_enable api-doc-extras gtk-doc) \ - $(use_with api-doc-extras private-docs) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable gtk) \ - $(use_enable introspection) \ - $(use_enable ipv6) \ - $(use_with kerberos krb5 "${EPREFIX}"/usr) \ - $(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \ - $(use_with ldap openldap) \ - $(use_enable vala vala-bindings) \ - $(use_enable weather) \ - --enable-google \ - --enable-largefile \ - --enable-smime \ - --with-libdb="${EPREFIX}"/usr \ - --without-phonenumber \ - --disable-examples \ - --disable-uoa -} - -src_install() { - gnome2_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 -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - unset ORBIT_SOCKETDIR - unset SESSION_MANAGER - unset DISPLAY - Xemake check -} diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch deleted file mode 100644 index c5fc44e..0000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch +++ /dev/null @@ -1,108 +0,0 @@ -From c66b549c259d33e15947d89257c50d945e3020c7 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 14 Jul 2015 11:49:31 +0200 -Subject: Doesn't honor Google settings as defined in gnome-online-accounts - -Use mail-disabled, calendar-disabled and contacts-disabled properties, -rather than rely on an interface addition/removal and a notification -about the change. - -Reported at https://bugzilla.redhat.com/show_bug.cgi?id=1242541 - -diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c -index e800c23..2f9be5e 100644 ---- a/modules/gnome-online-accounts/module-gnome-online-accounts.c -+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c -@@ -162,50 +162,6 @@ gnome_online_accounts_provider_type_to_backend_name (GBinding *binding, - return TRUE; - } - --static gboolean --gnome_online_accounts_object_is_non_null (GBinding *binding, -- const GValue *source_value, -- GValue *target_value, -- gpointer unused) --{ -- GoaObject *goa_object = GOA_OBJECT (g_binding_get_source (binding)); -- ESourceExtension *source_extension = E_SOURCE_EXTENSION (g_binding_get_target (binding)); -- ESource *source; -- ESourceGoa *goa_extension; -- gpointer v_object; -- -- v_object = g_value_get_object (source_value); -- g_value_set_boolean (target_value, v_object != NULL); -- -- g_return_val_if_fail (goa_object != NULL, TRUE); -- g_return_val_if_fail (source_extension != NULL, TRUE); -- -- source = e_source_extension_get_source (source_extension); -- goa_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_GOA); -- -- if (g_strcmp0 (g_binding_get_source_property (binding), "calendar") == 0) { -- gchar *uri = NULL; -- -- if (v_object && GOA_IS_CALENDAR (v_object)) -- uri = goa_calendar_dup_uri (v_object); -- -- e_source_goa_set_calendar_url (goa_extension, uri); -- -- g_free (uri); -- } else if (g_strcmp0 (g_binding_get_source_property (binding), "contacts") == 0) { -- gchar *uri = NULL; -- -- if (v_object && GOA_IS_CONTACTS (v_object)) -- uri = goa_contacts_dup_uri (v_object); -- -- e_source_goa_set_contacts_url (goa_extension, uri); -- -- g_free (uri); -- } -- -- return TRUE; --} -- - static GoaObject * - gnome_online_accounts_ref_account (EGnomeOnlineAccounts *extension, - ESource *source) -@@ -629,29 +585,20 @@ gnome_online_accounts_config_collection (EGnomeOnlineAccounts *extension, - source_extension, "identity", - G_BINDING_SYNC_CREATE); - -- e_binding_bind_property_full ( -- goa_object, "calendar", -+ e_binding_bind_property ( -+ goa_account, "calendar-disabled", - source_extension, "calendar-enabled", -- G_BINDING_SYNC_CREATE, -- gnome_online_accounts_object_is_non_null, -- NULL, -- NULL, (GDestroyNotify) NULL); -+ G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN); - -- e_binding_bind_property_full ( -- goa_object, "contacts", -+ e_binding_bind_property ( -+ goa_account, "contacts-disabled", - source_extension, "contacts-enabled", -- G_BINDING_SYNC_CREATE, -- gnome_online_accounts_object_is_non_null, -- NULL, -- NULL, (GDestroyNotify) NULL); -+ G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN); - -- e_binding_bind_property_full ( -- goa_object, "mail", -+ e_binding_bind_property ( -+ goa_account, "mail-disabled", - source_extension, "mail-enabled", -- G_BINDING_SYNC_CREATE, -- gnome_online_accounts_object_is_non_null, -- NULL, -- NULL, (GDestroyNotify) NULL); -+ G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN); - - g_clear_object (&goa_account); - g_clear_object (&goa_calendar); --- -cgit v0.10.2 -