Fix gimp-print for gimp-2.2 collision by renaming and add a gimp use flag to control the gimp printing plug-in creation

Package-Manager: portage-2.1.2.4

3 files changed, 34 insertions, 26 deletions

diff --git a/media-gfx/gimp-print/ChangeLog b/media-gfx/gimp-print/ChangeLog
index 407901eb6d00..fc8a139c155d 100644
--- a/media-gfx/gimp-print/ChangeLog
+++ b/media-gfx/gimp-print/ChangeLog
@@ -1,6 +1,11 @@
 # 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.81 2007/04/25 11:54:53 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.82 2007/04/25 20:05:53 genstef Exp $
+
+  25 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
+  gimp-print-5.1.0.ebuild:
+  Fix gimp-print for gimp-2.2 collision by renaming and add a gimp use flag to
+  control the gimp printing plug-in creation
 
   25 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
   -gimp-print-5.0.0.ebuild, gimp-print-5.1.0.ebuild:
diff --git a/media-gfx/gimp-print/Manifest b/media-gfx/gimp-print/Manifest
index 69d1251efb8c..7799ab97eb6d 100644
--- a/media-gfx/gimp-print/Manifest
+++ b/media-gfx/gimp-print/Manifest
@@ -12,14 +12,14 @@ EBUILD gimp-print-4.2.7.ebuild 2393 RMD160 95f01a98cfa4bb6914388918e9bbf74a9c0cf
 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.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
+EBUILD gimp-print-5.1.0.ebuild 2445 RMD160 5112e98b5b1510d6d28b34b41d272927458f3471 SHA1 a6c3e3c4e1179a106b75f72e6cd61c5f1cb34e15 SHA256 0c556a92b0f1d9846c5c1b27bd9e0a9132b04f5774e6c081a0b6aaa438610d8f
+MD5 ee68fe8dd9bb44e577e4fadcd6447670 gimp-print-5.1.0.ebuild 2445
+RMD160 5112e98b5b1510d6d28b34b41d272927458f3471 gimp-print-5.1.0.ebuild 2445
+SHA256 0c556a92b0f1d9846c5c1b27bd9e0a9132b04f5774e6c081a0b6aaa438610d8f gimp-print-5.1.0.ebuild 2445
+MISC ChangeLog 12412 RMD160 447de203d4e2bf9a73aab1a15806eafd280e1f9e SHA1 b3ab3ed424888e4f1b88905324ecdd3bdfce3820 SHA256 ca31439c905d0b52b4fb771a6fd4b769fa90586211f7ac2459baa30b7dc872da
+MD5 a1d8102fdb4cc96734a97ffb46a7ee0e ChangeLog 12412
+RMD160 447de203d4e2bf9a73aab1a15806eafd280e1f9e ChangeLog 12412
+SHA256 ca31439c905d0b52b4fb771a6fd4b769fa90586211f7ac2459baa30b7dc872da ChangeLog 12412
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
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 09ada7c1159e..2c8ebad88838 100644
--- a/media-gfx/gimp-print/gimp-print-5.1.0.ebuild
+++ b/media-gfx/gimp-print/gimp-print-5.1.0.ebuild
@@ -1,10 +1,10 @@
 # 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.3 2007/04/25 11:54:53 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.1.0.ebuild,v 1.4 2007/04/25 20:05:53 genstef Exp $
 
-inherit flag-o-matic eutils libtool
+inherit flag-o-matic eutils libtool multilib
 
-IUSE="cups foomaticdb gtk nls readline ppds"
+IUSE="cups foomaticdb gimp gtk nls readline ppds"
 
 MY_P=gutenprint-${PV/_/-}
 
@@ -16,7 +16,8 @@ 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+ )
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	gimp? ( >=media-gfx/gimp-2.2 >=x11-libs/gtk+-2.0 )
 	dev-lang/perl
 	foomaticdb? ( net-print/foomatic-db-engine )"
 DEPEND="${RDEPEND}
@@ -29,14 +30,6 @@ 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}"
@@ -52,6 +45,12 @@ src_compile() {
 		myconf="${myconf} --disable-cups-ppds"
 	fi
 
+	if use gtk || use gimp; then
+		myconf="${myconf} --enable-libgutenprintui2"
+	else
+		myconf="${myconf} --disable-libgutenprintui2"
+	fi
+
 	use foomaticdb \
 		&& myconf="${myconf} --with-foomatic3" \
 		|| myconf="${myconf} --without-foomatic"
@@ -63,11 +62,11 @@ src_compile() {
 		--with-user-guide \
 		--with-samples \
 		--with-escputil \
-		--with-gimp2-as-gutenprint \
 		--disable-translated-cups-ppds \
 		$(use_enable nls) \
 		$(use_with readline) \
-		$(use_enable gtk lexmarkutil) \
+		$(use_with gimp gimp2) \
+		$(use_with gimp gimp2-as-gutenprint) \
 		$(use_with cups) \
 		$myconf || die "econf failed"
 
@@ -78,13 +77,17 @@ src_compile() {
 }
 
 src_install () {
-	make install DESTDIR=${D} || die "make install failed"
+	emake 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/gutenprint-users-manual.{pdf,odt}
+	dodoc AUTHORS 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
+	rm -fR "${D}"/usr/share/gutenprint/doc
+	if ! use gtk && ! use gimp; then
+		rm -f "${D}"/usr/$(get_libdir)/pkgconfig/gutenprintui2.pc
+		rm -rf "${D}"/usr/include/gutenprintui2
+	fi
 }