remove some patches that got applied from the live ebuild, fold sound sed into patch

(Portage version: 2.1.1_pre5)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 78 deletions

diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index d4330cf53b09..fe2075864a81 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -1,11 +1,11 @@
+AUX do-sound.diff 347 RMD160 272f7aedc1a2206db40fe958cf6ae5046d03b3a7 SHA1 cb245af8b83418df92ff8abb6eb38b0d5e17a959 SHA256 ea24631c9c8f4e59c0a6b4d80beec161b1fbb3030af91bd71b103e44f47b01aa
+MD5 3c214830e3907f01c66bad3cf720bad8 files/do-sound.diff 347
+RMD160 272f7aedc1a2206db40fe958cf6ae5046d03b3a7 files/do-sound.diff 347
+SHA256 ea24631c9c8f4e59c0a6b4d80beec161b1fbb3030af91bd71b103e44f47b01aa files/do-sound.diff 347
 AUX gnash-0.7.1_p20060704-opengl.diff 829 RMD160 68dae8f130e6dfbd2051007c7f819b47e1889334 SHA1 ef7603ec759d628404e97aab7f2b73d70f6daeb2 SHA256 ff88cbac28c3465f8f7ea46f0bc61cfa2e016dade9b56ce729a44734d2798729
 MD5 4a1d412f7aab9b5b69ed4e6bba4780c2 files/gnash-0.7.1_p20060704-opengl.diff 829
 RMD160 68dae8f130e6dfbd2051007c7f819b47e1889334 files/gnash-0.7.1_p20060704-opengl.diff 829
 SHA256 ff88cbac28c3465f8f7ea46f0bc61cfa2e016dade9b56ce729a44734d2798729 files/gnash-0.7.1_p20060704-opengl.diff 829
-AUX gnash-as-needed.diff 1246 RMD160 538d72f2c50f987cdf8cae22e8c0df35776d9b18 SHA1 151aac8cb46b14b2ca50e73c7934698f8078932f SHA256 d050cf33b985d20d2b8cdceb3aa03aa0dff58f3d11d093a499556cd196ed7a92
-MD5 66447cf67689bf4c04cc75e2cf09ae9a files/gnash-as-needed.diff 1246
-RMD160 538d72f2c50f987cdf8cae22e8c0df35776d9b18 files/gnash-as-needed.diff 1246
-SHA256 d050cf33b985d20d2b8cdceb3aa03aa0dff58f3d11d093a499556cd196ed7a92 files/gnash-as-needed.diff 1246
 AUX gnash-fix-cxxflags-rpath.patch 2189 RMD160 b092e04727a686bd971c77e3619a418a5dbcc37f SHA1 3af2848fda6c761859315ae89ea0badbc567d207 SHA256 553fcad662bec090d2739bb3d69becb05b3d4f299cb79108f9cfd1969a4af418
 MD5 9e955f27087ffa5ef139acfa2c05b7d1 files/gnash-fix-cxxflags-rpath.patch 2189
 RMD160 b092e04727a686bd971c77e3619a418a5dbcc37f files/gnash-fix-cxxflags-rpath.patch 2189
@@ -14,10 +14,6 @@ AUX kdedir.diff 549 RMD160 50c3e78b0f2eeb6df8227ba7e8a7821d92557569 SHA1 d229740
 MD5 a62b476b9e36250b99438667ff08de02 files/kdedir.diff 549
 RMD160 50c3e78b0f2eeb6df8227ba7e8a7821d92557569 files/kdedir.diff 549
 SHA256 5ff50d54853527ff4f6b94f90c16a31fa4a5d62ffa3f84c53bec6e4dcfc25876 files/kdedir.diff 549
-AUX klash-int-not-external.diff 445 RMD160 2259c8aac1404b37ea9f100fbbb6f6f87cffba3e SHA1 f1c9615c83ede03fd99cc77d28c749837abf6eee SHA256 4b75cb0b7254905763bdcdbaf3525994b44b95c9f37e9cff803acffd7db633f7
-MD5 d724259461a7705c65d66ebf3648e8bc files/klash-int-not-external.diff 445
-RMD160 2259c8aac1404b37ea9f100fbbb6f6f87cffba3e files/klash-int-not-external.diff 445
-SHA256 4b75cb0b7254905763bdcdbaf3525994b44b95c9f37e9cff803acffd7db633f7 files/klash-int-not-external.diff 445
 AUX klash-makefile.diff 801 RMD160 81104db2821cf5353e4296b5a59ef39c61bc1ee6 SHA1 4d246981990683b6ec9363959fb549419f7f1d7e SHA256 4ee71a2d625847b833d135eb1c301cda3f877b9e540d2cefbb93b873dab566f0
 MD5 0f00152a4872e504338791a5aa0eccd3 files/klash-makefile.diff 801
 RMD160 81104db2821cf5353e4296b5a59ef39c61bc1ee6 files/klash-makefile.diff 801
@@ -27,14 +23,14 @@ EBUILD gnash-0.7.1_p20060704.ebuild 2686 RMD160 9fd1fb570d7d2962f795f5973882c2c4
 MD5 bf738eb32b77f43f125d8341e9a7b58e gnash-0.7.1_p20060704.ebuild 2686
 RMD160 9fd1fb570d7d2962f795f5973882c2c4e33a27e8 gnash-0.7.1_p20060704.ebuild 2686
 SHA256 8399cc3786b6473d2c7b56280df9e7aab66aa299fc972099903b2b017b540492 gnash-0.7.1_p20060704.ebuild 2686
-EBUILD gnash-0.7.1_p20090909.ebuild 3330 RMD160 1f2525962e881cfe540de2db208ded65f9e80eee SHA1 c82ab482e60c6e659db01efb8f5724bf4e91177f SHA256 df9ded81a22c5263cf63ec72e52c1f21238ec0d157b5594072531bfa1c16a077
-MD5 8b994fdc97d4846cb0b7dd89a9e86aa9 gnash-0.7.1_p20090909.ebuild 3330
-RMD160 1f2525962e881cfe540de2db208ded65f9e80eee gnash-0.7.1_p20090909.ebuild 3330
-SHA256 df9ded81a22c5263cf63ec72e52c1f21238ec0d157b5594072531bfa1c16a077 gnash-0.7.1_p20090909.ebuild 3330
-MISC ChangeLog 3628 RMD160 91930bfd5916c0f80a9fd6333c15455aba52ae41 SHA1 b6a78c6a5d7d91bd69d57f0bba3b5b7fa5f7f799 SHA256 782db1181952e4e679347e98e6dd1b95e6244f406276e34cf7ab96dcf6db429e
-MD5 1f9f69a0f6c054451de1220c74d5d070 ChangeLog 3628
-RMD160 91930bfd5916c0f80a9fd6333c15455aba52ae41 ChangeLog 3628
-SHA256 782db1181952e4e679347e98e6dd1b95e6244f406276e34cf7ab96dcf6db429e ChangeLog 3628
+EBUILD gnash-0.7.1_p20090909.ebuild 2905 RMD160 97c3bcb63faa1b607d8c79ab6914dfd5e7341ead SHA1 91d7c33941cc9b012e7e81dac03d9b02f3610d69 SHA256 564ce26d68d9ca4a6ab92f6ce2a0c20f60de974c9b8f513cd1cf6744f2e9495d
+MD5 e364fef78d77ea31f8a05647d8ec8286 gnash-0.7.1_p20090909.ebuild 2905
+RMD160 97c3bcb63faa1b607d8c79ab6914dfd5e7341ead gnash-0.7.1_p20090909.ebuild 2905
+SHA256 564ce26d68d9ca4a6ab92f6ce2a0c20f60de974c9b8f513cd1cf6744f2e9495d gnash-0.7.1_p20090909.ebuild 2905
+MISC ChangeLog 3892 RMD160 4714e431af370a21f872bd16588bad7bc3590430 SHA1 1cd59259167aa19d26afc299ea692392b4533575 SHA256 89fab7751c762b598faefea5ec1238ad25ab8de50689e43eba07f5a06ce7fbb9
+MD5 3ea05498ae979535901c90df1b3d46a4 ChangeLog 3892
+RMD160 4714e431af370a21f872bd16588bad7bc3590430 ChangeLog 3892
+SHA256 89fab7751c762b598faefea5ec1238ad25ab8de50689e43eba07f5a06ce7fbb9 ChangeLog 3892
 MISC metadata.xml 242 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c SHA1 383cfdd7a210a459dd71b1a8bad03be54f047d5b SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242
diff --git a/net-www/gnash/files/gnash-as-needed.diff b/net-www/gnash/files/gnash-as-needed.diff
deleted file mode 100644
index 9a3093722ab4..000000000000
--- a/net-www/gnash/files/gnash-as-needed.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -u gnash/libbase/Makefile.am.orig gnash/libbase/Makefile.am
---- gnash/libbase/Makefile.am.orig	2006-06-07 22:28:25.000000000 +0200
-+++ gnash/libbase/Makefile.am	2006-06-07 22:35:51.000000000 +0200
-@@ -94,8 +94,8 @@
- 	$(JPEG_LIBS) \
- 	$(ZLIB_LIBS) \
- 	$(CURL_LIBS) \
--	$(SDL_LIBS)
--#	$(OPENGL_LIBS)
-+	$(SDL_LIBS) \
-+	$(OPENGL_LIBS)
- 
- noinst_HEADERS = \
- 	container.h \
-diff -u gnash/server/Makefile.am.orig gnash/server/Makefile.am
---- gnash/server/Makefile.am.orig	2006-06-07 22:28:28.000000000 +0200
-+++ gnash/server/Makefile.am	2006-06-07 22:36:00.000000000 +0200
-@@ -184,8 +184,8 @@
- 
- libgnashserver_la_LIBADD = \
- 	$(ZLIB_LIBS) \
--	$(LIBXML_LIBS) 
--#	$(OPENGL_LIBS)
-+	$(LIBXML_LIBS) \
-+	$(OPENGL_LIBS)
- 
- #libserver_la_LDFLAGS = -module -avoid-version -no-undefined
- #libserver_la_LIBDADD =  #@DL_LIB@  # $(LIBLTDL)
-diff -u gnash/gui/Makefile.am.orig gnash/gui/Makefile.am
---- gnash/gui/Makefile.am.orig	2006-08-06 08:31:57.000000000 +0200
-+++ gnash/gui/Makefile.am	2006-08-06 08:38:15.000000000 +0200
-@@ -152,7 +152,9 @@
- 
- libgnashgui_la_LIBADD = \
- 	../server/libgnashserver.la \
--	../libamf/libgnashamf.la
-+	../libamf/libgnashamf.la \
-+	../backend/libgnashbackend.la \
-+	$(GLEXT_LIBS)
- 
- if USE_GUI_KDE
- bin_PROGRAMS = gnash klash
diff --git a/net-www/gnash/files/klash-int-not-external.diff b/net-www/gnash/files/klash-int-not-external.diff
deleted file mode 100644
index 245e5e99dddc..000000000000
--- a/net-www/gnash/files/klash-int-not-external.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnash/plugin/klash.orig/klash.cpp	2006-08-08 13:29:19.000000000 +0200
-+++ gnash/plugin/klash/klash.cpp	2006-08-08 13:30:25.000000000 +0200
-@@ -99,12 +99,12 @@
- 
- movie_state_e movie_menu_state;
- 
--extern int mouse_x;
--extern int mouse_y;
--extern int mouse_buttons;
-+int mouse_x;
-+int mouse_y;
-+int mouse_buttons;
- 
--extern int width;
--extern int height;
-+int width;
-+int height;
- 
- extern int windowid;
- class EmbedWidget : public QGLWidget