new version. migrate to gimp-help ebuild. drop alpha, ia64, mips. fixes #139471 and #139524.

Package-Manager: portage-2.1.1_pre2-r4

4 files changed, 191 insertions, 5 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 3ead4cc0a891..c946eb768316 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.160 2006/07/07 06:29:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.161 2006/07/07 14:30:41 allanonjl Exp $
+
+*gimp-2.2.12 (07 Jul 2006)
+
+  07 Jul 2006; John N. Laliberte <allanonjl@gentoo.org> +gimp-2.2.12.ebuild:
+  new version. migrate to gimp-help ebuild. drop alpha, ia64, mips. fixes
+  #139471 and #139524.
 
   07 Jul 2006; Markus Rothe <corsair@gentoo.org> gimp-2.2.11-r1.ebuild:
   Stable on ppc64; bug #139146
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index c2198c561ed5..8e3b913d1483 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -25,6 +25,7 @@ SHA256 8335de81c1b94ecf25f1f68421af6a76be571a0c131277f165818ab6a37541fe files/lt
 DIST gimp-1.2.5.tar.bz2 10885324 RMD160 d1be734271b763a22c0e8f5981c5c330a7744d31 SHA256 8c94835819203d7bc9bac2266a78bb7610a6dc473043b5362dc2a2aea720773b
 DIST gimp-2.2.10.tar.bz2 12916552 RMD160 3c1a18f0b1d2cc9d14f4777d270d69362149be77 SHA1 42d89a933f9dd663fe9857de09c67d1c1ba72ed8 SHA256 41f4befa851177e2ca9bbab2fad19926178c831454ca51f2cb91fec0ed9e243e
 DIST gimp-2.2.11.tar.bz2 12854751 RMD160 0304a859d53e4e6b7520b5e8634e64e07911eeba SHA1 11d22fb8448a87968e03cacf7f30cd7f6725d7c3 SHA256 169441ac8dd59d0dda52e4a93622e9824e74bf79b56aab6908c74ffd0418a2d4
+DIST gimp-2.2.12.tar.bz2 12875447 RMD160 31a4ee1344f799619dd9b38ea78e8748556fe7cb SHA1 f0368b069e0230e0411a18e7cb6f5fcc30325f1a SHA256 fd8368522f8d5d9db16d930f1ef702c5f052e513ab9801ac1fb91f7f26205baa
 DIST gimp-2.2.6.tar.bz2 13990261 RMD160 dad86a24499034f5428e29b4b925b5d316b9ac9d SHA256 e3ea3b0570a16a6cb2562b5bb1bdc78ea49efaf06b113f6e03691ac13b9fd877
 DIST gimp-2.2.8.tar.bz2 14016570 RMD160 9cdb97d34d884fe3c4467ace02ca882e35055d63 SHA1 48723b2f15206401875312b222a88bcde801301b SHA256 b8042476ef1257ed47a68eeb3e991280c2d2d0c9470e15379d0e6eb922ad7bed
 DIST gimp-2.2.9.tar.bz2 12811906 RMD160 31bd586716902dbb2e59ac552d0b14b1dcd19314 SHA256 7790a634e8a47e01c7108afeea933f9b614743eb1abd89dce4cb78adeec911fb
@@ -49,6 +50,10 @@ EBUILD gimp-2.2.11.ebuild 4515 RMD160 51b62f094453c92b20ddb69da0557171587c1b0f S
 MD5 cbcae4f73981bcf028c9d895a8a6261d gimp-2.2.11.ebuild 4515
 RMD160 51b62f094453c92b20ddb69da0557171587c1b0f gimp-2.2.11.ebuild 4515
 SHA256 b82876e778cb49ff20f3a1c81eb06b53347566d7a4aeea1c5c67249b72d5052b gimp-2.2.11.ebuild 4515
+EBUILD gimp-2.2.12.ebuild 4248 RMD160 1125232df7351ae1a402f4a766a73c03aba28436 SHA1 3c13bb1c2c6aac2ad8ce05f116ce576e9f23847c SHA256 590653c14cfd5eb353f15ec27f52ba19e9f0c4f580b39af7d1774a6911ec0526
+MD5 014259f10fbe7be92d6a258bb526878e gimp-2.2.12.ebuild 4248
+RMD160 1125232df7351ae1a402f4a766a73c03aba28436 gimp-2.2.12.ebuild 4248
+SHA256 590653c14cfd5eb353f15ec27f52ba19e9f0c4f580b39af7d1774a6911ec0526 gimp-2.2.12.ebuild 4248
 EBUILD gimp-2.2.6-r1.ebuild 4317 RMD160 5c05613fe31aee6bbfcf6c718047e0648c0e5cae SHA1 524ed713208d83224195c3d94ecce7ef3a5cd1ab SHA256 4fb8e51a5b2fe653b97ef63f2794d69b83bdafddaa3bda4da5196fc0c64ae2b0
 MD5 1382a2b01c1037d137a51a4f51783592 gimp-2.2.6-r1.ebuild 4317
 RMD160 5c05613fe31aee6bbfcf6c718047e0648c0e5cae gimp-2.2.6-r1.ebuild 4317
@@ -69,10 +74,10 @@ EBUILD gimp-9999.ebuild 3747 RMD160 966a6cddc7b66ef865e4e4bfe300e4cfc9f28530 SHA
 MD5 cb28e0f4fd31a202c20e3fa91b8b79b8 gimp-9999.ebuild 3747
 RMD160 966a6cddc7b66ef865e4e4bfe300e4cfc9f28530 gimp-9999.ebuild 3747
 SHA256 c89fc4b85a5f70b43a28d352edaffcc2ef2e52fd0a48817d9d5687213e8cf51b gimp-9999.ebuild 3747
-MISC ChangeLog 23377 RMD160 e8c5a9cdfa567a0f4755e92955d258bd0e692f70 SHA1 80ae02a0b40810d50479e3951e1f0c5a753c973d SHA256 ee52e33d62cbfefd70714aa39269c7c1de1d003c52974d80e776b7964059eeee
-MD5 946bdd1439836748e7ee5ca5751f5b53 ChangeLog 23377
-RMD160 e8c5a9cdfa567a0f4755e92955d258bd0e692f70 ChangeLog 23377
-SHA256 ee52e33d62cbfefd70714aa39269c7c1de1d003c52974d80e776b7964059eeee ChangeLog 23377
+MISC ChangeLog 23582 RMD160 8ed5a9a382299fc7efab3384eb8c54526aefaaf1 SHA1 642cec4f8a8124503f654e196aefb5c23c435626 SHA256 ed89595d53cacd7be8b93de30d5efe48cfd637cd06aad8ac06b0edc9c022adc6
+MD5 a7572ffbc1bdcb8b0f91441410b5fa77 ChangeLog 23582
+RMD160 8ed5a9a382299fc7efab3384eb8c54526aefaaf1 ChangeLog 23582
+SHA256 ed89595d53cacd7be8b93de30d5efe48cfd637cd06aad8ac06b0edc9c022adc6 ChangeLog 23582
 MISC metadata.xml 369 RMD160 b71b3f982cd3a530df18bb05a2a32430e0c1daea SHA1 1c448e18bc74a560156318c4d9186b4e31ccba0c SHA256 4fbdad87f03de0aa7de4d07707a4d870d2c0cba55fc3cd563dae0945620d763d
 MD5 cda75d04f4767d3920ffc234e66d95c7 metadata.xml 369
 RMD160 b71b3f982cd3a530df18bb05a2a32430e0c1daea metadata.xml 369
@@ -89,6 +94,9 @@ SHA256 b383d8d7114e41eaaca27e48b94f3da1efa2d0c54b6841f5821f7467fef27aba files/di
 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 afe22f024af8db30fd2f1dae48976916 files/digest-gimp-2.2.12 244
+RMD160 ca2f36da228d744120fbbaa319f8683e463e1615 files/digest-gimp-2.2.12 244
+SHA256 32c803f8e8e08342520c9f39803cd758731d2c8c792644e9bf9d2806581dd84a files/digest-gimp-2.2.12 244
 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.12 b/media-gfx/gimp/files/digest-gimp-2.2.12
new file mode 100644
index 000000000000..ccb24da9eee4
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.2.12
@@ -0,0 +1,3 @@
+MD5 6a1906db60166a88317f2df5f195a57d gimp-2.2.12.tar.bz2 12875447
+RMD160 31a4ee1344f799619dd9b38ea78e8748556fe7cb gimp-2.2.12.tar.bz2 12875447
+SHA256 fd8368522f8d5d9db16d930f1ef702c5f052e513ab9801ac1fb91f7f26205baa gimp-2.2.12.tar.bz2 12875447
diff --git a/media-gfx/gimp/gimp-2.2.12.ebuild b/media-gfx/gimp/gimp-2.2.12.ebuild
new file mode 100644
index 000000000000..6f442f965e77
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.2.12.ebuild
@@ -0,0 +1,169 @@
+# 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.12.ebuild,v 1.1 2006/07/07 14:30:41 allanonjl Exp $
+
+inherit flag-o-matic libtool eutils fdo-mime alternatives
+
+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="~amd64 ~hppa ~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
+	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
+}