[gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/

["Alexandre Rostovtsev" <tetromino@gentoo.org>]

commit:     bc24a8cef7b1c271e8b9edfe6b3a8d25c63847b0
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 05:50:22 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> 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