Version bump. Fixes bug #511062.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

4 files changed, 130 insertions, 2 deletions

diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog
index 6fa289237204..38aeb1383f04 100644
--- a/net-print/gutenprint/ChangeLog
+++ b/net-print/gutenprint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/gutenprint
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.50 2014/03/10 17:09:34 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.51 2014/05/30 02:26:09 mrueg Exp $
+
+*gutenprint-5.2.10 (30 May 2014)
+
+  30 May 2014; Manuel Rüger <mrueg@gentoo.org>
+  +files/gutenprint-5.2.10-genppd.patch, +gutenprint-5.2.10.ebuild:
+  Version bump. Fixes bug #511062.
 
   10 Mar 2014; Manuel Rüger <mrueg@gentoo.org>
   -files/gutenprint-5.2.7-genppd.patch, -files/gutenprint-5.2.7-stdio.patch,
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index bda40346d2f0..0016eac51398 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,6 +1,9 @@
+AUX gutenprint-5.2.10-genppd.patch 1609 SHA256 a9d5e8a0dffba31e1e12801a21dbfc53ced030dd919aa1eb6f6a480cbc27e837 SHA512 d582bafdf593a9e00d0f20aa5dd9043f52ca0c53bc713e979fd162c023acef937fd4a1706bcc808579ea97d122ede54f7a505537bb97b4fba5f68eeffced0a96 WHIRLPOOL ca948b19b3af4cfba26174982a6a009bbc7ab92d513b6313010381a670f6b23231c72329750087586d5683de24ed8c2a5c5440b72866bb606e9e4dcd94db3049
 AUX gutenprint-5.2.4-CFLAGS.patch 781 SHA256 e4df928bf523a90f595bea773ffbbdaf3b982a941a6f995a5709abfdb5e5c438 SHA512 2bdfbb024251f79d06b24a5fc72ec35c7c7f794df8eb4cb06983047e4339d77d3d9a7c1b2913e96ef4c28f82ba7970276e27e8fe7709aecfd20b27357995ea20 WHIRLPOOL b0b3de9a03251b23dfa6f3d092036bc5d0643812eec36b70814d26af4ca46173d9be39dc663e0c6d8133f83a5014b24f0f80346e87c8d82cf4c41b7a1fcbc2cb
 AUX gutenprint-5.2.8-genppd.patch 1959 SHA256 3ff261224f2b93cbdea289066f018282a201ab68e16d27461a0e54cb3a13f58d SHA512 69aa4dae7a06c5473672c3737c6f5565dda584b933c3409279a32e21275e8556fcf6ca5479c7f9bf87616b4ce062ebcaafaf1ab41d7b6f8f8e3279c371ce5916 WHIRLPOOL 086c7b33f1a5574b9ee2615e2f9b0475f990ad7dc33daa60f2334e64cddd3de656fd06a4c854e6e56e369d9903ed15700b41dbb0e058a3b75cfe064e380fd038
+DIST gutenprint-5.2.10.tar.bz2 6241585 SHA256 431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59 SHA512 bb71fd5c127748730dde01471b09907d500b72c35401abaf92c631d04156bacafd4b1a9baef61f48db6c4a622fd612a1e2834ed30207b5b178767ea9d9d5e1ac WHIRLPOOL 4d809f99df3515fc878d3be5df4f48b66fc764eea1f62db15e75d6ca7326c24c6c228bd975575c20f3e7bc8398c1e492e1025784e64a4534f82ad89c7ba92990
 DIST gutenprint-5.2.9.tar.bz2 5720450 SHA256 4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0 SHA512 082990e09c49247baab9575b34882026770923915eb1c4ff6f75475cd341691263c7567a430542ead868e80ee6ea82e00ad12c89be0611913f934d66a10a9549 WHIRLPOOL d466288983c4a194c76f505a5adc16af00a651c07a584ff860919b1cf0e2ca870091eac76c6b7d466d9508f3e77a4c6095efe593c0350feeb41dd761adb6e92a
+EBUILD gutenprint-5.2.10.ebuild 2469 SHA256 0bb92816b80771ff856f72479d2d533ea6dbbd4ef34048949e8409d6cb10b608 SHA512 549f0807a5eefc03fcd1b881614bb290a01c8370de9d9687cdc0a3bfe0f2516b578a63767b57831b1fb7d8730414dbf8314b9e67538a437e8f377cf1ce9d257c WHIRLPOOL ff69d8adeeb04a1766859bb9a538f19193786d8fdb7bf666c6bc33082486db5c0d12642aa7a3e23e10a7cd3b1e4ccd037b4a59de860444636886e1c85e966b43
 EBUILD gutenprint-5.2.9.ebuild 2469 SHA256 7de2c1ddfa0056c3e7165ac938d704fe6e7eeac2ae9d4e1424146283234be48f SHA512 e738446046e399e6508b6212e1ce29c911e0ac666a8057a7e72a865f7404f00dfbb88c54f6a6b6a172820f6b1ac874558727221591b7316c4fe93c297f17db38 WHIRLPOOL e1199f26dfd5971e584e9f5c3bb5090d6d3cb9e8c97cb4803e94264155339439ddc9d3a0bac6424b1517f2e99a5ab2aeee087694522b2ccd6999487b9f89f247
-MISC ChangeLog 22890 SHA256 6c748566f292f1a6eff2a786061634845e98e1694f704f6afd070d5bce7f68bf SHA512 2ff11a5b3f99873f448a662a728ad600010467dffcca3cbdeb013439351828bff18e9e2076b072e1489b70593a221bbc7c0e76b063a09881f90fb526b84f5fcb WHIRLPOOL e311ea9432f66dd3bb4464e6f2838047f23802a433499cfd55a28aaad045052d297486e7b56b58ce32a3d11adf5fd4c150d4fa2fa6341ad9940c18a54f2929ee
+MISC ChangeLog 23076 SHA256 d69888b308f2b2f11052ea8b851e5f46291d46b698bb0e9783b57ae1a322eb68 SHA512 20411e024bb015f1789e3c1318b35d9c84a5f9cdeff2d8aaded6fea1549d251a5e4ebd3c704c6fc9485737eec61769c5c0c7c3d869d8aa40a6197d3bbf916972 WHIRLPOOL 0acd752f537e9a77845cb47d6d79e587f977d72881c93e871f4bfee1f7c7b428f310553017a2d2681d2a1f150e5d0b6c90e45a2cb324b2d5d783d75d522be4a0
 MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
diff --git a/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch b/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch
new file mode 100644
index 000000000000..46d8d78b9ead
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.2.10-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_RELEASE_VERSION@_SOURCES = genppd.c i18n.c i18n.h
+ cups_genppd_@GUTENPRINT_RELEASE_VERSION@_CFLAGS = -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+-cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) $(GENPPD_LIBS) @LIBICONV@
+ cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ gutenprint_@GUTENPRINT_RELEASE_VERSION@_SOURCES = genppd.c i18n.c i18n.h
+ gutenprint_@GUTENPRINT_RELEASE_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+-gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
+ gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
+-rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
+ rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ ## Data
diff --git a/net-print/gutenprint/gutenprint-5.2.10.ebuild b/net-print/gutenprint/gutenprint-5.2.10.ebuild
new file mode 100644
index 000000000000..76f9a2e8b3c4
--- /dev/null
+++ b/net-print/gutenprint/gutenprint-5.2.10.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.10.ebuild,v 1.1 2014/05/30 02:26:09 mrueg Exp $
+
+EAPI=5
+
+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\
+		"${FILESDIR}"/${PN}-5.2.10-genppd.patch # bug 382927
+	sed -i "s:m4local:m4extra:" Makefile.am || die
+
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
+		-e "s/AM_PROG_CC_STDC/AC_PROG_CC/" \
+		-i configure.ac || 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
+}