Version bump.

  Don't install libtool scripts from the package testsuite (?) (bug #217354)*
  Fix parallel make error (patch by Martin van Gagern) (bug #254008)*
  Fixes nasty color regression on Canon Pixma's (bug #223731)
  Removes stupid CFLAGS from Makefile.
* fixed in 5.1.7 too
(Portage version: 2.2_rc23/cvs/Linux x86_64)

6 files changed, 234 insertions, 11 deletions

diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog
index b7af2fed9e24..9e91fb809c52 100644
--- a/net-print/gutenprint/ChangeLog
+++ b/net-print/gutenprint/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-print/gutenprint
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.4 2008/04/06 23:42:23 swegener Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.5 2009/03/04 22:54:09 dirtyepic Exp $
+
+*gutenprint-5.2.3 (04 Mar 2009)
+
+  04 Mar 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/gutenprint-5.1.7-parallel-build.patch,
+  +files/gutenprint-5.2.3-CFLAGS.patch,
+  +files/gutenprint-5.2.3-parallel-build.patch, gutenprint-5.1.7.ebuild,
+  +gutenprint-5.2.3.ebuild:
+  Version bump.
+    Don't install libtool scripts from the package testsuite (?) (bug #217354)*
+    Fix parallel make error (patch by Martin van Gagern) (bug #254008)*
+    Fixes nasty color regression on Canon Pixma's (bug #223731)
+    Removes stupid CFLAGS from Makefile.
+  * fixed in 5.1.7 too
 
   05 Apr 2008; Tobias Klausmann <klausman@gentoo.org>
   gutenprint-5.1.4.ebuild:
diff --git a/net-print/gutenprint/files/gutenprint-5.1.7-parallel-build.patch b/net-print/gutenprint/files/gutenprint-5.1.7-parallel-build.patch
new file mode 100644
index 000000000000..1e8a6d377797
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.1.7-parallel-build.patch
@@ -0,0 +1,41 @@
+To avoid parallel build issues, the ppd-stamp-pre target has to be executed
+before other ppd targets.
+
+2009-03-04 Martin von Gagern
+
+References:
+https://bugs.gentoo.org/254008
+Index: gutenprint-5.1.7/src/cups/Makefile.am
+===================================================================
+--- gutenprint-5.1.7.orig/src/cups/Makefile.am
++++ gutenprint-5.1.7/src/cups/Makefile.am
+@@ -173,10 +173,11 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
+ ppd: ppd-stamp
+ 
+ ppd-stamp: cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
++	$(MAKE) ppd-stamp-pre
+ 	$(MAKE) ppd-stamp-phony
+ 	touch ppd-stamp
+ 
+-ppd-stamp-phony: ppd-stamp-pre ppd-nonls $(PPD_NLS)
++ppd-stamp-phony: ppd-nonls $(PPD_NLS)
+ 
+ ppd-stamp-pre:
+ 	-$(RM) -r ppd
+Index: gutenprint-5.1.7/src/cups/Makefile.in
+===================================================================
+--- gutenprint-5.1.7.orig/src/cups/Makefile.in
++++ gutenprint-5.1.7/src/cups/Makefile.in
+@@ -1042,10 +1042,11 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
+ ppd: ppd-stamp
+ 
+ ppd-stamp: cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
++	$(MAKE) ppd-stamp-pre
+ 	$(MAKE) ppd-stamp-phony
+ 	touch ppd-stamp
+ 
+-ppd-stamp-phony: ppd-stamp-pre ppd-nonls $(PPD_NLS)
++ppd-stamp-phony: ppd-nonls $(PPD_NLS)
+ 
+ ppd-stamp-pre:
+ 	-$(RM) -r ppd
diff --git a/net-print/gutenprint/files/gutenprint-5.2.3-CFLAGS.patch b/net-print/gutenprint/files/gutenprint-5.2.3-CFLAGS.patch
new file mode 100644
index 000000000000..e5d64e6042e0
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.2.3-CFLAGS.patch
@@ -0,0 +1,24 @@
+diff -Naur gutenprint-5.2.3-orig/configure.ac gutenprint-5.2.3/configure.ac
+--- gutenprint-5.2.3-orig/configure.ac	2008-12-20 18:04:24.000000000 -0600
++++ gutenprint-5.2.3/configure.ac	2009-02-13 18:52:19.000000000 -0600
+@@ -631,20 +631,6 @@
+   if test x${USE_MAINTAINER_MODE} = xyes ; then
+     STP_ADD_COMPILER_ARGS([-pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
+   fi
+-  if test x$ENABLE_DEBUG = xyes ; then
+-    STP_ADD_COMPILER_ARG([-g])
+-  else
+-    STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
+-  fi
+-else
+-  if test x$ENABLE_DEBUG = xyes ; then
+-    STP_ADD_COMPILER_ARG([-g])
+-  else
+-    STP_ADD_FIRST_COMPILER_ARG([-O])
+-  fi
+-fi
+-if test x$ENABLE_PROFILE = xyes ; then
+-  STP_ADD_COMPILER_ARG([-pg])
+ fi
+ AC_SUBST(GNUCFLAGS)
+ 
diff --git a/net-print/gutenprint/files/gutenprint-5.2.3-parallel-build.patch b/net-print/gutenprint/files/gutenprint-5.2.3-parallel-build.patch
new file mode 100644
index 000000000000..20cb10bcbe26
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.2.3-parallel-build.patch
@@ -0,0 +1,42 @@
+To avoid parallel build issues, the ppd-stamp-pre target has to be executed
+before other ppd targets.
+
+2009-03-04 Martin von Gagern
+
+References:
+https://bugs.gentoo.org/254008
+
+Index: gutenprint-5.2.3/src/cups/Makefile.am
+===================================================================
+--- gutenprint-5.2.3.orig/src/cups/Makefile.am
++++ gutenprint-5.2.3/src/cups/Makefile.am
+@@ -182,10 +182,11 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
+ ppd: ppd-stamp
+ 
+ ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/xml/xml-stamp
++	$(MAKE) ppd-stamp-pre
+ 	$(MAKE) ppd-stamp-phony
+ 	touch ppd-stamp
+ 
+-ppd-stamp-phony: ppd-stamp-pre $(PPD)
++ppd-stamp-phony: $(PPD)
+ 
+ ppd-stamp-pre:
+ 	-$(RM) -r ppd
+Index: gutenprint-5.2.3/src/cups/Makefile.in
+===================================================================
+--- gutenprint-5.2.3.orig/src/cups/Makefile.in
++++ gutenprint-5.2.3/src/cups/Makefile.in
+@@ -1087,10 +1087,11 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
+ ppd: ppd-stamp
+ 
+ ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/xml/xml-stamp
++	$(MAKE) ppd-stamp-pre
+ 	$(MAKE) ppd-stamp-phony
+ 	touch ppd-stamp
+ 
+-ppd-stamp-phony: ppd-stamp-pre $(PPD)
++ppd-stamp-phony: $(PPD)
+ 
+ ppd-stamp-pre:
+ 	-$(RM) -r ppd
diff --git a/net-print/gutenprint/gutenprint-5.1.7.ebuild b/net-print/gutenprint/gutenprint-5.1.7.ebuild
index 298213f7046a..9acd5a7975cb 100644
--- a/net-print/gutenprint/gutenprint-5.1.7.ebuild
+++ b/net-print/gutenprint/gutenprint-5.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.1.7.ebuild,v 1.2 2008/04/05 16:21:37 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.1.7.ebuild,v 1.3 2009/03/04 22:54:09 dirtyepic Exp $
 
 inherit flag-o-matic eutils multilib
 
@@ -27,6 +27,17 @@ SLOT="0"
 
 append-flags -fno-inline-functions
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+
+	# IJS Patch
+	sed -i -e "s:<ijs\([^/]\):<ijs/ijs\1:g" src/ghost/ijsgutenprint.c || die "sed failed"
+}
+
+
 src_compile() {
 	if use cups && use ppds; then
 		myconf="${myconf} --enable-cups-ppds --enable-cups-level3-ppds"
@@ -59,17 +70,11 @@ src_compile() {
 		$(use_with cups) \
 		$myconf || die "econf failed"
 
-	# IJS Patch
-	sed -i -e "s:<ijs\([^/]\):<ijs/ijs\1:g" src/ghost/ijsgutenprint.c || die "sed failed"
-
 	emake || die "emake failed"
 }
 
 src_install () {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	exeinto /usr/share/gutenprint
-	doexe test/{unprint,pcl-unprint,bjc-unprint,parse-escp2,escp2-weavetest,run-testdither,run-weavetest,testdither}
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt}
 	dohtml doc/FAQ.html
diff --git a/net-print/gutenprint/gutenprint-5.2.3.ebuild b/net-print/gutenprint/gutenprint-5.2.3.ebuild
new file mode 100644
index 000000000000..9e5b94d7b5c9
--- /dev/null
+++ b/net-print/gutenprint/gutenprint-5.2.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.3.ebuild,v 1.1 2009/03/04 22:54:09 dirtyepic Exp $
+
+inherit autotools flag-o-matic eutils multilib
+
+IUSE="cups foomaticdb gimp gtk readline ppds"
+
+DESCRIPTION="Ghostscript and cups printer drivers"
+HOMEPAGE="http://gutenprint.sourceforge.net"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.bz2"
+RESTRICT="test"
+
+RDEPEND="cups? ( >=net-print/cups-1.1.14 )
+	virtual/ghostscript
+	sys-libs/readline
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	gimp? ( >=media-gfx/gimp-2.2 >=x11-libs/gtk+-2.0 )
+	dev-lang/perl
+	foomaticdb? ( net-print/foomatic-db-engine )"
+DEPEND="${RDEPEND}
+	gtk? ( dev-util/pkgconfig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-CFLAGS.patch
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+
+	# IJS Patch
+	sed -i -e "s:<ijs\([^/]\):<ijs/ijs\1:g" src/ghost/ijsgutenprint.c || die "sed failed"
+
+	mkdir m4local
+	AT_M4DIR="m4extra" eautoreconf
+}
+
+src_compile() {
+	if use cups && use ppds; then
+		myconf="${myconf} --enable-cups-ppds --enable-cups-level3-ppds"
+	else
+		myconf="${myconf} --disable-cups-ppds"
+	fi
+
+	if use gtk || use gimp; then
+		myconf="${myconf} --enable-libgutenprintui2"
+	else
+		myconf="${myconf} --disable-libgutenprintui2"
+	fi
+
+	use foomaticdb \
+		&& myconf="${myconf} --with-foomatic3" \
+		|| myconf="${myconf} --without-foomatic"
+
+	econf \
+		--enable-test \
+		--enable-epson \
+		--with-ghostscript \
+		--with-user-guide \
+		--with-samples \
+		--with-escputil \
+		--disable-translated-cups-ppds \
+		--enable-nls \
+		$(use_with readline) \
+		$(use_with gimp gimp2) \
+		$(use_with gimp gimp2-as-gutenprint) \
+		$(use_with cups) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt}
+	dohtml doc/FAQ.html
+	dohtml -r doc/users_guide/html doc/developer/developer-html
+	rm -fR "${D}"/usr/share/gutenprint/doc
+	if ! use gtk && ! use gimp; then
+		rm -f "${D}"/usr/$(get_libdir)/pkgconfig/gutenprintui2.pc
+		rm -rf "${D}"/usr/include/gutenprintui2
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" == "/" ] && [ -x /usr/sbin/cups-genppdupdate ]; then
+		elog "Updating installed printer ppd files"
+		elog $(/usr/sbin/cups-genppdupdate)
+	else
+		elog "You need to update installed ppds manually using cups-genppdupdate"
+	fi
+}