Add missing fontconfig dependency and fix bug #196289 with a corrected upstream patch, thanks Sebastian for reporting.

(Portage version: 2.1.3.16)

3 files changed, 19 insertions, 13 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index f0738148ab9a..b39f9b0347eb 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.16 2007/10/19 19:11:25 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.17 2007/10/23 21:19:18 tgurr Exp $
+
+  23 Oct 2007; Timo Gurr <tgurr@gentoo.org>
+  files/ghostscript-8.60-include.patch, ghostscript-gpl-8.60.ebuild:
+  Add missing fontconfig dependency and fix bug #196289 with a corrected
+  upstream patch, thanks Sebastian for reporting.
 
   19 Oct 2007; Timo Gurr <tgurr@gentoo.org>
   +files/ghostscript-8.60-include.patch, ghostscript-gpl-8.60.ebuild:
diff --git a/app-text/ghostscript-gpl/files/ghostscript-8.60-include.patch b/app-text/ghostscript-gpl/files/ghostscript-8.60-include.patch
index cafd5b0aaf3d..fee7bcf7977c 100644
--- a/app-text/ghostscript-gpl/files/ghostscript-8.60-include.patch
+++ b/app-text/ghostscript-gpl/files/ghostscript-8.60-include.patch
@@ -74,8 +74,8 @@
  	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
  	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
  	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
-+	$(INSTALL_PROGRAM) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)/iapi.h
-+	$(INSTALL_PROGRAM) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)/ierrors.h
++	$(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)/iapi.h
++	$(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)/ierrors.h
  
  soinstall: install-so install-scripts install-data
  
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild
index 3b9f8ab82b6b..6c35a884256f 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild,v 1.2 2007/10/19 19:11:25 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild,v 1.3 2007/10/23 21:19:18 tgurr Exp $
 
 inherit autotools elisp-common eutils versionator flag-o-matic
 
@@ -20,15 +20,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bindist cjk cups djvu gtk jpeg2k X"
 
-COMMON_DEPEND=">=media-libs/jpeg-6b
+COMMON_DEPEND="media-libs/fontconfig
+	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.5
-	>=sys-libs/zlib-1.1.4
 	>=media-libs/tiff-3.7
-	X? ( x11-libs/libXt x11-libs/libXext )
+	>=sys-libs/zlib-1.1.4
 	!bindist? ( djvu? ( app-text/djvu ) )
-	gtk? ( >=x11-libs/gtk+-2.0 )
 	cups? ( >=net-print/cups-1.1.20 )
+	gtk? ( >=x11-libs/gtk+-2.0 )
 	jpeg2k? ( media-libs/jasper )
+	X? ( x11-libs/libXt x11-libs/libXext )
 	!app-text/ghostscript-esp
 	!app-text/ghostscript-gnu"
 
@@ -103,13 +104,14 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		$(use_with X x) \
-		$(use_with jpeg2k jasper) \
 		$(use_enable cups) \
 		$(use_enable gtk) \
+		$(use_with jpeg2k jasper) \
+		$(use_with X x) \
 		--enable-dynamic \
-		--with-ijs \
+		--enable-fontconfig \
 		--with-drivers=ALL,rinkj \
+		--with-ijs \
 		--with-jbig2dec \
 	|| die "econf failed"
 
@@ -127,8 +129,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	emake DESTDIR="${D}" soinstall || die "emake soinstall failed"
+	emake DESTDIR="${D}" install-so install || die "emake install failed"
 
 	if ! use bindist && use djvu ; then
 		dobin gsdjvu || die "dobin gsdjvu install failed"