Fix --as-needed. Bug #138488

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 33 insertions, 21 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 51af15b0cfca..8843c8e86b51 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.126 2006/06/27 18:00:08 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.127 2006/07/01 19:58:13 dang Exp $
+
+  01 Jul 2006; <dang@gentoo.org> +files/evolution-2.6.2-as-needed.patch,
+  evolution-2.6.2.ebuild:
+  Fix --as-needed.  Bug #138488
 
 *evolution-2.6.2 (27 Jun 2006)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 92731c1751f6..f0dd8807edb8 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX evolution-2-CAN-2005-0102.patch 467 RMD160 7fc04d14339759a720c5007f9b75a9d575aa36a1 SHA1 d2567b1f9f90b3e320ae2793ffc110c90204f4c3 SHA256 96984df6e198faf47af75e61c7dea696f6716710583d8fbd8d22437ca5a8aca7
 MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
 RMD160 7fc04d14339759a720c5007f9b75a9d575aa36a1 files/evolution-2-CAN-2005-0102.patch 467
@@ -29,6 +26,10 @@ AUX evolution-2.5.5.1-sideview.patch 9730 RMD160 3df3caaf77487071e217b2803fe9357
 MD5 9e370064cd61615da09034946b0f066e files/evolution-2.5.5.1-sideview.patch 9730
 RMD160 3df3caaf77487071e217b2803fe9357b9a6ab2c9 files/evolution-2.5.5.1-sideview.patch 9730
 SHA256 cdc2d507df2589ff37b33b72157e3522b5f031969962eef36022930babe5fcbd files/evolution-2.5.5.1-sideview.patch 9730
+AUX evolution-2.6.2-as-needed.patch 503 RMD160 11a3c2c6bee5b14e267747dccfa7aca4eaf14fdd SHA1 cd345dcab342af716953601a7b7c15e631576a81 SHA256 b59fe688da890c40d5deef4c9ed791223d5dcba54a2a7286c0b588e5d974b49c
+MD5 d4f9b28fa25d52fd14a8144f22682ba9 files/evolution-2.6.2-as-needed.patch 503
+RMD160 11a3c2c6bee5b14e267747dccfa7aca4eaf14fdd files/evolution-2.6.2-as-needed.patch 503
+SHA256 b59fe688da890c40d5deef4c9ed791223d5dcba54a2a7286c0b588e5d974b49c files/evolution-2.6.2-as-needed.patch 503
 AUX evolution_mail-account-gui_authtype.diff 737 RMD160 8d72b2de92d0cbe0823c1324e52b005b79435c40 SHA1 262bd62ec9fb9101e7792bb189fec9efe6fd88af SHA256 54bbdf9df28ac28af4aa457c432197bdcc428e97b69b052718a41400450b32cc
 MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
 RMD160 8d72b2de92d0cbe0823c1324e52b005b79435c40 files/evolution_mail-account-gui_authtype.diff 737
@@ -37,7 +38,7 @@ DIST evolution-2.0.3.tar.bz2 15381448 RMD160 411899a8c59a06142a39ff6cbfd0cf59a6b
 DIST evolution-2.0.4.tar.bz2 15395184 RMD160 980400d7de33dee702c0624ee3312b3c4556baed SHA256 5d37ee2796ade1ebfc3b3e0dc4919594a3b3119079c055e0c3e935e5954c90c2
 DIST evolution-2.4.2.1.tar.bz2 11503590 RMD160 cb72e939fbd651a43ae09e0341f47e6ebf490c56 SHA1 b3e61e8f013ea35aa137928d1d25a91b3043357d SHA256 eae8fed13de8eee9f60606ec0e645876e4b9a1e9bb30d21dace54e3995ca5f40
 DIST evolution-2.5.5.1-bf-junk.tar.bz2 10771 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 SHA1 465205cf50770b72641995ec59617010dadaf204 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045
-DIST evolution-2.6.0.tar.bz2 12072895 RMD160 7f01966a6ff8b02ab5f5bf74a120e452cbc32f4d SHA256 9565772416a42ed779d33b55f56183c51baabbf5db6109f1e0d63611d76e7d7d
+DIST evolution-2.6.0.tar.bz2 12072895 RMD160 7f01966a6ff8b02ab5f5bf74a120e452cbc32f4d SHA1 f515b3112cb4b6a4f44a02ee398391cd178f2d59 SHA256 9565772416a42ed779d33b55f56183c51baabbf5db6109f1e0d63611d76e7d7d
 DIST evolution-2.6.1.tar.bz2 12291684 RMD160 05a6cdc9e1af70fb8009978ae1c4f1eda5adf38c SHA1 7faad424c0b5b04d5225f3804abe0564276f01d8 SHA256 9b78e132a52a9f7192ff396a6b957f9836794e34f45b96823f971756b8261ef8
 DIST evolution-2.6.2.tar.bz2 12394719 RMD160 72133312fb9cceae74d9f0e570dd898d5119a10b SHA1 08a6a9bf3754fff71cbdf82857337b1edc13ef46 SHA256 a69c45e9deae3a2eea06af08eacb9266e6cdcd452dd600ad96c2de23effa56f5
 EBUILD evolution-2.0.3-r2.ebuild 4203 RMD160 f6949275136453c3f437192ca54c2961137f4b0c SHA1 1253032a6f8df7d5832837b8d253417b0263a69d SHA256 807bfb77ae001822844a95fa69c0dcff076b0d04addfdb8739a6608b47c2ad25
@@ -60,14 +61,14 @@ EBUILD evolution-2.6.1.ebuild 6049 RMD160 f7e3c386c809c393e23b519866ea1787d032dc
 MD5 6fc51d77491ffe602536bc665f7b644f evolution-2.6.1.ebuild 6049
 RMD160 f7e3c386c809c393e23b519866ea1787d032dce0 evolution-2.6.1.ebuild 6049
 SHA256 9c8919e1ac164502155b361c6e1e887a5142009bc1a2df4ef7f38b1821246d83 evolution-2.6.1.ebuild 6049
-EBUILD evolution-2.6.2.ebuild 5861 RMD160 9f2221e666190fd3013f07344174eaabc4af67c5 SHA1 f67c413ae3470861f002963cdab9de507e0e3527 SHA256 75ccb24407d9237ad72cb460c5a4166986abe15ba98ddfc00cd862789d694955
-MD5 73e97f6695c87636d343b08992c6c686 evolution-2.6.2.ebuild 5861
-RMD160 9f2221e666190fd3013f07344174eaabc4af67c5 evolution-2.6.2.ebuild 5861
-SHA256 75ccb24407d9237ad72cb460c5a4166986abe15ba98ddfc00cd862789d694955 evolution-2.6.2.ebuild 5861
-MISC ChangeLog 34786 RMD160 51ae7a630ce92075dbdc55ea14ba3d64db343add SHA1 d778f7290cf280dd56e0e03117629c6d3d798613 SHA256 a28bb984ba1fe3bc029ee3e45d3ca9c1dd8e9f2d09e80d98427628e8cee9fbf3
-MD5 6fef3ed9a36cb0754f850277a0d5db85 ChangeLog 34786
-RMD160 51ae7a630ce92075dbdc55ea14ba3d64db343add ChangeLog 34786
-SHA256 a28bb984ba1fe3bc029ee3e45d3ca9c1dd8e9f2d09e80d98427628e8cee9fbf3 ChangeLog 34786
+EBUILD evolution-2.6.2.ebuild 5922 RMD160 5257b51a554423fb79c7e005d821d410d721605e SHA1 5c6c4aad3b32d2e4309cd2116b7489ba50200763 SHA256 fa4c56613fab8782af7ff28c9aa436bf945964f2302460723e2caa2c269198e4
+MD5 71abbd266eca7d5195c4229035d945df evolution-2.6.2.ebuild 5922
+RMD160 5257b51a554423fb79c7e005d821d410d721605e evolution-2.6.2.ebuild 5922
+SHA256 fa4c56613fab8782af7ff28c9aa436bf945964f2302460723e2caa2c269198e4 evolution-2.6.2.ebuild 5922
+MISC ChangeLog 34918 RMD160 9226ee9524b1e45f38779111af4ad12dd24f1818 SHA1 c5a0d460fe7c5f966dfaccda704ea604eba85005 SHA256 8e22d9d15f18ed8c9f201553098658b6b77a2d6010c8b1f8ddd0d495e3b70ba9
+MD5 7c6649837baee4ccf1bc236aba21efc1 ChangeLog 34918
+RMD160 9226ee9524b1e45f38779111af4ad12dd24f1818 ChangeLog 34918
+SHA256 8e22d9d15f18ed8c9f201553098658b6b77a2d6010c8b1f8ddd0d495e3b70ba9 ChangeLog 34918
 MISC metadata.xml 285 RMD160 0c12c7c2e6dd66ea44e83541384d6b634c642bc0 SHA1 bbd215b7c718049707751c25e6bfc2318fa0f292 SHA256 0c662917bda7d3035eab7db55ade83dadca650d2ceddc44b7765ba5f898bd816
 MD5 f0750af493d9560f5faf50f39fd644c5 metadata.xml 285
 RMD160 0c12c7c2e6dd66ea44e83541384d6b634c642bc0 metadata.xml 285
@@ -90,10 +91,3 @@ SHA256 d00bc781bcfb2fb66114729b1ec42fed88f999c0f7971304729e9ca61fbfc5cb files/di
 MD5 f58ca96f6e0006d63acada5e98d62982 files/digest-evolution-2.6.2 533
 RMD160 94fb86de744f42bcae39b6f5a0d6276ed559014e files/digest-evolution-2.6.2 533
 SHA256 730a2ffe0655db234cb17adecb91357a37e42064f41dc64cccfb7ab2fda0614d files/digest-evolution-2.6.2 533
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEoXIromPajV0RnrERAhFBAJ9qelCVTL+Wia533nDfnlnsBtlh0wCdES0g
-xM/IfSJz4pruemEUqSb8+wU=
-=b1EE
------END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.6.2.ebuild b/mail-client/evolution/evolution-2.6.2.ebuild
index 926a17b6131e..5b55f49c8d8f 100644
--- a/mail-client/evolution/evolution-2.6.2.ebuild
+++ b/mail-client/evolution/evolution-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.6.2.ebuild,v 1.1 2006/06/27 18:00:08 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.6.2.ebuild,v 1.2 2006/07/01 19:58:13 dang Exp $
 
 inherit eutils flag-o-matic alternatives gnome2 autotools
 
@@ -149,6 +149,9 @@ src_unpack() {
 	# Add widescreen mode, if requested
 	use widescreen && epatch ${FILESDIR}/${PN}-2.5.5.1-sideview.patch
 
+	# Fix --as-needed
+	epatch ${FILESDIR}/${P}-as-needed.patch
+
 	eaclocal || die
 	_elibtoolize --copy --force || die
 	eautoheader || die
diff --git a/mail-client/evolution/files/evolution-2.6.2-as-needed.patch b/mail-client/evolution/files/evolution-2.6.2-as-needed.patch
new file mode 100644
index 000000000000..c2deaf65b738
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.6.2-as-needed.patch
@@ -0,0 +1,11 @@
+diff -u -ruN evolution-2.6.2.orig/addressbook/printing/Makefile.am evolution-2.6.2/addressbook/printing/Makefile.am
+--- evolution-2.6.2.orig/addressbook/printing/Makefile.am	2003-11-07 00:51:41.000000000 -0500
++++ evolution-2.6.2/addressbook/printing/Makefile.am	2006-07-01 15:23:44.000000000 -0400
+@@ -39,6 +39,7 @@
+ 
+ contact_print_test_LDADD =	\
+ 	libecontactprint.la					\
++	$(top_builddir)/e-util/libeutil.la		\
+ 	$(top_builddir)/addressbook/util/libeabutil.la		\
+ 	$(EVOLUTION_ADDRESSBOOK_LIBS)
+