Clean out old patches

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 6 insertions, 49 deletions

diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index 8bb8a7e1849e..3cf0957f28da 100644
--- a/kde-base/kdemultimedia-kioslaves/ChangeLog
+++ b/kde-base/kdemultimedia-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia-kioslaves
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.136 2009/10/12 20:48:33 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.137 2009/10/13 00:22:20 abcd Exp $
+
+  13 Oct 2009; Jonathan Callen <abcd@gentoo.org>
+  -files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch:
+  Clean out old patches
 
   12 Oct 2009; Jonathan Callen <abcd@gentoo.org>
   -kdemultimedia-kioslaves-3.5.9.ebuild:
diff --git a/kde-base/kdemultimedia-kioslaves/Manifest b/kde-base/kdemultimedia-kioslaves/Manifest
index e0a753471c41..b7f2899d99e9 100644
--- a/kde-base/kdemultimedia-kioslaves/Manifest
+++ b/kde-base/kdemultimedia-kioslaves/Manifest
@@ -1,7 +1,6 @@
 AUX kdemultimedia-3.5.5+flac-1.1.3.patch 2456 RMD160 67dfbe88872adb5fc2064ad0cf545931a895500f SHA1 d6a5b9d518eb465b1174c127593f246fb44109e0 SHA256 bb337df8f696f49f1d121ca59113c95f7aef788bfd574ab20fdaf8c7e090021b
 AUX kdemultimedia-kioslaves-3.5.6-arts.patch 510 RMD160 4099ad9749bfacd1b197c369a7b68351a96a3586 SHA1 70f1461dc053ed8625108e4078fea8e8e3af74fa SHA256 07a0561996282b8e4710837851260b59e55bbd790b3d137436f8f78248aec2b0
 AUX kdemultimedia-kioslaves-3.5.8-freebsd.patch 894 RMD160 054c2d7b1e037ac1307281183f0a2ebc753ff26b SHA1 18afed5747e761444bda8788d30c98dd7838e27f SHA256 da6dbdf3939534e5efc6019244321113814de93f4e709f9831a51d57d8902abf
-AUX kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch 2258 RMD160 945736ab4699b1a56fb604321132a5c5eef6abac SHA1 241c5243aa5af133932135a4dcfbbe62f246bcf2 SHA256 3f9069a670bdab3f93d109719c213a2855c89a76aaffa7f2ef753f26046d5c67
 DIST kdemultimedia-3.5.10.tar.bz2 6333219 RMD160 b03b5363f29e1e75dcb3f13fddb7a01d17e337b5 SHA1 c85337b959882ec9f3bb51f5e1ee4ec74a988518 SHA256 c1deb0dd1603b705ecd9199b4002ddbd87a457311882f84b1b5925ab83fc0dc0
 DIST kdemultimedia-4.2.4.tar.bz2 1551945 RMD160 999978c712fd1d46f3b0056d9ffa970b5988f243 SHA1 ab1f9e38ab38d502aa771a70137ded811f40ad1c SHA256 181b85c0ddbb3ea7511ed5b505cb8f1e8c848de85396cd18a50363a309a89d91
 DIST kdemultimedia-4.3.1.tar.bz2 1585744 RMD160 893453f71b12969c2b16df2b4b5361edab6a7ef0 SHA1 ef50f869f1a6cdf91fe7808f095fccbd9463a7dd SHA256 978c452ed8ada2ff63d567aac02830d60b8bf6c37588bb16fe47336961ba163b
@@ -10,5 +9,5 @@ EBUILD kdemultimedia-kioslaves-3.5.10.ebuild 1659 RMD160 33702b474d3f89bd9fa60a4
 EBUILD kdemultimedia-kioslaves-4.2.4.ebuild 1071 RMD160 94568b357e8d41d22a99c9bf6d11dc2ebbac18bc SHA1 e36457b973f81a8547695acc937c1ed667ac5222 SHA256 d7a6f0f829b3ccb024886246fdd52b41167a3dde64e0384861c3d1cde6ca706a
 EBUILD kdemultimedia-kioslaves-4.3.1.ebuild 1128 RMD160 9ae54ed4a258b1c87901d91f5595de83df0808ce SHA1 f58113cac723a02cc25e23f5e56583fe08348de5 SHA256 7722884ccecdf6708b5b9d436a06383f4e297743de14d9d69580100f7473c7a5
 EBUILD kdemultimedia-kioslaves-4.3.2.ebuild 1126 RMD160 0ad661a262aa790014d0bb364abdb30b5b658ae3 SHA1 c1acc6dea2f34cc62566c817430ce2b20a55f119 SHA256 c394ce4b9bcab6f22cf8b707362346a15fbab4198a4e8e4c73a9cb90a5b22eb3
-MISC ChangeLog 20257 RMD160 35ed5b81af2a5a53488dded10bd538ce5557d697 SHA1 01f7c0395076d6f98fa13db2716f6e9682018ca9 SHA256 b9016a7c45581aabc094f583fe9edca9ab0473a61a45fb36169ba8fbd559c100
+MISC ChangeLog 20388 RMD160 9fbe431975a5c4fa172ad702bb04ab5048712e26 SHA1 65ee4c5dece1e275983458a01ebb6d0b8e418da5 SHA256 59244975efbab4e9416d719177b43266ba7a3b756c3eb50dc13fcae7a55f575a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch
deleted file mode 100644
index 98df4cf05ec6..000000000000
--- a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp
-===================================================================
---- kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp (revision 749997)
-+++ kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp (working copy)
-@@ -48,7 +48,16 @@ public:
-     unsigned long data;
- };
- 
--static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
-+static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder,
-+                                                    const FLAC__byte buffer[],
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-+                                                    unsigned bytes,
-+#else
-+                                                    size_t bytes,
-+#endif
-+                                                    unsigned samples,
-+                                                    unsigned current_frame,
-+                                                    void *client_data)
- {
-     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
- 
-@@ -110,9 +119,11 @@ unsigned long EncoderFLAC::size(long tim
- long EncoderFLAC::readInit(long size) {
-     kDebug(7117) << "EncoderFLAC::readInit() called";
-     d->data = 0;
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-     FLAC__stream_encoder_set_write_callback(d->encoder, WriteCallback);
-     FLAC__stream_encoder_set_metadata_callback(d->encoder, MetadataCallback);
-     FLAC__stream_encoder_set_client_data(d->encoder, d);
-+#endif
- 
-     // The options match approximely those of flac compression-level-3
-     FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
-@@ -125,7 +136,11 @@ long EncoderFLAC::readInit(long size) {
-     if (size > 0)
-         FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4);
- 
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-     FLAC__stream_encoder_init(d->encoder);
-+#else
-+    FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d);
-+#endif
-     return d->data;
- }
-