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 E4C56138CEF for ; Wed, 12 Feb 2014 20:59:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9348FE0BA5; Wed, 12 Feb 2014 20:58:56 +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 B7DF4E0BA4 for ; Wed, 12 Feb 2014 20:58:55 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9558133FA47 for ; Wed, 12 Feb 2014 20:58:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 5084A188D5 for ; Wed, 12 Feb 2014 20:58:49 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1392238064.6fa7d7849717fb5abd31da75faebfa6ecd97cab6.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/evolution-data-server/evolution-data-server-3.10.3.ebuild gnome-extra/evolution-data-server/evolution-data-server-3.11.5.ebuild gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild X-VCS-Directories: gnome-extra/evolution-data-server/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 6fa7d7849717fb5abd31da75faebfa6ecd97cab6 X-VCS-Branch: master Date: Wed, 12 Feb 2014 20:58:49 +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: 086d717d-f90f-47a7-8e54-1e62bdfc7943 X-Archives-Hash: a2b6e2dcfc11b9db0d93d806e32332bc commit: 6fa7d7849717fb5abd31da75faebfa6ecd97cab6 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Wed Feb 12 20:47:23 2014 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Wed Feb 12 20:47:44 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6fa7d784 gnome-extra/evolution-data-server: drop 3.10 ebuild and sync the rest with gentoo-x86 --- .../evolution-data-server-3.10.3.ebuild | 134 --------------------- .../evolution-data-server-3.11.5.ebuild | 9 +- .../evolution-data-server-9999.ebuild | 9 +- 3 files changed, 12 insertions(+), 140 deletions(-) diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.10.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.10.3.ebuild deleted file mode 100644 index 99560bc..0000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.10.3.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="no" -# python3 not really supported, bug #478678 -PYTHON_COMPAT=( python2_7 pypy2_0 ) -VALA_MIN_API_VERSION="0.18" -VALA_USE_DEPEND="vapigen" - -inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="http://projects.gnome.org/evolution/arch.shtml" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" -SLOT="0/45" # subslot = libcamel-1.2 soname version -IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" -REQUIRED_USE="vala? ( introspection )" - -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - REQUIRED_USE="${REQUIRED_USE} api-doc-extras? ( doc )" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" -fi - -RDEPEND=" - >=dev-libs/glib-2.34:2 - >=dev-db/sqlite-3.5:= - >=dev-libs/libgdata-0.10:= - >=app-crypt/libsecret-0.5 - >=dev-libs/libical-0.43:= - >=net-libs/libsoup-2.40.3:2.4 - >=dev-libs/libxml2-2 - >=sys-libs/db-4:= - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - >=app-crypt/gcr-3.4 - - sys-libs/zlib:= - virtual/libiconv - - 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/fix-la-relink-command - 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 - -[[ ${PV} = 9999 ]] && DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.14 )" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare - - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - append-cppflags "-I$(db_includedir)" - - # FIXME: Fix compilation flags crazyness - sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \ - -i configure || die "sed failed" -} - -src_configure() { - # 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 ldap openldap) \ - $(use_enable vala vala-bindings) \ - $(use_enable weather) \ - --enable-google \ - --enable-nntp \ - --enable-largefile \ - --enable-smime \ - --with-libdb="${EPREFIX}"/usr \ - --without-phonenumber \ - --disable-uoa -} - -src_install() { - # Prevent this evolution-data-server from linking to libs in the installed - # evolution-data-server libraries by adding -L arguments for build dirs to - # every .la file's relink_command field, forcing libtool to look there - # first during relinking. This will mangle the .la files installed by - # make install, but we don't care because we will be punting them anyway. - fix-la-relink-command . || die "fix-la-relink-command failed" - 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.11.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.11.5.ebuild index 8ee0a52..9fa33dd 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.11.5.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.11.5.ebuild @@ -33,7 +33,7 @@ fi RDEPEND=" >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5 + >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5:= >=dev-libs/glib-2.36:2 >=dev-libs/libgdata-0.10:= @@ -71,8 +71,11 @@ DEPEND="${RDEPEND} # eautoreconf needs: # >=gnome-base/gnome-common-2 -[[ ${PV} = 9999 ]] && DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.14 )" +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + doc? ( >=dev-util/gtk-doc-1.14 ) + " +fi pkg_setup() { python-any-r1_pkg_setup diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild index 8ee0a52..9fa33dd 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild @@ -33,7 +33,7 @@ fi RDEPEND=" >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5 + >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5:= >=dev-libs/glib-2.36:2 >=dev-libs/libgdata-0.10:= @@ -71,8 +71,11 @@ DEPEND="${RDEPEND} # eautoreconf needs: # >=gnome-base/gnome-common-2 -[[ ${PV} = 9999 ]] && DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.14 )" +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + doc? ( >=dev-util/gtk-doc-1.14 ) + " +fi pkg_setup() { python-any-r1_pkg_setup