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 58934138010 for ; Wed, 17 Oct 2012 08:58:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C93D9E04BA; Wed, 17 Oct 2012 08:58:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 14783E04BA for ; Wed, 17 Oct 2012 08:58:30 +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 488E133D759 for ; Wed, 17 Oct 2012 08:58:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E169CE5436 for ; Wed, 17 Oct 2012 08:58:27 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1350464285.bc24a8cef7b1c271e8b9edfe6b3a8d25c63847b0.tetromino@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.6.0.ebuild gnome-extra/evolution-data-server/evolution-data-server-3.6.1.ebuild gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild X-VCS-Directories: gnome-extra/evolution-data-server/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: bc24a8cef7b1c271e8b9edfe6b3a8d25c63847b0 X-VCS-Branch: master Date: Wed, 17 Oct 2012 08:58:27 +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: 1101cb17-507d-402c-8519-03a148f985cc X-Archives-Hash: 06894aff6b881736126debef92ecbe29 commit: bc24a8cef7b1c271e8b9edfe6b3a8d25c63847b0 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Oct 17 05:50:22 2012 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Wed Oct 17 08:58:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bc24a8ce gnome-extra/evolution-data-server: 3.6.0 → 3.6.1 + QA Bump, remove useless doc USE flag for non-live ebuilds, add a separate flag for private docs that only e-d-s developers would likely be interested in, use vala.eclass, and update license. --- ...0.ebuild => evolution-data-server-3.6.1.ebuild} | 24 +++++++++++-------- .../evolution-data-server-9999.ebuild | 24 +++++++++++-------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.6.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.6.1.ebuild similarity index 86% rename from gnome-extra/evolution-data-server/evolution-data-server-3.6.0.ebuild rename to gnome-extra/evolution-data-server/evolution-data-server-3.6.1.ebuild index 33acd5e..79195db 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.6.0.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.6.1.ebuild @@ -7,7 +7,7 @@ GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" PYTHON_DEPEND="2" -inherit db-use eutils flag-o-matic gnome2 python versionator virtualx +inherit db-use eutils flag-o-matic gnome2 python versionator vala virtualx if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -15,14 +15,19 @@ fi DESCRIPTION="Evolution groupware backend" HOMEPAGE="http://www.gnome.org/projects/evolution/" -LICENSE="LGPL-2 BSD DB" +# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". +LICENSE="|| ( LGPL-2 LGPL-3 ) BSD DB" SLOT="0" +IUSE="api-doc-extras +gnome-online-accounts +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="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" fi -IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather" RDEPEND=">=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:3 @@ -56,13 +61,12 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.17 virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.14 ) - vala? ( dev-lang/vala:0.18[vapigen] )" + vala? ( $(vala_depend) )" # eautoreconf needs: # >=gnome-base/gnome-common-2 -# >=dev-util/gtk-doc-am-1.9 -REQUIRED_USE="vala? ( introspection )" +[[ ${PV} = 9999 ]] && DEPEND="${DEPEND} + doc? ( >=dev-util/gtk-doc-1.14 )" # FIXME RESTRICT="test" @@ -72,9 +76,8 @@ pkg_setup() { # Uh, what to do about dbus-call-timeout ? G2CONF="${G2CONF} --disable-schemas-compile - VALAC=$(type -P valac-0.18) - VAPIGEN=$(type -P vapigen-0.18) - $(use_with doc private-docs) + $(use_enable api-doc-extras gtk-doc) + $(use_with api-doc-extras private-docs) $(use_enable gnome-online-accounts goa) $(use_enable introspection) $(use_enable ipv6) @@ -91,6 +94,7 @@ pkg_setup() { src_prepare() { gnome2_src_prepare + use vala && vala_src_prepare # /usr/include/db.h is always db-1 on FreeBSD # so include the right dir in CPPFLAGS 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 33acd5e..79195db 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild @@ -7,7 +7,7 @@ GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" PYTHON_DEPEND="2" -inherit db-use eutils flag-o-matic gnome2 python versionator virtualx +inherit db-use eutils flag-o-matic gnome2 python versionator vala virtualx if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -15,14 +15,19 @@ fi DESCRIPTION="Evolution groupware backend" HOMEPAGE="http://www.gnome.org/projects/evolution/" -LICENSE="LGPL-2 BSD DB" +# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". +LICENSE="|| ( LGPL-2 LGPL-3 ) BSD DB" SLOT="0" +IUSE="api-doc-extras +gnome-online-accounts +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="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" fi -IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather" RDEPEND=">=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:3 @@ -56,13 +61,12 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.17 virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.14 ) - vala? ( dev-lang/vala:0.18[vapigen] )" + vala? ( $(vala_depend) )" # eautoreconf needs: # >=gnome-base/gnome-common-2 -# >=dev-util/gtk-doc-am-1.9 -REQUIRED_USE="vala? ( introspection )" +[[ ${PV} = 9999 ]] && DEPEND="${DEPEND} + doc? ( >=dev-util/gtk-doc-1.14 )" # FIXME RESTRICT="test" @@ -72,9 +76,8 @@ pkg_setup() { # Uh, what to do about dbus-call-timeout ? G2CONF="${G2CONF} --disable-schemas-compile - VALAC=$(type -P valac-0.18) - VAPIGEN=$(type -P vapigen-0.18) - $(use_with doc private-docs) + $(use_enable api-doc-extras gtk-doc) + $(use_with api-doc-extras private-docs) $(use_enable gnome-online-accounts goa) $(use_enable introspection) $(use_enable ipv6) @@ -91,6 +94,7 @@ pkg_setup() { src_prepare() { gnome2_src_prepare + use vala && vala_src_prepare # /usr/include/db.h is always db-1 on FreeBSD # so include the right dir in CPPFLAGS