Needs older libical (#510032 by Bernd Feige)

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 7 insertions, 129 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/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
-}