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 48C73138010 for ; Wed, 17 Oct 2012 08:58:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0F5FE049A; 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 09C41E049A 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 3FF0233D383 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 20D6AE5441 for ; Wed, 17 Oct 2012 08:58:28 +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.98b1a2853678d4557bbda7e533a68e37418a0b1a.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/ X-VCS-Repository: proj/gnome X-VCS-Files: mail-client/evolution/evolution-3.6.0.ebuild mail-client/evolution/evolution-3.6.1.ebuild mail-client/evolution/evolution-9999.ebuild X-VCS-Directories: mail-client/evolution/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 98b1a2853678d4557bbda7e533a68e37418a0b1a X-VCS-Branch: master Date: Wed, 17 Oct 2012 08:58:28 +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: f9a32b33-3f7b-495f-a9e3-8f9c04343dd4 X-Archives-Hash: 4da100a518d6f4ade9eed87ca53dc204 commit: 98b1a2853678d4557bbda7e533a68e37418a0b1a Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Oct 17 06:17:24 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=98b1a285 mail-client/evolution: 3.6.0 → 3.6.1 + QA Bump, remove useless doc USE flag for non-live ebuilds, add missing highlight dependency, update license. --- ...olution-3.6.0.ebuild => evolution-3.6.1.ebuild} | 15 +++++++++------ mail-client/evolution/evolution-9999.ebuild | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/mail-client/evolution/evolution-3.6.0.ebuild b/mail-client/evolution/evolution-3.6.1.ebuild similarity index 92% rename from mail-client/evolution/evolution-3.6.0.ebuild rename to mail-client/evolution/evolution-3.6.1.ebuild index b90b905..086f40b 100644 --- a/mail-client/evolution/evolution-3.6.0.ebuild +++ b/mail-client/evolution/evolution-3.6.1.ebuild @@ -14,14 +14,16 @@ fi DESCRIPTION="Integrated mail, addressbook and calendaring functionality" HOMEPAGE="http://www.gnome.org/projects/evolution/" -LICENSE="GPL-2 LGPL-2 OPENLDAP" +# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". +LICENSE="|| ( LGPL-2 LGPL-3 ) CCPL-Attribution-ShareAlike-3.0 FDL-1.3+ OPENLDAP" SLOT="2.0" +IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl" if [[ ${PV} = 9999 ]]; then + IUSE="${IUSE} doc" KEYWORDS="" else KEYWORDS="~amd64 ~x86 ~x86-fbsd" fi -IUSE="crypt doc +gnome-online-accounts gstreamer kerberos ldap map ssl" # We need a graphical pinentry frontend to be able to ask for the GPG # password from inside evolution, bug 160302 @@ -74,18 +76,19 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2 >=dev-libs/nss-3.11 )" DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 + dev-util/gtk-doc-am >=dev-util/intltool-0.40.0 - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.14 )" + virtual/pkgconfig" # eautoreconf needs: # >=gnome-base/gnome-common-2.12 -# >=dev-util/gtk-doc-am-1.9 RDEPEND="${COMMON_DEPEND} + app-text/highlight !=dev-util/gtk-doc-1.14 )" fi pkg_setup() { diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild index b90b905..086f40b 100644 --- a/mail-client/evolution/evolution-9999.ebuild +++ b/mail-client/evolution/evolution-9999.ebuild @@ -14,14 +14,16 @@ fi DESCRIPTION="Integrated mail, addressbook and calendaring functionality" HOMEPAGE="http://www.gnome.org/projects/evolution/" -LICENSE="GPL-2 LGPL-2 OPENLDAP" +# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". +LICENSE="|| ( LGPL-2 LGPL-3 ) CCPL-Attribution-ShareAlike-3.0 FDL-1.3+ OPENLDAP" SLOT="2.0" +IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl" if [[ ${PV} = 9999 ]]; then + IUSE="${IUSE} doc" KEYWORDS="" else KEYWORDS="~amd64 ~x86 ~x86-fbsd" fi -IUSE="crypt doc +gnome-online-accounts gstreamer kerberos ldap map ssl" # We need a graphical pinentry frontend to be able to ask for the GPG # password from inside evolution, bug 160302 @@ -74,18 +76,19 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2 >=dev-libs/nss-3.11 )" DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 + dev-util/gtk-doc-am >=dev-util/intltool-0.40.0 - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.14 )" + virtual/pkgconfig" # eautoreconf needs: # >=gnome-base/gnome-common-2.12 -# >=dev-util/gtk-doc-am-1.9 RDEPEND="${COMMON_DEPEND} + app-text/highlight !=dev-util/gtk-doc-1.14 )" fi pkg_setup() {