New version

5 files changed, 163 insertions, 13 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 5f4d3e2d4461..5940a5d7c032 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.99 2004/12/17 21:27:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.100 2004/12/21 22:44:45 lu_zero Exp $
+
+*gimp-2.2.0 (21 Dec 2004)
+
+  21 Dec 2004; Luca Barbato <lu_zero@gentoo.org> +files/pygimp-logo.png.bz2,
+  +gimp-2.2.0.ebuild:
+  New version
 
   17 Dec 2004; Markus Rothe <corsair@gentoo.org> gimp-2.0.4.ebuild:
   Stable on ppc64
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index b8a4f9ca1d0b..54e3feb150b4 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,18 +1,21 @@
-MD5 177772053b3f12db5d94ee5df2e99ea6 ChangeLog 14580
-MD5 e7cbfba89facb9cca1a3117df924f41b gimp-1.2.5.ebuild 3206
-MD5 2951e3093e294629908f060f0d55a381 gimp-2.0.0.ebuild 2655
-MD5 d7a9ef0b998d360ae6254fc0508e2f7d gimp-2.0.2.ebuild 2570
-MD5 1fbffd70f406bee33a8827ebf6f43c48 gimp-2.0.4.ebuild 3205
 MD5 df316b1d4bd1c70f25f7ef811a14e5bc gimp-2.0.5.ebuild 3219
+MD5 7a6613d700dfe78f1a97563808af0e04 ChangeLog 14721
+MD5 d7a9ef0b998d360ae6254fc0508e2f7d gimp-2.0.2.ebuild 2570
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 1fbffd70f406bee33a8827ebf6f43c48 gimp-2.0.4.ebuild 3205
+MD5 2951e3093e294629908f060f0d55a381 gimp-2.0.0.ebuild 2655
 MD5 284476bb4ded32c690a4aa10be6cf03a gimp-2.0.6.ebuild 3238
-MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
-MD5 568ba885fc51613466e3b0039e21946c files/digest-gimp-2.0.0 65
-MD5 1f2afa6b0785b0547e956d5aff63cf4d files/digest-gimp-2.0.2 65
-MD5 0d3108f9120d6976ce4ccb29a131aea7 files/digest-gimp-2.0.4 133
-MD5 397055832117d5c76e873af50a2e6f30 files/digest-gimp-2.0.5 134
-MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
-MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
+MD5 e7cbfba89facb9cca1a3117df924f41b gimp-1.2.5.ebuild 3206
+MD5 081453aff1d978530f01864eb1cec20a gimp-2.2.0.ebuild 3360
 MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
+MD5 204a8065e28141810fbda423e4118b9e files/digest-gimp-2.2.0 134
+MD5 0d3108f9120d6976ce4ccb29a131aea7 files/digest-gimp-2.0.4 133
+MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
+MD5 2673113735e707942c89d4b3658b49fc files/pygimp-logo.png.bz2 20207
+MD5 397055832117d5c76e873af50a2e6f30 files/digest-gimp-2.0.5 134
+MD5 1f2afa6b0785b0547e956d5aff63cf4d files/digest-gimp-2.0.2 65
 MD5 bbe7cd6ece5455900adcaeed9b467679 files/digest-gimp-2.0.6 134
+MD5 568ba885fc51613466e3b0039e21946c files/digest-gimp-2.0.0 65
+MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
+MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.0 b/media-gfx/gimp/files/digest-gimp-2.2.0
new file mode 100644
index 000000000000..9d265067f769
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.2.0
@@ -0,0 +1,2 @@
+MD5 7fa66cfd3a2a67f95c3c80307e46e4dd gimp-2.2.0.tar.bz2 13806207
+MD5 4a5f7f6f31d14977718b62b5a3d79872 gimp-help-2-0.6.tar.gz 14156511
diff --git a/media-gfx/gimp/files/pygimp-logo.png.bz2 b/media-gfx/gimp/files/pygimp-logo.png.bz2
new file mode 100644
index 000000000000..6ffc270af0aa
--- /dev/null
+++ b/media-gfx/gimp/files/pygimp-logo.png.bz2
diff --git a/media-gfx/gimp/gimp-2.2.0.ebuild b/media-gfx/gimp/gimp-2.2.0.ebuild
new file mode 100644
index 000000000000..636f8ce3d5ce
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.2.0.ebuild
@@ -0,0 +1,139 @@
+# 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.1 2004/12/21 22:44:45 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.6" #"gimp-help-${PV/\./-}"
+S_HELP="$WORKDIR/${P_HELP}"
+SRC_URI="mirror://gimp/v2.2/${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.2 )
+	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
+	# Fix missing logo for python support
+	bzcat ${FILESDIR}/pygimp-logo.png.bz2 > \
+	${S}/plug-ins/pygimp/pygimp-logo.png
+
+}
+
+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
+
+}