From: Stefan Schweizer <genstef@gentoo.org>
Date: Wed, 25 Apr 2007 11:54:53 +0000 (+0000)
Subject: Fix collision thanks to jakub in bug 175943
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55f860c9d352f18418753f840c67430f59e8f816;p=gentoo.git

Fix collision thanks to jakub in bug 175943
Package-Manager: portage-2.1.2.4
---

diff --git a/media-gfx/gimp-print/ChangeLog b/media-gfx/gimp-print/ChangeLog
index 6fe92b113629..407901eb6d00 100644
--- a/media-gfx/gimp-print/ChangeLog
+++ b/media-gfx/gimp-print/ChangeLog
@@ -1,6 +1,10 @@
 # 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.80 2007/04/07 15:52:41 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.81 2007/04/25 11:54:53 genstef Exp $
+
+  25 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
+  -gimp-print-5.0.0.ebuild, gimp-print-5.1.0.ebuild:
+  Fix collision thanks to jakub in bug 175943
 
   07 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
   +files/gimp-print-5.1.0-nonls.patch, gimp-print-5.1.0.ebuild:
diff --git a/media-gfx/gimp-print/Manifest b/media-gfx/gimp-print/Manifest
index bc8824c9cd4a..69d1251efb8c 100644
--- a/media-gfx/gimp-print/Manifest
+++ b/media-gfx/gimp-print/Manifest
@@ -7,24 +7,19 @@ MD5 5b5e881cf37bdf1bfbf0437b3c5b13bb files/gimp-print-5.1.0-nonls.patch 644
 RMD160 4247b20cdf92699c614681f75814dc9ee6857f30 files/gimp-print-5.1.0-nonls.patch 644
 SHA256 50299f14547b955be738ba4a5b8632a699dfb6d75f1bd030df2a4b2c134f7f87 files/gimp-print-5.1.0-nonls.patch 644
 DIST gimp-print-4.2.7.tar.gz 5178122 RMD160 b517b1d3cff22347053c634ed96202588d93b63e SHA1 5a928b7fa8e83d2858d15e2bd22d143c2cd35bd8 SHA256 a6cfcbb4bf32d12a553252b98e6a6fdb5d44fe37debad4480bbc9326e2c69489
-DIST gutenprint-5.0.0.tar.bz2 4612717 RMD160 e3f2975cf1a23827b49be5608433d427a94558fb SHA1 ab45fed987b7ab1ec6a19e15d7d14ba9a414b622 SHA256 78a5326341f95a584e4d98b7dad7a56fb763211ecfc07f603af6336fa94d07a3
 DIST gutenprint-5.1.0.tar.bz2 4704727 RMD160 6eb4b3e7f4b4b70e133b2e0043b8a8153801ce48 SHA1 222596fd434f8b2719e49fcb541a3fced9959688 SHA256 7d9298bbc6ba06d3175f7b4b3060cbc406d9f96a4da965850f8f1ca227b9acf6
 EBUILD gimp-print-4.2.7.ebuild 2393 RMD160 95f01a98cfa4bb6914388918e9bbf74a9c0cfc76 SHA1 7cfa03c83371240ff566360de8ae9d7f9ca14473 SHA256 020acccead6024af8af7ff777b1933ffc6110547882217d11b2762f2b80d4ba7
 MD5 e2687cb0f337cb6ce6f53f2dd2dc47b8 gimp-print-4.2.7.ebuild 2393
 RMD160 95f01a98cfa4bb6914388918e9bbf74a9c0cfc76 gimp-print-4.2.7.ebuild 2393
 SHA256 020acccead6024af8af7ff777b1933ffc6110547882217d11b2762f2b80d4ba7 gimp-print-4.2.7.ebuild 2393
-EBUILD gimp-print-5.0.0.ebuild 2382 RMD160 5a2f02585be4601e9d1e1e6d80a97099c82a88a7 SHA1 4f1414279495164642a0866908c7dc5a6b582db6 SHA256 39f4dc3f3deb8f72455f53a71accb046f4a8a3db4ad70c320650da7abf48b311
-MD5 eecaf00f29b6547464f36d319f2327e2 gimp-print-5.0.0.ebuild 2382
-RMD160 5a2f02585be4601e9d1e1e6d80a97099c82a88a7 gimp-print-5.0.0.ebuild 2382
-SHA256 39f4dc3f3deb8f72455f53a71accb046f4a8a3db4ad70c320650da7abf48b311 gimp-print-5.0.0.ebuild 2382
-EBUILD gimp-print-5.1.0.ebuild 2450 RMD160 21fe166e6a6c6dacf643ecffa6bf10bd444394a0 SHA1 8de769c84ab93c9bf25f35fedafcd97410962c96 SHA256 f362e59371dcc767dcd990bdf0b8ae853515f21ae95df592fb09b41b2068e12d
-MD5 e123c122dab7ac21e5f2806a8980d42e gimp-print-5.1.0.ebuild 2450
-RMD160 21fe166e6a6c6dacf643ecffa6bf10bd444394a0 gimp-print-5.1.0.ebuild 2450
-SHA256 f362e59371dcc767dcd990bdf0b8ae853515f21ae95df592fb09b41b2068e12d gimp-print-5.1.0.ebuild 2450
-MISC ChangeLog 12054 RMD160 6bcc2953478f5b451b4bfa9c3077d1b74895f751 SHA1 fdab38f5736d436107331a1f886e01f3ee810178 SHA256 42cb505bab648704f05854451b993f9cc6e6e56a3defc5bc2dc407cd1f202cff
-MD5 1636c6ad08667b6addd7149f9a89bf7b ChangeLog 12054
-RMD160 6bcc2953478f5b451b4bfa9c3077d1b74895f751 ChangeLog 12054
-SHA256 42cb505bab648704f05854451b993f9cc6e6e56a3defc5bc2dc407cd1f202cff ChangeLog 12054
+EBUILD gimp-print-5.1.0.ebuild 2403 RMD160 7fb5f6153d2719076308d0e7647fe93a0778aa33 SHA1 be123de25695f898d927c7170dc5b2b72b6b152f SHA256 dc49efed346d18a266e806da22d34d0f4119fb68824ce6e4c4fd0f003988e809
+MD5 34aab952a8d18a9379390f69682c0a08 gimp-print-5.1.0.ebuild 2403
+RMD160 7fb5f6153d2719076308d0e7647fe93a0778aa33 gimp-print-5.1.0.ebuild 2403
+SHA256 dc49efed346d18a266e806da22d34d0f4119fb68824ce6e4c4fd0f003988e809 gimp-print-5.1.0.ebuild 2403
+MISC ChangeLog 12207 RMD160 7afabc8192d99344785133c02421e6f7e5379e44 SHA1 3920518f9190afbd96bacbf04093b8cccdada7b0 SHA256 ee605c09f29ffa4cee9bf6e85a4f209c65219c7195062d425615d44d240e729c
+MD5 6a9a7dc7989db705f06f44727715ee29 ChangeLog 12207
+RMD160 7afabc8192d99344785133c02421e6f7e5379e44 ChangeLog 12207
+SHA256 ee605c09f29ffa4cee9bf6e85a4f209c65219c7195062d425615d44d240e729c ChangeLog 12207
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -32,9 +27,6 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 MD5 3004782c3a7d48655bfd4670cb64fac9 files/digest-gimp-print-4.2.7 253
 RMD160 7ab910f602732c55eb077ebf488a54e2ab161884 files/digest-gimp-print-4.2.7 253
 SHA256 baad29165ce99523343d5fcdc93a76fb1f715ce911eef710016f415f1fab5958 files/digest-gimp-print-4.2.7 253
-MD5 df272798bbe930a44b6512c384ef07b9 files/digest-gimp-print-5.0.0 256
-RMD160 9cb15f6dff9065a2db2fd96ec88c25849829ac20 files/digest-gimp-print-5.0.0 256
-SHA256 b1a06c7222d9c17a41b978ae926d9ce4d60acceadfaff741f33eaa3ec6616fe6 files/digest-gimp-print-5.0.0 256
 MD5 efaeb9b72509840e249cfc0102416b1c files/digest-gimp-print-5.1.0 256
 RMD160 66851da2385d130026ace46efdc3582e10ecfc93 files/digest-gimp-print-5.1.0 256
 SHA256 dbf7590b3e02cf94d28ea7337e90000468cb91f93ff7aea0013ecd2cd9d28663 files/digest-gimp-print-5.1.0 256
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0 b/media-gfx/gimp-print/files/digest-gimp-print-5.0.0
deleted file mode 100644
index 1691bf804040..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ede8acbd1e94c9d4fd366fb37e335bfb gutenprint-5.0.0.tar.bz2 4612717
-RMD160 e3f2975cf1a23827b49be5608433d427a94558fb gutenprint-5.0.0.tar.bz2 4612717
-SHA256 78a5326341f95a584e4d98b7dad7a56fb763211ecfc07f603af6336fa94d07a3 gutenprint-5.0.0.tar.bz2 4612717
diff --git a/media-gfx/gimp-print/gimp-print-5.0.0.ebuild b/media-gfx/gimp-print/gimp-print-5.0.0.ebuild
deleted file mode 100644
index 73c5c60ed63b..000000000000
--- a/media-gfx/gimp-print/gimp-print-5.0.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.ebuild,v 1.3 2006/09/14 22:33:26 genstef Exp $
-
-inherit flag-o-matic eutils libtool
-
-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 )
-	virtual/ghostscript
-	sys-libs/readline
-	gtk? ( x11-libs/gtk+ )
-	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
-
-pkg_setup() {
-	if has_version "<media-gfx/gimp-2.3.10" && 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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
-
-	use foomaticdb \
-		&& myconf="${myconf} --with-foomatic3" \
-		|| myconf="${myconf} --without-foomatic"
-
-	econf \
-		--enable-test \
-		--with-ghostscript \
-		--with-user-guide \
-		--with-samples \
-		--with-escputil \
-		--disable-translated-cups-ppds \
-		$(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\1: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
-}
diff --git a/media-gfx/gimp-print/gimp-print-5.1.0.ebuild b/media-gfx/gimp-print/gimp-print-5.1.0.ebuild
index c3db22f5bec0..09ada7c1159e 100644
--- a/media-gfx/gimp-print/gimp-print-5.1.0.ebuild
+++ b/media-gfx/gimp-print/gimp-print-5.1.0.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.0.ebuild,v 1.2 2007/04/07 15:52:41 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.1.0.ebuild,v 1.3 2007/04/25 11:54:53 genstef Exp $
 
 inherit flag-o-matic eutils libtool
 
@@ -63,6 +63,7 @@ src_compile() {
 		--with-user-guide \
 		--with-samples \
 		--with-escputil \
+		--with-gimp2-as-gutenprint \
 		--disable-translated-cups-ppds \
 		$(use_enable nls) \
 		$(use_with readline) \
@@ -82,9 +83,7 @@ src_install () {
 	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
+	dodoc AUTHORS COPYING 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