Remove old, fix parallel install, bug 188759 thanks to Arthur Hagen <art-gt@broomstick.com>

Package-Manager: portage-2.1.3.12

10 files changed, 18 insertions, 335 deletions

diff --git a/media-gfx/gimp-print/ChangeLog b/media-gfx/gimp-print/ChangeLog
index 38179581105f..bae88536e9a0 100644
--- a/media-gfx/gimp-print/ChangeLog
+++ b/media-gfx/gimp-print/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gimp-print
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.87 2007/09/30 19:00:30 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.88 2007/10/10 19:08:45 genstef Exp $
+
+  10 Oct 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/gimp-print-5.1.0-nonls.patch, -gimp-print-5.1.0.ebuild,
+  -gimp-print-5.1.1.ebuild, -gimp-print-5.1.2.ebuild,
+  gimp-print-5.1.3.ebuild:
+  Remove old, fix parallel install, bug 188759 thanks to Arthur Hagen
+  <art-gt@broomstick.com>
 
   30 Sep 2007; Stefan Schweizer <genstef@gentoo.org>
   +gimp-print-5.1.3.ebuild:
diff --git a/media-gfx/gimp-print/Manifest b/media-gfx/gimp-print/Manifest
index afe505b5aaef..d22ffb59f65c 100644
--- a/media-gfx/gimp-print/Manifest
+++ b/media-gfx/gimp-print/Manifest
@@ -2,39 +2,20 @@ AUX gimp-print-4.2.7-asneeded.patch 1632 RMD160 b67ce5afee6b944229a4b33e4630a664
 MD5 a05ec877703c18041a47316cc21318c0 files/gimp-print-4.2.7-asneeded.patch 1632
 RMD160 b67ce5afee6b944229a4b33e4630a66451df4eab files/gimp-print-4.2.7-asneeded.patch 1632
 SHA256 ce30ce227e6a5b605a0b25f695e69c6fb680d30fae3f4f2d9be40ab6b5dfb134 files/gimp-print-4.2.7-asneeded.patch 1632
-AUX gimp-print-5.1.0-nonls.patch 644 RMD160 4247b20cdf92699c614681f75814dc9ee6857f30 SHA1 5a8765b592cd4bff10bbcdaa42401ffe2b6cc81b SHA256 50299f14547b955be738ba4a5b8632a699dfb6d75f1bd030df2a4b2c134f7f87
-MD5 5b5e881cf37bdf1bfbf0437b3c5b13bb files/gimp-print-5.1.0-nonls.patch 644
-RMD160 4247b20cdf92699c614681f75814dc9ee6857f30 files/gimp-print-5.1.0-nonls.patch 644
-SHA256 50299f14547b955be738ba4a5b8632a699dfb6d75f1bd030df2a4b2c134f7f87 files/gimp-print-5.1.0-nonls.patch 644
 DIST gimp-print-4.2.7.tar.gz 5178122 RMD160 b517b1d3cff22347053c634ed96202588d93b63e SHA1 5a928b7fa8e83d2858d15e2bd22d143c2cd35bd8 SHA256 a6cfcbb4bf32d12a553252b98e6a6fdb5d44fe37debad4480bbc9326e2c69489
-DIST gutenprint-5.1.0.tar.bz2 4704727 RMD160 6eb4b3e7f4b4b70e133b2e0043b8a8153801ce48 SHA1 222596fd434f8b2719e49fcb541a3fced9959688 SHA256 7d9298bbc6ba06d3175f7b4b3060cbc406d9f96a4da965850f8f1ca227b9acf6
-DIST gutenprint-5.1.1.tar.bz2 4739718 RMD160 25e78a83c06a071f7479770ded661ce2705087f3 SHA1 56cf4256407fa31e9c0757fb135582ef994d11e8 SHA256 ab44fb7807d3746563eff600e3e328791705a7891ae8b72a506089c93039ab25
-DIST gutenprint-5.1.2.tar.bz2 4739305 RMD160 6b6a6c1d7c2b16d085c7aa8daa1f688c40b5e4e7 SHA1 0b7c2f3aa6d50c83cf5e851d4d25e57cb6c0af7d SHA256 71fc0a921bdc6c7495fe2d2381193483330086be982f7b68b68e87fb43bd97f2
 DIST gutenprint-5.1.3.tar.bz2 4742380 RMD160 78b0eb9025f3b9365944627da3eded4dd7f3c666 SHA1 bb2ba1fcb6420ad23685e4cc1ec0f94bc4592be7 SHA256 6be13b32d9f222506368bf214f8ba0a3ef08a36b1ebbed8be61cfe38ca2f35c7
 EBUILD gimp-print-4.2.7.ebuild 2393 RMD160 95f01a98cfa4bb6914388918e9bbf74a9c0cfc76 SHA1 7cfa03c83371240ff566360de8ae9d7f9ca14473 SHA256 020acccead6024af8af7ff777b1933ffc6110547882217d11b2762f2b80d4ba7
 MD5 e2687cb0f337cb6ce6f53f2dd2dc47b8 gimp-print-4.2.7.ebuild 2393
 RMD160 95f01a98cfa4bb6914388918e9bbf74a9c0cfc76 gimp-print-4.2.7.ebuild 2393
 SHA256 020acccead6024af8af7ff777b1933ffc6110547882217d11b2762f2b80d4ba7 gimp-print-4.2.7.ebuild 2393
-EBUILD gimp-print-5.1.0.ebuild 2445 RMD160 5112e98b5b1510d6d28b34b41d272927458f3471 SHA1 a6c3e3c4e1179a106b75f72e6cd61c5f1cb34e15 SHA256 0c556a92b0f1d9846c5c1b27bd9e0a9132b04f5774e6c081a0b6aaa438610d8f
-MD5 ee68fe8dd9bb44e577e4fadcd6447670 gimp-print-5.1.0.ebuild 2445
-RMD160 5112e98b5b1510d6d28b34b41d272927458f3471 gimp-print-5.1.0.ebuild 2445
-SHA256 0c556a92b0f1d9846c5c1b27bd9e0a9132b04f5774e6c081a0b6aaa438610d8f gimp-print-5.1.0.ebuild 2445
-EBUILD gimp-print-5.1.1.ebuild 2339 RMD160 329bf69fef583efe132c3cc5a2f7f82f7fb869d6 SHA1 0ab8634cad041a833234ee87dfbb42da9307554a SHA256 f8169c0ebcc2d0646f4b805db3583702a96a034e2c91e04d59bed0775c41d1de
-MD5 4868b9fca48dff274c1eebb97222a5ff gimp-print-5.1.1.ebuild 2339
-RMD160 329bf69fef583efe132c3cc5a2f7f82f7fb869d6 gimp-print-5.1.1.ebuild 2339
-SHA256 f8169c0ebcc2d0646f4b805db3583702a96a034e2c91e04d59bed0775c41d1de gimp-print-5.1.1.ebuild 2339
-EBUILD gimp-print-5.1.2.ebuild 2339 RMD160 99a5f9b139c8e7f8e7bf7dff17b1a2ec465161c5 SHA1 43b3a5fd62c94fb4407a9f88efa9bb3be3adde1d SHA256 da2b2fb461b8cbf7dda78930759339605c48c2a37c34abfdb90863ff82a4a409
-MD5 ebead916e10f8f37c8efc35b81b7e5c0 gimp-print-5.1.2.ebuild 2339
-RMD160 99a5f9b139c8e7f8e7bf7dff17b1a2ec465161c5 gimp-print-5.1.2.ebuild 2339
-SHA256 da2b2fb461b8cbf7dda78930759339605c48c2a37c34abfdb90863ff82a4a409 gimp-print-5.1.2.ebuild 2339
-EBUILD gimp-print-5.1.3.ebuild 2339 RMD160 bc663035931417024ad4a93fc14c85b02a4273a7 SHA1 ce70f75183a1457c0b7ba73e87aa6016eb3d96b8 SHA256 1df84273da1be34bc0f3258ccf1325dd7819683bad936b418fcca1f05fe3f6de
-MD5 4cd452edef4ba0e8dfe3708770b7ce00 gimp-print-5.1.3.ebuild 2339
-RMD160 bc663035931417024ad4a93fc14c85b02a4273a7 gimp-print-5.1.3.ebuild 2339
-SHA256 1df84273da1be34bc0f3258ccf1325dd7819683bad936b418fcca1f05fe3f6de gimp-print-5.1.3.ebuild 2339
-MISC ChangeLog 13617 RMD160 a482a582f05836c49e94d17dd9559e389a0dc483 SHA1 a8755fedc84f29b00f66cea95c19ba2436dabfb8 SHA256 66de10801804d7c91041f72b48b9677810de1f9c773a3d44de3d2eb4da1f389c
-MD5 53b4ac63c25e6901a206a9ce0a3b9f3d ChangeLog 13617
-RMD160 a482a582f05836c49e94d17dd9559e389a0dc483 ChangeLog 13617
-SHA256 66de10801804d7c91041f72b48b9677810de1f9c773a3d44de3d2eb4da1f389c ChangeLog 13617
+EBUILD gimp-print-5.1.3.ebuild 2344 RMD160 3c758ee14f011479ad2bffd7456ccd41e52af550 SHA1 cea9dcbfb0850c1c1817fd25d6fb1d4639bca0b9 SHA256 7d9dea9f6f8b305746cb6f54e5f5c33901d005f863c5dd18f76da9c5f720d0f3
+MD5 c303f00e11050bfc836b7ae6184f2866 gimp-print-5.1.3.ebuild 2344
+RMD160 3c758ee14f011479ad2bffd7456ccd41e52af550 gimp-print-5.1.3.ebuild 2344
+SHA256 7d9dea9f6f8b305746cb6f54e5f5c33901d005f863c5dd18f76da9c5f720d0f3 gimp-print-5.1.3.ebuild 2344
+MISC ChangeLog 13913 RMD160 e7d9f2c58573bfae2864060276f735827e4a190b SHA1 546f0cd37fb09f819d100a2921af8ccbc10714bd SHA256 bec43e15437942ca1fab005b9d431999aed7e44a4821111dd72e5cc382d55d86
+MD5 1802d0864a8adbab0e66752d761c5d4b ChangeLog 13913
+RMD160 e7d9f2c58573bfae2864060276f735827e4a190b ChangeLog 13913
+SHA256 bec43e15437942ca1fab005b9d431999aed7e44a4821111dd72e5cc382d55d86 ChangeLog 13913
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -42,15 +23,6 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 MD5 3004782c3a7d48655bfd4670cb64fac9 files/digest-gimp-print-4.2.7 253
 RMD160 7ab910f602732c55eb077ebf488a54e2ab161884 files/digest-gimp-print-4.2.7 253
 SHA256 baad29165ce99523343d5fcdc93a76fb1f715ce911eef710016f415f1fab5958 files/digest-gimp-print-4.2.7 253
-MD5 efaeb9b72509840e249cfc0102416b1c files/digest-gimp-print-5.1.0 256
-RMD160 66851da2385d130026ace46efdc3582e10ecfc93 files/digest-gimp-print-5.1.0 256
-SHA256 dbf7590b3e02cf94d28ea7337e90000468cb91f93ff7aea0013ecd2cd9d28663 files/digest-gimp-print-5.1.0 256
-MD5 f4b19e8029bc489781da93216bcde620 files/digest-gimp-print-5.1.1 256
-RMD160 e2ceb691c375b6df338701a8840cb8663c28ec92 files/digest-gimp-print-5.1.1 256
-SHA256 8bd24f196ae76a98acb581664c52f7169f1db54e7b601de27476ea6984eeee4b files/digest-gimp-print-5.1.1 256
-MD5 cdb7d2dada0c8a155f46d1ffcbbc20ea files/digest-gimp-print-5.1.2 256
-RMD160 5ef8ada94132abe92152e23e16f4905f38459d32 files/digest-gimp-print-5.1.2 256
-SHA256 35f6088c70cb5cea1456285ac35100482e56402606711f1836c064397942eb3e files/digest-gimp-print-5.1.2 256
 MD5 43833595bd31e39cc37f350a0b7da22b files/digest-gimp-print-5.1.3 256
 RMD160 8a399e171488410ec428a3d595d9f962d5762057 files/digest-gimp-print-5.1.3 256
 SHA256 9f420fce1bb0cf2d2b0f39c217008effdb02967e03e6c0572138b0a08a00c289 files/digest-gimp-print-5.1.3 256
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-5.1.0 b/media-gfx/gimp-print/files/digest-gimp-print-5.1.0
deleted file mode 100644
index 4e30a8f7e361..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-5.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a31f0519e946fc202c4b9dc5cfec4391 gutenprint-5.1.0.tar.bz2 4704727
-RMD160 6eb4b3e7f4b4b70e133b2e0043b8a8153801ce48 gutenprint-5.1.0.tar.bz2 4704727
-SHA256 7d9298bbc6ba06d3175f7b4b3060cbc406d9f96a4da965850f8f1ca227b9acf6 gutenprint-5.1.0.tar.bz2 4704727
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-5.1.1 b/media-gfx/gimp-print/files/digest-gimp-print-5.1.1
deleted file mode 100644
index 97b9f31fd541..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-5.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 55bdd7b3672ce4e1704593cbb569be54 gutenprint-5.1.1.tar.bz2 4739718
-RMD160 25e78a83c06a071f7479770ded661ce2705087f3 gutenprint-5.1.1.tar.bz2 4739718
-SHA256 ab44fb7807d3746563eff600e3e328791705a7891ae8b72a506089c93039ab25 gutenprint-5.1.1.tar.bz2 4739718
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-5.1.2 b/media-gfx/gimp-print/files/digest-gimp-print-5.1.2
deleted file mode 100644
index 32a01f68bf1f..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-5.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5c7cf1f082d9baa290307d36e1703568 gutenprint-5.1.2.tar.bz2 4739305
-RMD160 6b6a6c1d7c2b16d085c7aa8daa1f688c40b5e4e7 gutenprint-5.1.2.tar.bz2 4739305
-SHA256 71fc0a921bdc6c7495fe2d2381193483330086be982f7b68b68e87fb43bd97f2 gutenprint-5.1.2.tar.bz2 4739305
diff --git a/media-gfx/gimp-print/files/gimp-print-5.1.0-nonls.patch b/media-gfx/gimp-print/files/gimp-print-5.1.0-nonls.patch
deleted file mode 100644
index 039bca3cc5eb..000000000000
--- a/media-gfx/gimp-print/files/gimp-print-5.1.0-nonls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gutenprint-5.1.0/src/cups/genppd.c.orig	2007-04-07 16:58:54.000000000 +0200
-+++ gutenprint-5.1.0/src/cups/genppd.c	2007-04-07 17:00:24.000000000 +0200
-@@ -276,7 +276,9 @@
-   const stp_printer_t	*p;		/* Printer driver */
-   const char		*lang = "C";
-   char			*s;
-+#ifdef ENABLE_NLS
-   char			**all_langs = getlangs();
-+#endif
-   char			filename[1024],		/* Filename */
- 			ppd_location[1024];	/* Installed location */
- 
-@@ -474,7 +476,9 @@
-       verbose = 0;
-       break;
-     case 'c':
-+#ifdef ENABLE_NLS
-       baselocaledir = optarg;
-+#endif
- #  ifdef DEBUG
-       fprintf(stderr, "DEBUG: baselocaledir: %s\n", baselocaledir);
- #  endif
diff --git a/media-gfx/gimp-print/gimp-print-5.1.0.ebuild b/media-gfx/gimp-print/gimp-print-5.1.0.ebuild
deleted file mode 100644
index 2c8ebad88838..000000000000
--- a/media-gfx/gimp-print/gimp-print-5.1.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.1.0.ebuild,v 1.4 2007/04/25 20:05:53 genstef Exp $
-
-inherit flag-o-matic eutils libtool multilib
-
-IUSE="cups foomaticdb gimp gtk nls readline ppds"
-
-MY_P=gutenprint-${PV/_/-}
-
-DESCRIPTION="Gimp Print Drivers"
-HOMEPAGE="http://gimp-print.sourceforge.net"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ppc64"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.bz2"
-
-RDEPEND="cups? ( >=net-print/cups-1.1.14 )
-	virtual/ghostscript
-	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"
-
-S=${WORKDIR}/${MY_P}
-
-append-flags -fno-inline-functions
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch ${FILESDIR}/gimp-print-5.1.0-nonls.patch
-
-	elibtoolize
-}
-
-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 \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_with gimp gimp2) \
-		$(use_with gimp gimp2-as-gutenprint) \
-		$(use_with cups) \
-		$myconf || die "econf failed"
-
-	# IJS Patch
-	sed -i -e "s:<ijs\([^/]\):<ijs/ijs\1:g" src/ghost/ijsgutenprint.c || die "sed failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	exeinto /usr/share/gutenprint
-	doexe test/{unprint,pcl-unprint,bjc-unprint,parse-escp2,escp2-weavetest,run-testdither,run-weavetest,testdither}
-
-	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
-}
diff --git a/media-gfx/gimp-print/gimp-print-5.1.1.ebuild b/media-gfx/gimp-print/gimp-print-5.1.1.ebuild
deleted file mode 100644
index 5379ce22699f..000000000000
--- a/media-gfx/gimp-print/gimp-print-5.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.1.1.ebuild,v 1.3 2007/05/23 08:10:50 genstef Exp $
-
-inherit flag-o-matic eutils multilib
-
-IUSE="cups foomaticdb gimp gtk readline ppds"
-
-MY_P=gutenprint-${PV/_/-}
-
-DESCRIPTION="Gimp Print Drivers"
-HOMEPAGE="http://gimp-print.sourceforge.net"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ppc64"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.bz2"
-RESTRICT="test"
-
-RDEPEND="cups? ( >=net-print/cups-1.1.14 )
-	virtual/ghostscript
-	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"
-
-S=${WORKDIR}/${MY_P}
-
-append-flags -fno-inline-functions
-
-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"
-
-	# IJS Patch
-	sed -i -e "s:<ijs\([^/]\):<ijs/ijs\1:g" src/ghost/ijsgutenprint.c || die "sed failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	exeinto /usr/share/gutenprint
-	doexe test/{unprint,pcl-unprint,bjc-unprint,parse-escp2,escp2-weavetest,run-testdither,run-weavetest,testdither}
-
-	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
-}
diff --git a/media-gfx/gimp-print/gimp-print-5.1.2.ebuild b/media-gfx/gimp-print/gimp-print-5.1.2.ebuild
deleted file mode 100644
index 5997d9ed8ef6..000000000000
--- a/media-gfx/gimp-print/gimp-print-5.1.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.1.2.ebuild,v 1.1 2007/06/04 11:14:52 genstef Exp $
-
-inherit flag-o-matic eutils multilib
-
-IUSE="cups foomaticdb gimp gtk readline ppds"
-
-MY_P=gutenprint-${PV/_/-}
-
-DESCRIPTION="Gimp Print Drivers"
-HOMEPAGE="http://gimp-print.sourceforge.net"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ppc64"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.bz2"
-RESTRICT="test"
-
-RDEPEND="cups? ( >=net-print/cups-1.1.14 )
-	virtual/ghostscript
-	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"
-
-S=${WORKDIR}/${MY_P}
-
-append-flags -fno-inline-functions
-
-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"
-
-	# IJS Patch
-	sed -i -e "s:<ijs\([^/]\):<ijs/ijs\1:g" src/ghost/ijsgutenprint.c || die "sed failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	exeinto /usr/share/gutenprint
-	doexe test/{unprint,pcl-unprint,bjc-unprint,parse-escp2,escp2-weavetest,run-testdither,run-weavetest,testdither}
-
-	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
-}
diff --git a/media-gfx/gimp-print/gimp-print-5.1.3.ebuild b/media-gfx/gimp-print/gimp-print-5.1.3.ebuild
index 0d8afc2f1299..c9d1b05126c1 100644
--- a/media-gfx/gimp-print/gimp-print-5.1.3.ebuild
+++ b/media-gfx/gimp-print/gimp-print-5.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.1.3.ebuild,v 1.1 2007/09/30 19:00:30 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.1.3.ebuild,v 1.2 2007/10/10 19:08:45 genstef Exp $
 
 inherit flag-o-matic eutils multilib
 
@@ -70,7 +70,7 @@ src_compile() {
 }
 
 src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
 	exeinto /usr/share/gutenprint
 	doexe test/{unprint,pcl-unprint,bjc-unprint,parse-escp2,escp2-weavetest,run-testdither,run-weavetest,testdither}