4 files changed, 7 insertions, 136 deletions
diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog
index 948a6ddf1907..6fa289237204 100644
--- a/net-print/gutenprint/ChangeLog
+++ b/net-print/gutenprint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/gutenprint
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.49 2013/04/25 18:43:59 radhermit Exp $
+# 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 $
+
+  10 Mar 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/gutenprint-5.2.7-genppd.patch, -files/gutenprint-5.2.7-stdio.patch,
+  -gutenprint-5.2.8.ebuild:
+  Cleanup old.
 
   25 Apr 2013; Tim Harder <radhermit@gentoo.org> gutenprint-5.2.9.ebuild:
   Fix autoreconf failures with automake-1.13 (bug #467206).
diff --git a/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch b/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch
deleted file mode 100644
index de175198ce14..000000000000
--- a/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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/files/gutenprint-5.2.7-stdio.patch b/net-print/gutenprint/files/gutenprint-5.2.7-stdio.patch
deleted file mode 100644
index e62497b30564..000000000000
--- a/net-print/gutenprint/files/gutenprint-5.2.7-stdio.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gutenprint-5.2.7.orig/src/cups/commandtocanon.c
-+++ gutenprint-5.2.7/src/cups/commandtocanon.c
-@@ -14,6 +14,7 @@
- #include <cups/cups.h>
- #include <ctype.h>
- #include <stdlib.h>
-+#include <stdio.h>
- 
- 
- /*
---- gutenprint-5.2.7.orig/src/cups/commandtoepson.c
-+++ gutenprint-5.2.7/src/cups/commandtoepson.c
-@@ -32,6 +32,7 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <stdio.h>
- 
- /*
-  * Macros...
diff --git a/net-print/gutenprint/gutenprint-5.2.8.ebuild b/net-print/gutenprint/gutenprint-5.2.8.ebuild
deleted file mode 100644
index 4007442d9936..000000000000
--- a/net-print/gutenprint/gutenprint-5.2.8.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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
-}