gimp version bump

Package-Manager: portage-2.1.2.7

4 files changed, 205 insertions, 5 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index cee455bd3a18..9e72848a9b7a 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.201 2007/05/27 07:39:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.202 2007/05/30 20:39:16 hanno Exp $
+
+*gimp-2.2.15 (30 May 2007)
+
+  30 May 2007; Hanno Boeck <hanno@gentoo.org> +gimp-2.2.15.ebuild:
+  Version bump.
 
   27 May 2007; Joshua Kinard <kumba@gentoo.org> gimp-2.3.16.ebuild:
   Stable on mips.
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 29c633d4bf6d..25721378d6c7 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gimp-sunras-bufferoverflow.diff 1530 RMD160 a6f50ed18481b698062bfed1316f36d79937e515 SHA1 4c6263b35b7a7324fb896a12cf8fa7bdb8aced94 SHA256 9114422a655884ec0ad64f3af15a39b7d45e8c48c59f3490c20e0b132ffef2f1
 MD5 48de54f51b3b6226fcc6b791a40efb78 files/gimp-sunras-bufferoverflow.diff 1530
 RMD160 a6f50ed18481b698062bfed1316f36d79937e515 files/gimp-sunras-bufferoverflow.diff 1530
@@ -7,11 +10,16 @@ MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 RMD160 dd7bfaef61da7474e003d2ce2cc5dc4fbbe297dc files/ltmain_sh-1.5.0-fix-relink.patch 1718
 SHA256 8335de81c1b94ecf25f1f68421af6a76be571a0c131277f165818ab6a37541fe files/ltmain_sh-1.5.0-fix-relink.patch 1718
 DIST gimp-2.2.14.tar.bz2 12836732 RMD160 cf43fb0436a6086a0bc85fd4a33b009bee557aa0 SHA1 cf0926b9f0ca910b31219bafa8188a8b7ebabe10 SHA256 f672f123118b7b52dfce5833ba26512463295e29d542f32d629ba39870112b4f
+DIST gimp-2.2.15.tar.bz2 13097438 RMD160 322b5c07de9e6cc9b206d944278d58d8d6cd1e2f SHA1 ce2357139179e67f361e3ce1b1fb82d1dd5c08e4 SHA256 d14621ab9bc18c4f491146d443fefbdf3eecb8470896545ce58f5c1e2fc450d7
 DIST gimp-2.3.16.tar.bz2 16370057 RMD160 f67d58f48b0997082024088ca37ef52c3b18c6bc SHA1 1987971e620a7b6a40a7f7ac8ac2b505277cce13 SHA256 fdccaed39f868a24ad408b4a84e5f13b2c8448562b17bdc5ca53f0ddda4f96f4
 EBUILD gimp-2.2.14.ebuild 4515 RMD160 846f2914e63801f639b8548f4f5baa148c019175 SHA1 4e2aeea9fd158b1f83cc7ae1405c375845d89073 SHA256 55d93db667b1b7f4bd2e45a21bb00ccaf73be2a8eda6ce1ec48d573e94424f95
 MD5 22f17d0bb14bd71c388dca79291530bf gimp-2.2.14.ebuild 4515
 RMD160 846f2914e63801f639b8548f4f5baa148c019175 gimp-2.2.14.ebuild 4515
 SHA256 55d93db667b1b7f4bd2e45a21bb00ccaf73be2a8eda6ce1ec48d573e94424f95 gimp-2.2.14.ebuild 4515
+EBUILD gimp-2.2.15.ebuild 4470 RMD160 c1c37db2d4d1e1061e5fff3c6f031abfdb134226 SHA1 a0e9ba7a692423b2ca8b702d5a39e35c38137cb5 SHA256 eab7875fe7673bc73fc97522f40c39fb01d709f6489903e341d268bb8b37d515
+MD5 1c1a9ac7054b5247028c534fa14796ad gimp-2.2.15.ebuild 4470
+RMD160 c1c37db2d4d1e1061e5fff3c6f031abfdb134226 gimp-2.2.15.ebuild 4470
+SHA256 eab7875fe7673bc73fc97522f40c39fb01d709f6489903e341d268bb8b37d515 gimp-2.2.15.ebuild 4470
 EBUILD gimp-2.3.16.ebuild 3538 RMD160 ef8033c0cadbc7987b3e4bec2c40f4be3b52dce2 SHA1 05a3b12d303ca30cf7a8a2c35dd2bb12f25d9001 SHA256 2e8065447ebe9a4945a7a7e8e52f8cffed3c626d6251cb16423e486db0b4a301
 MD5 d6a10b46752c8c4f0116c79ef0e9180f gimp-2.3.16.ebuild 3538
 RMD160 ef8033c0cadbc7987b3e4bec2c40f4be3b52dce2 gimp-2.3.16.ebuild 3538
@@ -20,10 +28,10 @@ EBUILD gimp-9999.ebuild 3517 RMD160 943095f62954e4e17e0bf471fc9feb467746d5aa SHA
 MD5 8d4e25a15d917b3f5980eb1f0f95bf69 gimp-9999.ebuild 3517
 RMD160 943095f62954e4e17e0bf471fc9feb467746d5aa gimp-9999.ebuild 3517
 SHA256 66b3eb84ab6cf94f48ae26ff7161fafc5a68d4ab7c8c7c6b55fb62f0c2815273 gimp-9999.ebuild 3517
-MISC ChangeLog 28572 RMD160 95adb445c062b4a1ed1b88654f8c651e777e3baf SHA1 3631bc96e2673d577c338721a10aa95461c544ef SHA256 7b38ce71bcc1ad305b167f3ec81497866b37606133fe6f0b4075e94ca30a6b19
-MD5 5fac4ed47a8912961333d5faaf514fa4 ChangeLog 28572
-RMD160 95adb445c062b4a1ed1b88654f8c651e777e3baf ChangeLog 28572
-SHA256 7b38ce71bcc1ad305b167f3ec81497866b37606133fe6f0b4075e94ca30a6b19 ChangeLog 28572
+MISC ChangeLog 28684 RMD160 a9974621a9fa8f06fdf45aac57cb7a24d1d6f40a SHA1 840f85f842b3b615189dbcb5201b8f6d17304f49 SHA256 f1a6240e4cd71aa43ce287c0d15e4094b41858b839782bf772680cb8bbe68aa6
+MD5 daca0cbd0899a280cc9d8718a03e0d6d ChangeLog 28684
+RMD160 a9974621a9fa8f06fdf45aac57cb7a24d1d6f40a ChangeLog 28684
+SHA256 f1a6240e4cd71aa43ce287c0d15e4094b41858b839782bf772680cb8bbe68aa6 ChangeLog 28684
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
 MD5 8fee4c6e0af48517b726cceb49fa580a metadata.xml 220
 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 metadata.xml 220
@@ -31,9 +39,19 @@ SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081 metadata
 MD5 9afd8c1e90b3fdf2a6433b2719f6b7b0 files/digest-gimp-2.2.14 244
 RMD160 6c125bd082d91a20f3c645a619e47d3c87f37afd files/digest-gimp-2.2.14 244
 SHA256 cf1ffa6f5b69db90627506914fe970ffdfe9c3ddb7663375f32ee03bee2a83c9 files/digest-gimp-2.2.14 244
+MD5 ddf4a713be8aff8df0de5101f98d6c67 files/digest-gimp-2.2.15 244
+RMD160 9fba979e25a8dd34d75a0f76be445a6284fd0606 files/digest-gimp-2.2.15 244
+SHA256 1b4cb59e071afb8f90d931e9f0044f94b172f2f6ef0e83da047518c17bd28670 files/digest-gimp-2.2.15 244
 MD5 fb64286ef3cdb0d669d1d9bbd639505b files/digest-gimp-2.3.16 244
 RMD160 6241fa34d1e316c3f99b12ee88f3642dd548ad38 files/digest-gimp-2.3.16 244
 SHA256 9e28c37f77a9046d208921dca60ece4f8833ee211ab18b59d625dc8153df1edf files/digest-gimp-2.3.16 244
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gimp-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gimp-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gimp-9999 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGXeEHr2QksT29OyARAlxMAJ0cPIe3IXTNKaypP7ic8mzhTs95EwCffA/y
+t2sKgCML0vVqTho+F1Vmqqk=
+=KSK3
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.15 b/media-gfx/gimp/files/digest-gimp-2.2.15
new file mode 100644
index 000000000000..e89dae3395d5
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.2.15
@@ -0,0 +1,3 @@
+MD5 5e705f0c7a3b37703d407e88bee357bb gimp-2.2.15.tar.bz2 13097438
+RMD160 322b5c07de9e6cc9b206d944278d58d8d6cd1e2f gimp-2.2.15.tar.bz2 13097438
+SHA256 d14621ab9bc18c4f491146d443fefbdf3eecb8470896545ce58f5c1e2fc450d7 gimp-2.2.15.tar.bz2 13097438
diff --git a/media-gfx/gimp/gimp-2.2.15.ebuild b/media-gfx/gimp/gimp-2.2.15.ebuild
new file mode 100644
index 000000000000..27f608a93514
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.2.15.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.15.ebuild,v 1.1 2007/05/30 20:39:16 hanno Exp $
+
+inherit flag-o-matic libtool eutils fdo-mime alternatives multilib python
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+
+SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png
+python smp sse svg tiff wmf"
+
+#	X? ( virtual/x11 )"
+RDEPEND=">=dev-libs/glib-2.4.5
+	>=x11-libs/gtk+-2.4.4
+	>=x11-libs/pango-1.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/fontconfig-2.2
+	>=media-libs/libart_lgpl-2.3.8-r1
+	sys-libs/zlib
+	dev-libs/libxml2
+	dev-libs/libxslt
+
+	gimpprint? ( =media-gfx/gimp-print-4.2* )
+	gtkhtml? ( =gnome-extra/gtkhtml-2* )
+
+	png? ( >=media-libs/libpng-1.2.10 )
+	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 )
+	lcms? ( media-libs/lcms )
+	doc? ( app-doc/gimp-help )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	dev-util/intltool
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+src_unpack() {
+
+	unpack "${A}"
+	cd "${S}"
+
+	# fixes bug #76050, allows for themable icons
+	sed -i -e s,@gimpdatadir@/images/@GIMP_DESKTOP_ICON@,@GIMP_DESKTOP_ICON@, ${S}/data/misc/gimp.desktop.in.in
+
+	# 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=
+
+	# remove this for now, since I have 3 reports that this is
+	# not necessary
+	# replace-flags "-march=k6*" "-march=i586"
+
+	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
+	# gimp uses floating point math, needs accuracy (#98685)
+	filter-flags "-fno-inline" "-ffast-math"
+
+	# this is fixed in HEAD, but apply when using mmx
+	if use mmx; then
+		append-flags "-fomit-frame-pointer"
+	fi
+
+	if use hardened; then
+		ewarn "hardened use flag suppressing mmx use flag"
+		HARDENED_SUPPRESS_MMX="--disable-mmx"
+	elif use x86; then
+		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
+	elif use amd64; then
+		HARDENED_SUPPRESS_MMX="--enable-mmx"
+	fi
+
+	local myconf
+
+	# Hard enable SIMD assembler code for AMD64.
+	if use x86; then
+		myconf="${myconf} `use_enable sse`"
+	elif use amd64; then
+		myconf="${myconf} --enable-sse"
+	fi
+
+	econf \
+		--disable-default-binary \
+		--with-x \
+		"${HARDENED_SUPPRESS_MMX}" \
+		${myconf} \
+		`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_enable smp mp` \
+		`use_with tiff libtiff` \
+		`use_with mng libmng` \
+		`use_with aalib aa` \
+		`use_with lcms` \
+		`use_with gtkhtml gtkhtml2` \
+		`use_with svg librsvg` \
+		`use_enable debug` || die
+
+	# X isn't optional (#58003) atm
+	#	`use_with X x` \
+
+	emake || die
+}
+
+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 ChangeLog* HACKING NEWS README*
+
+	# Create the gimp-remote link, see bug #36648
+	dosym gimp-remote-2.2 /usr/bin/gimp-remote
+}
+
+pkg_postinst() {
+	alternatives_auto_makesym "/usr/bin/gimp" "/usr/bin/gimp-[0-9].[0-9]"
+
+	# fix for bug #76050
+	ln -s $(gimptool-2.0 --gimpdatadir)/images/wilber-icon.png \
+		${ROOT}/usr/share/pixmaps/
+
+	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() {
+	[[ ! -f ${ROOT}/usr/bin/gimp-2.2 ]] && \
+		rm -f ${ROOT}/usr/share/pixmaps/wilber-icon.png
+
+	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
+}