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

(Portage version: 2.1.3.12)

9 files changed, 10 insertions, 299 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/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}