Ebuild cleanup, added missing dependency and fix bug #196289, thanks Sebastian for reporting.

(Portage version: 2.1.3.15)

3 files changed, 119 insertions, 6 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index dee73f945c4f..f0738148ab9a 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.15 2007/10/17 22:00:44 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.16 2007/10/19 19:11:25 tgurr Exp $
+
+  19 Oct 2007; Timo Gurr <tgurr@gentoo.org>
+  +files/ghostscript-8.60-include.patch, ghostscript-gpl-8.60.ebuild:
+  Ebuild cleanup, added missing dependency and fix bug #196289.
 
 *ghostscript-gpl-8.60 (17 Oct 2007)
 
diff --git a/app-text/ghostscript-gpl/files/ghostscript-8.60-include.patch b/app-text/ghostscript-gpl/files/ghostscript-8.60-include.patch
new file mode 100644
index 000000000000..cafd5b0aaf3d
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-8.60-include.patch
@@ -0,0 +1,106 @@
+--- /trunk/gs/src/Makefile.in	2007/09/27 20:20:46	8254
++++ trunk/gs/src/Makefile.in	2007/09/27 20:26:51	8255
+@@ -1,4 +1,4 @@
+-#  Copyright (C) 2001-2006 Artifex Software, Inc.
++#  Copyright (C) 2001-2007 Artifex Software, Inc.
+ #  All Rights Reserved.
+ #
+ #  This software is provided AS-IS with no warranty, either express or
+@@ -55,6 +55,7 @@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+ scriptdir = $(bindir)
++includedir = @includedir@
+ libdir = @libdir@
+ mandir = @mandir@
+ man1ext = 1
+@@ -67,6 +68,7 @@
+ gsdir = @datadir@/ghostscript
+ gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
+ gssharedir = @libdir@/ghostscript/$(GS_DOT_VERSION)
++gsincludedir = @includedir@/ghostscript/
+ 
+ docdir=$(gsdatadir)/doc
+ exdir=$(gsdatadir)/examples
+--- /trunk/gs/src/macosx.mak	2007/09/27 20:20:46	8254
++++ trunk/gs/src/macosx.mak	2007/09/27 20:26:51	8255
+@@ -1,4 +1,4 @@
+-#  Copyright (C) 2001-2006 Artifex Software, Inc.
++#  Copyright (C) 2001-2007 Artifex Software, Inc.
+ #  All Rights Reserved.
+ #
+ #  This software is provided AS-IS with no warranty, either express or
+@@ -58,11 +58,14 @@
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ scriptdir = $(bindir)
++includedir = $(prefix)/include
+ libdir = $(exec_prefix)/lib
+ mandir = $(prefix)/man
+ man1ext = 1
+ datadir = $(prefix)/Resources
+ gsdatadir = $(prefix)/Versions/$(GS_DOT_VERSION)/Resources
++gssharedir = $(libdir)/ghostscript/$(GS_DOT_VERSION)
++gsincludedir = $(includedir)/ghostscript/
+ 
+ docdir=$(gsdatadir)/doc
+ exdir=$(gsdatadir)/examples
+--- /trunk/gs/src/unix-dll.mak	2007/09/27 20:20:46	8254
++++ trunk/gs/src/unix-dll.mak	2007/09/27 20:26:51	8255
+@@ -1,4 +1,4 @@
+-#  Copyright (C) 2001-2006 Artifex Software, Inc.
++#  Copyright (C) 2001-2007 Artifex Software, Inc.
+ #  All Rights Reserved.
+ #
+ #  This software is provided AS-IS with no warranty, either express or
+@@ -60,7 +60,7 @@
+ #LDFLAGS_SO=-dynamiclib -install-name $(GS_SONAME_MAJOR_MINOR)
+ 
+ GS_SO=$(BINDIR)/$(GS_SONAME)
+-GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR)
++GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR) 
+ GS_SO_MAJOR_MINOR=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR)
+ 
+ # Shared object is built by redefining GS_XE in a recursive make.
+@@ -114,6 +114,7 @@
+ 	-mkdir -p $(DESTDIR)$(gsdatadir)
+ 	-mkdir -p $(DESTDIR)$(bindir)
+ 	-mkdir -p $(DESTDIR)$(libdir)
++	-mkdir -p $(DESTDIR)$(gsincludedir)
+ 	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
+ 	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
+ 	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
+@@ -121,6 +122,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
+ 
+ soinstall: install-so install-scripts install-data
+ 
+--- /trunk/gs/src/unix-gcc.mak	2007/09/27 20:20:46	8254
++++ trunk/gs/src/unix-gcc.mak	2007/09/27 20:26:51	8255
+@@ -1,4 +1,4 @@
+-#  Copyright (C) 2001-2006 Artifex Software, Inc.
++#  Copyright (C) 2001-2007 Artifex Software, Inc.
+ #  All Rights Reserved.
+ #
+ #  This software is provided AS-IS with no warranty, either express or
+@@ -56,12 +56,15 @@
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ scriptdir = $(bindir)
++includedir = $(prefix)/include
+ libdir = $(exec_prefix)/lib
+ mandir = $(prefix)/man
+ man1ext = 1
+ datadir = $(prefix)/share
+ gsdir = $(datadir)/ghostscript
+ gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
++gssharedir = $(libdir)/ghostscript/$(GS_DOT_VERSION)
++gsincludedir = $(includedir)/ghostscript/
+ 
+ docdir=$(gsdatadir)/doc
+ exdir=$(gsdatadir)/examples
+
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild
index 7e27ee277099..3b9f8ab82b6b 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.1 2007/10/17 22:00:44 tgurr Exp $
+# $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 $
 
 inherit autotools elisp-common eutils versionator flag-o-matic
 
@@ -20,8 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bindist cjk cups djvu gtk jpeg2k X"
 
-COMMON_DEPEND="virtual/libc
-	>=media-libs/jpeg-6b
+COMMON_DEPEND=">=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 )
@@ -66,6 +66,7 @@ src_unpack() {
 
 	# additional Gentoo patches
 	epatch "${FILESDIR}/ghostscript-afpl-8.54-rinkj.patch"
+	epatch "${FILESDIR}/ghostscript-8.60-include.patch"
 
 	if use bindist && use djvu ; then
 		ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
@@ -83,8 +84,6 @@ src_unpack() {
 			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/src/contrib.mak"
 	fi
 
-	sed -i -e "s:#if 1:#if 0:" "${S}/contrib/gdevhl12.c" || die "sed failed"
-
 	if ! use gtk ; then
 		sed -i "s:\$(GSSOX)::" src/*.mak || die "gsx sed failed"
 		sed -i "s:.*\$(GSSOX_XENAME)$::" src/*.mak || die "gsxso sed failed"
@@ -97,6 +96,9 @@ src_unpack() {
 		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
 		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
 		src/Makefile.in src/*.mak || die "sed failed"
+
+	cd "${S}"
+	eautoreconf
 }
 
 src_compile() {
@@ -126,6 +128,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" soinstall || die "emake soinstall failed"
 
 	if ! use bindist && use djvu ; then
 		dobin gsdjvu || die "dobin gsdjvu install failed"