--as-needed patch applied, with Testers permission

Package-Manager: portage-2.1_pre9-r5

4 files changed, 69 insertions, 17 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 65a136495856..77be17117e05 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.387 2006/03/30 20:12:41 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.388 2006/04/30 02:26:54 anarchy Exp $
+
+  30 Apr 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +files/gaim-2.0.0-as-needed.patch, gaim-2.0.0_beta3.ebuild:
+  --as-needed patch applied, with Testers permission
 
   30 Mar 2006; kathryn <gothgirl@gentoo.org> gaim-2.0.0_beta3.ebuild:
   updated deps for nss/ssl support
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 3419e95c310d..c7c68136ea88 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,27 +1,40 @@
-MD5 cb2c4f0c131a47f1facba59bb3b953e1 ChangeLog 56102
-RMD160 c601afe8f78ed066c4bad7375133b48501d488bc ChangeLog 56102
-SHA256 1def539f61f5a47e9a21a3fa2f443765878aca0a51f8771d01c67cc53e25e3d3 ChangeLog 56102
-MD5 55807d838af0375bc41eabe3534fdda8 files/digest-gaim-1.5.0 64
-RMD160 35345ec4b0fe16f5f1862974ba20bef7b54bfdbb files/digest-gaim-1.5.0 64
-SHA256 6d0d6a97397284c18dd881305d135a634f77b01c762cd8232f8b626d97841036 files/digest-gaim-1.5.0 64
-MD5 5447214c866d2701435a0b84e7280d71 files/digest-gaim-2.0.0_beta2-r2 253
-RMD160 3c53d5682c6d05cfd6c0f48b162c5eb673c4b6cf files/digest-gaim-2.0.0_beta2-r2 253
-SHA256 ccf624a4c27f49a823a5e988cfe639813ddcddb99efcea971b6cf79f8d3f484c files/digest-gaim-2.0.0_beta2-r2 253
-MD5 18ac09d4d582248a50d0f68546832419 files/digest-gaim-2.0.0_beta3 253
-RMD160 f5f547a5d04a6d1e1a3dc043abeabbe930ab8d55 files/digest-gaim-2.0.0_beta3 253
-SHA256 4e8269e2659d7e240380f43cef0fa13244ce16c29457d81ba55a20ac071f62e4 files/digest-gaim-2.0.0_beta3 253
+AUX gaim-0.76-xinput.patch 644 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f SHA1 f74085f170b8d6171cf47094bde9601f2e6085d7 SHA256 3532e792388cc6023522871bc99fd9e84204a42dfa6801b507df7fe480c37cd0 size 644
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f files/gaim-0.76-xinput.patch 644
 SHA256 3532e792388cc6023522871bc99fd9e84204a42dfa6801b507df7fe480c37cd0 files/gaim-0.76-xinput.patch 644
+AUX gaim-2.0.0-as-needed.patch 1732 RMD160 7e8d6b13588d5d4423f240346151166f7d89188b SHA1 075e9d039d5fd67d6612f5f10d54f1f8b4c229e0 SHA256 20cc229756b748aec47b93ed23d3230d87aeb3b57e5c5988ea9a50b144a83644 size 1732
+MD5 61978ed5513ab5e746faa25590c02408 files/gaim-2.0.0-as-needed.patch 1732
+RMD160 7e8d6b13588d5d4423f240346151166f7d89188b files/gaim-2.0.0-as-needed.patch 1732
+SHA256 20cc229756b748aec47b93ed23d3230d87aeb3b57e5c5988ea9a50b144a83644 files/gaim-2.0.0-as-needed.patch 1732
+DIST gaim-1.5.0.tar.bz2 6123237 size 6123237
+DIST gaim-2.0.0beta2.tar.bz2 7353162 RMD160 0d3b4018148b882269822944da26a07c9ab25cff SHA256 72c1af01c46c305c4d37ea1fa18e27a33bede6efc19eab7c0b2c80122c73b758 size 7353162
+DIST gaim-2.0.0beta3.tar.bz2 8056708 RMD160 f7c7273ebb5149b5eb3b3759f4a1d756f68392c5 SHA256 5ce3a0054b26e96cacb5471d0d3456fde00223cadc267a3e010155b6a2ffe710 size 8056708
+EBUILD gaim-1.5.0.ebuild 4181 RMD160 564bc734da173923441dc86d6caba79f50f8ccda SHA1 0daab64a60511b2d589a3df359bda35431c1af91 SHA256 6f0426214a4670f03b4e3b305f31a4a9c0c354c42722b307fe5deb85c5345cf7 size 4181
 MD5 375e4842d0812bfba079e1b2539c7b17 gaim-1.5.0.ebuild 4181
 RMD160 564bc734da173923441dc86d6caba79f50f8ccda gaim-1.5.0.ebuild 4181
 SHA256 6f0426214a4670f03b4e3b305f31a4a9c0c354c42722b307fe5deb85c5345cf7 gaim-1.5.0.ebuild 4181
+EBUILD gaim-2.0.0_beta2-r2.ebuild 5462 RMD160 5457966a7103a833ad6443f41c45897b3e7ee3d3 SHA1 d91b04415ff88cc2080f84f7a5daa49612f277e4 SHA256 57ca508badc3d691058b0777328f5ef2294e60145310e976882511bcf435f459 size 5462
 MD5 2e08064c481c88940c023b304ad27ef8 gaim-2.0.0_beta2-r2.ebuild 5462
 RMD160 5457966a7103a833ad6443f41c45897b3e7ee3d3 gaim-2.0.0_beta2-r2.ebuild 5462
 SHA256 57ca508badc3d691058b0777328f5ef2294e60145310e976882511bcf435f459 gaim-2.0.0_beta2-r2.ebuild 5462
-MD5 283a5495674b8ead7a0389cd3d59aaf8 gaim-2.0.0_beta3.ebuild 5341
-RMD160 1ced60ccb33d497ec63331e7cf80341f9c4716f4 gaim-2.0.0_beta3.ebuild 5341
-SHA256 790b7a880052dab3bc9bd21675ddb35fcec3dc5f1538059c4b5fa4824c04f5dc gaim-2.0.0_beta3.ebuild 5341
+EBUILD gaim-2.0.0_beta3.ebuild 5389 RMD160 3d05350c497291a7d25c12ac140bb3fb6d3ecda0 SHA1 6fd69385108dfa7ff40f5cfcb2e7f8cf88e7a0d3 SHA256 32bfe39987247268fde3750e0585dd71d123b72828e033d22b0bba6b1faf0852 size 5389
+MD5 1df3b263c45a7de904574bf73b93757c gaim-2.0.0_beta3.ebuild 5389
+RMD160 3d05350c497291a7d25c12ac140bb3fb6d3ecda0 gaim-2.0.0_beta3.ebuild 5389
+SHA256 32bfe39987247268fde3750e0585dd71d123b72828e033d22b0bba6b1faf0852 gaim-2.0.0_beta3.ebuild 5389
+MISC ChangeLog 56267 RMD160 da2496b3325b494957612ed77ea9057f3485734d SHA1 25353b2540d8ea3d8129a045020fd121eea762d4 SHA256 0291efb24de46e2bc85735891a9fe2798d145d60fed2267548daa9dabd468435 size 56267
+MD5 6a1190dae1a9a9ac72d6d3ba46a02704 ChangeLog 56267
+RMD160 da2496b3325b494957612ed77ea9057f3485734d ChangeLog 56267
+SHA256 0291efb24de46e2bc85735891a9fe2798d145d60fed2267548daa9dabd468435 ChangeLog 56267
+MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f size 414
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f metadata.xml 414
+MD5 55807d838af0375bc41eabe3534fdda8 files/digest-gaim-1.5.0 64
+RMD160 35345ec4b0fe16f5f1862974ba20bef7b54bfdbb files/digest-gaim-1.5.0 64
+SHA256 6d0d6a97397284c18dd881305d135a634f77b01c762cd8232f8b626d97841036 files/digest-gaim-1.5.0 64
+MD5 5447214c866d2701435a0b84e7280d71 files/digest-gaim-2.0.0_beta2-r2 253
+RMD160 3c53d5682c6d05cfd6c0f48b162c5eb673c4b6cf files/digest-gaim-2.0.0_beta2-r2 253
+SHA256 ccf624a4c27f49a823a5e988cfe639813ddcddb99efcea971b6cf79f8d3f484c files/digest-gaim-2.0.0_beta2-r2 253
+MD5 18ac09d4d582248a50d0f68546832419 files/digest-gaim-2.0.0_beta3 253
+RMD160 f5f547a5d04a6d1e1a3dc043abeabbe930ab8d55 files/digest-gaim-2.0.0_beta3 253
+SHA256 4e8269e2659d7e240380f43cef0fa13244ce16c29457d81ba55a20ac071f62e4 files/digest-gaim-2.0.0_beta3 253
diff --git a/net-im/gaim/files/gaim-2.0.0-as-needed.patch b/net-im/gaim/files/gaim-2.0.0-as-needed.patch
new file mode 100644
index 000000000000..16ac4567d67e
--- /dev/null
+++ b/net-im/gaim/files/gaim-2.0.0-as-needed.patch
@@ -0,0 +1,33 @@
+--- src/Makefile.in	2006-04-13 22:05:21.000000000 -0500
++++ src/Makefile.in	2006-04-13 22:24:28.000000000 -0500
+@@ -142,7 +142,7 @@
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++	$(AM_LDFLAGS) $(LDFLAGS)
+ SOURCES = $(libgaim_client_la_SOURCES) $(gaim_SOURCES) \
+ 	$(gaim_client_example_SOURCES)
+ DIST_SOURCES = $(am__libgaim_client_la_SOURCES_DIST) \
+@@ -858,7 +858,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libgaim-client.la: $(libgaim_client_la_OBJECTS) $(libgaim_client_la_DEPENDENCIES) 
+-	$(LINK) $(am_libgaim_client_la_rpath) $(libgaim_client_la_LDFLAGS) $(libgaim_client_la_OBJECTS) $(libgaim_client_la_LIBADD) $(LIBS)
++	$(LINK) $(am_libgaim_client_la_rpath) $(libgaim_client_la_LDFLAGS) $(libgaim_client_la_OBJECTS) $(libgaim_client_la_LIBADD) $(LIBS) $(DBUS_LIBS) -o $@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+@@ -889,10 +889,10 @@
+ 	done
+ gaim$(EXEEXT): $(gaim_OBJECTS) $(gaim_DEPENDENCIES) 
+ 	@rm -f gaim$(EXEEXT)
+-	$(LINK) $(gaim_LDFLAGS) $(gaim_OBJECTS) $(gaim_LDADD) $(LIBS)
++	$(LINK) $(gaim_LDFLAGS) $(gaim_OBJECTS) $(gaim_LDADD) $(LIBS) -o $@
+ gaim-client-example$(EXEEXT): $(gaim_client_example_OBJECTS) $(gaim_client_example_DEPENDENCIES) 
+ 	@rm -f gaim-client-example$(EXEEXT)
+-	$(LINK) $(gaim_client_example_LDFLAGS) $(gaim_client_example_OBJECTS) $(gaim_client_example_LDADD) $(LIBS)
++	$(LINK) $(gaim_client_example_LDFLAGS) $(gaim_client_example_OBJECTS) $(gaim_client_example_LDADD) $(LIBS) $(DBUS_LIBS)  -o $@
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
diff --git a/net-im/gaim/gaim-2.0.0_beta3.ebuild b/net-im/gaim/gaim-2.0.0_beta3.ebuild
index 1d29a5ae9755..e23d25b2b763 100644
--- a/net-im/gaim/gaim-2.0.0_beta3.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta3.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/net-im/gaim/gaim-2.0.0_beta3.ebuild,v 1.3 2006/03/30 20:12:42 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3.ebuild,v 1.4 2006/04/30 02:26:54 anarchy Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono
 
@@ -111,6 +111,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-2.0.0-as-needed.patch
 }
 
 src_compile() {