old

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 16 insertions, 531 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index a525e56c7820..81eedd1b7bbc 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.91 2012/03/25 15:40:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.92 2012/06/14 22:26:39 ssuominen Exp $
+
+  14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/graphicsmagick-1.3.7-debian-fixed.patch,
+  -files/graphicsmagick-1.3.7-perl-ldflags.patch,
+  -graphicsmagick-1.3.12-r1.ebuild:
+  old
 
   25 Mar 2012; Raúl Porcel <armin76@gentoo.org> graphicsmagick-1.3.13.ebuild:
   alpha/sparc stable wrt #399903
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index df197d7bfed5..08d878011c63 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -2,21 +2,20 @@
 Hash: SHA1
 
 AUX graphicsmagick-1.3.13-lzma_configure.patch 710 RMD160 8cf2edfbc65d4ea793f7c8881cc1647787f0816c SHA1 12e73c07627e6d1cb387bb3b8bac8331dec4b98b SHA256 b0577b2a5445c21fba810a3e6cec92f6a2f4fd5c0c09560331c3025cb8a7d815
-AUX graphicsmagick-1.3.7-debian-fixed.patch 14493 RMD160 cbeccbd775d60da7f2b498540fdef8b08189eeb6 SHA1 2da7acdf46401cbc294170919c592cb842ab2afa SHA256 da17fbb6e30ca42b2d07871cc730de8f5ad61df9387cf22948fe1dcb72263b8c
-AUX graphicsmagick-1.3.7-perl-ldflags.patch 991 RMD160 e234224a939892f04a82b83e48ef475318183b28 SHA1 5e5c89d808bd3040945c64a60e1f8df35c03053d SHA256 f1ff9bf3009b1e353089ed27067bee2895b4e7f0d9e15100abdebac20bef8644
-DIST GraphicsMagick-1.3.12.tar.bz2 6690493 RMD160 0a2749ee38a63c00c3ee6259ea7ea65c2bccc621 SHA1 6b8a414af162ad8679f2f04b10f128edc8ee3233 SHA256 4ceea8558c959fba847b2a4cd92232aac37f5f6a59dda234bc17ef83b90e57d7
 DIST GraphicsMagick-1.3.13.tar.xz 4899208 RMD160 ff8170a15ce1a2f4441273704bbefe9f45e3950d SHA1 b85b21785bb072fd795f7fc6ac902cffae4e96e6 SHA256 45e3a676309b25837f34ae78a9f46573af260e38f4ba4960f16b70b8e1968f22
 DIST GraphicsMagick-1.3.14.tar.xz 4879292 RMD160 b8d973d60af70e48ff02689ebb8efb115fd36807 SHA1 307fb59e60685721c365da4c2f593523743ca599 SHA256 8a17891e54d2ffbb5c976922b9293eff258cdb66f74e4886f7c4ae10b7ac84cc
-DIST graphicsmagick-1.3.12-libpng15.patch.bz2 11866 RMD160 922a212315319c5c0818fea61263623b5701bbe1 SHA1 f3b416d7e2fe668e4da05b1dcf6078fa3cf087d8 SHA256 553bddf928debabd438a25719f5c5a559bfd33f26c0f17dd4eab8438d91edddd
-EBUILD graphicsmagick-1.3.12-r1.ebuild 3709 RMD160 b0b5b69b1a1dad255a235dc1939b3c9591c8be9b SHA1 4a0b3b3d4f009f3cf21d19f436244257037fe221 SHA256 8465cf675fb8da31c84550072872cc0502e3528c5c6a534845999213683d0b61
 EBUILD graphicsmagick-1.3.13.ebuild 3101 RMD160 4f0038e8d452f95c61a621230e8e8b05f1ee8cc0 SHA1 5b49b063518cc48117ba2e4ee2a027fbdf482cf9 SHA256 662eb525e865e3fdead9203f9017f2a48983d34509eea31e843d447084a68e80
 EBUILD graphicsmagick-1.3.14.ebuild 3131 RMD160 7a8c4b1a94ce3d5ad6bfd6049880f92c4cd0c231 SHA1 b563273253b864c961b5ca11fc6ff83a07663699 SHA256 430c039f9107e60c8a37cdf57991d7fb287ddd140955e4c84c81f9a72c8864be
-MISC ChangeLog 9081 RMD160 b0e137d34a735ba7b5bba7d74982c9c6902b37be SHA1 36b569848e132439ae7e2c1da35ff5766db021a7 SHA256 ecf94593a02a042c118926018449b1c04d65411ae4a7c9b66eac71a7e315624b
+MISC ChangeLog 9280 RMD160 de033249ce675c416c1103ee9e29ef1208561bee SHA1 f660ea96e663ccd17ed6e177a1dd776907080caf SHA256 5df78d8c65c8a3e8f529370cf92209c69d88ff52397006888d70827e360935cf
 MISC metadata.xml 948 RMD160 777ea220f961149cf9da9f4d0150c613df0ca92b SHA1 cf14a02282804546e796d61d143b0add1c086cfd SHA256 885686871e4c7d112c5fcbbe0a9056a286c5714985643844bb3a078175085ac6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9vPIwACgkQuQc30/atMkDvOwCgv4OhJ75UdP9gZuMYGmdivPPt
-vZAAoIojSb2CdiAmRu67hRArhE/zEa6w
-=hnLZ
+iQEcBAEBAgAGBQJP2mQoAAoJEEdUh39IaPFNY24H/RXPNo9tNFfdTC2ZM0CtFYdT
+uOw7dSlkegDUQsdsi2hKuJ93WbL17Cy1P9+9yig529Yapf2Y9K4CehiIHmz1l3bL
+HqdI1uhleK04oYb8FVnIaUcxR2W+R0clS4r0I39Hx/4YFl9R0Z9iUFd5Z9BMQ8at
+xeSXVvtNq76+zLuzaIyBq1yoC6Q5fYByri6CU5ACHlrayL2zdY+dGAcwZHXgimCy
+2stDpUhXQ9jsSh1gbHqADoGqvFLTIvVUAr1Mh31q12IdY6DCGZInrF+hpY+SALCT
+jODhTgWf6O10tu4SHVubBrtEepn+2i/gXRcUJnLxXn705opg/lZEquFt/5y0FaY=
+=5dpq
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.7-debian-fixed.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.7-debian-fixed.patch
deleted file mode 100644
index c806510e6a9d..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.7-debian-fixed.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-Index: GraphicsMagick-1.3.7/magick/delegate.c
-===================================================================
---- GraphicsMagick-1.3.7.orig/magick/delegate.c
-+++ GraphicsMagick-1.3.7/magick/delegate.c
-@@ -454,7 +454,10 @@ MagickExport unsigned int InvokeDelegate
-   char
-     *command,
-     **commands,
--    filename[MaxTextExtent];
-+    linkedname[MaxTextExtent],
-+    linkedinfoname[MaxTextExtent],
-+    filename[MaxTextExtent],
-+    safechars[]="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,-_+ /";
- 
-   const DelegateInfo
-     *delegate_info;
-@@ -474,6 +477,10 @@ MagickExport unsigned int InvokeDelegate
-   assert(image != (Image *) NULL);
-   assert(image->signature == MagickSignature);
-   temporary_image_filename=(*image->filename == '\0');
-+  linkedname[0]='\0';
-+  linkedname[MaxTextExtent-1]='\0';
-+  linkedinfoname[0]='\0';
-+  linkedinfoname[MaxTextExtent-1]='\0';
-   if (temporary_image_filename)
-     {
-       /* Allocate a temporary filename if image is unnamed.  */
-@@ -483,12 +490,24 @@ MagickExport unsigned int InvokeDelegate
-           return(False);
-         }
-     }
-+  else if (strspn(image->filename, safechars) != strlen(image->filename))
-+    {
-+      strncpy(linkedname,image->filename,MaxTextExtent-1);
-+      if (!AcquireTemporarySymlink(image->filename,linkedname))
-+	{
-+          (void) ThrowException(exception,FileOpenError,UnableToCreateTemporaryFile,image->filename);
-+	  return (False);
-+	}
-+    }
-+
-   (void) strlcpy(filename,image->filename,MaxTextExtent);
-   delegate_info=GetDelegateInfo(decode,encode,exception);
-   if (delegate_info == (DelegateInfo *) NULL)
-     {
-       if (temporary_image_filename)
-         (void) LiberateTemporaryFile(image->filename);
-+      if (*linkedname)
-+	strncpy(image->filename,linkedname,MaxTextExtent-1);
-       (void) ThrowException(exception,DelegateError,NoTagFound,
-         decode ? decode : encode);
-       return(False);
-@@ -509,6 +528,18 @@ MagickExport unsigned int InvokeDelegate
-         }
-       image_info->temporary=True;
-     }
-+  else if (strspn(image_info->filename, safechars) != strlen(image_info->filename))
-+    {
-+      strncpy(linkedinfoname,image_info->filename,MaxTextExtent-1);
-+      if (!AcquireTemporarySymlink(image_info->filename,linkedinfoname))
-+	{
-+          if (temporary_image_filename)
-+            LiberateTemporaryFile(image->filename);
-+          (void) ThrowException(exception,FileOpenError,UnableToCreateTemporaryFile,image_info->filename);
-+          return(False);
-+        }
-+      temporary_image_filename=True;
-+    }
- 
-   if (delegate_info->mode != 0)
-     if ((decode && (delegate_info->encode != (char *) NULL)) ||
-@@ -532,6 +563,13 @@ MagickExport unsigned int InvokeDelegate
-         {
-           if (temporary_image_filename)
-             (void) LiberateTemporaryFile(image->filename);
-+	  if (*linkedname)
-+            strncpy(image->filename,linkedname,MaxTextExtent-1);
-+	  if (*linkedinfoname)
-+            {
-+              LiberateTemporaryFile(linkedinfoname);
-+              strncpy(image_info->filename,linkedinfoname,MaxTextExtent-1);
-+	    }
-           (void) ThrowException(exception,FileOpenError,UnableToCreateTemporaryFile,image_info->unique);
-           return(False);
-         }
-@@ -540,6 +578,13 @@ MagickExport unsigned int InvokeDelegate
-         {
-           if (temporary_image_filename)
-             (void) LiberateTemporaryFile(image->filename);
-+	  if (*linkedname)
-+            strncpy(image->filename,linkedname,MaxTextExtent-1);
-+	  if (*linkedinfoname)
-+            {
-+              LiberateTemporaryFile(linkedinfoname);
-+              strncpy(image_info->filename,linkedinfoname,MaxTextExtent-1);
-+	    }
-           (void) LiberateTemporaryFile(image_info->unique);
-           (void) ThrowException(exception,FileOpenError,UnableToCreateTemporaryFile,image_info->zero);
-           return(False);
-@@ -553,6 +598,13 @@ MagickExport unsigned int InvokeDelegate
-             (void) LiberateTemporaryFile(image_info->zero);
-             if (temporary_image_filename)
-               (void) LiberateTemporaryFile(image->filename);
-+	    if (*linkedname)
-+              strncpy(image->filename,linkedname,MaxTextExtent-1);
-+	    if (*linkedinfoname)
-+              {
-+                LiberateTemporaryFile(linkedinfoname);
-+                strncpy(image_info->filename,linkedinfoname,MaxTextExtent-1);
-+	      }
-             (void) ThrowException(exception,DelegateError,DelegateFailed,
-               decode ? decode : encode);
-             return(False);
-@@ -578,6 +630,13 @@ MagickExport unsigned int InvokeDelegate
-               (void) LiberateTemporaryFile(image_info->zero);
-               if (temporary_image_filename)
-                 (void) LiberateTemporaryFile(image->filename);
-+	      if (*linkedname)
-+                strncpy(image->filename,linkedname,MaxTextExtent-1);
-+	      if (*linkedinfoname)
-+                {
-+                  LiberateTemporaryFile(linkedinfoname);
-+                  strncpy(image_info->filename,linkedinfoname,MaxTextExtent-1);
-+	        }
-               DestroyImageInfo(clone_info);
-               (void) ThrowException(exception,DelegateError,DelegateFailed,
-                 decode ? decode : encode);
-@@ -599,6 +658,13 @@ MagickExport unsigned int InvokeDelegate
-     {
-       if (temporary_image_filename)
-         (void) LiberateTemporaryFile(image->filename);
-+      if (*linkedname)
-+        strncpy(image->filename,linkedname,MaxTextExtent-1);
-+      if (*linkedinfoname)
-+        {
-+          LiberateTemporaryFile(linkedinfoname);
-+          strncpy(image_info->filename,linkedinfoname,MaxTextExtent-1);
-+        }
-       (void) ThrowException(exception,ResourceLimitError,MemoryAllocationFailed,decode ? decode : encode);
-       return(False);
-     }
-@@ -733,6 +799,13 @@ MagickExport unsigned int InvokeDelegate
-  error_exit:
-   if (temporary_image_filename)
-     (void) LiberateTemporaryFile(image->filename);
-+  if (*linkedname)
-+    strncpy(image->filename,linkedname,MaxTextExtent-1);
-+  if (*linkedinfoname)
-+    {
-+      LiberateTemporaryFile(linkedinfoname);
-+      strncpy(image_info->filename,linkedinfoname,MaxTextExtent-1);
-+    }
-   for ( ; commands[i] != (char *) NULL; i++)
-     MagickFreeMemory(commands[i]);
-   MagickFreeMemory(commands);
-Index: GraphicsMagick-1.3.7/magick/symbols.h
-===================================================================
---- GraphicsMagick-1.3.7.orig/magick/symbols.h
-+++ GraphicsMagick-1.3.7/magick/symbols.h
-@@ -29,6 +29,7 @@
- #define AcquireTemporaryFileDescriptor GmAcquireTemporaryFileDescriptor
- #define AcquireTemporaryFileName GmAcquireTemporaryFileName
- #define AcquireTemporaryFileStream GmAcquireTemporaryFileStream
-+#define AcquireTemporarySymlink GmAcquireTemporarySymlink
- #define AdaptiveThresholdImage GmAdaptiveThresholdImage
- #define AddDefinitions GmAddDefinitions
- #define AddNoiseImage GmAddNoiseImage
-Index: GraphicsMagick-1.3.7/magick/tempfile.c
-===================================================================
---- GraphicsMagick-1.3.7.orig/magick/tempfile.c
-+++ GraphicsMagick-1.3.7/magick/tempfile.c
-@@ -192,6 +192,93 @@ MagickExport MagickPassFail AcquireTempo
- %                                                                             %
- %                                                                             %
- %                                                                             %
-++   A c q u i r e T e m p o r a r y S y m l i n k                             %
-+%                                                                             %
-+%                                                                             %
-+%                                                                             %
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+%
-+% AcquireTemporarySymlink replaces the contents of the string buffer pointed
-+% to by filename with the unique name of a symbolic link.  True is returned
-+% if a symlink waas created, or False is returned if there is a failure.
-+% The allocated symlink should be recovered via the LiberateTemporaryFile()
-+% function once it is no longer required.
-+%
-+% The format of the AcquireTemporarySymlink method is:
-+%
-+%     unsigned int AcquireTemporarySymlink(char *linkname, const char *name,
-+%                                          ExceptionInfo *exception)
-+%
-+%  A description of each parameter follows.
-+%
-+%   o linkname: Specifies a pointer to an array of characters that must be
-+%               MaxTextExtent characters of size.  The unique
-+%               name of the symlink is returned in this array.
-+%   o name: Specifies a file name the symlink should point to.
-+*/
-+MagickExport unsigned int AcquireTemporarySymlink(char *linkname, const char *name)
-+{
-+  char
-+    *tempdir,
-+    tempname[MaxTextExtent];
-+
-+  int
-+    fd,
-+    tries;
-+  
-+  assert(linkname != (char *)NULL);
-+  linkname[0]='\0';
-+  tempname[MaxTextExtent-1]='\0';
-+
-+  tempdir=getenv("MAGICK_TMPDIR");
-+#if defined(POSIX)
-+  if (!tempdir)
-+    tempdir=getenv("TMPDIR");
-+#endif /* POSIX */
-+#if defined(WIN32)
-+  if (!tempdir)
-+    tempdir=getenv("TMP");
-+  if (!tempdir)
-+    tempdir=getenv("TEMP");
-+#endif /* WIN32 */
-+#if defined(P_tmpdir)
-+  if (!tempdir)
-+    tempdir=P_tmpdir;
-+#endif
-+
-+  for (tries=0; tries < 15; tries++)
-+    {
-+      strncpy(tempname,"gmXXXXXX",MaxTextExtent-1);
-+      ComposeTemporaryFileName(tempname);
-+      strncpy(linkname,tempdir,MaxTextExtent-1);
-+      if (tempdir[strlen(tempdir)-1] != DirectorySeparator[0])
-+	strncat(linkname,DirectorySeparator,MaxTextExtent-1);
-+      strncat(linkname,tempname,MaxTextExtent-1);
-+      if (*name == '/')
-+        fd=symlink(name, linkname);
-+      else
-+        {
-+          char cname[MaxTextExtent];
-+	  if (!getcwd(cname,(size_t)MaxTextExtent))
-+	    return (False);
-+	  strncat(cname,DirectorySeparator,MaxTextExtent-1);
-+	  strncat(cname,name,MaxTextExtent-1);
-+	  fd=symlink(cname,linkname);
-+	}
-+      if (fd != -1)
-+	{
-+	  AddTemporaryFileToList(linkname);
-+	  return (True);
-+	}
-+    }
-+  return (False);
-+}
-+
-+/*
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+%                                                                             %
-+%                                                                             %
-+%                                                                             %
- +   A c q u i r e T e m p o r a r y F i l e D e s c r i p t o r               %
- %                                                                             %
- %                                                                             %
-Index: GraphicsMagick-1.3.7/magick/tempfile.h
-===================================================================
---- GraphicsMagick-1.3.7.orig/magick/tempfile.h
-+++ GraphicsMagick-1.3.7/magick/tempfile.h
-@@ -26,6 +26,7 @@ MagickExport void
- 
- MagickExport MagickPassFail
-   AcquireTemporaryFileName(char *filename),
-+  AcquireTemporarySymlink(char *linkname, const char *name),
-   LiberateTemporaryFile(char *filename);
- 
- MagickExport int
-Index: GraphicsMagick-1.3.7/magick/utility.c
-===================================================================
---- GraphicsMagick-1.3.7.orig/magick/utility.c
-+++ GraphicsMagick-1.3.7/magick/utility.c
-@@ -1222,6 +1222,72 @@ MagickExport void FormatString(char *str
- %                                                                             %
- %                                                                             %
- %                                                                             %
-+%  F o r m a t S t r i n g N u m e r i c                                      %
-+%                                                                             %
-+%                                                                             %
-+%                                                                             %
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+%
-+%  Method FormatStringNumeric formats output for a single numeric argument.
-+%  It takes into account that the format string given might be untrusted
-+%  user input, and returns a pointer to the formatted string.
-+%
-+%  The format of the FormatStringNumeric method is:
-+%
-+%      char * FormatStringNumeric(char *string,const char *format,int value)
-+%
-+%  A description of each parameter follows.
-+%
-+%   o  format:  A string describing the format to use to write the numeric
-+%      argument. Only the first numeric format identifier is replaced.
-+%
-+%   o  value:  Numeric value to substitute into format string.
-+%
-+%
-+*/
-+MagickExport char *FormatStringNumeric(const char *format,int value)
-+{
-+  char
-+    *p,
-+    *string;
-+
-+  string = NULL;
-+
-+  (void) CloneString(&string, format);
-+
-+  for (p=strchr(format,'%'); p != (char *) NULL; p=strchr(p+1,'%'))
-+  {  
-+    char
-+      *q;
-+
-+    q=(char *) p+1;
-+    if (*q == '0')
-+      (void) strtol(q,&q,10);
-+    if ((*q == '%') || (*q == 'd') || (*q == 'o') || (*q == 'x'))
-+    {
-+      char
-+        c;
-+
-+      q++;
-+      c=*q;
-+      *q='\0';
-+      (void) snprintf(string+(p-format),MaxTextExtent-(p-format),p,value);
-+      *q=c;
-+      (void) ConcatenateString(&string,q);
-+      if (*(q-1) == '%')
-+        p++;
-+      else
-+        break;
-+    }
-+  }
-+  return string;
-+}
-+
-+/*
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+%                                                                             %
-+%                                                                             %
-+%                                                                             %
- %   G e t E x e c u t i o n P a t h                                           %
- %                                                                             %
- %                                                                             %
-Index: GraphicsMagick-1.3.7/magick/utility.h
-===================================================================
---- GraphicsMagick-1.3.7.orig/magick/utility.h
-+++ GraphicsMagick-1.3.7/magick/utility.h
-@@ -75,6 +75,7 @@ extern MagickExport char
-   *AllocateString(const char *),
-   *Base64Encode(const unsigned char *,const size_t,size_t *),
-   *EscapeString(const char *,const char),
-+  *FormatStringNumeric(const char *,int),
-   *GetPageGeometry(const char *),
-   **ListFiles(const char *,const char *,long *),
-   *SetClientName(const char *),
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.7-perl-ldflags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.7-perl-ldflags.patch
deleted file mode 100644
index dd231dbf5776..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.7-perl-ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- PerlMagick/Makefile.PL.in.orig	2010-01-10 20:05:53.000000000 +0000
-+++ PerlMagick/Makefile.PL.in	2010-01-10 23:27:53.000000000 +0000
-@@ -58,16 +58,16 @@
-    'LD'          => $Config{'ld'} == $Config{'cc'} ? '@CC@' : $Config{'ld'},
- 
-    # Linker flags for building an executable
--   'LDFLAGS'    =>  "-L@MAGICKLIBDIR@ $Config{'ldflags'}",
-+   'LDFLAGS'    =>  "$Config{'ldflags'} @LDFLAGS@",
- 
-    # Linker flags for building a dynamically loadable module
--   'LDDLFLAGS'  => "-L@MAGICKLIBDIR@ $Config{'lddlflags'}",
-+   'LDDLFLAGS'  => "$Config{'ldflags'} @LDFLAGS@ -L@MAGICKLIBDIR@ $Config{'lddlflags'}",
- 
-    # Install PerlMagick binary into GraphicsMagick bin directory
-    'INSTALLBIN'	=> '@BIN_DIR@',
- 
-    # Library specification
--   'LIBS'	=> ['-L@MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
-+   'LIBS'	=> ['@LDFLAGS@ -L@MAGICKLIBDIR@ -lGraphicsMagick @MAGICK_DEP_LIBS@'],
- 
-    # Perl binary name (if a Perl binary is built)
-    'MAP_TARGET'	=> 'PerlMagick',
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.12-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.12-r1.ebuild
deleted file mode 100644
index 4873f7633714..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.12-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.12-r1.ebuild,v 1.8 2011/12/16 09:34:05 naota Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic perl-module
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-libpng15.patch.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bzip2 cxx debug doc fpx imagemagick jbig jpeg jpeg2k lcms modules openmp
-	perl png q16 q32 svg threads tiff truetype X wmf zlib"
-
-RDEPEND="app-text/ghostscript-gpl
-	bzip2? ( app-arch/bzip2 )
-	fpx? ( media-libs/libfpx )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( >=media-libs/jasper-1.701.0 )
-	lcms? ( =media-libs/lcms-1* )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng )
-	svg? ( dev-libs/libxml2 )
-	tiff? ( >=media-libs/tiff-3.8.2 )
-	truetype? ( >=media-libs/freetype-2.0 )
-	wmf? ( media-libs/libwmf )
-	X? ( x11-libs/libXext x11-libs/libSM )
-	imagemagick? ( !media-gfx/imagemagick )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use openmp &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-			! has_version sys-devel/gcc[openmp] )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		ewarn "If you want to build fftw with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
-		epause 5
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.7-perl-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-1.3.7-debian-fixed.patch
-	epatch "${WORKDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
-	local quantumDepth
-	if use q16 ; then
-		quantumDepth="16"
-	elif use q32 ; then
-		quantumDepth="32"
-	else
-		quantumDepth="8"
-	fi
-
-	# cannot use EAPI=3 because perl-module eclass doesn't support it yet
-	use !prefix && EPREFIX=
-
-	use debug && filter-flags -fomit-frame-pointer
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--enable-shared \
-		--enable-largefile \
-		--without-included-ltdl \
-		--without-frozenpaths \
-		--without-gslib \
-		--with-quantum-depth=${quantumDepth} \
-		--with-fontpath="${EPREFIX}/usr/share/fonts" \
-		--with-gs-font-dir="${EPREFIX}/usr/share/fonts/default/ghostscript" \
-		--with-windows-font-dir="${EPREFIX}/usr/share/fonts/corefonts" \
-		--with-perl-options="INSTALLDIRS=vendor" \
-		$(use_enable debug ccmalloc) \
-		$(use_enable debug prof) \
-		$(use_enable debug gcov) \
-		$(use_enable imagemagick magick-compat) \
-		$(use_enable openmp) \
-		$(use_with bzip2 bzlib) \
-		$(use_with cxx magick-plus-plus) \
-		$(use_with fpx) \
-		$(use_with jbig) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms) \
-		$(use_with modules) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with svg xml) \
-		$(use_with threads) \
-		$(use_with tiff) \
-		$(use_with truetype ttf) \
-		$(use_with wmf) \
-		$(use_with X x) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use perl; then
-		emake perl-build || die "emake perl failed"
-	fi
-}
-
-src_test() {
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use perl; then
-		perl -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
-		emake -C PerlMagick DESTDIR="${D}" \
-			install || die "emake perl install failed"
-		fixlocalpod
-	fi
-	use doc || rm -rf "${D}"usr/share/doc/${PF}/html
-}