Drop useless USE=doc, it only regenerated documentation. Update license. Use vala.eclass. Drop old.

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

7 files changed, 46 insertions, 337 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 8d409462b51e..eaa72beff5bf 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.344 2012/09/27 10:42:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.345 2012/10/17 09:54:20 tetromino Exp $
+
+  17 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -evolution-data-server-2.32.3-r1.ebuild,
+  evolution-data-server-2.32.3-r2.ebuild,
+  evolution-data-server-3.2.3-r2.ebuild, -evolution-data-server-3.4.3.ebuild,
+  evolution-data-server-3.4.4.ebuild:
+  Drop useless USE=doc, it only regenerated documentation. Update license. Use
+  vala.eclass. Drop old.
 
   27 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
   evolution-data-server-3.4.4.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 60fc223055ac..8a390d21ef19 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -15,19 +15,20 @@ AUX fix_relink_command.pl 4074 SHA256 f6da0e687f7e64eab82671def4b7445602d1bf64e9
 DIST evolution-data-server-2.32.3-patches.tar.xz 24072 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa SHA512 20e12257e7153d074f20c158fc16a5a8feed8e9ed34035c6d752e31ca5b21436e08d767433aa16b885ad0aa8a95b18b41f79c80f2b30db42a5af402082882d55 WHIRLPOOL 660000ccaa0160325b92cf26ea031c96190645ce4bd2a6fc83b03411c6a2bb7f7aadc0ca0a493e1ff386fd4ac4471035af2da0decb436db7f8cf74b792ac4bd2
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c SHA512 863ccea7717a7fe743155513e74fc8ea35f558702bd4ff1075e15d1a36c1ecd9d5e285bd2a81245d680c05cf0521029583134b4e1d12668244042df3f5e62dfb WHIRLPOOL 3c56210f477901c3ea2d4712e631d219969cb113ff1c4cba3fcefccb67fed363a6207025b46922b9c1f6ba3427b962b5e0565c6b1441249c74b29afa314e3580
 DIST evolution-data-server-3.2.3.tar.xz 3729592 SHA256 8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c SHA512 6b717bcd3398f52dc9f8f083c4ef8b497c31e8924c6d9fe782c41858e213e1b184be9d3e8a1bf6e81090cf62e892898d9d640ccb43479afe87325c959a2e59cd WHIRLPOOL 5a890622a1a1ab1b5633cb683c8b6bf110c230bab7b4c66e24240759c26941111343179de3b07219d4c2bbe0d6869016800f0ef17792fb130bfc09aeb6164c21
-DIST evolution-data-server-3.4.3.tar.xz 3645752 SHA256 455d0ee5ba5f1638f593476427697c9b5fc9668389b18f170449710f711626d8 SHA512 5bd2958af5a9459915a9e6c21416e9972ceb9161793428f9849bf5cb325fd42ca88cf63b688e6208b7f54f25ab7ca944c98225ab0494570a418977e675850a05 WHIRLPOOL 4311ee8f7498f28782b887ffc7485b333e0ec0749a13f637f54d06829a4523bd3154de0c84698ba41905348ab4070612b89850be6825748f8384955c1f548c08
 DIST evolution-data-server-3.4.4.tar.xz 3647048 SHA256 ce9e1d5625503cd7f1f0631ec2f552e26800c33305b45722b34eba8da5ced491 SHA512 0c8945c01f634f0736935cd1096edd294a988707a8a229c2a38cfed8931952e670050a040c50da23a3be605f0a121cfb0d2cf0d8da8ec7d45edf0473b9af251f WHIRLPOOL afc940b4c0065d424048e0d87a6b1cd4fe9728c1480ec479df159e3940cc82daed51100bc4ce99de8df3d490bc50e9100898b0a1871e0e389e95b61fd37f233e
-EBUILD evolution-data-server-2.32.3-r1.ebuild 4669 SHA256 b617dd397ebf949c4947a2072e6b2e1236a99efe3fcc40a8831ae74be3eaabb9 SHA512 96b98bca18abd07e3a8e8dca3919d35d5b9387c9476a91fe8823ecfdb74e1fba6aed666783d929c6e213dafa2cfb4bcbb7ff0739fe8b47d42b9e57140404dd63 WHIRLPOOL d5415a035ed210c2100a663caa5e69d363499cf2853d45832735eb5e66117e86cc8c018fa1c0f1e6a82c701f1148ea908064e686d4921df8c74feb30c47ae5b5
-EBUILD evolution-data-server-2.32.3-r2.ebuild 4941 SHA256 55c04aa9c6bf2be5f4bbcb75b0a30aee025cb5b892913c599dd466f25ccee462 SHA512 ef8776e8e3203d236fd6bc895c6249aaa3a1d1139d36d1e9855e3f1b621fc1558753b0c61642cd9418e0e07a0b94452a92e5fba2ef58a17ef35ec07e715590b7 WHIRLPOOL 0cfd44808323cceba2df9d1db99c18fbd47f5dbfbe03755c4776e12fb1f8f3592e0b10604eec578fa807d96805b5badef0c9efd2ebf7415427bc1f8778b0262f
-EBUILD evolution-data-server-3.2.3-r2.ebuild 4645 SHA256 c85325a682071b1448c88a6a85b85fdc9dfd3f130892de77bbedc77945e92163 SHA512 fb50708b9bc08f56eae880364c3a590b74cbc9c2f5a39dbb39fc2075bb629dc609f6ff701d23e28a40facf3d4029b471a3faecf94438f2853b2585f955d7d849 WHIRLPOOL 9e2ed68df8d729a4b90d42c678480fd3be73d39f93b6747bc6d6c0728b63280060097d33bf16851d26108958cbca83eacc43ac42896e3337ab25d90ccb1e093f
-EBUILD evolution-data-server-3.4.3.ebuild 3994 SHA256 0c4cb00810dadcb80b21e6790f919b4598d04583c311cd04369d78f460880a41 SHA512 1e1e82a41bbf0d0311392859a4d64aea0bce17bb766545c233c01a7991f07b3bff35acda41d45ec8a13586a3fcbef1fffe44c169ccb6267ea0e601d282986032 WHIRLPOOL 4d58f5b7659d4a8399c4abd64b9add889e5781530b3ce1b89d6a0ce456ee7ee0addbe7d143a4e6eb67c86a6e76d3210ae14ede5451e5903f6cfd6d26e559ad32
-EBUILD evolution-data-server-3.4.4.ebuild 4005 SHA256 1bcce4d656a30d5fc5dace33f08d188f34d484b7c3748228c77a5b15b622327a SHA512 b81e47086f948e23edc7dd70fd8ba2e30f60af4c180a2e07bf9a618ace69302b327d7944d82b1dcfae478eaeb20779b0545df33253c708f2cde57a0418c60a1c WHIRLPOOL 835493426eb9de10c2eec4c194817184a4856c38470bbbd34afe9613b2cd7abf9e846680b7d58592d07bca4d5430a91327fe2c4a8bbc21e514c2bd6a1ffe11be
-MISC ChangeLog 67708 SHA256 4eeb8b71cddd734ebc65026738bb6a1f7859970f2d15592067f77bce1cddeff3 SHA512 9bfff8c6737f4a3e35f8dec9c7e1ac44a8e73389a5948b5a03f3f47c05a03249b59e4e014fa136d5df1d11cc2d224343ccd77f2892d35264d7454801e6bfc70c WHIRLPOOL d80d30eb08ed809ff31a1a6005d8068a9fbe688ac95c04c968cd9af92813e8a13ea2858d9108a812a80042b59077302797e7448a218fb3f7dd0722fcdc1ef023
+EBUILD evolution-data-server-2.32.3-r2.ebuild 4950 SHA256 c0687138dfd7dc808377a40b910f1ace4f6cfa8ba0af5db735efd72b3a908c37 SHA512 b67b5aa19ab04e4ff84287797a5c22b89b9e67ff9eafbb4ad925077d75e14326bff869b287448a9bb4410d7adfe175c58d1297b1c32d7fd4f40fa91477a79396 WHIRLPOOL 11bbefac230b65b84a69cf7f42f807f1c1421272899b4010ad74220ff6fa08302d6b63e37a86c7dbd046a0d58f5a1e7d2c4c18b672b4f68beaf1318c507066cc
+EBUILD evolution-data-server-3.2.3-r2.ebuild 4651 SHA256 211704d9d9d591d14d0bc7d7976d5f551daba54c83fedb257650f690fb8396ee SHA512 5a86ec4f5e36e66d8ef6996d0a09a2fe8aa5515b96147f8c60a249c1965ce94ee2114545aca3a5479fa09497f55e87187131c403e6e4bae7325857ab4982480a WHIRLPOOL 604bde3ff8f690e83732d9cdb18e04c614ef92a3c0cee2a7c2049b82e1bf3468639ea691e559e7408e9a0455eb96cddcd7f9b9c0b8e8c0d77819285169f3958d
+EBUILD evolution-data-server-3.4.4.ebuild 4011 SHA256 efe9d179e19dd2d411c2138ffc3895684d8b9a802ae8e101b438bc6ba0db601c SHA512 977d714cc6c7d79794213e66908cd4c09ab07aa3161b091467e542909788d061f89079742149141f3e93d4389cbd07bbdcb44abe62e3bf703849a3c4d0861460 WHIRLPOOL 0d69cec18ac28da8ce2b4bef8d7df2ee1713699fc9e114678b1601123faab921a8031433939efe6075a277225ca64ff18a64cae3c4ef64a283ef9d9a598952da
+MISC ChangeLog 68074 SHA256 952d163b02c77e925dc9d2a83b83030b80afa3e0cdb2f6d208babc7ab7d9cf3b SHA512 cf0d9df44e7c63cad3022b545e78441d327aaf008bd33b493bb8f2e4608b01d904b70c89f7c4af016377ca196c6c04cf4ee7a914d8c6f2079fdbd3b3a3445d41 WHIRLPOOL e4eafa428c1504d18c253d37e792f68584dac165cab7da975649d4a0c2d616c956a4586102378616825bd60ddb0082875abbbca56578610946fafd3de4c9a14a
 MISC metadata.xml 535 SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c SHA512 38aceea7cd19077688d45c10e16d935761a1913bc0d60a917e0e4cc11926959ec2154e08ffd903bc560d16c9e97c723d590d082e2e1a9a3dfc7ecc4e74fb7131 WHIRLPOOL 99ee5c5b8639e9a74f98878fe3b81985eb5f023e1b4f12c9e12a66e21d0e7f266faaedae6b086ef4603f3d53fc9aff0f0a5a3669a27179bfac07c2b495577114
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBkLawACgkQl5yvQNBFVTU5kgCfXDaX9wjYHdYAjpeleN4ue6ao
-5ZQAn2ZSRu/2QZxxV/mqteGKlK6l9Gs9
-=u2v2
+iQEcBAEBCAAGBQJQfoBNAAoJEJ0WA1zPCt1hNCoIALquwlo14Aqx4wxhnVQOIZA4
+NVfonedYxHYQMQXO0gQgd5QTz+4/nQYNUBwRjl1wVcYNpdtqS4BleFAgrCrH5uNI
+ZleZfmKYNNqSEXpUej6wHKZzL9lUa8kZDOjb4OJ6hgr416xtcuG1p4WACTzPeL4z
+hsaVS9LOhWuOmpgVJPIwYCwIQWT3wj1GeVqYstRMrXRDu/OIq8Hhk7/vuhWpAqFD
+8Napc8W9syTZcYc7CbOvhkqzkm7V6a5EY+7oPlbOkoV00kbM0nMo+arbru61ee31
+q8UpOPGGCPwYmAodVk4CDthMybWD2sS/FDWl72HQqmpg3h2ifiWmIvnljIC7bA4=
+=S/vW
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
deleted file mode 100644
index 16b508d7ab62..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild,v 1.9 2012/05/05 06:25:24 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-IUSE="doc ipv6 kerberos gnome-keyring ldap +weather"
-
-RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.24:2
-	>=gnome-base/gconf-2
-	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.6.3
-	>=dev-libs/libical-0.43
-	>=net-libs/libsoup-2.4:2.4
-	>=dev-libs/libxml2-2
-	>=sys-libs/db-4
-	sys-libs/zlib
-	virtual/libiconv
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	weather? (
-		>=dev-libs/libgweather-2.25.4:2
-		<dev-libs/libgweather-2.91:2 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.5
-	sys-devel/bison
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-#	>=dev-util/gtk-doc-am-1.9
-
-pkg_setup() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-	# ssl stuff always enabled as recommended in upstream bug #642984
-	G2CONF="${G2CONF}
-		$(use_enable gnome-keyring)
-		$(use_enable ipv6)
-		$(use_with kerberos krb5 /usr)
-		$(use_with ldap openldap)
-		$(use_with weather)
-		--disable-gtk3
-		--enable-largefile
-		--with-libdb=/usr
-		--enable-ssl
-		--enable-smime"
-
-}
-
-src_prepare() {
-	# Adjust to gentoo's /etc/service
-	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
-
-	# GNOME bug 611353 (skips failing test atm)
-	epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
-
-	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
-	sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
-		-i addressbook/tests/Makefile.{am,in} \
-		|| die "failing test sed 1 failed"
-
-	# Apply multiple backports and fixed from master and 2.32 branches
-	#
-	# 009 and 010 patches are broken, bug #372651
-	rm "${WORKDIR}/${P}-patches"/009*.patch || die
-	rm "${WORKDIR}/${P}-patches"/010*.patch || die
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-
-	# /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_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure.ac configure || die "sed 3 failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-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.
-	perl "${FILESDIR}/fix_relink_command.pl" . \
-		|| die "fix_relink_command.pl 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_preinst() {
-	gnome2_pkg_preinst
-
-	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
-		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
-		libedata-book-1.2.so.2 libebook-1.2.so.9 \
-		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
-	do
-		preserve_old_lib /usr/$(get_libdir)/$lib
-	done
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
-		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
-		libedata-book-1.2.so.2 libebook-1.2.so.9 \
-		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
-	do
-		preserve_old_lib_notify /usr/$(get_libdir)/$lib
-	done
-
-	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-2.32.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
index 70e3d1da6b3f..387e7d4d610d 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.11 2012/07/15 17:38:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.12 2012/10/17 09:54:20 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,11 +15,12 @@ HOMEPAGE="http://projects.gnome.org/evolution/"
 
 SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
 
-LICENSE="LGPL-2 BSD DB"
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD DB"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 
-IUSE="doc ipv6 kerberos gnome-keyring ldap +weather"
+IUSE="ipv6 kerberos gnome-keyring ldap +weather"
 
 RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=x11-libs/gtk+-2.24:2
@@ -47,11 +48,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.5
 	sys-devel/bison
 	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	>=dev-util/gtk-doc-am-1.9"
 # eautoreconf needs:
 #	>=gnome-base/gnome-common-2
-#	>=dev-util/gtk-doc-am-1.9
 
 pkg_setup() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild
index 78c63687faf3..316930128eae 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild,v 1.3 2012/08/13 04:58:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild,v 1.4 2012/10/17 09:54:20 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
 
-inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
+inherit autotools db-use eutils flag-o-matic gnome2 vala versionator virtualx
 
 DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
+HOMEPAGE="http://projects.gnome.org/evolution/"
 
-LICENSE="LGPL-2 BSD DB"
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD DB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
+IUSE="+gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
 
 # GNOME3: How do we slot libedataserverui-3.0.so?
 # Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
@@ -43,17 +46,15 @@ RDEPEND=">=dev-libs/glib-2.28:2
 DEPEND="${RDEPEND}
 	dev-util/fix-la-relink-command
 	dev-util/gperf
-	virtual/pkgconfig
 	>=dev-util/intltool-0.35.5
 	sys-devel/bison
 	>=gnome-base/gnome-common-2
 	>=dev-util/gtk-doc-am-1.9
 	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
 # eautoreconf needs:
 #	>=gnome-base/gnome-common-2
-#	>=dev-util/gtk-doc-am-1.9
 
 REQUIRED_USE="vala? ( introspection )"
 
@@ -65,8 +66,6 @@ pkg_setup() {
 	# Uh, what to do about dbus-call-timeout ?
 	# Fails to build with --disable-ssl; bug #392679, https://bugzilla.gnome.org/show_bug.cgi?id=642984
 	G2CONF="${G2CONF}
-		VALAC=$(type -P valac-0.14)
-		VAPIGEN=$(type -P vapigen-0.14)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable introspection)
 		$(use_enable ipv6)
@@ -101,6 +100,7 @@ src_prepare() {
 	eautoreconf
 
 	gnome2_src_prepare
+	use vala && vala_src_prepare
 
 	# GNOME bug 611353 (skips failing test atm)
 	# XXX: uncomment when there's a proper fix
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.4.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.4.3.ebuild
deleted file mode 100644
index 438e57043152..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.4.3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.4.3.ebuild,v 1.3 2012/09/10 17:07:04 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit db-use eutils flag-o-matic gnome2 versionator virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
-
-RDEPEND=">=dev-libs/glib-2.31:2
-	>=x11-libs/gtk+-3.2:3
-	>=gnome-base/gconf-2
-	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.10
-	>=gnome-base/gnome-keyring-2.20.1
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libical-0.43
-	>=net-libs/libsoup-2.31.2:2.4
-	>=dev-libs/libxml2-2
-	>=sys-libs/db-4
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-
-	sys-libs/zlib
-	virtual/libiconv
-
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.1.1
-		>=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-2.90.0:2 )
-"
-DEPEND="${RDEPEND}
-	dev-util/fix-la-relink-command
-	dev-util/gperf
-	>=dev-util/intltool-0.35.5
-	sys-devel/bison
-	>=gnome-base/gnome-common-2
-	>=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.13.0:0.14[vapigen] )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-#	>=dev-util/gtk-doc-am-1.9
-
-REQUIRED_USE="vala? ( introspection )"
-
-# FIXME
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-	# Uh, what to do about dbus-call-timeout ?
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		VALAC=$(type -P valac-0.14)
-		VAPIGEN=$(type -P vapigen-0.14)
-		$(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"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# GNOME bug 611353 (skips failing test atm)
-	# XXX: uncomment when there's a proper fix
-	#epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
-
-	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
-	#sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
-	#	-i addressbook/tests/Makefile.{am,in} \
-	#	|| die "failing test sed 1 failed"
-
-	# /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-3.4.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild
index 88605f18b6c2..45cea5eec4fa 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild,v 1.4 2012/09/27 10:42:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild,v 1.5 2012/10/17 09:54:20 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
 
-inherit db-use eutils flag-o-matic gnome2 versionator virtualx
+inherit db-use eutils flag-o-matic gnome2 vala versionator virtualx
 
 DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
+HOMEPAGE="http://projects.gnome.org/evolution/"
 
-LICENSE="LGPL-2 BSD DB"
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD DB"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
+IUSE="+gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
 
 RDEPEND=">=dev-libs/glib-2.31:2
 	>=x11-libs/gtk+-3.2:3
@@ -50,11 +53,9 @@ 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.13.0:0.14[vapigen] )"
+	vala? ( $(vala_depend) )"
 # eautoreconf needs:
 #	>=gnome-base/gnome-common-2
-#	>=dev-util/gtk-doc-am-1.9
 
 REQUIRED_USE="vala? ( introspection )"
 
@@ -66,8 +67,6 @@ pkg_setup() {
 	# Uh, what to do about dbus-call-timeout ?
 	G2CONF="${G2CONF}
 		--disable-schemas-compile
-		VALAC=$(type -P valac-0.14)
-		VAPIGEN=$(type -P vapigen-0.14)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable introspection)
 		$(use_enable ipv6)
@@ -83,6 +82,7 @@ pkg_setup() {
 
 src_prepare() {
 	gnome2_src_prepare
+	use vala && vala_src_prepare
 
 	# GNOME bug 611353 (skips failing test atm)
 	# XXX: uncomment when there's a proper fix