removed 4.2.0; added !media-gfx/gimp-print in all other ebuilds

11 files changed, 29 insertions, 66 deletions

diff --git a/net-print/gimp-print-cups/ChangeLog b/net-print/gimp-print-cups/ChangeLog
index 1c0ad56567aa..78bf4dd3847f 100644
--- a/net-print/gimp-print-cups/ChangeLog
+++ b/net-print/gimp-print-cups/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for net-print/gimp-print-cups
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/ChangeLog,v 1.15 2003/03/07 15:28:31 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/ChangeLog,v 1.16 2003/03/08 09:40:37 lordvan Exp $
 
 *gimp-print-cups-4.3.11 (05 Mar 2003)
+  08 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org> *.ebuild:
+  added !media-gfx/gimp-print dep since it conflicts
+  removed 4.2.0
+	
   05 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org> gimp-print-cups-4.3.11.ebuild:
   new version ~arch + package.masked(because it breaks ghostscript)
 	
diff --git a/net-print/gimp-print-cups/files/digest-gimp-print-cups-4.2.0-r1 b/net-print/gimp-print-cups/files/digest-gimp-print-cups-4.2.0-r1
deleted file mode 100644
index a1c56d1b09a6..000000000000
--- a/net-print/gimp-print-cups/files/digest-gimp-print-cups-4.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4350e2ac1f27eccad0d7ce2aab90cdf6 gimp-print-4.2.0.tar.gz 4501914
diff --git a/net-print/gimp-print-cups/gimp-print-cups-4.2.0-r1.ebuild b/net-print/gimp-print-cups/gimp-print-cups-4.2.0-r1.ebuild
deleted file mode 100644
index 2b2aad59e25f..000000000000
--- a/net-print/gimp-print-cups/gimp-print-cups-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.2.0-r1.ebuild,v 1.4 2003/02/13 15:24:28 vapier Exp $
-
-DESCRIPTION="The Common Unix Printing System - Gimp Print Drivers"
-HOMEPAGE="http://www.cups.org"
-KEYWORDS="x86"
-SRC_URI="http://download.sourceforge.net/gimp-print/${P/-cups/}.tar.gz"
-
-S=${WORKDIR}/${P/-cups/}
-DEPEND="net-print/cups 
-	media-gfx/imagemagick
-	sys-libs/readline
-	sys-devel/perl"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--mandir=/usr/share/man \
-		--localstatedir=/var/lib \
-		--infodir=/usr/share/info \
-		--with-cups \
-		--enable-test \
-		--with-samples \
-		--without-gimp \
-		--with-escputil \
-		--without-foomatic \
-		--with-testpattern \
-		--without-user-guide \
-		--host=${CHOST} || die "bad ./configure"
-
-	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,parse-bjc}
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README \
-		 doc/gimpprint.ps
-	dohtml doc/manual-html doc/FAQ.html
-}
diff --git a/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r1.ebuild b/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r1.ebuild
index 3736e91e29c5..fbeb6a3ff80b 100644
--- a/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r1.ebuild
+++ b/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r1.ebuild,v 1.4 2003/02/13 15:24:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r1.ebuild,v 1.5 2003/03/08 09:40:37 lordvan Exp $
 
 MY_PN=${PN/-cups/}
 
@@ -14,7 +14,8 @@ DEPEND="net-print/cups
 	=x11-libs/gtk+-1.2*
 	media-gfx/imagemagick
 	sys-libs/readline
-	sys-devel/perl"
+	sys-devel/perl
+        !media-gfx/gimp-print"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r2.ebuild b/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r2.ebuild
index 943942f532fc..66bffee43bea 100644
--- a/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r2.ebuild
+++ b/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r2.ebuild,v 1.7 2003/02/13 15:24:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.0-r2.ebuild,v 1.8 2003/03/08 09:40:37 lordvan Exp $
 
 IUSE="nls gtk readline"
 
@@ -16,7 +16,8 @@ DEPEND="net-print/cups
 	media-gfx/imagemagick
 	sys-libs/readline
 	sys-devel/perl
-	gtk? ( =x11-libs/gtk+-1.2* )"
+	gtk? ( =x11-libs/gtk+-1.2* )
+        !media-gfx/gimp-print"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-print/gimp-print-cups/gimp-print-cups-4.3.0.ebuild b/net-print/gimp-print-cups/gimp-print-cups-4.3.0.ebuild
index ec095024a399..5ac4b8eeef04 100644
--- a/net-print/gimp-print-cups/gimp-print-cups-4.3.0.ebuild
+++ b/net-print/gimp-print-cups/gimp-print-cups-4.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.0.ebuild,v 1.5 2003/02/13 15:24:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.0.ebuild,v 1.6 2003/03/08 09:40:37 lordvan Exp $
 
 MY_PN=${PN/-cups/}
 
@@ -14,7 +14,8 @@ DEPEND="net-print/cups
 	=x11-libs/gtk+-1.2*
 	media-gfx/imagemagick
 	sys-libs/readline
-	sys-devel/perl"
+	sys-devel/perl
+        !media-gfx/gimp-print"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-print/gimp-print-cups/gimp-print-cups-4.3.10.ebuild b/net-print/gimp-print-cups/gimp-print-cups-4.3.10.ebuild
index f80e1870b5b6..d5de882dfbe7 100644
--- a/net-print/gimp-print-cups/gimp-print-cups-4.3.10.ebuild
+++ b/net-print/gimp-print-cups/gimp-print-cups-4.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.10.ebuild,v 1.1 2003/03/07 15:28:31 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.10.ebuild,v 1.2 2003/03/08 09:40:37 lordvan Exp $
 
 IUSE="nls gtk readline"
 
@@ -17,7 +17,8 @@ DEPEND=">=net-print/cups-1.1.18
 	media-gfx/imagemagick
 	sys-libs/readline
 	sys-devel/perl
-        =x11-libs/gtk+-1.2*"
+        =x11-libs/gtk+-1.2*
+        !media-gfx/gimp-print"
 #gtk? ( =x11-libs/gtk+-1.2* ) bug #14945
 
 LICENSE="GPL-2"
diff --git a/net-print/gimp-print-cups/gimp-print-cups-4.3.11.ebuild b/net-print/gimp-print-cups/gimp-print-cups-4.3.11.ebuild
index 22a5166115b9..708e57d49309 100644
--- a/net-print/gimp-print-cups/gimp-print-cups-4.3.11.ebuild
+++ b/net-print/gimp-print-cups/gimp-print-cups-4.3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.11.ebuild,v 1.1 2003/03/05 17:19:09 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.11.ebuild,v 1.2 2003/03/08 09:40:37 lordvan Exp $
 
 IUSE="nls gtk readline"
 
@@ -17,7 +17,8 @@ DEPEND=">=net-print/cups-1.1.18
 	media-gfx/imagemagick
 	sys-libs/readline
 	sys-devel/perl
-	gtk? ( =x11-libs/gtk+-1.2* )"
+	gtk? ( =x11-libs/gtk+-1.2* )
+        !media-gfx/gimp-print"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-print/gimp-print-cups/gimp-print-cups-4.3.5.ebuild b/net-print/gimp-print-cups/gimp-print-cups-4.3.5.ebuild
index 6a324aaacd47..7eef561524d9 100644
--- a/net-print/gimp-print-cups/gimp-print-cups-4.3.5.ebuild
+++ b/net-print/gimp-print-cups/gimp-print-cups-4.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.5.ebuild,v 1.3 2003/02/13 15:24:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.5.ebuild,v 1.4 2003/03/08 09:40:37 lordvan Exp $
 
 IUSE="nls gtk readline"
 
@@ -16,7 +16,8 @@ DEPEND="net-print/cups
 	media-gfx/imagemagick
 	sys-libs/readline
 	sys-devel/perl
-	gtk? ( =x11-libs/gtk+-1.2* )"
+	gtk? ( =x11-libs/gtk+-1.2* )
+        !media-gfx/gimp-print"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-print/gimp-print-cups/gimp-print-cups-4.3.8-r1.ebuild b/net-print/gimp-print-cups/gimp-print-cups-4.3.8-r1.ebuild
index 9e70419705a1..f4e8d934f48e 100644
--- a/net-print/gimp-print-cups/gimp-print-cups-4.3.8-r1.ebuild
+++ b/net-print/gimp-print-cups/gimp-print-cups-4.3.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.8-r1.ebuild,v 1.2 2003/02/13 15:24:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.8-r1.ebuild,v 1.3 2003/03/08 09:40:37 lordvan Exp $
 
 IUSE="nls gtk readline"
 
@@ -17,7 +17,8 @@ DEPEND=">=net-print/cups-1.1.18
 	media-gfx/imagemagick
 	sys-libs/readline
 	sys-devel/perl
-	gtk? ( =x11-libs/gtk+-1.2* )"
+	gtk? ( =x11-libs/gtk+-1.2* )
+        !media-gfx/gimp-print"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-print/gimp-print-cups/gimp-print-cups-4.3.8.ebuild b/net-print/gimp-print-cups/gimp-print-cups-4.3.8.ebuild
index ecd8c6f84ef9..b172d055a124 100644
--- a/net-print/gimp-print-cups/gimp-print-cups-4.3.8.ebuild
+++ b/net-print/gimp-print-cups/gimp-print-cups-4.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.8.ebuild,v 1.3 2003/02/13 15:25:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gimp-print-cups/gimp-print-cups-4.3.8.ebuild,v 1.4 2003/03/08 09:40:37 lordvan Exp $
 
 IUSE="nls gtk readline"
 
@@ -16,7 +16,8 @@ DEPEND="net-print/cups
 	media-gfx/imagemagick
 	sys-libs/readline
 	sys-devel/perl
-	gtk? ( =x11-libs/gtk+-1.2* )"
+	gtk? ( =x11-libs/gtk+-1.2* )
+        !media-gfx/gimp-print"
 
 LICENSE="GPL-2"
 SLOT="0"