14 files changed, 133 insertions, 205 deletions
diff --git a/dev-util/pbuilder/ChangeLog b/dev-util/pbuilder/ChangeLog
index 6b66e83e15e3..ce60c9d74a49 100644
--- a/dev-util/pbuilder/ChangeLog
+++ b/dev-util/pbuilder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/pbuilder
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/ChangeLog,v 1.2 2003/07/29 13:59:12 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/ChangeLog,v 1.3 2003/08/11 11:57:09 lanius Exp $
+
+*pbuilder-0.80 (11 Aug 2003)
+
+  11 Aug 2003; lanius@gentoo.org pbuilder-0.80.ebuild:
+  version bump
 
   29 Jul 2003; lanius@gentoo.org pbuilder-0.76.ebuild:
   stable bump
diff --git a/dev-util/pbuilder/Manifest b/dev-util/pbuilder/Manifest
index 4d79e3388ca5..281699671187 100644
--- a/dev-util/pbuilder/Manifest
+++ b/dev-util/pbuilder/Manifest
@@ -1,6 +1,6 @@
-MD5 5068faf9394147851bf4906f1df8ac57 ChangeLog 409
+MD5 042d0d225e5fc79916f9ed0533c05b4c ChangeLog 509
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 46b182f038c8c945d91b7a712bfc7ff6 pbuilder-0.76.ebuild 687
-MD5 46b182f038c8c945d91b7a712bfc7ff6 pbuilder-0.80.ebuild 687
+MD5 0a4d47af78a8aaed54a752164ce8216d pbuilder-0.80.ebuild 687
 MD5 940f4822cd2642ca8ef3eee411be33b6 files/digest-pbuilder-0.76 64
 MD5 471693c38d2476f00aaa5048fd1dd70b files/digest-pbuilder-0.80 64
diff --git a/dev-util/pbuilder/files/digest-pbuilder-0.80 b/dev-util/pbuilder/files/digest-pbuilder-0.80
new file mode 100644
index 000000000000..8b281af8159e
--- /dev/null
+++ b/dev-util/pbuilder/files/digest-pbuilder-0.80
@@ -0,0 +1 @@
+MD5 094a203b20a3af2a68a63865e1bed346 pbuilder_0.80.tar.gz 98476
diff --git a/dev-util/pbuilder/pbuilder-0.80.ebuild b/dev-util/pbuilder/pbuilder-0.80.ebuild
new file mode 100644
index 000000000000..22ac415e23e4
--- /dev/null
+++ b/dev-util/pbuilder/pbuilder-0.80.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/pbuilder-0.80.ebuild,v 1.1 2003/08/11 11:57:09 lanius Exp $
+
+DESCRIPTION="personal package builder for Debian packages"
+HOMEPAGE="http://packages.qa.debian.org/p/pbuilder.html"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+SRC_URI="http://http.us.debian.org/debian/pool/main/p/pbuilder/pbuilder_${PV}.tar.gz"
+S=${WORKDIR}/pbuilder
+DEPEND=">=sys-apps/debianutils-1.13.1
+	net-misc/wget
+	dev-util/debootstrap
+	app-arch/dpkg"
+IUSE=""
+
+src_install() {
+	make DESTDIR=${D} install
+	dodoc AUTHORS COPYING ChangeLog README THANKS
+}
diff --git a/media-gfx/gimp-print/ChangeLog b/media-gfx/gimp-print/ChangeLog
index ab5ae9efa8a2..badae92d2f07 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.19 2003/07/31 14:08:41 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.20 2003/08/11 11:54:14 lanius Exp $
+
+*gimp-print-4.3.19 (11 Aug 2003)
+
+  11 Aug 2003; lanius@gentoo.org gimp-print-4.2.2.ebuild,
+  gimp-print-4.2.5-r1.ebuild, gimp-print-4.2.5.ebuild,
+  gimp-print-4.3.19.ebuild:
+  version bump
 
 *gimp-print-4.2.5-r2 (31 Jul 2003)
 
diff --git a/media-gfx/gimp-print/Manifest b/media-gfx/gimp-print/Manifest
index e9d4104545b1..051207cf3042 100644
--- a/media-gfx/gimp-print/Manifest
+++ b/media-gfx/gimp-print/Manifest
@@ -1,7 +1,7 @@
-MD5 1b4ec9aa8455281525409c2d750417cc ChangeLog 3321
+MD5 106509b043a135c458740958c72b2e20 ChangeLog 3512
 MD5 97cfa015a1c9998c27f499875a61bcf8 gimp-print-4.3.18.ebuild 2535
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 9e3ec6841dc315b69c555acd0ff79e4a gimp-print-4.3.19.ebuild 2541
+MD5 4c8959bd8da56c00c279e5dea5a05d85 gimp-print-4.3.19.ebuild 2541
 MD5 48e16ad7307e11092d4fe041576669e9 gimp-print-4.2.5-r2.ebuild 2209
 MD5 9368837ea52262a379d6f07aba7c1e63 files/digest-gimp-print-4.3.19 71
 MD5 03e5fd6fc00f70543c6a19d3c5a1e0c9 files/digest-gimp-print-4.3.18 71
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-4.2.2 b/media-gfx/gimp-print/files/digest-gimp-print-4.2.2
deleted file mode 100644
index 3a73c1c9a23c..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-4.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b95242674acd95511002795086b2ec3 gimp-print-4.2.2.tar.gz 4843433
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-4.2.5 b/media-gfx/gimp-print/files/digest-gimp-print-4.2.5
deleted file mode 100644
index 0c10e01131a6..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-4.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82a75fa7c97423b1a787df41552da3cc gimp-print-4.2.5.tar.gz 4992416
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-4.2.5-r1 b/media-gfx/gimp-print/files/digest-gimp-print-4.2.5-r1
deleted file mode 100644
index 0c10e01131a6..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-4.2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82a75fa7c97423b1a787df41552da3cc gimp-print-4.2.5.tar.gz 4992416
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-4.3.19 b/media-gfx/gimp-print/files/digest-gimp-print-4.3.19
new file mode 100644
index 000000000000..1fa6c5d5516b
--- /dev/null
+++ b/media-gfx/gimp-print/files/digest-gimp-print-4.3.19
@@ -0,0 +1 @@
+MD5 dd81758f8f85a1c5c900dc6c84e376e2 gimp-print-4.3.19.tar.bz2 4104712
diff --git a/media-gfx/gimp-print/gimp-print-4.2.2.ebuild b/media-gfx/gimp-print/gimp-print-4.2.2.ebuild
deleted file mode 100644
index 9cf188ec5f6c..000000000000
--- a/media-gfx/gimp-print/gimp-print-4.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.2.ebuild,v 1.11 2003/03/08 09:46:27 lordvan Exp $
-
-inherit libtool
-
-DESCRIPTION="Gimp Plugin and Ghostscript driver for Gimp"
-SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.gz"
-HOMEPAGE="http://gimp-print.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha sparc"
-IUSE="cups doc nls"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	=media-gfx/gimp-1.2*
-	app-text/ghostscript
-	net-print/foomatic
-	doc? ( app-text/texi2html )
-	cups? ( >=net-print/cups-1.1.16 )
-        !net-print/gimp-print-cups"
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	elibtoolize
-	aclocal
-
-	econf \
-		--with-ghost \
-		--sysconfdir=/etc/gimp/1.2/ \
-		--with-gimp-exec-prefix=/usr \
-		--with-testpattern \
-		`use_with cups` \
-		`use_enable nls` \
-		${myconf} || die
-
-	cp src/gimp/Makefile src/gimp/Makefile.orig
-	sed -e 's:--install-admin-bin:--install-bin:g' \
-		src/gimp/Makefile.orig >src/gimp/Makefile
-	
-	emake || die
-}
-
-src_install() {
-	dodir /usr/lib/gimp/1.2/.gimp-1.2/plug-ins/print
-
-	make \
-		DESTDIR=${D} \
-		HOME=/usr/lib/gimp/1.2 \
-		install || die "make install failed"
-
-	# NOTE: this build uses gimptool to install the plugin, so
-	# if we dont do it this way, it will install to / no
-	# matter what.
-	#
-	# NOTE to whoever commented this: Please DO NOT!
-	mv ${D}/usr/lib/gimp/1.2/.gimp-1.2/plug-ins/ \
-		${D}/usr/lib/gimp/1.2/
-	rm -rf ${D}/usr/lib/gimp/1.2/.gimp-1.2/
-	     
-	dodoc AUTHORS ChangeLog COPYING NEWS README*
-	dohtml -r doc
-}
diff --git a/media-gfx/gimp-print/gimp-print-4.2.5-r1.ebuild b/media-gfx/gimp-print/gimp-print-4.2.5-r1.ebuild
deleted file mode 100644
index 0a64f8694876..000000000000
--- a/media-gfx/gimp-print/gimp-print-4.2.5-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.5-r1.ebuild,v 1.5 2003/07/19 23:06:53 tester Exp $
-
-inherit libtool
-
-DESCRIPTION="Gimp Plugin and Ghostscript driver for Gimp"
-SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.gz"
-HOMEPAGE="http://gimp-print.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc hppa ~amd64"
-IUSE="cups doc nls"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=media-gfx/gimp-1.2.3
-	app-text/ghostscript
-	net-print/foomatic
-	doc? ( app-text/texi2html )
-	cups? ( >=net-print/cups-1.1.16 )
-        !net-print/gimp-print-cups"
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	elibtoolize
-	aclocal
-
-	local myconf=""
-	has_version =media-gfx/gimp-1.2* \
-		&& myconf='${myconf} --sysconfdir=/etc/gimp/1.2/' \
-		|| myconf='${myconf} --sysconfdir=/etc/gimp/1.3/'
-
-	econf \
-		--with-ghost \
-		--with-gimp-exec-prefix=/usr \
-		--with-testpattern \
-		`use_with cups` \
-		`use_enable nls` \
-		${myconf} || die
-
-	cp src/gimp/Makefile src/gimp/Makefile.orig
-	sed -e 's:--install-admin-bin:--install-bin:g' \
-		src/gimp/Makefile.orig >src/gimp/Makefile
-
-	emake || die
-}
-
-src_install() {
-	dodir /usr/lib/gimp/1.2/.gimp-1.2/plug-ins/print
-
-	make \
-		DESTDIR=${D} \
-		HOME=/usr/lib/gimp/1.2 \
-		install || die "make install failed"
-	
-	# NOTE: this build uses gimptool to install the plugin, so
-	# if we dont do it this way, it will install to / no
-	# matter what.
-	#
-	# NOTE to whoever commented this: Please DO NOT!
-	mv ${D}/usr/lib/gimp/1.2/.gimp-1.2/plug-ins/ \
-		${D}/usr/lib/gimp/1.2/
-	rm -rf ${D}/usr/lib/gimp/1.2/.gimp-1.2/
-	     
-	dodoc AUTHORS ChangeLog COPYING NEWS README*
-	dohtml -r doc
-}
diff --git a/media-gfx/gimp-print/gimp-print-4.2.5.ebuild b/media-gfx/gimp-print/gimp-print-4.2.5.ebuild
deleted file mode 100644
index ec0ae6e92ade..000000000000
--- a/media-gfx/gimp-print/gimp-print-4.2.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.5.ebuild,v 1.7 2003/07/19 23:06:53 tester Exp $
-
-inherit libtool
-
-DESCRIPTION="Gimp Plugin and Ghostscript driver for Gimp"
-SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.gz"
-HOMEPAGE="http://gimp-print.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc alpha ~sparc amd64"
-IUSE="cups doc nls"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	=media-gfx/gimp-1.2*
-	app-text/ghostscript
-	net-print/foomatic
-	doc? ( app-text/texi2html )
-	cups? ( >=net-print/cups-1.1.16 )
-        !net-print/gimp-print-cups"
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	elibtoolize
-	aclocal
-
-	econf \
-		--with-ghost \
-		--sysconfdir=/etc/gimp/1.2/ \
-		--with-gimp-exec-prefix=/usr \
-		--with-testpattern \
-		`use_with cups` \
-		`use_enable nls` \
-		|| die
-
-	cp src/gimp/Makefile src/gimp/Makefile.orig
-	sed -e 's:--install-admin-bin:--install-bin:g' \
-		src/gimp/Makefile.orig >src/gimp/Makefile
-	
-	emake || die
-}
-
-src_install() {
-	dodir /usr/lib/gimp/1.2/.gimp-1.2/plug-ins/print
-
-	make \
-		DESTDIR=${D} \
-		HOME=/usr/lib/gimp/1.2 \
-		install || die "make install failed"
-	
-	# NOTE: this build uses gimptool to install the plugin, so
-	# if we dont do it this way, it will install to / no
-	# matter what.
-	#
-	# NOTE to whoever commented this: Please DO NOT!
-	mv ${D}/usr/lib/gimp/1.2/.gimp-1.2/plug-ins/ \
-		${D}/usr/lib/gimp/1.2/
-	rm -rf ${D}/usr/lib/gimp/1.2/.gimp-1.2/
-	     
-	dodoc AUTHORS ChangeLog COPYING NEWS README*
-	dohtml -r doc
-}
diff --git a/media-gfx/gimp-print/gimp-print-4.3.19.ebuild b/media-gfx/gimp-print/gimp-print-4.3.19.ebuild
new file mode 100644
index 000000000000..c7e47f4f77b8
--- /dev/null
+++ b/media-gfx/gimp-print/gimp-print-4.3.19.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.3.19.ebuild,v 1.1 2003/08/11 11:54:14 lanius Exp $
+
+IUSE="nls gtk readline cups foomaticdb ppds"
+
+DESCRIPTION="Gimp Print Drivers"
+HOMEPAGE="http://gimp-print.sourceforge.net"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.bz2"
+
+DEPEND="cups? ( >=net-print/cups-1.1.14 )
+	media-gfx/imagemagick
+	>=app-text/ghostscript-7.05.6-r3
+	sys-libs/readline
+	gtk? ( =x11-libs/gtk+-1.2* )
+	dev-lang/perl
+	!media-gfx/gimp-print-cups
+	foomaticdb? ( net-print/foomatic-db-engine )"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_compile() {
+	local myconf
+
+	use nls \
+		&& myconf="${myconf} --enable-nls" \
+		|| myconf="${myconf} --disable-nls"
+
+	use readline \
+		&& myconf="${myconf} --with-readline" \
+		|| myconf="${myconf} --without-readline"
+
+	use gtk \
+		&& myconf="${myconf} --enable-lexmarkutil" \
+		|| myconf="${myconf} --disable-lexmarkutil"
+	
+	has_version =media-gfx/gimp-1.2* \
+		&& myconf="${myconf} --with-gimp" \
+		|| myconf="${myconf} --without-gimp"
+
+	if [ `use cups` ]; then
+		myconf="${myconf} --with-cups"
+	else
+		myconf="${myconf} --without-cups"
+	fi
+
+	if [ "`use cups`" -a "`use ppds`" ]; then
+		myconf="${myconf} --enable-cups-ppds"
+	else
+		myconf="${myconf} --disable-cups-ppds"
+	fi
+	
+	use foomaticdb \
+		&& myconf="${myconf} --with-foomatic3" \
+		|| myconf="${myconf} --without-foomatic"
+
+	# --without-translated-ppds enabled \
+	econf \
+		--enable-test \
+		--with-ghostscript \
+		--with-user-guide \
+		--with-samples \
+		--with-escputil \
+		$myconf || die
+
+	# IJS Patch
+	cp src/ghost/ijsgimpprint.c src/ghost/ijsgimpprint.c.org
+	sed -e "s/<ijs/<ijs\/ijs/g" src/ghost/ijsgimpprint.c.org > src/ghost/ijsgimpprint.c
+
+	emake || die "compile problem"
+}
+
+src_install () {
+	make install DESTDIR=${D} || die
+
+	exeinto /usr/share/gimp-print
+	doexe test/{unprint,pcl-unprint,bjc-unprint,parse-escp2,curve,escp2-weavetest,run-testdither,run-weavetest,testdither}
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README \
+		doc/users_guide/users-guide.ps doc/users_guide/users-guide.pdf \
+		${D}/usr/share/gimp-print/doc/gimpprint.ps
+	dohtml doc/FAQ.html
+	dohtml -r doc/users_guide/html doc/developer/developer-html
+	rm -fR ${D}/usr/share/gimp-print/doc
+}
+
+pkg_postinst () {
+	einfo "The gimp-print ebuild no longer creates the ppds automatically, please use foomatic"
+	einfo "to do so or remerge gimp-print with the ppds use flag."
+}