gimp version bump

Package-Manager: portage-2.1.5.3

3 files changed, 155 insertions, 5 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index cef6263fcd67..793fdb9b2129 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.254 2008/05/18 02:08:03 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.255 2008/06/02 13:28:21 hanno Exp $
+
+*gimp-2.4.6 (02 Jun 2008)
+
+  02 Jun 2008; Hanno Boeck <hanno@gentoo.org> +gimp-2.4.6.ebuild:
+  Version bump.
 
   18 May 2008; Hanno Boeck <hanno@gentoo.org> gimp-2.3.19.ebuild,
   gimp-2.4.2.ebuild, gimp-2.4.5.ebuild, gimp-9999.ebuild:
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 4b98e315dda4..0c7def6c193d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -6,16 +6,18 @@ AUX gimp-web-browser.patch 1579 RMD160 33fd018a83b8ade7ced9bbd4c80b9c29468781fd
 DIST gimp-2.3.19.tar.bz2 16803491 RMD160 3ea293372ef0656543912c0a63ab287fd9ae72ca SHA1 f04efda774e8ed57ded5058d37091f7a8d7b17b2 SHA256 f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0
 DIST gimp-2.4.2.tar.bz2 17777846 RMD160 f9da1008c29746379eb728f27e9b0d452ba2318f SHA1 4913a411abde3fccae5350e00a9bd20742715367 SHA256 00393b2d2aa163a7791dc4456306bf903d920d345aeee162d0e2ce85cfae5fb1
 DIST gimp-2.4.5.tar.bz2 17819962 RMD160 963a139e417354d898abd2499a5f31ecfc0da75b SHA1 70cf6af5700cf6db73fca898510873394eb95581 SHA256 dadf13c2e605245572f1bdb948969c3f3ef3d2b18a9ca1f64d6f9383ac48d5ae
+DIST gimp-2.4.6.tar.bz2 18365363 RMD160 17d61da426950f8a7286f7e82259d23b46adb1fd SHA1 6cbfda0da19bf5a2221013afe32643e3c09aeeda SHA256 99aef9e70edf80e4f3605727ba2979286c568a02cadf6e8c5d37a5ce6cce0bea
 EBUILD gimp-2.3.19.ebuild 3420 RMD160 6b764050ce4a20bc249fdf34246b9036c9498f4b SHA1 0f394608c2b25669ad886ee13b61407c474bc02c SHA256 0550dc8499e285dcaff590f31f014d5e5303ee6e03978f80eb49a810d3dbec7b
 EBUILD gimp-2.4.2.ebuild 3687 RMD160 3663e7a85f32416c99a4c7a83b6f81962f4e7f7f SHA1 7c499615c56d63ea10208e2d692789f6440471d9 SHA256 2f60b463680e951cb810436f5da1c99f9793b8a8365658cffad3dae70843ffd8
 EBUILD gimp-2.4.5.ebuild 4094 RMD160 22126076fb55e569bad57f2548aa9156ccf520de SHA1 b53dd03cf15de7b1f419ec1249cf19f627d00b23 SHA256 400da58ee6f1acca0cc3e6fafeab0b576b658874729c1e3b256fc1667d57c480
+EBUILD gimp-2.4.6.ebuild 4094 RMD160 63bb9aacc99f3fd9566494ad13635a71278089ce SHA1 2a6b3c3be503a5057faa58c08bd619ce3be5777a SHA256 7e10ac32dd5aae19581113fec98c64a3adcaf83d5fc8ebc2ef88de980ac2b5d6
 EBUILD gimp-9999.ebuild 3765 RMD160 4eb85d08786ba8d73536e5bb60118fe2f9b42382 SHA1 c8a20283d95e2e8d274bde17cb97bb2a255a56b4 SHA256 b24670ec12036af85fab20131f8a0c0e377dd889a4d7bc8168ad124af187f464
-MISC ChangeLog 34683 RMD160 7bc433965238df7a5dd1cd7730a9b72dc2e1fdc4 SHA1 09ee6b08124d1fc370dc67ab29ccbae1a7381b35 SHA256 51ec104b6d9cbd00d1c2b30eda9cc7e9b2e124da69ecd53e8ea7c7341ec68053
+MISC ChangeLog 34793 RMD160 560985f5dede623114ba8f067ddd9bfd79103d4f SHA1 b81731a73013fb2b2e59fb072067bddd14f62e2a SHA256 5836f06c1bf53394ce82490359e7b6ea6c519bb52e29f4ab15413a806e0833cb
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgvj40ACgkQr2QksT29OyBYGQCdE/9q+fiVN8jDthgNpqrY2oBh
-QIQAoJrz8/gSDcIg0lPoy1CAif+OniFq
-=dwGZ
+iEYEARECAAYFAkhD9X0ACgkQr2QksT29OyA1qwCfRzF3Qe/lvMeFXkeFPUZrGRYE
+vOQAn09kICGNjiKcYEfyLPgzWoZ/DQk9
+=yBGB
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-2.4.6.ebuild b/media-gfx/gimp/gimp-2.4.6.ebuild
new file mode 100644
index 000000000000..c88bb3a6559e
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.4.6.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.1 2008/06/02 13:28:21 hanno Exp $
+
+inherit fdo-mime flag-o-matic multilib python eutils autotools
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.4/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="alsa aalib altivec curl dbus debug doc exif gtkhtml gnome hal lcms mmx mng pdf png python smp sse svg tiff wmf"
+# jpeg temporarily removed, disabling jpeg requires upstream fix which will come in 2.5
+
+RDEPEND=">=dev-libs/glib-2.12.3
+	>=x11-libs/gtk+-2.10.13
+	>=x11-libs/pango-1.12.2
+	>=media-libs/freetype-2.1.7
+	>=media-libs/fontconfig-2.2.0
+	>=media-libs/libart_lgpl-2.3.8-r1
+	sys-libs/zlib
+	dev-libs/libxml2
+	dev-libs/libxslt
+	x11-misc/xdg-utils
+	x11-themes/hicolor-icon-theme
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+	curl? ( net-misc/curl )
+	dbus? ( dev-libs/dbus-glib )
+	hal? ( sys-apps/hal )
+	gnome? ( >=gnome-base/gnome-vfs-2.10.0
+		>=gnome-base/libgnomeui-2.10.0
+		>=gnome-base/gnome-keyring-0.4.5 )
+	gtkhtml? ( =gnome-extra/gtkhtml-2* )
+	>=media-libs/jpeg-6b-r2
+	exif? ( >=media-libs/libexif-0.6.15 )
+	lcms? ( media-libs/lcms )
+	mng? ( media-libs/libmng )
+	pdf? ( >=app-text/poppler-bindings-0.3.1 )
+	png? ( >=media-libs/libpng-1.2.2 )
+	python?	( >=dev-lang/python-2.2.1
+		>=dev-python/pygtk-2.10.4 )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	svg? ( >=gnome-base/librsvg-2.8.0 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.31
+	>=sys-devel/gettext-0.17
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+pkg_setup() {
+	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
+		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
+		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
+	fi
+	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
+		eerror "This package requires media-libs/alsa-lib compiled with midi support."
+		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/gimp-web-browser.patch"
+
+	# Workaround for MIME-type, this is fixed in gimp trunk, so we can
+	# remove this with >= 2.5
+	use svg && epatch "${FILESDIR}/gimp-svg.diff"
+
+	eautoreconf
+}
+
+src_compile() {
+	# workaround portage variable leakage
+	local AA=
+
+	# gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078)
+	# gimp uses floating point math, needs accuracy (#98685)
+	filter-flags "-fno-inline" "-ffast-math"
+	# gimp assumes char is signed (fixes preview corruption)
+	if use ppc || use ppc64; then
+		append-flags "-fsigned-char"
+	fi
+
+	econf --enable-default-binary \
+		--with-x \
+		$(use_with aalib aa) \
+		$(use_with alsa) \
+		$(use_enable altivec) \
+		$(use_with curl) \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_with dbus) \
+		$(use_with hal) \
+		$(use_with gnome gnomevfs) \
+		$(use_with gtkhtml gtkhtml2) \
+		--with-libjpeg \
+		$(use_with exif libexif) \
+		$(use_with lcms) \
+		$(use_enable mmx) \
+		$(use_with mng libmng) \
+		$(use_with pdf poppler) \
+		$(use_with png libpng) \
+		$(use_enable python) \
+		$(use_enable smp mp) \
+		$(use_enable sse) \
+		$(use_with svg librsvg) \
+		$(use_with tiff libtiff) \
+		$(use_with wmf) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS README*
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	elog
+	elog "If you want Postscript file support, emerge ghostscript."
+	elog
+
+	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
+		/usr/$(get_libdir)/gimp/2.0/plug-ins
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
+		/usr/$(get_libdir)/gimp/2.0/plug-ins
+}