as-needed patch changed out with patch I sent upstream that has been accepted

(Portage version: 2.1_pre10-r3)
 (Unsigned Manifest commit)

2 files changed, 12 insertions, 45 deletions

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index c7c68136ea88..0f5fb888e72e 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -2,10 +2,10 @@ AUX gaim-0.76-xinput.patch 644 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f S
 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
+AUX gaim-2.0.0_beta3-as-needed.patch 401 RMD160 5546fb8a00b774ee17e9e5d605f5b0ed620d75c1 SHA1 21416ead465dd22ae0c9b3005656ff4e00e3405e SHA256 5db944b244b6324b2e09b0d68ce672fd633043b33028030205465efddd24f855 size 401
+MD5 5b872a7214f3650a286c300a7511cc94 files/gaim-2.0.0_beta3-as-needed.patch 401
+RMD160 5546fb8a00b774ee17e9e5d605f5b0ed620d75c1 files/gaim-2.0.0_beta3-as-needed.patch 401
+SHA256 5db944b244b6324b2e09b0d68ce672fd633043b33028030205465efddd24f855 files/gaim-2.0.0_beta3-as-needed.patch 401
 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
@@ -17,14 +17,14 @@ EBUILD gaim-2.0.0_beta2-r2.ebuild 5462 RMD160 5457966a7103a833ad6443f41c45897b3e
 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
-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
+EBUILD gaim-2.0.0_beta3.ebuild 5438 RMD160 85b893a576a450a3443bd3d9651e36f594a4a09a SHA1 e180e0e0cebf23bae7f4f975cb6c9d6ba6b3d84c SHA256 17d3abaa798e9fc836f0d48bf6cb50851c234b48701c8295a83f49e424f9a566 size 5438
+MD5 ae4e5f1937035d4eccad0b67f88cbd54 gaim-2.0.0_beta3.ebuild 5438
+RMD160 85b893a576a450a3443bd3d9651e36f594a4a09a gaim-2.0.0_beta3.ebuild 5438
+SHA256 17d3abaa798e9fc836f0d48bf6cb50851c234b48701c8295a83f49e424f9a566 gaim-2.0.0_beta3.ebuild 5438
+MISC ChangeLog 56491 RMD160 2d3d4111330a5a38c9a17769271e60773a62b69e SHA1 ea6510e315febec9ec8195f299bd09e1231b0dc8 SHA256 5416fa4f5fe1ea57ddd6de68b9f7836d6c6ad4edd4af9ee5eb74639c5237f162 size 56491
+MD5 c746c361836fa5811fd528d6294fc36c ChangeLog 56491
+RMD160 2d3d4111330a5a38c9a17769271e60773a62b69e ChangeLog 56491
+SHA256 5416fa4f5fe1ea57ddd6de68b9f7836d6c6ad4edd4af9ee5eb74639c5237f162 ChangeLog 56491
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f size 414
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
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
deleted file mode 100644
index 16ac4567d67e..000000000000
--- a/net-im/gaim/files/gaim-2.0.0-as-needed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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)"