[net-print/gutenprint] Version bump per bug #333791. Remove old

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

8 files changed, 18 insertions, 408 deletions

diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog
index 3ed03ba00b24..9d1b515e5e5c 100644
--- a/net-print/gutenprint/ChangeLog
+++ b/net-print/gutenprint/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-print/gutenprint
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.12 2010/11/09 21:38:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.13 2010/11/25 13:22:35 alexxy Exp $
+
+*gutenprint-5.2.6 (25 Nov 2010)
+
+  25 Nov 2010; Alexey Shvetsov <alexxy@gentoo.org> -gutenprint-5.1.7.ebuild,
+  -files/gutenprint-5.1.7-parallel-build.patch, -gutenprint-5.2.3.ebuild,
+  -files/gutenprint-5.2.3-CFLAGS.patch,
+  -files/gutenprint-5.2.3-parallel-build.patch, -gutenprint-5.2.4.ebuild,
+  -gutenprint-5.2.5.ebuild, +gutenprint-5.2.6.ebuild:
+  Version bump per bug #333791. Remove old
 
   09 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   gutenprint-5.2.5-r1.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
deleted file mode 100644
index 1e8a6d377797..000000000000
--- a/net-print/gutenprint/files/gutenprint-5.1.7-parallel-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index e5d64e6042e0..000000000000
--- a/net-print/gutenprint/files/gutenprint-5.2.3-CFLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 20cb10bcbe26..000000000000
--- a/net-print/gutenprint/files/gutenprint-5.2.3-parallel-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
index f2dde3f16c3b..000000000000
--- a/net-print/gutenprint/gutenprint-5.1.7.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.5 2009/12/26 17:43:20 pva Exp $
-
-inherit 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 )
-	app-text/ghostscript-gpl
-	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"
-
-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"
-	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.5.1 ]; then
-		elog "Updating installed printer ppd files"
-		elog $(/usr/sbin/cups-genppdupdate.5.1)
-	else
-		elog "You need to update installed ppds manually using cups-genppdupdate.5.1"
-	fi
-}
diff --git a/net-print/gutenprint/gutenprint-5.2.3.ebuild b/net-print/gutenprint/gutenprint-5.2.3.ebuild
deleted file mode 100644
index c661d2ec2138..000000000000
--- a/net-print/gutenprint/gutenprint-5.2.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.2 2009/12/26 17:43:20 pva 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 )
-	app-text/ghostscript-gpl
-	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
-}
diff --git a/net-print/gutenprint/gutenprint-5.2.4.ebuild b/net-print/gutenprint/gutenprint-5.2.4.ebuild
deleted file mode 100644
index 786b9eba74cd..000000000000
--- a/net-print/gutenprint/gutenprint-5.2.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.4.ebuild,v 1.2 2009/12/26 17:43:20 pva 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 )
-	app-text/ghostscript-gpl
-	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
-
-	# 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
-}
diff --git a/net-print/gutenprint/gutenprint-5.2.5.ebuild b/net-print/gutenprint/gutenprint-5.2.6.ebuild
index 743c5cb9dcb9..254d6f47e348 100644
--- a/net-print/gutenprint/gutenprint-5.2.5.ebuild
+++ b/net-print/gutenprint/gutenprint-5.2.6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.5.ebuild,v 1.2 2010/02/23 12:51:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.6.ebuild,v 1.1 2010/11/25 13:22:35 alexxy Exp $
+
+EAPI="3"
 
 inherit autotools flag-o-matic eutils multilib
 
@@ -8,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.bz2"
 RESTRICT="test"
 
@@ -25,20 +27,16 @@ DEPEND="${RDEPEND}
 LICENSE="GPL-2"
 SLOT="0"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-5.2.4-CFLAGS.patch"
-
 	# IJS Patch
 	sed -i -e "s:<ijs\([^/]\):<ijs/ijs\1:g" src/ghost/ijsgutenprint.c || die "sed failed"
-
+	# Regen configure
 	mkdir m4local
 	AT_M4DIR="m4extra" eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	if use cups && use ppds; then
 		myconf="${myconf} --enable-cups-ppds --enable-cups-level3-ppds"
 	else
@@ -69,8 +67,6 @@ src_compile() {
 		$(use_with gimp gimp2-as-gutenprint) \
 		$(use_with cups) \
 		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
 }
 
 src_install () {
@@ -78,7 +74,7 @@ src_install () {
 
 	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
+	dohtml -r doc/gutenprintui2/html doc/gutenprint/developer-html
 	rm -fR "${D}"/usr/share/gutenprint/doc
 	if ! use gtk && ! use gimp; then
 		rm -f "${D}"/usr/$(get_libdir)/pkgconfig/gutenprintui2.pc