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 0E6771387B1 for ; Sat, 16 Nov 2013 14:54:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C658AE08EA; Sat, 16 Nov 2013 14:53:57 +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 26A0FE08EA for ; Sat, 16 Nov 2013 14:53:57 +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 D8EA233F150 for ; Sat, 16 Nov 2013 14:53:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 80214E530A for ; Sat, 16 Nov 2013 14:53:54 +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: <1384617701.7ef4e954f3ee4ce78faa2fe94ae714a09e5b81ca.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.2.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: 7ef4e954f3ee4ce78faa2fe94ae714a09e5b81ca X-VCS-Branch: master Date: Sat, 16 Nov 2013 14:53:54 +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: 4fc5aa64-97f6-488d-9d0a-7b2de93c2cad X-Archives-Hash: b253a1bc97cabd00f6cb6648d20f6301 commit: 7ef4e954f3ee4ce78faa2fe94ae714a09e5b81ca Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Nov 16 16:01:12 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Nov 16 16:01:41 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7ef4e954 gnome-extra/evolution-data-server: sync with gentoo-x86 --- .../evolution-data-server-3.10.2.ebuild | 40 +++++++++----------- .../evolution-data-server-9999.ebuild | 43 +++++++++------------- 2 files changed, 35 insertions(+), 48 deletions(-) diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.10.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.10.2.ebuild index d95f0f0..0b0a77d 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.10.2.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.10.2.ebuild @@ -5,11 +5,11 @@ EAPI="5" GCONF_DEBUG="no" # python3 not really supported, bug #478678 -PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} ) +PYTHON_COMPAT=( python2_7 pypy2_0 ) VALA_MIN_API_VERSION="0.18" VALA_USE_DEPEND="vapigen" -inherit db-use eutils flag-o-matic gnome2 python-any-r1 vala versionator virtualx +inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -20,7 +20,6 @@ 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 -# TODO: Ubuntu online accounts (libaccounts-glib, rest, json-glib, libsignon-glib ) IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" REQUIRED_USE="vala? ( introspection )" @@ -29,7 +28,7 @@ if [[ ${PV} = 9999 ]]; then REQUIRED_USE="${REQUIRED_USE} api-doc-extras? ( doc )" KEYWORDS="" else - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" fi RDEPEND=" @@ -56,9 +55,10 @@ RDEPEND=" weather? ( >=dev-libs/libgweather-3.5:2= ) " DEPEND="${RDEPEND} + ${PYTHON_DEPS} dev-util/fix-la-relink-command dev-util/gperf - >=dev-util/gtk-doc-am-1.9 + >=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 @@ -75,18 +75,21 @@ pkg_setup() { } src_prepare() { - gnome2_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 \ - --disable-schemas-compile \ - --disable-uoa \ $(use_enable api-doc-extras gtk-doc) \ $(use_with api-doc-extras private-docs) \ $(use_enable gnome-online-accounts goa) \ @@ -101,7 +104,9 @@ src_configure() { --enable-nntp \ --enable-largefile \ --enable-smime \ - --with-libdb="${EPREFIX}"/usr + --with-libdb="${EPREFIX}"/usr \ + --without-phonenumber \ + --disable-uoa } src_install() { @@ -114,10 +119,9 @@ src_install() { gnome2_src_install if use ldap; then - MY_MAJORV=$(get_version_component_range 1-2) insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema || die "doins failed" - dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema + doins "${FILESDIR}"/calentry.schema + dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema fi } @@ -125,16 +129,6 @@ src_test() { unset DBUS_SESSION_BUS_ADDRESS unset ORBIT_SOCKETDIR unset SESSION_MANAGER - export XDG_DATA_HOME="${T}" unset DISPLAY - Xemake check || die "Tests failed." -} - -pkg_postinst() { - gnome2_pkg_postinst - - if use ldap; then - elog "" - elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema" - fi + Xemake check } 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 8f350b7..2f3f296 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild @@ -5,11 +5,11 @@ EAPI="5" GCONF_DEBUG="no" # python3 not really supported, bug #478678 -PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} ) +PYTHON_COMPAT=( python2_7 pypy2_0 ) VALA_MIN_API_VERSION="0.18" VALA_USE_DEPEND="vapigen" -inherit db-use eutils flag-o-matic gnome2 python-any-r1 vala versionator virtualx +inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -20,7 +20,6 @@ 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/47" # subslot = libcamel-1.2 soname version -# TODO: Ubuntu online accounts (libaccounts-glib, rest, json-glib, libsignon-glib ) IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" REQUIRED_USE="vala? ( introspection )" @@ -29,7 +28,7 @@ if [[ ${PV} = 9999 ]]; then REQUIRED_USE="${REQUIRED_USE} api-doc-extras? ( doc )" KEYWORDS="" else - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" fi RDEPEND=" @@ -47,7 +46,7 @@ RDEPEND=" sys-libs/zlib:= virtual/libiconv - gtk? ( + gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.2:3 ) @@ -58,9 +57,10 @@ RDEPEND=" weather? ( >=dev-libs/libgweather-3.5:2= ) " DEPEND="${RDEPEND} + ${PYTHON_DEPS} dev-util/fix-la-relink-command dev-util/gperf - >=dev-util/gtk-doc-am-1.9 + >=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 @@ -77,19 +77,20 @@ pkg_setup() { } src_prepare() { - gnome2_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() { gnome2_src_configure \ - --disable-schemas-compile \ - --disable-examples \ - --disable-uoa \ $(use_enable api-doc-extras gtk-doc) \ $(use_with api-doc-extras private-docs) \ $(use_enable gnome-online-accounts goa) \ @@ -104,7 +105,10 @@ src_configure() { --enable-nntp \ --enable-largefile \ --enable-smime \ - --with-libdb="${EPREFIX}"/usr + --with-libdb="${EPREFIX}"/usr \ + --without-phonenumber \ + --disable-examples \ + --disable-uoa } src_install() { @@ -117,10 +121,9 @@ src_install() { gnome2_src_install if use ldap; then - MY_MAJORV=$(get_version_component_range 1-2) insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema || die "doins failed" - dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema + doins "${FILESDIR}"/calentry.schema + dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema fi } @@ -128,16 +131,6 @@ src_test() { unset DBUS_SESSION_BUS_ADDRESS unset ORBIT_SOCKETDIR unset SESSION_MANAGER - export XDG_DATA_HOME="${T}" unset DISPLAY - Xemake check || die "Tests failed." -} - -pkg_postinst() { - gnome2_pkg_postinst - - if use ldap; then - elog "" - elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema" - fi + Xemake check }