Remove GNOME 2.18 version

(Portage version: 2.1.4.4)

8 files changed, 11 insertions, 520 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 912d2577c773..b8812ba2c3cd 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.171 2008/02/04 04:34:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.172 2008/03/10 21:41:08 leio Exp $
+
+  10 Mar 2008; Mart Raudsepp <leio@gentoo.org>
+  -files/evolution-data-server-1.7.3-libdb.patch,
+  -files/evolution-data-server-1.9.91-as-needed.patch,
+  -files/evolution-data-server-1.10-fix-maildir-account.patch,
+  -files/evolution-data-server-1.10-newline-in-contacts.patch,
+  -files/evolution-data-server-1.12.2-local-delivery.patch,
+  -evolution-data-server-1.10.3.1.ebuild,
+  -evolution-data-server-1.12.2-r1.ebuild:
+  Remove GNOME 2.18 version
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org>
   evolution-data-server-1.12.3.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.10.3.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.10.3.1.ebuild
deleted file mode 100644
index 6632f8859df0..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.10.3.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2008 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-1.10.3.1.ebuild,v 1.10 2008/01/29 16:54:15 dang Exp $
-EAPI="1"
-
-inherit db-use eutils flag-o-matic gnome2 autotools
-
-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 keyring krb4 ldap ssl"
-
-RDEPEND=">=dev-libs/glib-2.10
-	>=gnome-base/libbonobo-2.4.2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/gnome-common-2
-	keyring? ( gnome-base/gnome-keyring )
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=net-libs/libsoup-2.2.90:2.2
-	sys-libs/zlib
-	=sys-libs/db-4*
-	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-pkg_setup() {
-	G2CONF="$(use_with ldap openldap)       \
-		$(use_with kerberos krb5 /usr)      \
-		$(use_enable ssl nss)               \
-		$(use_enable ssl smime)             \
-		$(use_enable ipv6)                  \
-		$(use_enable keyring 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
-
-	# Fix what ?
-	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
-
-	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-1.7.3-libdb.patch
-
-	# Resolve symbols at execution time for setgid binaries
-	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-	# Maildir account configured to select files and not directories bug 133504
-	epatch "${FILESDIR}"/${PN}-1.10-fix-maildir-account.patch
-
-	# evolution displays \n newline in Contacts bug 175516
-	epatch "${FILESDIR}"/${PN}-1.10-newline-in-contacts.patch
-
-#-------------Upstream GNOME look here -----------------#
-
-	# --as-needed fixes
-	epatch "${FILESDIR}"/${PN}-1.9.91-as-needed.patch
-
-	# fix for dep ordering so we can add libedataserverui to libexchange-storage
-	# we need to do this or: undefined reference to `e_passwords_get_password'
-	# are the kinds of errors you will get.
-
-	# move the groupwise backend and provider for addressbook, camel, and
-	# calendar to its own folder called server.deps.
-	mkdir server.deps
-	mv addressbook/backends/groupwise server.deps/addressbook
-	mv camel/providers/groupwise server.deps/camel
-	mv calendar/backends/groupwise server.deps/calendar
-
-	# now fix the autotools foo for the new directory and the removed ones
-	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am
-
-	# remove groupwise folder from Makefile's since they are in a diff location
-	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am
-
-	# fix configure.in location of the Makefile's
-	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in
-	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in
-	# tack on the server.deps Makefile on our last edit
-	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in
-
-	# fix file includes
-	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c
-
-	# Fix db version for FreeBSD users where -ldb is always db-1
-	sed -i -e "s:-ldb:-l$(db_libname):" configure.in
-
-#---------------Upstream GNOME stop here---------------
-	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
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild
deleted file mode 100644
index 9f751eea246f..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2008 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-1.12.2-r1.ebuild,v 1.2 2008/01/29 16:54:15 dang Exp $
-EAPI="1"
-
-inherit db-use eutils flag-o-matic gnome2 autotools
-
-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 keyring krb4 ldap ssl"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libbonobo-2.4.2
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=dev-libs/libxml2-2
-	keyring? ( gnome-base/gnome-keyring )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	>=gnome-base/libgnomeui-2
-	>=net-libs/libsoup-2.2.91:2.2
-	>=gnome-base/gnome-common-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
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-pkg_setup() {
-	G2CONF="$(use_with ldap openldap)       \
-		$(use_with kerberos krb5 /usr)      \
-		$(use_enable ssl nss)               \
-		$(use_enable ssl smime)             \
-		$(use_enable ipv6)                  \
-		$(use_enable keyring 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
-
-	# Fix what ?
-	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
-
-	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch
-
-	# Resolve symbols at execution time for setgid binaries
-	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-	# Don't assume that endian.h and byteswap.h exist on all non sun os's
-	epatch "${FILESDIR}"/${PN}-1.12.1-icaltz-util.patch
-
-	# Fix selection of mbox for local delivery (bug #201504)
-	epatch "${FILESDIR}"/${PN}-1.12.2-local-delivery.patch
-
-#-------------Upstream GNOME look here -----------------#
-
-	# --as-needed fixes
-	epatch "${FILESDIR}"/${PN}-1.11.3-as-needed.patch
-
-	# fix for dep ordering so we can add libedataserverui to libexchange-storage
-	# we need to do this or: undefined reference to `e_passwords_get_password'
-	# are the kinds of errors you will get.
-
-	# move the groupwise backend and provider for addressbook, camel, and
-	# calendar to its own folder called server.deps.
-	mkdir server.deps || die "mkdir server.deps failed"
-	mv addressbook/backends/groupwise server.deps/addressbook || die "mv address/groupwise failed"
-	mv camel/providers/groupwise server.deps/camel || die "mv camel/groupwise failed"
-	mv calendar/backends/groupwise server.deps/calendar || die "mv calendar/groupwise failed"
-
-	# now fix the autotools foo for the new directory and the removed ones
-	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am || die "echo failed"
-
-	# remove groupwise folder from Makefile's since they are in a diff location
-	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am || die "sed 1 failed"
-
-	# fix configure.in location of the Makefile's
-	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in || die "sed 2 failed"
-	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in || die "sed 3 failed"
-	# tack on the server.deps Makefile on our last edit
-	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in || die "sed 4 failed"
-
-	# fix file includes
-	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c || die "sed 5 failed"
-
-	# Fix db version for FreeBSD users where -ldb is always db-1
-	sed -i -e "s:-ldb:-l$(db_libname):" configure.in || die "sed 6 failed"
-
-#---------------Upstream GNOME stop here---------------
-	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
-}
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-fix-maildir-account.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-fix-maildir-account.patch
deleted file mode 100644
index 6fe9ef9cdc01..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-fix-maildir-account.patch
+++ /dev/null
@@ -1,116 +0,0 @@
- http://bugs.gentoo.org/show_bug.cgi?id=133504
-
- 2007-08-13  Milan Crha  <mcrha@redhat.com>
-
- ** Fix for bug http://bugzilla.gnome.org/show_bug.cgi?id=352346
-
- * camel-provider.h: Added new constants CAMEL_URL_PART_PATH_DIR and
- CAMEL_URL_NEED_PATH_DIR; when CAMEL_URL_NEED_PATH_DIR is set, then
- in editor dialog is choosing file, without it directory.
-
-diff -Naur evolution-data-server-1.10.2.orig/camel/camel-provider.h evolution-data-server-1.10.2/camel/camel-provider.h
---- evolution-data-server-1.10.2.orig/camel/camel-provider.h	2007-04-09 16:42:48.000000000 +0400
-+++ evolution-data-server-1.10.2/camel/camel-provider.h	2007-08-13 13:00:24.000000000 +0400
-@@ -85,6 +85,7 @@
- #define CAMEL_URL_PART_HOST	 (1 << 3)
- #define CAMEL_URL_PART_PORT	 (1 << 4)
- #define CAMEL_URL_PART_PATH	 (1 << 5)
-+#define CAMEL_URL_PART_PATH_DIR  (1 << 6)
- 
- #define CAMEL_URL_PART_NEED	       8
- #define CAMEL_URL_PART_HIDDEN	(CAMEL_URL_PART_NEED + 8)
-@@ -108,6 +109,7 @@
- #define CAMEL_URL_NEED_HOST	 (CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED)
- #define CAMEL_URL_NEED_PORT	 (CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED)
- #define CAMEL_URL_NEED_PATH	 (CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED)
-+#define CAMEL_URL_NEED_PATH_DIR  (CAMEL_URL_PART_PATH_DIR << CAMEL_URL_PART_NEED)
- 
- #define CAMEL_URL_HIDDEN_USER	 (CAMEL_URL_PART_USER << CAMEL_URL_PART_HIDDEN)
- #define CAMEL_URL_HIDDEN_AUTH	 (CAMEL_URL_PART_AUTH << CAMEL_URL_PART_HIDDEN)
-diff -Naur evolution-data-server-1.10.2.orig/camel/providers/local/camel-local-provider.c evolution-data-server-1.10.2/camel/providers/local/camel-local-provider.c
---- evolution-data-server-1.10.2.orig/camel/providers/local/camel-local-provider.c	2007-04-09 16:42:41.000000000 +0400
-+++ evolution-data-server-1.10.2/camel/providers/local/camel-local-provider.c	2007-08-13 13:01:06.000000000 +0400
-@@ -55,7 +55,7 @@
- 	N_("For storing local mail in MH-like mail directories."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	mh_conf_entries,
- 	/* ... */
- };
-@@ -73,7 +73,7 @@
- 	N_("For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR |CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	mbox_conf_entries,
- 	/* ... */
- };
-@@ -95,7 +95,7 @@
- 	N_("For storing local mail in maildir directories."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	maildir_conf_entries,
- 	/* ... */
- };
-@@ -109,9 +109,9 @@
- 	{ CAMEL_PROVIDER_CONF_END }
- };
- 
--static CamelProvider spool_provider = {
-+static CamelProvider spool_file_provider = {
- 	"spool",
--	N_("Standard Unix mbox spool or directory"),
-+	N_("Standard Unix mbox spool file"),
- 	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-@@ -120,6 +120,17 @@
- 	/* ... */
- };
- 
-+static CamelProvider spool_directory_provider = {
-+	"spooldir",
-+	N_("Standard Unix mbox spool directory"),
-+	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
-+	"mail",
-+	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	spool_conf_entries,
-+	/* ... */
-+};
-+
- #endif
- 
- /* build a canonical 'path' */
-@@ -233,13 +244,19 @@
- 	camel_provider_register(&mbox_provider);
- 
- #ifndef G_OS_WIN32
--	spool_conf_entries[0].value = path;  /* default path - same as mbox */
--	spool_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
--	spool_provider.url_hash = local_url_hash;
--	spool_provider.url_equal = local_url_equal;
--	spool_provider.translation_domain = GETTEXT_PACKAGE;
--	camel_provider_register(&spool_provider);
--	
-+	spool_conf_entries[0].value = path;  /* default path - same as mbox; it's for both file and directory */
-+	spool_file_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
-+	spool_file_provider.url_hash = local_url_hash;
-+	spool_file_provider.url_equal = local_url_equal;
-+	spool_file_provider.translation_domain = GETTEXT_PACKAGE;
-+	camel_provider_register(&spool_file_provider);
-+
-+	spool_directory_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
-+	spool_directory_provider.url_hash = local_url_hash;
-+	spool_directory_provider.url_equal = local_url_equal;
-+	spool_directory_provider.translation_domain = GETTEXT_PACKAGE;
-+	camel_provider_register(&spool_directory_provider);
-+
- 	path = getenv("MAILDIR");
- 	maildir_conf_entries[0].value = path ? path : "";  /* default path */
- 	maildir_provider.object_types[CAMEL_PROVIDER_STORE] = camel_maildir_store_get_type ();
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-newline-in-contacts.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-newline-in-contacts.patch
deleted file mode 100644
index 6e3709f068e8..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-newline-in-contacts.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-2007-08-14  Milan Crha  <mcrha@redhat.com>
-
-** Fix for bug #356176 by Patrick Ohly
-
-  * libebook/e-vcard.c: (read_attribute_value):
-  Skip over folding by calling skip_newline() to find
-  the next real character after a backslash.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=356176
-https://bugs.gentoo.org/show_bug.cgi?id=175516
-
---- trunk/addressbook/libebook/e-vcard.c	2007/08/14 13:53:49	7954
-+++ trunk/addressbook/libebook/e-vcard.c	2007/08/14 14:17:12	7955
-@@ -273,6 +273,12 @@
- 				g_string_append_c (str, '\\');
- 				break;
- 			}
-+
-+			/* beware, there might be a line break due to folding,
-+			 * need next real character
-+			 */
-+			lp = skip_newline (lp, quoted_printable);
-+
- 			switch (*lp) {
- 			case 'n': g_string_append_c (str, '\n'); break;
- 			case 'N': g_string_append_c (str, '\n'); break;
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.2-local-delivery.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.2-local-delivery.patch
deleted file mode 100644
index d2543f16e795..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.2-local-delivery.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: camel/providers/local/camel-local-provider.c
-===================================================================
---- camel/providers/local/camel-local-provider.c	(révision 8259)
-+++ camel/providers/local/camel-local-provider.c	(révision 8261)
-@@ -74,7 +74,7 @@
- 	N_("For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR |CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	mbox_conf_entries,
- 	/* ... */
- };
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-libdb.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-libdb.patch
deleted file mode 100644
index 22ce75d2ffe6..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-libdb.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.7.3.orig/configure.in evolution-data-server-1.7.3/configure.in
---- evolution-data-server-1.7.3.orig/configure.in	2006-06-12 10:27:29.000000000 -0400
-+++ evolution-data-server-1.7.3/configure.in	2006-07-06 23:43:43.000000000 -0400
-@@ -1389,9 +1393,6 @@
- export privincludedir
- export privdatadir
- AC_CONFIG_SUBDIRS(calendar/libical)
--if test $dynamic_libdb = no; then
--        AC_CONFIG_SUBDIRS(libdb/dist)
--fi
- AC_OUTPUT([
- Makefile
- evolution-data-server-zip
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.9.91-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.9.91-as-needed.patch
deleted file mode 100644
index 3fe166fb1094..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.9.91-as-needed.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-data-server-1.9.91.orig/Makefile.am evolution-data-server-1.9.91/Makefile.am
---- evolution-data-server-1.9.91.orig/Makefile.am	2007-01-03 09:57:27.000000000 -0500
-+++ evolution-data-server-1.9.91/Makefile.am	2007-02-14 13:33:26.000000000 -0500
-@@ -5,8 +5,8 @@ if ! WITH_LIBDB
- LIBDB = libdb
- endif
- 
--SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
--DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
-+SUBDIRS = $(LIBDB) win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
-+DIST_SUBDIRS= win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
- 
- changelogs =			\
- 	ChangeLog
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-data-server-1.9.91.orig/configure.in evolution-data-server-1.9.91/configure.in
---- evolution-data-server-1.9.91.orig/configure.in	2007-02-12 09:26:16.000000000 -0500
-+++ evolution-data-server-1.9.91/configure.in	2007-02-14 13:31:56.000000000 -0500
-@@ -968,7 +968,7 @@ if test "x${with_krb5}" != "xno"; then
- 	AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
- 	[
- 		LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
--		AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
-+		AC_TRY_LINK([#include <krb5.h>],krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
- 		[
- 			LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
- 			AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no")
-@@ -995,11 +995,16 @@ if test "x${with_krb5}" != "xno"; then
- 			msg_krb5="yes (Heimdal)"
- 		fi
- 		KRB5_LDFLAGS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
-+		AC_MSG_RESULT(msg_krb5)
-+	else
-+		dnl AC_MSG_CHECKING([for Kerberos 5])
-+		AC_MSG_RESULT([no])
-+		AC_MSG_ERROR([You specified with krb5, but it was not found.])
- 	fi
- else
--	AC_MSG_CHECKING(for Kerberos 5)
--	AC_MSG_RESULT($with_krb5)
-+	AC_MSG_WARN([krb5 support disabled])
- fi
-+
- AM_CONDITIONAL(ENABLE_KRB5, test x$with_krb5 != xno)
- 
- AC_CHECK_HEADER([et/com_err.h],[AC_DEFINE([HAVE_ET_COM_ERR_H], 1, [Have et/comm_err.h])])
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-data-server-1.9.91.orig/servers/exchange/storage/Makefile.am evolution-data-server-1.9.91/servers/exchange/storage/Makefile.am
---- evolution-data-server-1.9.91.orig/servers/exchange/storage/Makefile.am	2007-01-03 09:56:23.000000000 -0500
-+++ evolution-data-server-1.9.91/servers/exchange/storage/Makefile.am	2007-02-14 13:29:55.000000000 -0500
-@@ -80,14 +80,15 @@ libexchange_storage_1_2_la_LIBADD =				\
- 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
- 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
- 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-+	$(top_builddir)/libedataserverui/libedataserverui-1.2.la\
- 	$(E_DATA_SERVER_LIBS)					\
- 	$(E_DATA_SERVER_UI_LIBS)				\
- 	$(LDAP_LIBS)						\
- 	$(SOUP_LIBS)						\
--	$(SOCKET_LIBS)
-+	$(SOCKET_LIBS)						\
-+	$(KRB5_LDFLAGS)
- 
- libexchange_storage_1_2_la_LDFLAGS =				\
--	$(KRB5_LDFLAGS)						\
- 	$(NO_UNDEFINED)						\
- 	-version-info $(LIBEXCHANGE_STORAGE_CURRENT):$(LIBEXCHANGE_STORAGE_REVISION):$(LIBEXCHANGE_STORAGE_AGE)
-