This patch is no longer needed

2 files changed, 0 insertions, 138 deletions

diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index a66a873f6287..f8e0f16092d6 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -4,4 +4,3 @@ MD5 77f534982d22e2a44fd25a0ad51f9eb4 id3lib-3.8.3-r1.ebuild 891
 MD5 fe615fff8136cfc3fc0fe0e83a522b68 files/digest-id3lib-3.8.0 64
 MD5 21b2333db59cc116a7e3c96563fe9ccd files/id3lib-3.8.0-gcc3.patch 2707
 MD5 202375b32b2a80a367a2230716144988 files/digest-id3lib-3.8.3-r1 64
-MD5 ed1bb587f79798d50dd77521a7e7a8aa files/id3lib-3.8.0_pre2-gcc3.patch 3452
diff --git a/media-libs/id3lib/files/id3lib-3.8.0_pre2-gcc3.patch b/media-libs/id3lib/files/id3lib-3.8.0_pre2-gcc3.patch
deleted file mode 100644
index 08b4968f503d..000000000000
--- a/media-libs/id3lib/files/id3lib-3.8.0_pre2-gcc3.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -w -b -B -u -U 5 -r -P -x *~ -x *.[oa] id3lib-3.8.0pre2/src/tag_file.cpp id3lib-3.8.0pre2.doj/src/tag_file.cpp
---- id3lib-3.8.0pre2/src/tag_file.cpp	Sat Sep  8 04:30:18 2001
-+++ id3lib-3.8.0pre2.doj/src/tag_file.cpp	Thu Oct  4 23:22:40 2001
-@@ -268,18 +268,11 @@
-     }
-     char sTempFile[ID3_PATH_LENGTH];
-     strcpy(sTempFile, filename.c_str());
-     strcat(sTempFile, sTmpSuffix.c_str());
-     
--    int fd = mkstemp(sTempFile);
--    if (fd < 0)
--    {
--      remove(sTempFile);
--      //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
--    }
--
--    ofstream tmpOut(fd);
-+    ofstream tmpOut(sTempFile);
-     if (!tmpOut)
-     {
-       tmpOut.close();
-       remove(sTempFile);
-       return 0;
-@@ -290,13 +283,13 @@
-     tmpOut.write(tagData, tagSize);
-     file.seekg(tag.GetPrependedBytes(), ios::beg);
-     uchar tmpBuffer[BUFSIZ];
-     while (file)
-     {
--      file.read(tmpBuffer, BUFSIZ);
-+      file.read((char *)tmpBuffer, BUFSIZ);
-       size_t nBytes = file.gcount();
--      tmpOut.write(tmpBuffer, nBytes);
-+      tmpOut.write((char *)tmpBuffer, nBytes);
-     }
-       
-     tmpOut.close();
- 
-     file.close();
-diff -w -b -B -u -U 5 -r -P -x *~ -x *.[oa] id3lib-3.8.0pre2/src/utils.cpp id3lib-3.8.0pre2.doj/src/utils.cpp
---- id3lib-3.8.0pre2/src/utils.cpp	Sat Sep  8 04:30:18 2001
-+++ id3lib-3.8.0pre2.doj/src/utils.cpp	Thu Oct  4 23:31:17 2001
-@@ -31,12 +31,14 @@
- #if defined HAVE_ICONV_H
- # include <iconv.h>
- # include <errno.h>
- #endif
- 
--#include <ctype.h>
--#include <iostream.h>
-+#include <cctype>
-+#include <iostream>
-+#include <string>
-+using namespace std;
- 
- #ifdef macintosh
- #define NOCREATE ((std::ios_base::openmode)0)
- #define toascii(X) (X)
- #else
-@@ -115,11 +117,11 @@
-     size_t target_size = BUFSIZ;
-     
-     do
-     {
-       size_t nconv = iconv(cd, 
--                           &source_str, &source_size, 
-+                           (char **)&source_str, &source_size, 
-                            &target_str, &target_size);
-       if (nconv == (size_t) -1 && errno != EINVAL && errno != E2BIG)
-       {
-         return target;
-       }
-@@ -214,11 +216,11 @@
- 
- namespace
- {
-   bool exists(String name)
-   {
--    ifstream file(name.c_str(), NOCREATE);
-+    ifstream file(name.c_str()/*, NOCREATE*/);
-     return file.is_open() != 0;
-   }
- };
- 
- ID3_Err dami::createFile(String name, fstream& file)
-@@ -285,11 +287,11 @@
-     
-   if (file.is_open())
-   {
-     file.close();
-   }
--  file.open(name.c_str(), ios::in | ios::out | ios::binary | NOCREATE);
-+  file.open(name.c_str(), ios::in | ios::out | ios::binary /*| NOCREATE*/);
-   if (!file)
-   {
-     return ID3E_ReadOnly;
-   }
-     
-@@ -305,11 +307,11 @@
-     
-   if (file.is_open())
-   {
-     file.close();
-   }
--  file.open(name.c_str(), ios::in | ios::out | ios::binary | NOCREATE);
-+  file.open(name.c_str(), ios::in | ios::out | ios::binary /*| NOCREATE*/);
-   if (!file)
-   {
-     return ID3E_ReadOnly;
-   }
-     
-@@ -320,11 +322,11 @@
- {
-   if (file.is_open())
-   {
-     file.close();
-   }
--  file.open(name.c_str(), ios::in | ios::binary | NOCREATE);
-+  file.open(name.c_str(), ios::in | ios::binary /*| NOCREATE*/);
-   if (!file)
-   {
-     return ID3E_NoFile;
-   }
-     
-@@ -335,11 +337,11 @@
- {
-   if (file.is_open())
-   {
-     file.close();
-   }
--  file.open(name.c_str(), ios::in | ios::binary | NOCREATE);
-+  file.open(name.c_str(), ios::in | ios::binary /*| NOCREATE*/);
-   if (!file)
-   {
-     return ID3E_NoFile;
-   }
-