Revision bump and remove old. Fixes bug #382927 with help from Martin von Gagern and Rafał Mużyło.

(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)

3 files changed, 46 insertions, 4 deletions

diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog
index aa3ebfc87bf4..bd0fa4f56ce4 100644
--- a/net-print/gutenprint/ChangeLog
+++ b/net-print/gutenprint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/gutenprint
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.25 2011/09/11 07:28:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.26 2011/09/15 21:30:05 radhermit Exp $
+
+*gutenprint-5.2.7-r1 (15 Sep 2011)
+
+  15 Sep 2011; Tim Harder <radhermit@gentoo.org> -gutenprint-5.2.7.ebuild,
+  +gutenprint-5.2.7-r1.ebuild, +files/gutenprint-5.2.7-genppd.patch:
+  Revision bump and remove old. Fixes bug #382927 with help from Martin von
+  Gagern and Rafał Mużyło.
 
   11 Sep 2011; Tim Harder <radhermit@gentoo.org> gutenprint-5.2.7.ebuild:
   Respect CFLAGS and build genppd statically (fixes bug #382027).
diff --git a/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch b/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch
new file mode 100644
index 000000000000..fbe6b6ace9c4
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch
@@ -0,0 +1,35 @@
+--- gutenprint-5.2.7/configure.ac.orig
++++ gutenprint-5.2.7/configure.ac
+@@ -128,8 +128,8 @@
+ dnl *_cflags:   cflags for pkg-config
+ dnl *_libs:     libs for pkg-config
+ 
+-GUTENPRINT_LIBS="-lgutenprint"
+-GUTENPRINTUI2_LIBS="-lgutenprintui2"
++GUTENPRINT_LIBS='$(top_builddir)/src/main/libgutenprint.la'
++GUTENPRINTUI2_LIBS='$(top_builddir)/src/gutenprintui2/libgutenprintui2.la'
+ gutenprint_version=${GUTENPRINT_VERSION}
+ gutenprintui2_version=${GUTENPRINT_VERSION}
+ 
+--- gutenprint-5.2.7/src/cups/Makefile.am.orig
++++ gutenprint-5.2.7/src/cups/Makefile.am
+@@ -96,16 +96,16 @@
+ 
+ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
+ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) $(GENPPD_LIBS) @LIBICONV@
+ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
+ gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+-gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
+ gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
+-rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
+ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ ## Data
diff --git a/net-print/gutenprint/gutenprint-5.2.7.ebuild b/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild
index e210035e49ac..bc1c31756b8f 100644
--- a/net-print/gutenprint/gutenprint-5.2.7.ebuild
+++ b/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.7.ebuild,v 1.2 2011/09/11 07:28:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild,v 1.1 2011/09/15 21:30:05 radhermit Exp $
 
 EAPI=4
 
@@ -32,7 +32,8 @@ RESTRICT="test"
 DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.2.4-CFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-5.2.4-CFLAGS.patch" \
+		"${FILESDIR}"/${P}-genppd.patch
 	sed -i -e "s:m4local:m4extra:" Makefile.am || die
 	eautoreconf
 }
@@ -58,7 +59,6 @@ src_configure() {
 		--enable-test \
 		--with-ghostscript \
 		--disable-translated-cups-ppds \
-		--enable-static-genppd \
 		$(use_with gimp gimp2) \
 		$(use_with gimp gimp2-as-gutenprint) \
 		$(use_with cups) \