Version bump, fix bugs #95358, #110742, #118962

(Portage version: 2.1_pre3-r1)

5 files changed, 97 insertions, 13 deletions

diff --git a/media-gfx/gimp-print/ChangeLog b/media-gfx/gimp-print/ChangeLog
index 9a2424b22417..f4a7e2641e33 100644
--- a/media-gfx/gimp-print/ChangeLog
+++ b/media-gfx/gimp-print/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gimp-print
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.64 2006/01/04 09:28:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.65 2006/01/24 19:16:36 genstef Exp $
+
+*gimp-print-5.0.0_rc2 (24 Jan 2006)
+
+  24 Jan 2006; Stefan Schweizer <genstef@gentoo.org>
+  gimp-print-4.2.7.ebuild, +gimp-print-5.0.0_rc2.ebuild:
+  Version bump, fix bugs #95358, #110742, #118962
 
   04 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/gimp-print-5.0.0_rc1-asneeded.patch, gimp-print-5.0.0_rc1.ebuild:
diff --git a/media-gfx/gimp-print/Manifest b/media-gfx/gimp-print/Manifest
index 2f5444febb2f..7b18ed446a05 100644
--- a/media-gfx/gimp-print/Manifest
+++ b/media-gfx/gimp-print/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 846fcbe217bbe398e766841751b2a95a ChangeLog 9193
 MD5 5f304014b5d0eb55e0a62cc46d098dfb files/digest-gimp-print-4.2.6 69
 MD5 0dbf86fe4303814e2dfa36f8c4b8e67c files/digest-gimp-print-4.2.7 69
 MD5 ecd67127e5d68d1ad44c9b8f6c70b1e5 files/digest-gimp-print-5.0.0_beta4 76
 MD5 2a5e9010ecd49db63841ba5f47716fc1 files/digest-gimp-print-5.0.0_rc1 74
+MD5 502e8c97082b9b79169fdaf3692ebbd7 files/digest-gimp-print-5.0.0_rc2 74
 MD5 f0ef5fbb2743863e5400d0b254e143c2 files/gimp-print-5.0.0_rc1-asneeded.patch 10965
 MD5 d127b4f94cec575d3aec9d13955d2f27 gimp-print-4.2.6.ebuild 2212
 MD5 70553ab6eead387f4ae932aae1bd4aea gimp-print-4.2.7.ebuild 2218
 MD5 61e404ce73546a5bc61dcf9ff58bc382 gimp-print-5.0.0_beta4.ebuild 2254
 MD5 4adbb2267ac9c48f3a07f6dcbcc8022d gimp-print-5.0.0_rc1.ebuild 2252
+MD5 60a05cba385f8ff45c3f4121f40d66fc gimp-print-5.0.0_rc2.ebuild 2313
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDu5VGAiZjviIA2XgRAkrhAKChT0qq0VKSQsvQARXLr6ZElUOtXgCghCt7
-6/YqDAEum78hglg6gXO4gt4=
-=L9Ck
------END PGP SIGNATURE-----
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_rc2 b/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_rc2
new file mode 100644
index 000000000000..9540348df60e
--- /dev/null
+++ b/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_rc2
@@ -0,0 +1 @@
+MD5 82850c8fa82fd1b34c9829cc20901613 gutenprint-5.0.0-rc2.tar.bz2 4075898
diff --git a/media-gfx/gimp-print/gimp-print-4.2.7.ebuild b/media-gfx/gimp-print/gimp-print-4.2.7.ebuild
index 8dbde992acc8..34e2c38268a5 100644
--- a/media-gfx/gimp-print/gimp-print-4.2.7.ebuild
+++ b/media-gfx/gimp-print/gimp-print-4.2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.7.ebuild,v 1.11 2005/09/13 16:37:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.7.ebuild,v 1.12 2006/01/24 19:16:36 genstef Exp $
 
 inherit libtool
 
@@ -84,4 +84,5 @@ src_install () {
 	dohtml doc/FAQ.html
 	dohtml -r doc/users_guide/html doc/developer/developer-html
 	rm -fR ${D}/usr/share/gimp-print/doc
+	use foomaticdb && rm -f ${D}/usr/share/foomatic/db/source/driver/gimp-print.xml
 }
diff --git a/media-gfx/gimp-print/gimp-print-5.0.0_rc2.ebuild b/media-gfx/gimp-print/gimp-print-5.0.0_rc2.ebuild
new file mode 100644
index 000000000000..9efd9fa31ee3
--- /dev/null
+++ b/media-gfx/gimp-print/gimp-print-5.0.0_rc2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 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_rc2.ebuild,v 1.1 2006/01/24 19:16:36 genstef Exp $
+
+inherit flag-o-matic libtool autotools
+
+IUSE="cups foomaticdb 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 )
+	media-gfx/imagemagick
+	virtual/ghostscript
+	sys-libs/readline
+	gtk? ( x11-libs/gtk+ )
+	dev-lang/perl
+	foomaticdb? ( net-print/foomatic-db-engine )"
+DEPEND="${RDEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+append-flags -fno-inline-functions
+
+pkg_setup() {
+	if built_with_use media-gfx/gimp gimpprint; then
+		ewarn "gimpprint is not yet available due to the API Change in version 5.0"
+		ewarn "Please remerge gimp with USE=-gimpprint to avoid collissions"
+		die "gimp with gimpprint USE-flag detected"
+	fi
+}
+
+src_compile() {
+	elibtoolize --reverse-deps
+
+	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 \
+		$(use_enable nls) \
+		$(use_with readline) \
+		$(use_enable gtk lexmarkutil) \
+		$(use_with cups) \
+		$myconf || die "econf failed"
+
+	# IJS Patch
+	sed -i -e "s/<ijs/<ijs\/ijs/g" src/ghost/ijsgutenprint.c || die "sed failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	make 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 COPYING ChangeLog NEWS README \
+		doc/users_guide/users-guide.ps doc/users_guide/users-guide.pdf \
+		${D}/usr/share/gutenprint/doc/gutenprint.pdf
+	dohtml doc/FAQ.html
+	dohtml -r doc/users_guide/html doc/developer/developer-html
+	rm -fR ${D}/usr/share/gutenprint/doc
+}