version bump, cleanups

Package-Manager: portage-2.0.51.19

9 files changed, 28 insertions, 199 deletions

diff --git a/media-gfx/gimp-print/ChangeLog b/media-gfx/gimp-print/ChangeLog
index 3f0f1a7464c8..a36922d5e630 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.58 2005/05/18 19:41:54 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.59 2005/05/31 22:40:53 lanius Exp $
+
+*gimp-print-5.0.0_beta4 (31 May 2005)
+
+  31 May 2005; Heinrich Wendel <lanius@gentoo.org>
+  -gimp-print-4.2.5-r2.ebuild, -gimp-print-5.0.0_beta2.ebuild,
+  -gimp-print-5.0.0_beta3.ebuild, +gimp-print-5.0.0_beta4.ebuild:
+  version bump, cleanups
 
   18 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
   gimp-print-4.2.7.ebuild:
diff --git a/media-gfx/gimp-print/Manifest b/media-gfx/gimp-print/Manifest
index 944f9f25f1ad..05739a95286d 100644
--- a/media-gfx/gimp-print/Manifest
+++ b/media-gfx/gimp-print/Manifest
@@ -1,12 +1,18 @@
-MD5 09ed9067feec21313fae88b8a9169a40 gimp-print-4.2.7.ebuild 2220
-MD5 812cc7f6dfae562baa0ae440e6746f06 ChangeLog 8334
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 d127b4f94cec575d3aec9d13955d2f27 gimp-print-4.2.6.ebuild 2212
-MD5 a19fcf9a91f7030e083e1562c8a8fa96 gimp-print-5.0.0_beta3.ebuild 2258
-MD5 c8286d84d04d49b65ef82b369aa555db gimp-print-5.0.0_beta2.ebuild 2285
-MD5 ee465b10ce4384d333b1d2e60d9b6cd2 gimp-print-4.2.5-r2.ebuild 2352
-MD5 0dbf86fe4303814e2dfa36f8c4b8e67c files/digest-gimp-print-4.2.7 69
+MD5 e7b423008927b6b09ad9702ede83cd0a gimp-print-5.0.0_beta4.ebuild 2251
+MD5 6004024036a14068ac77d1692b756020 ChangeLog 8576
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 09ed9067feec21313fae88b8a9169a40 gimp-print-4.2.7.ebuild 2220
 MD5 5f304014b5d0eb55e0a62cc46d098dfb files/digest-gimp-print-4.2.6 69
-MD5 507611e7d805188b59f5cbd8416be325 files/digest-gimp-print-5.0.0_beta2 76
-MD5 68cc29ffb32d107b59d0ab6407a7613e files/digest-gimp-print-4.2.5-r2 69
-MD5 3f2a8a73225fabcba70ec7a40a7f87ed files/digest-gimp-print-5.0.0_beta3 76
+MD5 0dbf86fe4303814e2dfa36f8c4b8e67c files/digest-gimp-print-4.2.7 69
+MD5 ecd67127e5d68d1ad44c9b8f6c70b1e5 files/digest-gimp-print-5.0.0_beta4 76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCnOhxevY57Fted3ERAmWzAJwJdk8Uv/mFI7p1ZxTClXcSyPq9RQCfSXv9
+4FI0YQIfgwLq5ID9DKhw6G4=
+=/VFj
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-4.2.5-r2 b/media-gfx/gimp-print/files/digest-gimp-print-4.2.5-r2
deleted file mode 100644
index 0c10e01131a6..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-4.2.5-r2
+++ /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-5.0.0_beta2 b/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_beta2
deleted file mode 100644
index 8ff6c2a9a39c..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7aec697e41b33ba55534c7745bc2785b gimp-print-5.0.0-beta2.tar.bz2 4477461
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_beta3 b/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_beta3
deleted file mode 100644
index b05c06a0f9b8..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8cfa54029f5affaa578a608fe0cba52d gutenprint-5.0.0-beta3.tar.bz2 4451081
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_beta4 b/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_beta4
new file mode 100644
index 000000000000..14c419ff9f6d
--- /dev/null
+++ b/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_beta4
@@ -0,0 +1 @@
+MD5 2ae4b958916a9b39773bdbe524f26f4a gutenprint-5.0.0-beta4.tar.bz2 3810348
diff --git a/media-gfx/gimp-print/gimp-print-4.2.5-r2.ebuild b/media-gfx/gimp-print/gimp-print-4.2.5-r2.ebuild
deleted file mode 100644
index 0c6baa0a8d88..000000000000
--- a/media-gfx/gimp-print/gimp-print-4.2.5-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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-r2.ebuild,v 1.11 2005/02/20 19:22:14 lanius Exp $
-
-inherit libtool
-
-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.gz"
-
-DEPEND="cups? ( >=net-print/cups-1.1.14 )
-	media-gfx/imagemagick
-	virtual/ghostscript
-	sys-libs/readline
-	gtk? ( =x11-libs/gtk+-1.2* )
-	dev-lang/perl
-	foomaticdb? ( net-print/foomatic-db-engine )"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-src_compile() {
-	elibtoolize --reverse-deps
-
-	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
-
-	use foomaticdb \
-		&& myconf="${myconf} --with-foomatic3" \
-		|| myconf="${myconf} --without-foomatic"
-
-	econf \
-		--enable-test \
-		--with-ghosts \
-		--with-user-guide \
-		--with-samples \
-		--with-escputil \
-		--without-translated-ppds \
-		$myconf || die
-
-	# IJS Patch
-	sed -i -e "s/<ijs/<ijs\/ijs/g" src/ghost/ijsgimpprint.c
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	make install DESTDIR=${D} || die
-
-	if ! use ppds; then
-		rm -fR ${D}/usr/share/cups/model/
-	fi
-
-	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."
-}
diff --git a/media-gfx/gimp-print/gimp-print-5.0.0_beta2.ebuild b/media-gfx/gimp-print/gimp-print-5.0.0_beta2.ebuild
deleted file mode 100644
index d0396a650973..000000000000
--- a/media-gfx/gimp-print/gimp-print-5.0.0_beta2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 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.0.0_beta2.ebuild,v 1.2 2005/02/20 19:22:14 lanius Exp $
-
-inherit flag-o-matic libtool
-
-IUSE="cups foomaticdb gtk nls readline"
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Gimp Print Drivers"
-HOMEPAGE="http://gimp-print.sourceforge.net"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.bz2"
-
-DEPEND="cups? ( >=net-print/cups-1.1.14 )
-	media-gfx/imagemagick
-	virtual/ghostscript
-	sys-libs/readline
-	gtk? ( =x11-libs/gtk+-1.2* )
-	dev-lang/perl
-	foomaticdb? ( net-print/foomatic-db-engine )"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-append-flags -fno-inline-functions
-
-src_compile() {
-	elibtoolize --reverse-deps
-
-	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"
-
-	if use cups; then
-		myconf="${myconf} --with-cups"
-	else
-		myconf="${myconf} --without-cups"
-	fi
-
-	# disable for now, it does not work correctly
-	#if use cups && use ppds; then
-	#	myconf="${myconf} --enable-cups-ppds --enable-cups-level3-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
-	sed -i -e "s/<ijs/<ijs\/ijs/g" 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,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
-}
diff --git a/media-gfx/gimp-print/gimp-print-5.0.0_beta3.ebuild b/media-gfx/gimp-print/gimp-print-5.0.0_beta4.ebuild
index f810e78cf4f0..456917051d18 100644
--- a/media-gfx/gimp-print/gimp-print-5.0.0_beta3.ebuild
+++ b/media-gfx/gimp-print/gimp-print-5.0.0_beta4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 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.0.0_beta3.ebuild,v 1.2 2005/04/09 15:49:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.0.0_beta4.ebuild,v 1.1 2005/05/31 22:40:53 lanius Exp $
 
 inherit flag-o-matic libtool
 
 IUSE="cups foomaticdb gtk nls readline"
 
-MY_P=gutenprint-5.0.0-beta3
+MY_P=gutenprint-5.0.0-beta4
 
 DESCRIPTION="Gimp Print Drivers"
 HOMEPAGE="http://gimp-print.sourceforge.net"
@@ -17,7 +17,7 @@ DEPEND="cups? ( >=net-print/cups-1.1.14 )
 	media-gfx/imagemagick
 	virtual/ghostscript
 	sys-libs/readline
-	gtk? ( =x11-libs/gtk+-1.2* )
+	gtk? ( x11-libs/gtk+ )
 	dev-lang/perl
 	foomaticdb? ( net-print/foomatic-db-engine )"