gimp bump

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc4-git2 x86_64

5 files changed, 132 insertions, 8 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index bca4127fb44d..bf0b7e6b5cfb 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,15 @@
 # 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.270 2008/10/17 18:52:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.271 2008/11/14 00:54:30 hanno Exp $
+
+*gimp-2.6.2 (14 Nov 2008)
+
+  14 Nov 2008; Hanno Boeck <hanno@gentoo.org> gimp-2.6.1.ebuild,
+  +gimp-2.6.2.ebuild:
+  Version bump.
+
+  26 Oct 2008; Hanno Boeck <hanno@gentoo.org> gimp-2.6.1.ebuild:
+  Re-add patch for building without jpeg, not yet upstream.
 
   17 Oct 2008; Markus Meier <maekke@gentoo.org> metadata.xml:
   smp USE-flag is global now
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index b7c63f6f34ab..43f96c539627 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -12,20 +12,22 @@ DIST gimp-2.4.6.tar.bz2 18365363 RMD160 17d61da426950f8a7286f7e82259d23b46adb1fd
 DIST gimp-2.4.7.tar.bz2 18977384 RMD160 79062e60db1fe172e2a91ff0601462462d3a61cb SHA1 fd6dac4fd107f3b741168ffcaf4425a9dd179327 SHA256 d398eef058faf81053c624690ba3192a8d517b1370c6f35d10e0eae2190109c9
 DIST gimp-2.6.0.tar.bz2 15897821 RMD160 66dae43b362298314befc39916bb3e01b9098b50 SHA1 187effb5722a1d5943c48ec74a3be96c836215f6 SHA256 f4055ea8f1815d7dcca6bf0159af70489243d63a14dcfaf2a994af062d829ca8
 DIST gimp-2.6.1.tar.bz2 15939661 RMD160 4cf18ae63a813ccf35a0b33ede3b24a304b47b03 SHA1 c03c737496444c811c73772d356db3dbf886fd68 SHA256 095f0ca02d4b426ec0f6929397cdd641e6f0031395e43b276132ab1a40678a0a
+DIST gimp-2.6.2.tar.bz2 15918673 RMD160 baba90572478200f9422d447437c6f669140fc03 SHA1 b6ae56413263d8ea3d4a26af74960eb406ed86fa SHA256 31abf898738f975d3b4e19926a196c0719497f3a2300ceb15fcb440090c5ab2d
 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 4092 RMD160 fe15f6da7cbb8f6f32eb85d9c9e1987f2efd8abc SHA1 2434b9f1c07aea1da493e8868686a358f3efb46e SHA256 5439c52f7ee4eb7bd39cae7db5b143910df450b8da4261c997cc5016ea1ec5f6
 EBUILD gimp-2.4.6.ebuild 3844 RMD160 1d071e845eaea37a31c346190cc2d68445664cc6 SHA1 f4f828712e7fdeb9c3929c859f927f515346fd61 SHA256 ab657c07a9676324282b18c9e400e4515a944d107520bef7cf660373f2539233
 EBUILD gimp-2.4.7.ebuild 3851 RMD160 1c4e786a176b229acd6f4ec4d1d89201ea04deab SHA1 e583b34bafb4b52cf71ceff4a3303ebad55fb472 SHA256 0d4234105fa5df9f3feba2442f46ec24150ab15b4b82c94d041684339335994c
 EBUILD gimp-2.6.0.ebuild 3238 RMD160 991a9fc123a36a303d69d7371f5c51c5e9eb2ef2 SHA1 9b326c763a5b9cf185daa99c86ca204af627897c SHA256 4b1d51bdc7c890912cf098c1d3a3e214b8bd38d52bd2227ac0c276d25cd22e29
-EBUILD gimp-2.6.1.ebuild 3016 RMD160 35781c28554cefce47618172a856d4d748c32b70 SHA1 ce9e3a3fd21523daa8c59c8c3abebf7a4a4580a4 SHA256 b1117f7ad3ccaf594146b232fbea2e411f40b100bbb9ecef21568a13796126bf
+EBUILD gimp-2.6.1.ebuild 3147 RMD160 f82f0d7fd06e4fb803efbc4ea92a0a0da77b09b5 SHA1 47bd3c404f2a267cce5f2ac9a8f4b93b9ab5239c SHA256 08a11b7c21195bd3ac0e8d5d50ae6ca7015d8ac607ec30ade5cf141fb75f6213
+EBUILD gimp-2.6.2.ebuild 3016 RMD160 8caa17a2f09b66b2501b68fea84299283c015d37 SHA1 cbdf4b150283badddd501b0ffa32bef4a957d057 SHA256 01bb28f1cf819c815adf91f55eba12fac039340bf24ec54f43c07cad9bd3539d
 EBUILD gimp-9999.ebuild 3765 RMD160 4eb85d08786ba8d73536e5bb60118fe2f9b42382 SHA1 c8a20283d95e2e8d274bde17cb97bb2a255a56b4 SHA256 b24670ec12036af85fab20131f8a0c0e377dd889a4d7bc8168ad124af187f464
-MISC ChangeLog 36355 RMD160 0ae76860afa44e5142ae1b93c062ae1f12d5ccb9 SHA1 efbc58a3a08f07572601253f743f3135905505c2 SHA256 8749d436fadce623fc47dc8943779d1e10c1a340549bf5e993579c21f2025355
-MISC metadata.xml 301 RMD160 e5d549ea222701ebcd253e67bcc5befb70fc5447 SHA1 a72389b6a35a3771b84d24e9243f138671e73601 SHA256 561d249cfcd013a317623c6b48b0302df39a8eea41b30c2e79ca1b2fc9e39a6d
+MISC ChangeLog 36611 RMD160 a7f3dc01d93436ddbe03b0490fb9dfa96a051a23 SHA1 44bf3dc2584a9151caef4a96e6bbb3125a3e8397 SHA256 1ec7c26a41e7f76622f02ff2e2a0851e45a4c94d1e9eeb3717a7d533883b2363
+MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj432MACgkQkKaRLQcq0GKGUwCfY3sWhsd6n3774Rd1oEZCOyih
-GLUAni8Cse6z36RvBdd7m3paD+6kuJke
-=xivx
+iEYEARECAAYFAkkczEwACgkQr2QksT29OyCrOQCePxNeA1I6eWmnFPfeXzTYdesf
+g08An1nsHff1aJgkz/qpGzmlvYt3hrkT
+=nIpj
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-2.6.1.ebuild b/media-gfx/gimp/gimp-2.6.1.ebuild
index cccac52e0d25..7cb301f18768 100644
--- a/media-gfx/gimp/gimp-2.6.1.ebuild
+++ b/media-gfx/gimp/gimp-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # 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.6.1.ebuild,v 1.1 2008/10/13 16:30:11 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.1.ebuild,v 1.2 2008/11/14 00:54:30 hanno Exp $
 
 inherit eutils gnome2 fdo-mime multilib python
 
@@ -54,6 +54,12 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
+src_unpack() {
+	gnome2_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-2.6.0-file-psd-needs-jpeg.patch" || die "epatch failed"
+}
+
 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."
diff --git a/media-gfx/gimp/gimp-2.6.2.ebuild b/media-gfx/gimp/gimp-2.6.2.ebuild
new file mode 100644
index 000000000000..502368da5623
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.6.2.ebuild
@@ -0,0 +1,104 @@
+# 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.6.2.ebuild,v 1.1 2008/11/14 00:54:30 hanno Exp $
+
+inherit eutils gnome2 fdo-mime multilib python
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
+
+RDEPEND=">=dev-libs/glib-2.18.1
+	>=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
+	media-libs/gegl
+	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/gvfs
+		>=gnome-base/libgnomeui-2.10.0
+		>=gnome-base/gnome-keyring-0.4.5 )
+	webkit? ( net-libs/webkit-gtk )
+	jpeg? ( >=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.5.0
+		>=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.40
+	>=sys-devel/gettext-0.17
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+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
+
+	G2CONF="--enable-default-binary \
+		--with-x \
+		$(use_with aalib aa) \
+		$(use_with alsa) \
+		$(use_enable altivec) \
+		$(use_with curl libcurl) \
+		$(use_with dbus) \
+		$(use_with hal) \
+		$(use_with gnome gvfs) \
+		--without-gnomevfs \
+		$(use_with webkit) \
+		$(use_with jpeg 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)"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
+		/usr/$(get_libdir)/gimp/2.0/plug-ins
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
+		/usr/$(get_libdir)/gimp/2.0/plug-ins
+}
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 4ef4244e7ced..fbc2636cad8c 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -9,5 +9,8 @@
 	<flag name='webkit'>
 		Enable the webkit rendering engine
 	</flag>
+	<flag name='smp'>
+		Enable support for multiprocessors
+	</flag>
 </use>
 </pkgmetadata>