Needs older libical (#510032 by Bernd Feige)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 12 insertions, 136 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 4cd782db2f9d..d1b70927ed75 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.394 2014/05/30 05:32:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.395 2014/06/05 06:52:29 pacho Exp $
+
+  05 Jun 2014; Pacho Ramos <pacho@gentoo.org>
+  -evolution-data-server-3.12.1.ebuild, evolution-data-server-3.10.4.ebuild:
+  Needs older libical (#510032 by Bernd Feige)
 
 *evolution-data-server-3.12.2 (30 May 2014)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 00cccc2b373e..0cf935ffb72c 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -13,18 +13,16 @@ 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.10.4.tar.xz 3961320 SHA256 5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d SHA512 6ca596f2a99e599316d897f78c0504d0f184c0a8726e48adb8b3450412b624cb388851539f9d7270213b5679404d9a8cd8323e61f4499ed674fdfbe3eb1ce21d WHIRLPOOL 4a37519c690993260c2965a1cdc17f3c2d818c2354ff9720509c8e92d18df8059f2a90fcb4906c707017362b1d91636e65464bd1af2b9f21c2789bfeea391dea
-DIST evolution-data-server-3.12.1.tar.xz 4994796 SHA256 8c794d7f3e5241cc8856ab1d9fccab29487c575d3a3b7d9b884064864b96caa3 SHA512 184cf2086461371ae9e5e8cecad2c4b5f9149e872d35bd3631ce48590499527be21f393ec8771a2542b22fab24f69536bb0778d16156e774cf7ef5794f7cd0b0 WHIRLPOOL 24cad093d354ae4d7764c2ff4c79d705f98d132ebda9cdfb8f531b635f9880e081aad60617da6244a393a18c7df9a38c12f964bb77dc32046a61255a03b7f325
 DIST evolution-data-server-3.12.2.tar.xz 5000908 SHA256 91c95e17a8c1cd1086dafcd99a40bdf8f5993770f251f8b0a10e5395e3f5a3b6 SHA512 81e651fbc6f893426c341e48e25ee5ff55821e7a27b391324cc6a1596a5e45e2b75aba21e59cc6f0bb9713d42be628d64e4405a1dbe477ba22a6262ca0ec3a8f WHIRLPOOL 49395f321da209ff82e5f5b0837c1054aa4ebc09ad4bc568a46970726d66c3676ebf83df0fe41ccbcfdcc7889d2e0043bae9250ea2e2e7852c57b89b6db17d0a
 EBUILD evolution-data-server-2.32.3-r3.ebuild 5155 SHA256 131f1419171c2d7a877f7290948965dba3d3316cf24401bd48962e1e8993d661 SHA512 4340c7b1bac68b292d8a5a9c1fa51a316554d8307bdc7f2ce5cf28dfdf2c8ff58a9cecf350190359f20c39bf419931669ff8bbb540e7549f1b9c19798a10b27e WHIRLPOOL a12d27c6cc552b31c7407b1c583fd707cc01bd02ded30e5791ab26d82b6b4d8a6958846e3a2b34f91707b06f80c602e6efbb61d81d4b9a48c95758c92616cddd
-EBUILD evolution-data-server-3.10.4.ebuild 3607 SHA256 0e8a41deea85bad35dce626806a0797bbe9778a3f19a6ae2b17e9e333b3f2cc8 SHA512 1f10d1121d8a9b6055a9e7926ca12e74b4d20c18639ee369222cb5d9535f5e558c56ca6f4000c6c1f966bc26edd75decd0b995d224249d74dbeaeaf515c0cb1f WHIRLPOOL 1fa183d47afe2e7d20aaadbdd4c5057f5a1fbcf71f34af12a4a406e38eb728cde4c49d584d6b462744b3b45dc382693a69253c2c2c461b2a6bb2f3329c9373f3
-EBUILD evolution-data-server-3.12.1.ebuild 3370 SHA256 256161acf37723ee8a684651b868743159d4b720221c880091ccaffd9785928b SHA512 33d106cfc84069ad5428580af2cd3b5e456a4e87ed9c923f69664854f6098138091c5065f711dd7d9691c3dc7265b69c1414f17335667189eb820dd299410d37 WHIRLPOOL 75511cfe3291d4e4dbe109bb924d7f21ba78616b2d46e3380bbe48b8934ffd4d800aed966edb14c22f5722094390b1c6554eb203fab06adf38a14dfa2ad2beba
+EBUILD evolution-data-server-3.10.4.ebuild 3627 SHA256 1d105ecc1a084de7375e8037dc8d3480e2452de67ef6382d4f69549978d4c8f2 SHA512 9dc7e0d9d799802ed22ef354b6b61832185674acdddff342ae9c829498f2beb4a25cbf781de1a0a71a71b23fc260ba1b90d5a1f6a64b84e00208bd45b4c1c6bb WHIRLPOOL 82c544c105a192d87f5eb14974df500733b6faca380bbb023265a5849e984c156d62407cbe8fa864a49151c29656ba9a53bfadef4aa9be43d07632b4e8d68d90
 EBUILD evolution-data-server-3.12.2.ebuild 3370 SHA256 bb1b7bbe463b60fdc20393301e4e995849e82c8d667e555d1c4489f171bbbe5f SHA512 f2a56beecf9df7a5e19a89119bd09deed81382a70806cd7f0aad1e3b3b84302156c9e01e44272040089bf2da9b0250fe303fac39373a31f704c207ca81705877 WHIRLPOOL 97b35665f1720cb2d2d3e6e3b25f05ebb37045af91415b828530563908b3c8747e112b29ac0e387f60c3fd9ba498735a1d0f6d0854799054bc5312c5c154a0c6
-MISC ChangeLog 76530 SHA256 dfe8c2e339adb55d4396560da5b84a1f8b2a4de6062bbe3f224d97fca60865c4 SHA512 699606cb155a760acae8e511d67ca5c378f68e78cab26d07253cabe7e810c0352940f12573b04387cc9b02f6bd1ddcc5dc4b1bcff01d53a4093a9f8cd3321ef6 WHIRLPOOL 4da95436be13829a7f31f140771213dca1e49c5790f3086c215be55feae76a1a48d717ad41c4fcf9bf90d4078d5d5840416e208b9f1747a737ce85f41f5f14bd
+MISC ChangeLog 76701 SHA256 86e22f4a71fca43f4aa9e9641f33e5ca5cd21ad8f22c7e7a28c61943f126af0f SHA512 1ed8c26687da70d44689bc7360fd835a9545e8d08b3c71fbd68e7e33a0a7aeb41f5bbc99120a54459279d8b818dc67b1dd7064d55227a8237394bef60ec6e1ba WHIRLPOOL a7ac16b556bb83bd4c5668242ec1c6f8fc0f18c45cd2c8057e9a4e718ee35ce590a7c158ab5bc7acf312699e0b302760f6c3b6457b7ab4b1e062ee8af5023a4c
 MISC metadata.xml 506 SHA256 3b17f5d3335559ed8198c33f0866c39d854a452218344082d4453dddf555710b SHA512 4916d65f5fc5ccf4ddb5bd12717e3d839e01240df064c0b485f106713aa28573dd9a79944d2f4db0371fd766f8ff2938580b91fc90d2a72e44b9829f4e026b89 WHIRLPOOL 6b863b456d3e3c87a88cfcdfaaa105b4620524d840af99cafb9a70ea6ae619113e3c5e9575f3f7d4e487a695aa26aa3246e79c36059fa555f158d5fc3923a86a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOIF9wACgkQCaWpQKGI+9Rm9QCbBISn+Odd74P8PY6nTKV22Hxg
-jukAn3gI92gp5D0LUO4maTBvrWa73lA+
-=UMMJ
+iEYEAREIAAYFAlOQE64ACgkQCaWpQKGI+9SV2ACfUOMa2ChxYpVOFnsNr9Ohdnly
+Nq4An1SeGUU/GahkxIBgjcrNIae9TOrp
+=qXed
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.10.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.10.4.ebuild
index 1f55b0ddb4c6..8e2adf7be8ec 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.10.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.10.4.ebuild,v 1.5 2014/03/31 21:05:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.10.4.ebuild,v 1.6 2014/06/05 06:52:29 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -28,6 +28,7 @@ RDEPEND="
 	>=dev-libs/libgdata-0.10:=
 	>=app-crypt/libsecret-0.5[crypt]
 	>=dev-libs/libical-0.43:=
+	<dev-libs/libical-1
 	>=net-libs/libsoup-2.40.3:2.4
 	>=dev-libs/libxml2-2
 	>=sys-libs/db-4:=
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.1.ebuild
deleted file mode 100644
index 2535dbf83626..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.12.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2014 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.12.1.ebuild,v 1.2 2014/05/27 06:49:44 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-# python3 not really supported, bug #478678
-PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/49" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.5:=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libgdata-0.10:=
-	>=dev-libs/libical-0.43:=
-	>=net-libs/libsoup-2.42:2.4
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=sys-libs/db-4:=
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.2:3
-	)
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-3.5.5
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-# Some tests fail due to missings locales.
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-
-	# Fix relink issues in src_install
-	ELTCONF="--reverse-deps"
-
-	gnome2_src_prepare
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	# phonenumber does not exist in tree
-	gnome2_src_configure \
-		$(use_enable api-doc-extras gtk-doc) \
-		$(use_with api-doc-extras private-docs) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gtk) \
-		$(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-google \
-		--enable-largefile \
-		--enable-smime \
-		--with-libdb="${EPREFIX}"/usr \
-		--without-phonenumber \
-		--disable-examples \
-		--disable-uoa
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	unset DISPLAY
-	Xemake check
-}