Added another patch from Debian. Now force disabling of gslib which caused bad JPEG i/o

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 395 insertions, 18 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 1de76b1df6e9..dcbbbadc8b4b 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.52 2010/01/10 23:39:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.53 2010/01/12 20:51:25 bicatali Exp $
+
+*graphicsmagick-1.3.7-r2 (12 Jan 2010)
+
+  12 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -graphicsmagick-1.3.7-r1.ebuild, +graphicsmagick-1.3.7-r2.ebuild,
+  +files/graphicsmagick-1.3.7-debian-fixed.patch:
+  Added another patch from Debian. Now force disabling of gslib which caused
+  bad JPEG i/o
 
 *graphicsmagick-1.3.7-r1 (11 Jan 2010)
 
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 5f443add35d8..bec36e32eef3 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,15 +3,16 @@ Hash: SHA1
 
 AUX graphicsmagick-1.3.7-CVE-2009-1882.patch 19819 RMD160 2f011c693e18233354ea5d3e1cf7b5e639f08996 SHA1 8b61f70bbe3e6aadc6ec61e7765a2cb12918ee05 SHA256 e0a64d87ebdabedb6df39a97df31f96792a10464c16d432cc10cf8503fd6a260
 AUX graphicsmagick-1.3.7-CVE-2009-3736.patch 702 RMD160 1501640ef81023b93672eea2ff4c25c1f65abe22 SHA1 93274cac801e1e76bd2406d48d220c8244296e1d SHA256 f55c8ce74c05500432b7c65a1ec66b5c0e405b79264534c6c6b4353879b628c6
+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.7.tar.bz2 6581207 RMD160 56a7408d2f3fc15be2859a0d5b3c42e0549faf0c SHA1 e65c4d799704245216821374f66de5796795c263 SHA256 0d2e8f81574efc7e16c05b72fc9a62a2ba333d6fa196bdb72f8fda8ce7a585fc
-EBUILD graphicsmagick-1.3.7-r1.ebuild 3546 RMD160 00a7d6aa4886c1a3ae54c5d731b1072ebc1d1713 SHA1 1651c47d49fd39cae03be62049794ab0196a591b SHA256 64c8f03162c596c180828c8ec180639fe4beb89230a0de595c65eb42344732ef
-MISC ChangeLog 3501 RMD160 c88a9cc0323aa86c9c3ead40bfb2ee6ae801248f SHA1 49eeb731d8ac8156153d87bdce7fd0a291e01d00 SHA256 d9da4a5d99a737ea6fd219785ec0ec3b2e90bbf6ae5890b28d620d5673cf14ca
+EBUILD graphicsmagick-1.3.7-r2.ebuild 3666 RMD160 028d897f644725ca514e42d7962b252e68a890ec SHA1 c82fa7a707aede2ddf60b4c604d573e83bcbdced SHA256 ac4bb2a45f50b598358d0c260f677ea466ce6331045b851b8e883252186b960f
+MISC ChangeLog 3807 RMD160 22f16a4d8cc4533dfab2a28291147b6bdefbb175 SHA1 9e46f687fac38718affc7c6e56cfe6d4db65c16f SHA256 e12d7b5f38b7278a6625289bfa6c11182fb6f5ae9c517492d36b0c2ec7b647bb
 MISC metadata.xml 903 RMD160 e5fa58daf0c17fb76f9e803549f9c52d9d36f44d SHA1 0db1be15b54789f77946c7dd40cb209da656c542 SHA256 abe3379727737dd6472c47392cebd328a635c08130bd4fa5d71ecf1c1e980a6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktKbb8ACgkQ1ycZbhPLE2CgKQCfbVAEbYdXQHfA0Pk311oQAeW2
-Px8AnR41AL7X4H9BPfH1sJ0CH8bFSaSz
-=9II/
+iEYEARECAAYFAktM6WYACgkQ1ycZbhPLE2CdjQCeM0BD9qvmpSztA9QvPI0yVfPN
+GaoAn1LFA91UAluhYZDCAxMH1c6Adsuk
+=D9/K
 -----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
new file mode 100644
index 000000000000..c806510e6a9d
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.7-debian-fixed.patch
@@ -0,0 +1,366 @@
+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/graphicsmagick-1.3.7-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.7-r2.ebuild
index ca82b8b8f763..eccc1af66ab3 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.7-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.7-r1.ebuild,v 1.1 2010/01/10 23:39:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.7-r2.ebuild,v 1.1 2010/01/12 20:51:25 bicatali Exp $
 
 EAPI="2"
 
@@ -15,12 +15,12 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bzip2 cxx debug doc fpx -gs imagemagick jbig +jpeg +jpeg2k lcms openmp
+IUSE="bzip2 cxx debug doc fpx imagemagick jbig +jpeg +jpeg2k lcms openmp
 	perl +png q16 q32 +svg +threads tiff +truetype X wmf zlib"
 
-RDEPEND="bzip2? ( app-arch/bzip2 )
+RDEPEND="app-text/ghostscript-gpl
+	bzip2? ( app-arch/bzip2 )
 	fpx? ( media-libs/libfpx )
-	gs? ( app-text/ghostscript-gpl )
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( media-libs/jpeg )
 	jpeg2k? ( >=media-libs/jasper-1.701.0 )
@@ -41,13 +41,6 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-CVE-2009-1882.patch"
-	"${FILESDIR}/${P}-CVE-2009-3736.patch"
-	"${FILESDIR}/${P}-perl-ldflags.patch"
-)
-#	"${FILESDIR}/${P}-perl-link.patch"
-
 pkg_setup() {
 	if use openmp &&
 		[[ $(tc-getCC)$ == *gcc* ]] &&
@@ -61,6 +54,13 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-CVE-2009-1882.patch"
+	epatch "${FILESDIR}/${P}-CVE-2009-3736.patch"
+	epatch "${FILESDIR}/${P}-perl-ldflags.patch"
+	epatch "${FILESDIR}/${P}-debian-fixed.patch"
+}
+
 src_configure() {
 	local quantumDepth
 	if use q16 ; then
@@ -80,8 +80,11 @@ src_configure() {
 		--enable-largefile \
 		--without-included-ltdl \
 		--without-frozenpaths \
+		--without-gslib \
 		--with-modules \
 		--with-quantum-depth=${quantumDepth} \
+		--with-fontpath="/usr/share/fonts" \
+		--with-gs-font-dir="/usr/share/fonts/default/ghostscript" \
 		$(use_enable debug ccmalloc) \
 		$(use_enable debug prof) \
 		$(use_enable debug gcov) \
@@ -90,7 +93,6 @@ src_configure() {
 		$(use_with bzip2 bzlib) \
 		$(use_with cxx magick-plus-plus) \
 		$(use_with fpx) \
-		$(use_with gs gslib) \
 		$(use_with jbig) \
 		$(use_with jpeg) \
 		$(use_with jpeg2k jp2) \