Revision bump, added patch to fix compilation with libpng >=1.2.10 (bug #136661). Thanks to "michel <michel7@mail.ru>" for the patch.

Package-Manager: portage-2.1_rc4-r2

5 files changed, 235 insertions, 5 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 5c3683efc888..dd599cd2bb97 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.146 2006/06/15 15:43:43 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.147 2006/06/16 13:50:37 chutzpah Exp $
+
+*gimp-2.2.11-r1 (16 Jun 2006)
+
+  16 Jun 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/gimp-2.2.11-libpng-1.2.10.patch, +gimp-2.2.11-r1.ebuild:
+  Revision bump, added patch to fix compilation with libpng >=1.2.10 (bug
+  #136661). Thanks to "michel <michel7@mail.ru>" for the patch.
 
 *gimp-2.2.11 (15 Jun 2006)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 5416e088b12b..9cf61850af06 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,7 @@
+AUX gimp-2.2.11-libpng-1.2.10.patch 483 RMD160 0449ce96b44330847c16fd75086e0e13b501c789 SHA1 eb4bad47ea63b08009f2c7b964be3d60f5416640 SHA256 6f2614b24e91d7f7b645b14778c2c935f965ddfa6087b7086652b8bc70002df6
+MD5 13fb5cd8091e7f21d4be92dc8e2f63a3 files/gimp-2.2.11-libpng-1.2.10.patch 483
+RMD160 0449ce96b44330847c16fd75086e0e13b501c789 files/gimp-2.2.11-libpng-1.2.10.patch 483
+SHA256 6f2614b24e91d7f7b645b14778c2c935f965ddfa6087b7086652b8bc70002df6 files/gimp-2.2.11-libpng-1.2.10.patch 483
 AUX gimp-2.2.8-configure-fix.patch 2423 RMD160 707a1bbe83f4d39f58043374781734e2b0bef837 SHA1 4f1000c8b08ff81cda7d3022f657999e8be305fc SHA256 dd93b399bac7ceed86099f11a6cdc9de30e6a144fbf37760f2a949f659f98662
 MD5 ff17b80bceb6bd818e20556c23647b0f files/gimp-2.2.8-configure-fix.patch 2423
 RMD160 707a1bbe83f4d39f58043374781734e2b0bef837 files/gimp-2.2.8-configure-fix.patch 2423
@@ -36,6 +40,10 @@ EBUILD gimp-2.2.10.ebuild 4498 RMD160 24b708bfb605a0598437b4a53a1f9f874ee7ed68 S
 MD5 22d3ea7e66a7b819f1159c778fa41b13 gimp-2.2.10.ebuild 4498
 RMD160 24b708bfb605a0598437b4a53a1f9f874ee7ed68 gimp-2.2.10.ebuild 4498
 SHA256 cfb9685719dc688716a1eede8876252fef2fbe14f6df671a8dc50c52aab48ec6 gimp-2.2.10.ebuild 4498
+EBUILD gimp-2.2.11-r1.ebuild 4592 RMD160 9233c55568768b7c72cb5c277f40cf103dc67ad5 SHA1 95e3cc72ec8611003debd90eb62339aa2ac1fa35 SHA256 c258c595bfdfaf7850cb402cfc01c4024151ee363f1c322c2535648c5339d49f
+MD5 19d1ca55e6c880b200a4233029d6d816 gimp-2.2.11-r1.ebuild 4592
+RMD160 9233c55568768b7c72cb5c277f40cf103dc67ad5 gimp-2.2.11-r1.ebuild 4592
+SHA256 c258c595bfdfaf7850cb402cfc01c4024151ee363f1c322c2535648c5339d49f gimp-2.2.11-r1.ebuild 4592
 EBUILD gimp-2.2.11.ebuild 4489 RMD160 bf8be9d12f7e51397b1e3c309c42aaf8a229fd4a SHA1 e109fa5f74b839581d09638901464436947dc5ec SHA256 ffba38374eff54f9e1a2e944aaf918b775128c3b207c7259e14ffd0d898c2ed1
 MD5 8d8dce8d23aa7a7d94575a7a500fe77f gimp-2.2.11.ebuild 4489
 RMD160 bf8be9d12f7e51397b1e3c309c42aaf8a229fd4a gimp-2.2.11.ebuild 4489
@@ -56,10 +64,10 @@ EBUILD gimp-9999.ebuild 3774 RMD160 6a487d20ae59802dd8948e0ca297770ec6f290b8 SHA
 MD5 7eb39d8305fe8d683e63c7e6f7d98be5 gimp-9999.ebuild 3774
 RMD160 6a487d20ae59802dd8948e0ca297770ec6f290b8 gimp-9999.ebuild 3774
 SHA256 ff834b60e28985f5066ab0b79e9e1d77034e615926188d6948c8ae2e934585c2 gimp-9999.ebuild 3774
-MISC ChangeLog 21251 RMD160 acc72131a7a523cdd7c039447832a16b0341bdaa SHA1 964ba578d6abcedc4a46096b2ca3b7cd070ce4a8 SHA256 203cef2c7c1788ebe95991387a6daba550e64f3a0864b7dcc9f953dd0c8e0c8b
-MD5 06ed23f575ce9d8012f100eb73f3c312 ChangeLog 21251
-RMD160 acc72131a7a523cdd7c039447832a16b0341bdaa ChangeLog 21251
-SHA256 203cef2c7c1788ebe95991387a6daba550e64f3a0864b7dcc9f953dd0c8e0c8b ChangeLog 21251
+MISC ChangeLog 21540 RMD160 1a6572abfef002b68acd0930be7cebb45d8307cd SHA1 ed27b4d7591fcaf028c9bf63ee8ee04e8dbb8edf SHA256 93b245dba93953da2c51096f9230e1e1f471f217bb01754ddcdb3514d91c2241
+MD5 af9053e4a8ebf7f45833d197db99adf9 ChangeLog 21540
+RMD160 1a6572abfef002b68acd0930be7cebb45d8307cd ChangeLog 21540
+SHA256 93b245dba93953da2c51096f9230e1e1f471f217bb01754ddcdb3514d91c2241 ChangeLog 21540
 MISC metadata.xml 369 RMD160 b71b3f982cd3a530df18bb05a2a32430e0c1daea SHA1 1c448e18bc74a560156318c4d9186b4e31ccba0c SHA256 4fbdad87f03de0aa7de4d07707a4d870d2c0cba55fc3cd563dae0945620d763d
 MD5 cda75d04f4767d3920ffc234e66d95c7 metadata.xml 369
 RMD160 b71b3f982cd3a530df18bb05a2a32430e0c1daea metadata.xml 369
@@ -73,6 +81,9 @@ SHA256 d0301500a80744c1c3931c3c308fde66e4c8a6112a199512cfc8c360b78d44fc files/di
 MD5 155933e4a5b214d0efc3ae62b5cecfcd files/digest-gimp-2.2.11 500
 RMD160 1fd7577cc934786f78355c85cf7ea28e2baacfe4 files/digest-gimp-2.2.11 500
 SHA256 b383d8d7114e41eaaca27e48b94f3da1efa2d0c54b6841f5821f7467fef27aba files/digest-gimp-2.2.11 500
+MD5 155933e4a5b214d0efc3ae62b5cecfcd files/digest-gimp-2.2.11-r1 500
+RMD160 1fd7577cc934786f78355c85cf7ea28e2baacfe4 files/digest-gimp-2.2.11-r1 500
+SHA256 b383d8d7114e41eaaca27e48b94f3da1efa2d0c54b6841f5821f7467fef27aba files/digest-gimp-2.2.11-r1 500
 MD5 692d7b6d23f89a136481f93cd809964e files/digest-gimp-2.2.6-r1 494
 RMD160 8cb390d7126022f077cecb89cf6fd855fbafa36b files/digest-gimp-2.2.6-r1 494
 SHA256 77a07e8ba41cb031bfd6809cc75332766c75fd419630d0628a50de62007c087d files/digest-gimp-2.2.6-r1 494
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.11-r1 b/media-gfx/gimp/files/digest-gimp-2.2.11-r1
new file mode 100644
index 000000000000..04c1c784b259
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.2.11-r1
@@ -0,0 +1,6 @@
+MD5 0403e9b4e0415c99cd27b137b9839212 gimp-2.2.11.tar.bz2 12854751
+RMD160 0304a859d53e4e6b7520b5e8634e64e07911eeba gimp-2.2.11.tar.bz2 12854751
+SHA256 169441ac8dd59d0dda52e4a93622e9824e74bf79b56aab6908c74ffd0418a2d4 gimp-2.2.11.tar.bz2 12854751
+MD5 22a1e10c314c5547fe8721c4f6f0b30a gimp-help-2-0.10.tar.gz 41802089
+RMD160 8bf675b1973077f810382d90f36e8c4057e22aea gimp-help-2-0.10.tar.gz 41802089
+SHA256 cd1cd381435823809264e10ede6d597ec46d443c5bcd7b803da4190ba505454f gimp-help-2-0.10.tar.gz 41802089
diff --git a/media-gfx/gimp/files/gimp-2.2.11-libpng-1.2.10.patch b/media-gfx/gimp/files/gimp-2.2.11-libpng-1.2.10.patch
new file mode 100644
index 000000000000..92fddcf1b8fe
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.2.11-libpng-1.2.10.patch
@@ -0,0 +1,20 @@
+--- plug-ins/common/png.c.orig	2006-06-15 19:45:07.000000000 +0200
++++ plug-ins/common/png.c	2006-06-15 19:45:51.000000000 +0200
+@@ -1012,7 +1012,7 @@
+    * Done with the file...
+    */
+ 
+-  png_read_destroy (pp, info, NULL);
++  png_destroy_read_struct(&pp, &info, NULL);
+ 
+   g_free (pixel);
+   g_free (pixels);
+@@ -1441,7 +1441,7 @@
+     };
+ 
+   png_write_end (pp, info);
+-  png_write_destroy (pp);
++  png_destroy_write_struct(&pp, &info);
+ 
+   g_free (pixel);
+   g_free (pixels);
diff --git a/media-gfx/gimp/gimp-2.2.11-r1.ebuild b/media-gfx/gimp/gimp-2.2.11-r1.ebuild
new file mode 100644
index 000000000000..90d4aba6713a
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.2.11-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.11-r1.ebuild,v 1.1 2006/06/16 13:50:37 chutzpah Exp $
+
+inherit flag-o-matic libtool eutils fdo-mime alternatives
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+
+P_HELP="gimp-help-2-0.10"
+S_HELP="$WORKDIR/${P_HELP}"
+SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
+	doc? ( mirror://gimp/help/${P_HELP}.tar.gz )"
+
+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 )"
+
+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"
+
+	# fix for change in libpng's API (bug #136661)
+	epatch "${FILESDIR}/${P}-libpng-1.2.10.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
+
+	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 ChangeLog* HACKING NEWS README*
+
+	if use doc; then
+		cd ${S_HELP}
+		make DESTDIR="${D}" install || die
+	fi
+
+	# 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
+	einfo ""
+	einfo "If you want Postscript file support, emerge ghostscript."
+	einfo ""
+}
+
+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
+}