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 8D6B81381F3 for ; Fri, 12 Jul 2013 11:48:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DC14E09EC; Fri, 12 Jul 2013 11:48:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 562DDE09F4 for ; Fri, 12 Jul 2013 11:48:28 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C83833E9FC for ; Fri, 12 Jul 2013 11:48:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C65F6E468F for ; Fri, 12 Jul 2013 11:48:24 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1373629493.46051dd436f173b02425799cfc5e7140089bbca6.plaes@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.7.92-r1.ebuild gnome-extra/evolution-data-server/evolution-data-server-3.9.4.ebuild gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild X-VCS-Directories: gnome-extra/evolution-data-server/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 46051dd436f173b02425799cfc5e7140089bbca6 X-VCS-Branch: master Date: Fri, 12 Jul 2013 11:48:24 +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: d80d7233-7565-44a4-b25a-695710627424 X-Archives-Hash: 48ba9c3bf0fb75dc9d23df2119d09e83 commit: 46051dd436f173b02425799cfc5e7140089bbca6 Author: Priit Laes plaes org> AuthorDate: Fri Jul 12 11:44:53 2013 +0000 Commit: Priit Laes plaes org> CommitDate: Fri Jul 12 11:44:53 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=46051dd4 gnome-extra/evolution-data-server: Add 3.9.4, clean old, sync with gx86 --- ...1.ebuild => evolution-data-server-3.9.4.ebuild} | 35 ++++++++-------------- .../evolution-data-server-9999.ebuild | 32 ++++++++------------ 2 files changed, 26 insertions(+), 41 deletions(-) diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.7.92-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.9.4.ebuild similarity index 82% rename from gnome-extra/evolution-data-server/evolution-data-server-3.7.92-r1.ebuild rename to gnome-extra/evolution-data-server/evolution-data-server-3.9.4.ebuild index cee2bb1..81bf49c 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.7.92-r1.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.9.4.ebuild @@ -3,25 +3,25 @@ # $Header: $ EAPI="5" +PYTHON_COMPAT=( python{2_7,3,3} ) GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" VALA_MIN_API_VERSION="0.18" VALA_USE_DEPEND="vapigen" # No PYTHON_DEPEND, python is only needed at build time -inherit db-use eutils flag-o-matic gnome2 python vala versionator virtualx +inherit db-use eutils flag-o-matic gnome2 python-any-r1 vala versionator virtualx if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi DESCRIPTION="Evolution groupware backend" -HOMEPAGE="http://projects.gnome.org/evolution/" +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/43" # subslot = libcamel-1.2 soname version +SLOT="0/44" # subslot = libcamel-1.2 soname version # TODO: Ubuntu online accounts (libaccounts-glib, rest, json-glib, libsignon-glib ) -IUSE="api-doc-extras +gnome-online-accounts +google +gtk +introspection ipv6 ldap kerberos vala +weather" +IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" REQUIRED_USE="vala? ( introspection )" if [[ ${PV} = 9999 ]]; then @@ -33,30 +33,29 @@ else fi RDEPEND=" - >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5 + >=dev-libs/glib-2.34:2 >=dev-db/sqlite-3.5:= - >=dev-libs/glib-2.34:2 + >=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 - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 ) - google? ( >=dev-libs/libgdata-0.10:= ) 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.5:2= ) " DEPEND="${RDEPEND} - =dev-lang/python-2* dev-util/fix-la-relink-command dev-util/gperf >=dev-util/gtk-doc-am-1.9 @@ -71,20 +70,11 @@ DEPEND="${RDEPEND} [[ ${PV} = 9999 ]] && DEPEND="${DEPEND} doc? ( >=dev-util/gtk-doc-1.14 )" -# FIXME -RESTRICT="test" - pkg_setup() { - python_set_active_version 2 - python_pkg_setup + python-any-r1_pkg_setup } src_prepare() { - DOCS="ChangeLog MAINTAINERS NEWS TODO" - - # https://bugzilla.gnome.org/show_bug.cgi?id=693101 - epatch "${FILESDIR}/${P}-fix-imapx-redownload.patch" - gnome2_src_prepare use vala && vala_src_prepare @@ -100,13 +90,14 @@ src_configure() { $(use_enable api-doc-extras gtk-doc) \ $(use_with api-doc-extras private-docs) \ $(use_enable gnome-online-accounts goa) \ - $(use_enable google) \ + $(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 \ 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 9b27f80..81bf49c 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild @@ -3,25 +3,25 @@ # $Header: $ EAPI="5" +PYTHON_COMPAT=( python{2_7,3,3} ) GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" VALA_MIN_API_VERSION="0.18" VALA_USE_DEPEND="vapigen" # No PYTHON_DEPEND, python is only needed at build time -inherit db-use eutils flag-o-matic gnome2 python vala versionator virtualx +inherit db-use eutils flag-o-matic gnome2 python-any-r1 vala versionator virtualx if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi DESCRIPTION="Evolution groupware backend" -HOMEPAGE="http://projects.gnome.org/evolution/" +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/43" # subslot = libcamel-1.2 soname version +SLOT="0/44" # subslot = libcamel-1.2 soname version # TODO: Ubuntu online accounts (libaccounts-glib, rest, json-glib, libsignon-glib ) -IUSE="api-doc-extras +gnome-online-accounts +google +gtk +introspection ipv6 ldap kerberos vala +weather" +IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" REQUIRED_USE="vala? ( introspection )" if [[ ${PV} = 9999 ]]; then @@ -33,30 +33,29 @@ else fi RDEPEND=" - >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5 + >=dev-libs/glib-2.34:2 >=dev-db/sqlite-3.5:= - >=dev-libs/glib-2.34:2 + >=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 - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 ) - google? ( >=dev-libs/libgdata-0.10:= ) 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.5:2= ) " DEPEND="${RDEPEND} - =dev-lang/python-2* dev-util/fix-la-relink-command dev-util/gperf >=dev-util/gtk-doc-am-1.9 @@ -71,17 +70,11 @@ DEPEND="${RDEPEND} [[ ${PV} = 9999 ]] && DEPEND="${DEPEND} doc? ( >=dev-util/gtk-doc-1.14 )" -# FIXME -RESTRICT="test" - pkg_setup() { - python_set_active_version 2 - python_pkg_setup + python-any-r1_pkg_setup } src_prepare() { - DOCS="ChangeLog MAINTAINERS NEWS TODO" - gnome2_src_prepare use vala && vala_src_prepare @@ -97,13 +90,14 @@ src_configure() { $(use_enable api-doc-extras gtk-doc) \ $(use_with api-doc-extras private-docs) \ $(use_enable gnome-online-accounts goa) \ - $(use_enable google) \ + $(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 \