New version

4 files changed, 147 insertions, 3 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 368b2970f19d..6af8bea577b3 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.95 2004/11/03 18:41:28 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.96 2004/11/03 23:58:44 lu_zero Exp $
+
+*gimp-2.0.6 (04 Nov 2004)
+
+  04 Nov 2004; Luca Barbato <lu_zero@gentoo.org> gimp-2.0.5.ebuild,
+  +gimp-2.0.6.ebuild:
+  New version, updated the manual
 
   03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> gimp-2.0.5.ebuild:
   ~alpha keyword.
diff --git a/media-gfx/gimp/files/digest-gimp-2.0.6 b/media-gfx/gimp/files/digest-gimp-2.0.6
new file mode 100644
index 000000000000..cd058b483b94
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.0.6
@@ -0,0 +1,2 @@
+MD5 632b9ec629ba7c48d292069c37a1a6c1 gimp-2.0.6.tar.bz2 14097124
+MD5 4b10833a545842ee4436a75eea68fd42 gimp-help-2-0.5.tar.gz 11904088
diff --git a/media-gfx/gimp/gimp-2.0.5.ebuild b/media-gfx/gimp/gimp-2.0.5.ebuild
index aa526a6b976c..b94dd4e25180 100644
--- a/media-gfx/gimp/gimp-2.0.5.ebuild
+++ b/media-gfx/gimp/gimp-2.0.5.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.5.ebuild,v 1.2 2004/11/03 18:41:28 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.5.ebuild,v 1.3 2004/11/03 23:58:44 lu_zero Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
 LICENSE="GPL-2"
 
-P_HELP="gimp-help-2-0.4" #"gimp-help-${PV/\./-}"
+P_HELP="gimp-help-${PV/\./-}"
 S_HELP="$WORKDIR/${P_HELP}"
 SRC_URI="mirror://gimp/v2.0/${P}.tar.bz2
 	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
diff --git a/media-gfx/gimp/gimp-2.0.6.ebuild b/media-gfx/gimp/gimp-2.0.6.ebuild
new file mode 100644
index 000000000000..f17ed9aa39e2
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.0.6.ebuild
@@ -0,0 +1,136 @@
+# 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 $
+
+inherit flag-o-matic libtool eutils
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+LICENSE="GPL-2"
+
+P_HELP="gimp-help-2-0.5" #"gimp-help-${PV/\./-}"
+S_HELP="$WORKDIR/${P_HELP}"
+SRC_URI="mirror://gimp/v2.0/${P}.tar.bz2
+	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
+
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha"
+#IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
+IUSE="aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
+
+# FIXME : some more things can be (local) USE flagged
+# a few options are detection only, fix them to switch
+
+#	X? ( virtual/x11 )"
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.2
+	>=x11-libs/gtk+-2.2.2
+	>=x11-libs/pango-1.2.2
+	>=media-libs/fontconfig-2.2
+	>=media-libs/libart_lgpl-2.3.8-r1
+	sys-libs/zlib
+
+	gimpprint? ( =media-gfx/gimp-print-4.2* )
+	doc? ( =gnome-extra/libgtkhtml-2* )
+
+	png? ( >=media-libs/libpng-1.2.1 )
+	jpeg? ( >=media-libs/jpeg-6b-r2
+		media-libs/libexif )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	mng? ( media-libs/libmng )
+
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	svg? ( >=gnome-base/librsvg-2.2 )
+
+	aalib?	( media-libs/aalib )
+	python?	( >=dev-lang/python-2.2
+		>=dev-python/pygtk-2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	dev-util/intltool
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Fix linking to older version of gimp if installed - this should
+	# void liquidx's hack, so it is removed.
+	epatch ${FILESDIR}/ltmain_sh-1.5.0-fix-relink.patch
+
+}
+
+src_compile() {
+
+	# Since 1.3.16, fixes linker problems when upgrading
+	elibtoolize
+
+	# Workaround portage variable leakage
+	local AA=
+
+	# only use mmx if hardened is not set
+	local USE_MMX=
+
+	replace-flags "-march=k6*" "-march=i586"
+
+	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
+	filter-flags "-fno-inline"
+
+	if use hardened; then
+		ewarn "hardened use flag suppressing mmx use flag"
+		HARDENED_SUPPRESS_MMX="--disable-mmx"
+	else
+		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
+	fi
+
+	econf \
+		--disable-default-binary \
+		--with-x \
+		"${HARDENED_SUPPRESS_MMX}" \
+		`use_enable sse` \
+		`use_enable altivec` \
+		`use_enable doc gtk-doc` \
+		`use_enable python` \
+		`use_enable gimpprint print` \
+		`use_with png libpng` \
+		`use_with jpeg libjpeg` \
+		`use_with jpeg libexif` \
+		`use_with tiff libtiff` \
+		`use_with mng libmng` \
+		`use_with aalib aa` \
+		`use_enable debug` || die
+
+	# X isn't optional (#58003) atm
+	#	`use_with X x` \
+
+	emake || die
+
+	if use doc; then
+		cd ${S_HELP}
+		econf --without-gimp || die
+		emake || die
+	fi
+
+}
+
+src_install() {
+
+	# Workaround portage variable leakage
+	local AA=
+
+	# create these dirs to make the makefile installs these items correctly
+	dodir /usr/share/{applications,application-registry,mime-info}
+
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
+		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
+
+	if use doc; then
+		cd ${S_HELP}
+		make DESTDIR=${D} install || die
+	fi
+
+}