New version for GNOME 2.28. Clean up old revision.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 66 insertions, 159 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index dccd21d9c743..d636d75a22fb 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.244 2009/10/24 16:51:51 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.245 2009/10/29 22:20:03 eva Exp $
+
+*evolution-data-server-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -evolution-data-server-2.24.5-r2.ebuild,
+  -evolution-data-server-2.26.2.ebuild,
+  +files/evolution-data-server-2.28.0-gentoo_etc_services.patch,
+  +evolution-data-server-2.28.1.ebuild:
+  New version for GNOME 2.28. Clean up old revision.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org>
   evolution-data-server-2.26.3.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.24.5-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.24.5-r2.ebuild
deleted file mode 100644
index 965ac3bf76ac..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.24.5-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2009 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.24.5-r2.ebuild,v 1.9 2009/04/27 14:39:31 jer Exp $
-
-inherit db-use eutils flag-o-matic gnome2 autotools versionator
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 Sleepycat"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
-
-RDEPEND=">=dev-libs/glib-2.16.1
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.4
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
-	>=dev-db/sqlite-3.5
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	>=gnome-base/libgnomeui-2
-	sys-libs/zlib
-	=sys-libs/db-4*
-	ldap? ( >=net-nds/openldap-2.0 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(use_enable ipv6)
-		$(use_enable gnome-keyring)
-		--with-libdb=/usr/$(get_libdir)"
-
-	if use krb4 && ! built_with_use virtual/krb5 krb4; then
-		ewarn
-		ewarn "In order to add kerberos 4 support, you have to emerge"
-		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Adjust to gentoo's /etc/service
-	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
-
-	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-	# Fix building evo-exchange with --as-needed, upstream bug #342830
-	epatch "${FILESDIR}"/${PN}-2.23.6-as-needed.patch
-
-	# Fix S/MIME verification.  Bug #258867
-	epatch "${FILESDIR}"/${P}-CVE-2009-0547.patch
-
-	# Fix NTLM SASL authentication. Bug #261203
-	epatch "${FILESDIR}"/${PN}-CVE-2009-0582.patch
-
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" -i gtk-doc.make
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" -i gtk-doc.make
-	fi
-
-	# gtk-doc-am and gnome-common needed for this
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-		s|mozilla-nspr|nspr|" "${S}"/configure
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	cd "${S}"
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use ldap; then
-		MY_MAJORV=$(get_version_component_range 1-2)
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym "${D}"/usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-
-}
-
-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-2.26.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.28.1.ebuild
index d481a632c5fb..5b75fcfc3e9f 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.26.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.28.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2009 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.26.2.ebuild,v 1.3 2009/05/31 13:23:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.28.1.ebuild,v 1.1 2009/10/29 22:20:03 eva Exp $
 
 EAPI="2"
 
-inherit db-use eutils flag-o-matic gnome2 autotools versionator
+inherit db-use eutils flag-o-matic gnome2 versionator
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
 
 LICENSE="LGPL-2 Sleepycat"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
 
 RDEPEND=">=dev-libs/glib-2.16.1
@@ -20,7 +20,6 @@ RDEPEND=">=dev-libs/glib-2.16.1
 	>=gnome-base/libbonobo-2.20.3
 	>=gnome-base/gconf-2
 	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
 	>=dev-libs/libxml2-2
 	>=net-libs/libsoup-2.4
 	>=dev-libs/libgweather-2.25.4
@@ -30,12 +29,11 @@ RDEPEND=">=dev-libs/glib-2.16.1
 	ssl? (
 		>=dev-libs/nspr-4.4
 		>=dev-libs/nss-3.9 )
-	>=gnome-base/libgnomeui-2
 	sys-libs/zlib
 	=sys-libs/db-4*
 	ldap? ( >=net-nds/openldap-2.0 )
 	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5[krb4] )"
+	krb4? ( app-crypt/mit-krb5[krb4] )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
@@ -63,23 +61,18 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Adjust to gentoo's /etc/service
-	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
-
-	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-2.25.90-no-libdb.patch
+	epatch "${FILESDIR}/${PN}-2.28.0-gentoo_etc_services.patch"
 
 	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-	# Fix building evo-exchange with --as-needed, upstream bug #342830
-	# and configure failing to detect kerberos5-libs with as-needed
-	epatch \
-		"${FILESDIR}"/${PN}-2.25.5-as-needed.patch \
-		"${FILESDIR}"/${P}-as-needed-configure.patch
+	epatch "${FILESDIR}/${PN}-1.8.0-camel-rewind.patch"
 
-	# gtk-doc-am and gnome-common needed for this
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
+			-i gtk-doc.make || die "sed 1 failed"
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
+			-i gtk-doc.make || die "sed 2 failed"
+	fi
 
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
@@ -94,6 +87,10 @@ 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
+	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+		-i configure.ac configure || die "sed 3 failed"
 }
 
 src_install() {
@@ -105,7 +102,6 @@ src_install() {
 		doins "${FILESDIR}"/calentry.schema || die "doins failed"
 		dosym "${D}"/usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
 	fi
-
 }
 
 pkg_postinst() {
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.0-gentoo_etc_services.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.0-gentoo_etc_services.patch
new file mode 100644
index 000000000000..07eb146e230d
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.0-gentoo_etc_services.patch
@@ -0,0 +1,39 @@
+From 02cc551defa9cb222216b4ae03a9e883a9abcb64 Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Mon, 28 Sep 2009 21:34:36 +0200
+Subject: [PATCH] Adjust imap+pop3 stuffs to gentoo services
+
+---
+ camel/providers/imap/camel-imap-store.c |    2 +-
+ camel/providers/pop3/camel-pop3-store.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
+index a5eb640..1574e79 100644
+--- a/camel/providers/imap/camel-imap-store.c
++++ b/camel/providers/imap/camel-imap-store.c
+@@ -959,7 +959,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
+ 		port = ssl_options[i].port;
+ 	} else {
+ 		mode = MODE_CLEAR;
+-		serv = (gchar *) "imap";
++		serv = (gchar *) "imap2";
+ 		port = IMAP_PORT;
+ 	}
+ 
+diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
+index 89be794..a79c06b 100644
+--- a/camel/providers/pop3/camel-pop3-store.c
++++ b/camel/providers/pop3/camel-pop3-store.c
+@@ -311,7 +311,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
+ 		port = ssl_options[i].port;
+ 	} else {
+ 		mode = MODE_CLEAR;
+-		serv = (gchar *) "pop3";
++		serv = (gchar *) "pop-3";
+ 		port = POP3S_PORT;
+ 	}
+ 
+-- 
+1.6.5.rc1
+