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

Package-Manager: portage-2.2.0_alpha5_p2/cvs/Linux x86_64

9 files changed, 35 insertions, 433 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/Manifest b/net-print/gutenprint/Manifest
index 2e10a399dd1c..8a2d738dbdcf 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,38 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX gutenprint-5.1.7-parallel-build.patch 1570 RMD160 8617ba8ae4616c7be10b8d66103cdaec5c21c8be SHA1 ae58cd73b891bbec56e9d502fe47ea0908b0feb8 SHA256 489ad9d9d54e523d8b607a3bee6333d1c35bbb8121ac20273a0eff1e57ed1bee
-AUX gutenprint-5.2.3-CFLAGS.patch 781 RMD160 f9c6650d899768cc3e8cb846cca388aca8c33872 SHA1 248af46ba40397d0c75b5cbf2b9ee5a99990fc22 SHA256 e4df928bf523a90f595bea773ffbbdaf3b982a941a6f995a5709abfdb5e5c438
-AUX gutenprint-5.2.3-parallel-build.patch 1295 RMD160 297b98d5025ab82ceb20eb64f01b7f5e8508cf39 SHA1 118d848c28ab5094a1d25071ebf5fa9a9e5eb79b SHA256 ba5290c9a131f7f31915d58d8bf315f4672edd4d60b899bffc334ccddedf36cc
 AUX gutenprint-5.2.4-CFLAGS.patch 781 RMD160 f9c6650d899768cc3e8cb846cca388aca8c33872 SHA1 248af46ba40397d0c75b5cbf2b9ee5a99990fc22 SHA256 e4df928bf523a90f595bea773ffbbdaf3b982a941a6f995a5709abfdb5e5c438
 AUX gutenprint-5.2.5-Makefile.patch 564 RMD160 c292214f0a46d3cc36e6a08ac5fbc72a739279f7 SHA1 92df0231b7ce7b779c78f3ba80670acf032e5260 SHA256 b17043d3160e754ca1bb50acf92818f13d3f7983343c97508985f42aba288462
 DIST gutenprint-5.1.4.tar.bz2 4714151 RMD160 44f23d30eeab6f911f28c5982ca9ffc1677a0c49 SHA1 1e65fbb90d1b6f2344f32378d026326c103bb3eb SHA256 2189127e50171334ebd8ca3791455062daeef150894ce8dfb063bc2da7b35763
-DIST gutenprint-5.1.7.tar.bz2 4703590 RMD160 7f85d64823006899dc41165fcdc97872f6519616 SHA1 7fb93b8b7a0ef1e5f7cf83700cb96b2448241195 SHA256 48ba351290067c061a5e68225e488d0eb570fe76dd0856e08ae9fbe2ef62fc4b
-DIST gutenprint-5.2.3.tar.bz2 4929205 RMD160 ae6edf1dea2cd88572736bf0784a4353b59e7113 SHA1 e4ddb21665578835d58267d59b57d8d970c3ee86 SHA256 cd001593cbad73bc102e9a1ec9d736236dd62626aab1a8b40252928af6522fef
-DIST gutenprint-5.2.4.tar.bz2 5119559 RMD160 c42cfc847d3886c2a299a30dbcdf66a119a282de SHA1 ae680314650dd9a52df5fd11cd0282cc6f9662e6 SHA256 b610e86305efbb98696af20366696f06ea40a7b030b45f21a83a142892ab9626
 DIST gutenprint-5.2.5.tar.bz2 5215539 RMD160 cd88cd3ffc28fcc54e1de94d2f5ee069102d23a6 SHA1 380d9f870e7f12088fc5dffac02413cae9a9ccb4 SHA256 6b562390769785573bb25715a9cbcb2e638b2740d391f4632a0ed4a0bc8fa3fa
+DIST gutenprint-5.2.6.tar.bz2 5283223 RMD160 ede2dea11742c77fede450880685efcde3a91967 SHA1 9fbe1ab899d5e83f34e21534cc5c1b8921c9039b SHA256 4744e1b5aab4c78a5af8da629d83d8ca3d8d217171301dc905c2e11dca5edc7e
 EBUILD gutenprint-5.1.4.ebuild 2580 RMD160 646e2a450f51439a48b2948a4df302cb0737bf70 SHA1 afcccb3fc6209f9610dde6d219c9bfccc15a6eff SHA256 d5d6a8d987b38c664db953eee8e670988299b49b0a3486cd88777434089ce65e
-EBUILD gutenprint-5.1.7.ebuild 2529 RMD160 ee6ce25826f0937f73366b6a00a51ffb202d7cb0 SHA1 e465049efb74ac071898d778a78fbff9175281b3 SHA256 2e45e7a1608b5eb478df2a2f7caefcb19d6e329766f7bbfa593eec1d1aafa36f
-EBUILD gutenprint-5.2.3.ebuild 2581 RMD160 e64ed222d2626d10646056abc8641ba54a24f337 SHA1 698b14cf650f3e34250cd24c8e1750eed239b22e SHA256 1810dff48ec50f8209016b4ff7f15ee05a2bed5bfb22ea04b9c5555f34d3d979
-EBUILD gutenprint-5.2.4.ebuild 2533 RMD160 b2bd3a59309b1ad273db4caf94453f9337308428 SHA1 a89b1fc16fdbc2da5aa742d32192bf1ddf5c881d SHA256 13138313c404ac7c22f270cd63172103923e65e625814e611e920d15d18eb97e
 EBUILD gutenprint-5.2.5-r1.ebuild 2574 RMD160 a875e50af90712786f63939e88bd3251cd3a1979 SHA1 fe5852fb8aa121c9622f6312edd468b7b9599185 SHA256 6d8ff36b729321564372e0e4e8747c31eead396f12208ec3ab0c5e4be902eea8
-EBUILD gutenprint-5.2.5.ebuild 2543 RMD160 a871797e92be8f0ce41119319c587e3ade189ace SHA1 0fa3d677f3b399a8f7e5b97683b92b4030ce5e19 SHA256 0d08f75cc6a21e850487b41f6d5099e1823ae2cbea3def9ae2d4807492458e27
-MISC ChangeLog 17513 RMD160 1c7f59e12ebf37edba818712c40c53f9c6500452 SHA1 21daca4b18aa837a875c63c7d20dc5f72af1d29a SHA256 58e66e019148fec5ab674e9520ce14ebea20da8e726d231f9b462e4ecb17d583
+EBUILD gutenprint-5.2.6.ebuild 2526 RMD160 e12a03ebd8d6ff4c57faad5b06d2401e831b417a SHA1 33a9907739c6db9eaba1c23b2f0ba5b9a2295edb SHA256 7b31070ccac0cf9f04b9dcb6ff8927d404d44060c9e2b7e591f31199a54cd625
+MISC ChangeLog 17906 RMD160 ca465693e5c6bc589e2e86cc2b27592233c970d2 SHA1 fe5c653ac5eca1f8c25fdec8aa1fd496fb56b973 SHA256 8574b37bf5b9d065d1e4776dfb6c130589d91c29157018a9c91bdafd9f470a9d
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM2b7YAAoJENwGBM22xffe+vYP/3IGIv6Ku3ywB/LbL03SzJGO
-aML/DyOmmsyk1Q7dnDNernmrzDVtW3jvJlf7lFEJIqqQZSNOnFWqtf9oDz4xhUIz
-RD2h3RQBMqJBFEtzqOglniMLpq58Yp1XEX+m+31fgJD0xIncfyWaD4+/+YPjzCYG
-+kvplzwJE7XYMs9yUaCeNTh0PH1N/+XslQt4xySo/QHW5JV5VqgM4AcrsdZAY+/X
-jQ0IvdX8QhN+6JySXAyo9V+KpsYAwAZky2i/VzHvVcp8gZYiLHV7iotc9ZytCNJS
-4w+YPRAFo+l+xb5ZAPmyYAYtjbHZ8hdaPdEb2s0YnEnbfQpJIRtQ/n9ao4Fsn72W
-rWlwmuDXYMADfRba/347ufGcq3O42ftHwUZHZKRp90YepARUn1GMfSjeCCm46DMX
-/izhKHJYcKJgq7+gTXBkytzBxb2Agt8HFccBBzkcrBmjQcmyvBVaCzv7fF6N8Vpl
-9WThQ3Ht3iVgCPRGJqGRG3VhMpgqKA8tyb0UjwEpnDVtbglArTRl+s8GlQ7trUWE
-jxaqzuopqjLRJtGpZ/mhp0B+Ylj/1YDx+BYcoN24rixJWmOQ+A47xUist99zDN0H
-V/V5E9Hb5NJiZZ6PEmHEZHIoYUYa0kZejItoIOmKrsMftJAZh7yeY5ej9Yn9Df1c
-i5XbSBLckZddO1BDGUGJ
-=Pxa7
+iQIcBAEBCAAGBQJM7mMtAAoJEOf+E+/4L5LmecwP/Rt6XptnU04tvI/YF2CfkqxC
+lHcnKVzCJ8CN243e+xLFBeOJCB4uKiz1+ysdiIDzrSjwjWC0DV1Ap4DhIMLjioXJ
+N/14jg1Rro6c8xCUNaplN/K1TdDE/fKwuK3IK21je3LylQ9AsAkClC5+QU0ChpgH
+X889HBdEkg7+ySb85UAoE90/OLNPIpHhDatcULqsYwlhQGJMSrZs5iP1Ht5CGN+Z
+6A7cNYGPsR7s+kK011FJES1c4uDI0asUwAS73mBT8t3Kuinx+uPGG1MykWtS/r00
+mD1GM5qLwp+OH7sAcrN95IVtO8xv8gBmh2NJ+cJ2768+z5JuGeAahwyOx9dvj9kv
+9+fQV19iauysJ8tYwByq8ZxbnPfmPUPP3po/LKlvmBN/XiSVwuGZz5CGi45QoB5j
+i/sFx8VfG0YJ3Fx/I15D4dNGSHN30uV4MciAmKgxI1qhHU+V/YfAK7UW3C7aA7iL
+XWNEPL+UTJBAYOBlYCm0O4ubNOOrixeOt8VHW365Ur8cH1TWTDLbNjZ1MTnsl6qp
+PtwZDYO7A9DyvwlK2BesKwTr7wkJrxiL0r4+GdBq1hjOJgAU6Zn7BtC00CmOVrmU
+YBpgUdwDJIntrianvKxg7TJfHQicE30kQc6xhpY2NLeaw7/P5re34gG65cQbzNUO
+OCA3ZCFDHCcLARwnt14g
+=mlWt
 -----END PGP SIGNATURE-----
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