Version bump wrt bug#420829.

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

3 files changed, 122 insertions, 1 deletions

diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog
index 26d4d57139bd..d738dda9f9bd 100644
--- a/net-print/gutenprint/ChangeLog
+++ b/net-print/gutenprint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/gutenprint
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.38 2012/05/29 12:39:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.39 2012/06/14 12:07:33 scarabeus Exp $
+
+*gutenprint-5.2.8 (14 Jun 2012)
+
+  14 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/gutenprint-5.2.8-genppd.patch, +gutenprint-5.2.8.ebuild:
+  Version bump wrt bug#420829.
 
   29 May 2012; Tim Harder <radhermit@gentoo.org> -gutenprint-5.2.6.ebuild:
   Remove old.
diff --git a/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch b/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch
new file mode 100644
index 000000000000..f61fb69ccfd2
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch
@@ -0,0 +1,23 @@
+diff -urN gutenprint-5.2.8.old/src/cups/Makefile.am gutenprint-5.2.8/src/cups/Makefile.am
+--- gutenprint-5.2.8.old/src/cups/Makefile.am	2012-06-14 14:03:53.011828220 +0200
++++ gutenprint-5.2.8/src/cups/Makefile.am	2012-06-14 14:04:57.672829331 +0200
+@@ -98,16 +98,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.8.ebuild b/net-print/gutenprint/gutenprint-5.2.8.ebuild
new file mode 100644
index 000000000000..4007442d9936
--- /dev/null
+++ b/net-print/gutenprint/gutenprint-5.2.8.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.8.ebuild,v 1.1 2012/06/14 12:07:33 scarabeus Exp $
+
+EAPI=4
+
+inherit eutils multilib autotools
+
+DESCRIPTION="Ghostscript and cups printer drivers"
+HOMEPAGE="http://gutenprint.sourceforge.net"
+SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cups foomaticdb gimp gtk nls readline ppds static-libs"
+
+RDEPEND="app-text/ghostscript-gpl
+	dev-lang/perl
+	readline? ( sys-libs/readline )
+	cups? ( >=net-print/cups-1.1.14 )
+	foomaticdb? ( net-print/foomatic-db-engine )
+	gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	gtk? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )"
+
+RESTRICT="test"
+
+REQUIRED_USE="gimp? ( gtk )"
+
+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.8-genppd.patch # bug 382927
+	sed -i -e "s:m4local:m4extra:" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use cups && use ppds; then
+		myconf+=" --enable-cups-ppds --enable-cups-level3-ppds"
+	else
+		myconf+=" --disable-cups-ppds"
+	fi
+
+	use foomaticdb \
+		&& myconf+=" --with-foomatic3" \
+		|| myconf+=" --without-foomatic"
+
+	econf \
+		--enable-test \
+		--with-ghostscript \
+		--disable-translated-cups-ppds \
+		$(use_enable gtk libgutenprintui2) \
+		$(use_with gimp gimp2) \
+		$(use_with gimp gimp2-as-gutenprint) \
+		$(use_with cups) \
+		$(use_enable nls) \
+		$(use_with readline) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	dohtml doc/FAQ.html
+	dohtml -r doc/gutenprintui2/html
+	rm -fR "${ED}"/usr/share/gutenprint/doc
+	if ! use gtk; then
+		rm -f "${ED}"/usr/$(get_libdir)/pkgconfig/gutenprintui2.pc
+		rm -rf "${ED}"/usr/include/gutenprintui2
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f '{}' +
+}
+
+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
+}