fix linking problems as reported in #85013 and #92682.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 65 insertions, 19 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index ccbf5f9f8c08..4f8705d38e80 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.79 2005/07/18 05:07:16 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.80 2005/07/22 02:21:55 allanonjl Exp $
+
+*evolution-2.2.3-r2 (21 Jul 2005)
+
+  21 Jul 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/evolution-2.2.3-linking-fix.patch, -evolution-2.2.3-r1.ebuild,
+  +evolution-2.2.3-r2.ebuild:
+  fix linking problems as reported in #85013 and #92682.
 
 *evolution-2.2.3-r1 (17 Jul 2005)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index f4b692da0554..2198f216595a 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,23 +1,24 @@
-MD5 9a733bae3866a45558a21cc34dad50fa ChangeLog 27674
+MD5 2a8ad9a4f1ef4a19c4188cfd749805b1 evolution-2.2.1.1.ebuild 4485
 MD5 3318548ad5a620ebd3b5405ef77100fd evolution-1.2.4.ebuild 6254
-MD5 6863c6f78e61559a49ad1fcaffaf9caf evolution-2.2.3-r1.ebuild 5848
+MD5 adad3a1145fdfc65e0d250f24eb8d2d0 evolution-2.2.3-r2.ebuild 5982
+MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093
 MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206
+MD5 6e096910f5a93141405bc204f82c560c ChangeLog 27925
 MD5 6ec9b6a7896b799d17a21c4edffd33c9 metadata.xml 272
-MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093
-MD5 2a8ad9a4f1ef4a19c4188cfd749805b1 evolution-2.2.1.1.ebuild 4485
-MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
-MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
+MD5 231c671de5ffec656f15c352abe8dcc4 files/evolution-2.2-mark-as.patch 2283
+MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
+MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
 MD5 37b21b99689c8ad1b67df7ed2425e6cc files/evolution-2.2.3-credits.patch 1838
-MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3-r1 70
-MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
-MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
-MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
-MD5 a71bb4ab71d2e4cc5e02649d87f36e12 files/evolution-2.2.3-configure_plugins.patch 2733
-MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
-MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
-MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
-MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
-MD5 231c671de5ffec656f15c352abe8dcc4 files/evolution-2.2-mark-as.patch 2283
 MD5 5c653e85cdd60291967915b55df80e82 files/digest-evolution-2.2.1.1 72
+MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
+MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
 MD5 80037ae3781636f2ddad3a09bf628ebc files/evolution-2.2-pilot.patch 998
+MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
+MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3-r2 70
+MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
+MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
+MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
+MD5 a71bb4ab71d2e4cc5e02649d87f36e12 files/evolution-2.2.3-configure_plugins.patch 2733
+MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
+MD5 388d698898d1346cb7007da471abed11 files/evolution-2.2.3-linking-fix.patch 1491
diff --git a/mail-client/evolution/evolution-2.2.3-r1.ebuild b/mail-client/evolution/evolution-2.2.3-r2.ebuild
index abd12105a60f..7b1407a314b0 100644
--- a/mail-client/evolution/evolution-2.2.3-r1.ebuild
+++ b/mail-client/evolution/evolution-2.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.3-r1.ebuild,v 1.1 2005/07/18 05:07:16 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.3-r2.ebuild,v 1.1 2005/07/22 02:21:56 allanonjl Exp $
 
 inherit eutils flag-o-matic alternatives gnome2
 
@@ -71,8 +71,11 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-credits.patch
 	# Accept the list of plugins separated by commas instead of spaces.
 	epatch ${FILESDIR}/${P}-configure_plugins.patch
+	# Fix for linking problems, #85013 and #92682
+	epatch ${FILESDIR}/${P}-linking-fix.patch
 
-	einfo "Running autoconf"
+	einfo "Running automake/autoconf"
+	automake || die "Automake failed"
 	autoconf || die "Autoconf failed"
 }
 
diff --git a/mail-client/evolution/files/digest-evolution-2.2.3-r1 b/mail-client/evolution/files/digest-evolution-2.2.3-r2
index 1991cc8b56f8..1991cc8b56f8 100644
--- a/mail-client/evolution/files/digest-evolution-2.2.3-r1
+++ b/mail-client/evolution/files/digest-evolution-2.2.3-r2
diff --git a/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch b/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch
new file mode 100644
index 000000000000..c62eacd913c1
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch
@@ -0,0 +1,35 @@
+--- evolution-2.2.3/calendar/gui/Makefile.am	2005-01-07 06:38:57.000000000 -0500
++++ evolution-2.2.3.new/calendar/gui/Makefile.am	2005-07-19 17:30:27.000000000 -0400
+@@ -216,6 +216,7 @@
+ libevolution_calendar_la_LIBADD =					\
+ 	$(top_builddir)/widgets/menus/libmenus.la			\
+ 	$(top_builddir)/shell/libeshell.la				\
++	$(top_builddir)/mail/libevolution-mail.la			\
+ 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
+ 	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la		\
+ 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
+--- evolution-2.2.3/Makefile.am	2005-02-25 13:02:09.000000000 -0500
++++ evolution-2.2.3.new/Makefile.am	2005-07-19 18:00:43.000000000 -0400
+@@ -40,10 +40,10 @@
+ 	filter			\
+ 	$(SMIME_DIR)		\
+ 	addressbook		\
+-	calendar		\
+-        art                     \
+ 	composer		\
+ 	mail			\
++	calendar		\
++        art                     \
+ 	plugins			\
+ 	ui			\
+ 	views			\
+--- evolution-2.2.1.1/mail/Makefile.am	2005-01-24 22:06:54.000000000 -0500
++++ evolution-2.2.1.1.new/mail/Makefile.am	2005-07-18 21:59:53.000000000 -0400
+@@ -197,6 +197,7 @@
+ 	$(top_builddir)/filter/libfilter.la			\
+ 	$(top_builddir)/widgets/menus/libmenus.la		\
+ 	$(top_builddir)/addressbook/util/libeabutil.la		\
++	$(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
+ 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
+ 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+ 	$(SMIME_LIB)						\