Drop old patches

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

6 files changed, 18 insertions, 223 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index d866c3bed6ce..197a7bc0a713 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.354 2010/01/10 17:15:34 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.355 2010/02/16 06:44:24 abcd Exp $
+
+  16 Feb 2010; Jonathan Callen <abcd@gentoo.org>
+  -files/amarok-1.4.9.1-libmtp-0.3.0-API.patch,
+  -files/amarok-1.4.10-gcc-4.3.patch, -files/amarok-1.4.10-gcc44.patch,
+  -files/amarok-libmp4v2.patch:
+  Drop old patches
 
   10 Jan 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   files/amarok-2.2.2-nodebug.patch:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 00281070ba82..15f673139c08 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,10 +1,9 @@
-AUX amarok-1.4.10-gcc-4.3.patch 271 RMD160 facfb2796b871f3b3a5cb0c5e2268386950b3801 SHA1 c86f458ba6ae8d5b78a047852f9f2699e6da2908 SHA256 b96e976276f5c87265ecdb62b596f6f2e91c921130b833b0e395f2b50c9fa9cc
-AUX amarok-1.4.10-gcc44.patch 4085 RMD160 bda16ee1d016cd158654b3f80faa413eaa7a6543 SHA1 f5c7eeea6ff80d6e634465517face69f3f344516 SHA256 b94338af91e5a108c39b100162f38bfe53d6c94fb9ed4c175f09de68df1c1989
-AUX amarok-1.4.9.1-libmtp-0.3.0-API.patch 1912 RMD160 475852fde4ad1e27cc093d9435a4b525492e0156 SHA1 b211ad82d9abc49dd3a51260ba597cfaa78d9f6b SHA256 87583a40c4e13eae7a5364dc5b98dd83885c216e662c05c4de7c1de9739f6d9c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amarok-2.2-mysql-libs.patch 540 RMD160 16b143a50c126ba69851e4c1d1524b1d6b7c175d SHA1 0358c91184604bf4587cfa755202a41ba9c4d346 SHA256 ace02a3f8d20295077de08d17af00382c19ad21ddf4ef324ff7c5e5ec4d666e1
 AUX amarok-2.2.2-nodebug.patch 16478 RMD160 8f8eedbd5a29f10da6243cc4ac586f59ca493a7d SHA1 c2316800d0632b473b14d683415f51a36879922a SHA256 022a655eff5cd918fc61999001a3251de7e406cbffb40127295820eb4e398a29
 AUX amarok-libmp4v2-2.patch 1317 RMD160 f2af142c7acca5d2f558d121fa4cd0ded2ea044c SHA1 14ab94f14e5be19f7ea5c6b83fdde768a1e5bcc1 SHA256 9a83dfdab7f393a802ec6394bf314736c7866391fb496b256c028bc81f86ce5c
-AUX amarok-libmp4v2.patch 2882 RMD160 f0786378bf963e8d10db49631bb0981facd9ed90 SHA1 a60289d7c852056c27ad2d03dc09b0500f428ac3 SHA256 df4c71a25381470411ac2223ec978989e1f3fa7e784de6a0b9e1cb53eed65e06
 AUX amarok-qtscriptcheck.patch 1024 RMD160 0693ddd6bbaa2f15d381eec329cfeff1e8b176cd SHA1 0585c08f8159a06c95e89f22e788d6e039224fbb SHA256 8a2983f3bd5ec422f2ed0a90a49970fd13fed3852c66ed220c01b4d8418ce89d
 DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fca SHA1 7603f991aa92810669e71278f9abc20a2180f97d SHA256 2f40b0664701f79d5a49cb336ba2567535e0eb093c1a0691bbac08b73224643d
 DIST amarok-2.2.1.90.tar.bz2 8572570 RMD160 6a01be2c80cadead1ae1b50c6c53464311091151 SHA1 3441631c2c8ba589f13c8d2fb26dd2f3b97de451 SHA256 0f30b3014540f9396503bef3299394c3ac644cafb9968c65c330170f34b715c2
@@ -16,5 +15,12 @@ EBUILD amarok-2.2.1-r2.ebuild 2787 RMD160 0329ad0290a718b412fce63cfe74e32b949d7d
 EBUILD amarok-2.2.1.90.ebuild 2760 RMD160 62c79bc9818de001aa1c7cc19b2f69edeeb2c39a SHA1 62919d9dd880716a8428843ff0afd4038d08f423 SHA256 508d01cfc9bebbf231ccddda7c288888288e55d999925f99675ad79c609c50c9
 EBUILD amarok-2.2.1.ebuild 2773 RMD160 6a07a36b2459b8506e4cc313c77f01ddee1b0e86 SHA1 e10b48f50e61e708c12e02b30b2207af71518be1 SHA256 b108945fd5933b0c251e02ae0d9c26cf4afc82c8c87831eb637e3e86bac5fafd
 EBUILD amarok-2.2.2.ebuild 2802 RMD160 1b331328506927c54151b2385f25b6f64b4cf2fe SHA1 775dcc7d92de1c8584a04c2dfed6545393da37e5 SHA256 ab52b01fb81c8dec695e7b1216c74df5917edf5c0ac419e490647df676c90aec
-MISC ChangeLog 57669 RMD160 2fec6b1c567d6d052229571ae6fc6c926121b64c SHA1 97913dd905e197ae57943b88bcc018f547253bb2 SHA256 4c84a0400fc8064cd758ebc1ca1645575857f19c37f98d32e7e72ac2036a1ad0
+MISC ChangeLog 57883 RMD160 accd3733f70f4fb405199f738c0babdc63ccb881 SHA1 23652041fe66a0b74942871de1db8a9d75b23b7c SHA256 192f38ec8840c8e839858f4b63beb9a730f760a86f8a921d84d60325ec11a1a8
 MISC metadata.xml 1283 RMD160 f188f32c38a3e5425d86c59b8c1af8f27833d6b2 SHA1 34f8738cfbf39c87b3ef2ed35f43711b3302c15c SHA256 72c533c0a2afe35a34f0064cdac226e714a1d4bfdddd5cbb6a2ecc75541c16c8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt6PtQACgkQOypDUo0oQOr2twCZAcQV3faDvdmS6QHLvOuumGBq
+vs8AoIeZZRAXn0IC0Hf7CeGOroUGbBVc
+=aLRm
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/files/amarok-1.4.10-gcc-4.3.patch b/media-sound/amarok/files/amarok-1.4.10-gcc-4.3.patch
deleted file mode 100644
index d05e714a9802..000000000000
--- a/media-sound/amarok/files/amarok-1.4.10-gcc-4.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- amarok-1.4.10/amarok/src/engine/helix/hxplayercontrol.cpp
-+++ amarok-1.4.10/amarok/src/engine/helix/hxplayercontrol.cpp
-@@ -21,6 +21,7 @@
- #include <unistd.h>
- #include <iostream>
- #include <cstring>
-+#include <cstdlib>
- #include <sys/mman.h>
- 
- using namespace std;
diff --git a/media-sound/amarok/files/amarok-1.4.10-gcc44.patch b/media-sound/amarok/files/amarok-1.4.10-gcc44.patch
deleted file mode 100644
index 632e9fa3bdee..000000000000
--- a/media-sound/amarok/files/amarok-1.4.10-gcc44.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/audibleproperties.cpp amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp
---- amarok-1.4.10-orig/amarok/src/metadata/audible/audibleproperties.cpp	2008-08-13 15:21:51.000000000 -0600
-+++ amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp	2009-03-31 22:12:29.000000000 -0600
-@@ -31,6 +31,8 @@
- 
- #include <netinet/in.h> // ntohl
- 
-+#include <stdio.h>
-+
- using namespace TagLib;
- 
- 
-diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/audibletag.cpp amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp
---- amarok-1.4.10-orig/amarok/src/metadata/audible/audibletag.cpp	2009-03-31 22:08:16.000000000 -0600
-+++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp	2009-03-31 22:11:57.000000000 -0600
-@@ -30,6 +30,7 @@
- #include <netinet/in.h> // ntohl
- #include <stdlib.h>
- #include <string.h>
-+#include <stdio.h>
- 
- using namespace TagLib;
- 
-diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefile.cpp amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp
---- amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefile.cpp	2008-08-13 15:21:51.000000000 -0600
-+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp	2009-03-31 22:13:06.000000000 -0600
-@@ -29,6 +29,8 @@
- #include <taglib/tfile.h>
- #include <taglib/audioproperties.h>
- 
-+#include <stdio.h>
-+
- namespace TagLib {
- ////////////////////////////////////////////////////////////////////////////////
- // public members
-diff -Naur amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
---- amarok-1.4.10-orig/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2008-08-13 15:21:51.000000000 -0600
-+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2009-03-31 22:16:01.000000000 -0600
-@@ -23,6 +23,7 @@
- #include "taglib_audiblefile.h"
- 
- #include <string.h>
-+#include <stdio.h>
- 
- TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
-         bool readProperties,
-diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavfile.cpp amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp
---- amarok-1.4.10-orig/amarok/src/metadata/wav/wavfile.cpp	2008-08-13 15:21:51.000000000 -0600
-+++ amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp	2009-03-31 22:18:22.000000000 -0600
-@@ -29,6 +29,8 @@
- #include <taglib/audioproperties.h>
- #include <taglib/tag.h>
- 
-+#include <stdio.h>
-+
- namespace TagLib {
- ////////////////////////////////////////////////////////////////////////////////
- // public members
-diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavproperties.cpp amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp
---- amarok-1.4.10-orig/amarok/src/metadata/wav/wavproperties.cpp	2008-08-13 15:21:51.000000000 -0600
-+++ amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp	2009-03-31 22:18:06.000000000 -0600
-@@ -31,6 +31,8 @@
- 
- #include <netinet/in.h> // ntohl
- 
-+#include <stdio.h>
-+
- using namespace TagLib;
- 
- struct WavHeader
-diff -Naur amarok-1.4.10-orig/amarok/src/metadata/wav/wavfiletyperesolver.cpp amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp
---- amarok-1.4.10-orig/amarok/src/metadata/wav/wavfiletyperesolver.cpp	2008-08-13 15:21:51.000000000 -0600
-+++ amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp	2009-03-31 22:19:55.000000000 -0600
-@@ -23,6 +23,7 @@
- #include "wavfile.h"
- 
- #include <string.h>
-+#include <stdio.h>
- 
- TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
-         bool readProperties,
-diff -Naur amarok-1.4.10-orig/amarok/src/metabundlesaver.cpp amarok-1.4.10/amarok/src/metabundlesaver.cpp
---- amarok-1.4.10-orig/amarok/src/metabundlesaver.cpp	2008-08-13 15:21:51.000000000 -0600
-+++ amarok-1.4.10/amarok/src/metabundlesaver.cpp	2009-03-31 22:30:30.000000000 -0600
-@@ -6,7 +6,7 @@
- 
- #include <stdlib.h>
- #include <unistd.h>
--#include <stdio.h>
-+#include <cstdio>
- #include <time.h>
- #include <sys/time.h>
- #include <sys/types.h>
diff --git a/media-sound/amarok/files/amarok-1.4.9.1-libmtp-0.3.0-API.patch b/media-sound/amarok/files/amarok-1.4.9.1-libmtp-0.3.0-API.patch
deleted file mode 100644
index a4500070b3b6..000000000000
--- a/media-sound/amarok/files/amarok-1.4.9.1-libmtp-0.3.0-API.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- amarok/src/mediadevice/mtp/mtpmediadevice.cpp
-+++ amarok/src/mediadevice/mtp/mtpmediadevice.cpp
-@@ -293,12 +293,13 @@
-         parent_id = getDefaultParentId();
-     }
-     debug() << "Parent id : " << parent_id << endl;
-+    trackmeta->parent_id = parent_id;
- 
-     m_critical_mutex.lock();
-     debug() << "Sending track... " << bundle.url().path().utf8() << endl;
-     int ret = LIBMTP_Send_Track_From_File(
-         m_device, bundle.url().path().utf8(), trackmeta,
--        progressCallback, this, parent_id
-+        progressCallback, this
-     );
-     m_critical_mutex.unlock();
- 
-@@ -529,7 +530,7 @@
-         for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
-             album_object->tracks[i++] = it->track()->id();
-         album_object->no_tracks = items->count();
--        ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
-+        ret = LIBMTP_Create_New_Album( m_device, album_object );
-         if( ret != 0 )
-         {
-             debug() << "creating album failed : " << ret << endl;
-@@ -608,7 +609,7 @@
- {
-     debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
-     char *name_copy = qstrdup( name );
--    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
-+    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
-     delete(name_copy);
-     debug() << "New folder ID: " << new_folder_id << endl;
-     if( new_folder_id == 0 )
-@@ -913,7 +914,7 @@
-     if( item->playlist()->id() == 0 )
-     {
-         debug() << "creating new playlist : " << metadata->name << endl;
--        int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
-+        int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
-         if( ret == 0 )
-         {
-             item->playlist()->setId( metadata->playlist_id );
diff --git a/media-sound/amarok/files/amarok-libmp4v2.patch b/media-sound/amarok/files/amarok-libmp4v2.patch
deleted file mode 100644
index 3ea88f053562..000000000000
--- a/media-sound/amarok/files/amarok-libmp4v2.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ur amarok-1.4.10.orig/amarok/configure.in.in amarok-1.4.10/amarok/configure.in.in
---- amarok-1.4.10.orig/amarok/configure.in.in	2008-08-14 00:21:51.000000000 +0300
-+++ amarok-1.4.10/amarok/configure.in.in	2009-07-10 17:58:31.000000000 +0300
-@@ -977,7 +977,7 @@
-     ac_cppflags_save=$CPPFLAGS
-     CPPFLAGS="$CPPFLAGS -I."
-     AC_CHECK_HEADERS(systems.h)
--    AC_CHECK_HEADERS([mp4.h], [have_mp4_h=yes], [],
-+    AC_CHECK_HEADERS([mp4v2/mp4v2.h], [have_mp4_h=yes], [],
-         [#ifdef HAVE_SYSTEMS_H
-          # include <systems.h>
-          #endif
-diff -ur amarok-1.4.10.orig/amarok/src/metadata/mp4/mp4properties.h amarok-1.4.10/amarok/src/metadata/mp4/mp4properties.h
---- amarok-1.4.10.orig/amarok/src/metadata/mp4/mp4properties.h	2008-08-14 00:21:51.000000000 +0300
-+++ amarok-1.4.10/amarok/src/metadata/mp4/mp4properties.h	2009-07-10 17:57:45.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- #include <audioproperties.h>
- #include <tstring.h>
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- // mp4.h drags in mp4_config.h that defines these
- // get rid of them so they don't conflict with our config.h
- #undef VERSION
-diff -ur amarok-1.4.10.orig/amarok/src/metadata/mp4/mp4tag.h amarok-1.4.10/amarok/src/metadata/mp4/mp4tag.h
---- amarok-1.4.10.orig/amarok/src/metadata/mp4/mp4tag.h	2008-08-14 00:21:51.000000000 +0300
-+++ amarok-1.4.10/amarok/src/metadata/mp4/mp4tag.h	2009-07-10 17:57:52.000000000 +0300
-@@ -23,7 +23,7 @@
- 
- #include <tag.h>
- #include "mp4file.h"
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- 
- namespace TagLib {
- diff -ur amarok-1.4.10.orig/amarok/src/metadata/mp4/mp4file.cpp amarok-1.4.10/amarok/src/metadata/mp4/mp4file.cpp
---- amarok-1.4.10.orig/amarok/src/metadata/mp4/mp4file.cpp	2009-07-10 18:58:13.000000000 +0000
-+++ amarok-1.4.10/amarok/src/metadata/mp4/mp4file.cpp	2009-07-10 18:59:11.000000000 +0000
-@@ -30,6 +30,8 @@
- #include <audioproperties.h>
- 
- #include <stdint.h>
-+#include <stdlib.h>
-+#include <sys/types.h>
- 
- #define MP4V2_HAS_WRITE_BUG 1
- 
-diff -ur amarok-1.4.10.orig/amarok/src/metadata/mp4/mp4properties.cpp amarok-1.4.10/amarok/src/metadata/mp4properties.cpp
---- amarok-1.4.10.orig/amarok/src/metadata/mp4/mp4properties.cpp	2009-07-10 18:58:13.000000000 +0000
-+++ amarok-1.4.10/amarok/src/metadata/mp4/mp4properties.cpp	2009-07-10 18:58:39.000000000 +0000
-@@ -30,6 +30,7 @@
- #endif
- 
- #include <stdint.h>
-+#include <sys/types.h>
- 
- #ifndef UINT64_TO_DOUBLE
- #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
-diff -ur amarok-1.4.10.orig/amarok/src/metadata/mp4/mp4tag.cpp amarok-1.4.10/amarok/src/metadata/mp4/mp4tag.cpp
---- amarok-1.4.10.orig/amarok/src/metadata/mp4/mp4tag.cpp	2009-07-10 18:58:13.000000000 +0000
-+++ amarok-1.4.10/amarok/src/metadata/mp4/mp4tag.cpp	2009-07-10 18:59:36.000000000 +0000
-@@ -24,6 +24,8 @@
- 
- #include <tag.h>
- #include <stdint.h>
-+#include <stdlib.h>
-+#include <sys/types.h>
- 
- using namespace TagLib;
-