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

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

commit:     8d8dc263f86e76fa4df30d881ca074591a618fa8
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 08:23:04 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 08:23:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8d8dc263

gnome-extra/evolution-data-server: moved to gx86

Sync live ebuidl with gx86, add metadata.xml

---
 .../evolution-data-server-3.6.2.ebuild             |  144 --------------------
 .../evolution-data-server-9999.ebuild              |   37 +++---
 gnome-extra/evolution-data-server/metadata.xml     |   12 ++
 3 files changed, 32 insertions(+), 161 deletions(-)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.6.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.6.2.ebuild
deleted file mode 100644
index 8f82317..0000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.6.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use eutils flag-o-matic gnome2 python vala versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-fi
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.2:3
-	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.10
-	>=gnome-base/gnome-keyring-2.20.1
-	>=dev-libs/libical-0.43
-	>=net-libs/libsoup-2.38.1: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
-		>=net-libs/liboauth-0.9.4 )
-	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-util/fix-la-relink-command
-	dev-util/gperf
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( >=dev-util/gtk-doc-1.14 )"
-
-# FIXME
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-	# Uh, what to do about dbus-call-timeout ?
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		$(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)
-		$(use_with kerberos krb5 ${EPREFIX}/usr)
-		$(use_with ldap openldap)
-		$(use_enable vala vala-bindings)
-		$(use_enable weather)
-		--enable-nntp
-		--enable-largefile
-		--enable-smime
-		--with-libdb=${EPREFIX}/usr"
-	python_set_active_version 2
-}
-
-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
-	append-cppflags "-I$(db_includedir)"
-
-	# FIXME: Fix compilation flags crazyness
-	# Touch configure.ac if doing eautoreconf
-	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
-}
-
-src_install() {
-	# Prevent this evolution-data-server from linking to libs in the installed
-	# evolution-data-server libraries by adding -L arguments for build dirs to
-	# every .la file's relink_command field, forcing libtool to look there
-	# first during relinking. This will mangle the .la files installed by
-	# make install, but we don't care because we will be punting them anyway.
-	fix-la-relink-command . || die "fix-la-relink-command failed"
-	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
-	fi
-}
-
-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
-}

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 8f82317..847fb4c 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
 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
 if [[ ${PV} = 9999 ]]; then
@@ -19,7 +19,7 @@ HOMEPAGE="http://projects.gnome.org/evolution/"
 
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0"
+SLOT="0/40" # subslot = libcamel-1.2 soname version
 IUSE="api-doc-extras +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -33,34 +33,35 @@ fi
 
 RDEPEND=">=dev-libs/glib-2.32:2
 	>=x11-libs/gtk+-3.2:3
-	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.10
+	>=dev-db/sqlite-3.5:=
+	>=dev-libs/libgdata-0.10:=
 	>=gnome-base/gnome-keyring-2.20.1
-	>=dev-libs/libical-0.43
+	>=dev-libs/libical-0.43:=
 	>=net-libs/libsoup-2.38.1:2.4
 	>=dev-libs/libxml2-2
-	>=sys-libs/db-4
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
+	>=sys-libs/db-4:=
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
 	>=app-crypt/gcr-3.4
 
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/libiconv
 
 	gnome-online-accounts? (
 		>=net-libs/gnome-online-accounts-3.2
 		>=net-libs/liboauth-0.9.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	weather? ( >=dev-libs/libgweather-3.5:2 )
+	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
 	>=dev-util/intltool-0.35.5
 	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )"
@@ -74,6 +75,11 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
 	# Uh, what to do about dbus-call-timeout ?
 	G2CONF="${G2CONF}
@@ -91,10 +97,7 @@ pkg_setup() {
 		--enable-largefile
 		--enable-smime
 		--with-libdb=${EPREFIX}/usr"
-	python_set_active_version 2
-}
 
-src_prepare() {
 	gnome2_src_prepare
 	use vala && vala_src_prepare
 

diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
new file mode 100644
index 0000000..db353b5
--- /dev/null
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<use>
+		<flag name="api-doc-extras">Build documentation for private APIs</flag>
+		<flag name="gnome-online-accounts">Enable using
+			<pkg>net-libs/gnome-online-accounts</pkg> for authorization</flag>
+		<flag name="vala">Build <pkg>dev-lang/vala</pkg> bindings</flag>
+		<flag name="weather">Enable optional weather calendar support</flag>
+	</use>
+</pkgmetadata>