More fixes, changed doc? to gtkhtml? (bug #74848), and fixed USE=-doc to not install any developer documentation in 2.2.0

4 files changed, 17 insertions, 10 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 3939da09982c..6ab1c7e3d96c 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.101 2004/12/22 15:25:36 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.102 2004/12/22 16:43:11 obz Exp $
+
+  23 Dec 2004; Mike Gardiner <obz@gentoo.org> gimp-2.2.0.ebuild, gimp-2.0.6.ebuild:
+  More fixes, changed doc? to gtkhtml? (bug #74848), and fixed USE=-doc to not install any developer documentation in 2.2.0
 
   22 Dec 2004; Mike Gardiner <obz@gentoo.org> +files/pygimp-logo.png,
   -files/pygimp-logo.png.bz2, gimp-2.2.0.ebuild:
@@ -27,7 +30,7 @@
   +gimp-2.0.6.ebuild:
   New version, updated the manual
 
-  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> gimp-2.0.5.ebuild:
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> gimp-2.0.5.ebuild:
   ~alpha keyword.
 
 *gimp-2.0.5 (29 Oct 2004)
@@ -80,7 +83,7 @@
   gimp-1.2.4.ebuild, gimp-1.2.5.ebuild:
   Fix use invocation
 
-  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> gimp-1.2.5.ebuild:
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> gimp-1.2.5.ebuild:
   Stable on alpha.
 
   01 Jun 2004; Travis Tilley <lv@gentoo.org> gimp-2.0.0.ebuild:
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 849fc754608c..06bc3d8fcb5a 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,9 +2,9 @@ MD5 2951e3093e294629908f060f0d55a381 gimp-2.0.0.ebuild 2655
 MD5 d7a9ef0b998d360ae6254fc0508e2f7d gimp-2.0.2.ebuild 2570
 MD5 e7cbfba89facb9cca1a3117df924f41b gimp-1.2.5.ebuild 3206
 MD5 1fbffd70f406bee33a8827ebf6f43c48 gimp-2.0.4.ebuild 3205
-MD5 0a1fccdc8aeceba00980fc6d94cdc680 gimp-2.2.0.ebuild 3426
-MD5 284476bb4ded32c690a4aa10be6cf03a gimp-2.0.6.ebuild 3238
-MD5 d1cfea65dcd648fdd8a9ef5a1c811b86 ChangeLog 14884
+MD5 c1e60ad669f691e24a19620620d58222 gimp-2.2.0.ebuild 3512
+MD5 b56ad7481b4838ae420404ee8f2c84cc gimp-2.0.6.ebuild 3238
+MD5 4a3f1162ae671016ab360876aeb25ae6 ChangeLog 15102
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 df316b1d4bd1c70f25f7ef811a14e5bc gimp-2.0.5.ebuild 3219
 MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
diff --git a/media-gfx/gimp/gimp-2.0.6.ebuild b/media-gfx/gimp/gimp-2.0.6.ebuild
index f17ed9aa39e2..4e6b39524c67 100644
--- a/media-gfx/gimp/gimp-2.0.6.ebuild
+++ b/media-gfx/gimp/gimp-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.6.ebuild,v 1.1 2004/11/03 23:58:44 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.6.ebuild,v 1.2 2004/12/22 16:43:11 obz Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -31,7 +31,7 @@ RDEPEND="virtual/x11
 	sys-libs/zlib
 
 	gimpprint? ( =media-gfx/gimp-print-4.2* )
-	doc? ( =gnome-extra/libgtkhtml-2* )
+	gtkhtml? ( =gnome-extra/libgtkhtml-2* )
 
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2
diff --git a/media-gfx/gimp/gimp-2.2.0.ebuild b/media-gfx/gimp/gimp-2.2.0.ebuild
index d592669d941f..6eba3a664d8d 100644
--- a/media-gfx/gimp/gimp-2.2.0.ebuild
+++ b/media-gfx/gimp/gimp-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.0.ebuild,v 1.3 2004/12/22 15:43:24 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.0.ebuild,v 1.4 2004/12/22 16:43:11 obz Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -34,7 +34,7 @@ RDEPEND="virtual/x11
 	dev-libs/libxslt
 
 	gimpprint? ( =media-gfx/gimp-print-4.2* )
-	doc? ( =gnome-extra/libgtkhtml-2* )
+	gtkhtml? ( =gnome-extra/libgtkhtml-2* )
 
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2
@@ -89,11 +89,15 @@ src_compile() {
 	else
 		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
 	fi
+	
+	local myconf
+	use doc || myconf="${myconf} --disable-devel-docs"
 
 	econf \
 		--disable-default-binary \
 		--with-x \
 		"${HARDENED_SUPPRESS_MMX}" \
+		${myconf} \
 		`use_enable sse` \
 		`use_enable altivec` \
 		`use_enable doc gtk-doc` \