Added cache updates to 2.2.6. Marked stable on x86.

(Portage version: 2.0.51.19)

5 files changed, 206 insertions, 29 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index a721f477d992..ac985f79f309 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.107 2005/04/22 17:20:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.108 2005/05/10 12:54:05 allanonjl Exp $
+
+*gimp-2.2.6-r1 (10 May 2005)
+
+  10 May 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +gimp-2.2.6-r1.ebuild:
+  Added cache updates to 2.2.6. Marked stable on x86.
 
   22 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> gimp-2.2.6.ebuild:
   ~ia64 keyword, bug 89768.
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 34b34513ab68..abf8cb89af24 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,35 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e041f8b965cd6c4c418f77e49b9f131f ChangeLog 15723
-MD5 405d2674bac45813485d5abed39d6eb3 gimp-2.2.3.ebuild 3740
-MD5 542c10ced4b60c3b5f6d181da2c008d4 gimp-2.2.0.ebuild 3512
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 23321eb2aa740463c9181ddcacb2c9bd gimp-2.0.6.ebuild 3247
-MD5 b7f3525874f600867d25816774e51965 gimp-2.2.6.ebuild 3657
 MD5 b3fb5e1d6f43034d0b9182f097b2df11 gimp-2.0.0.ebuild 2654
+MD5 f692a1112d7cdb428aca80bb60441a87 gimp-2.2.6.ebuild 3651
 MD5 0c8f35412e83518ba717b652b05e4c85 gimp-2.0.2.ebuild 2569
-MD5 f4ee70356bf8aa8f588d0d41e194c584 gimp-2.0.4.ebuild 3203
+MD5 405d2674bac45813485d5abed39d6eb3 gimp-2.2.3.ebuild 3740
 MD5 77ea6e18335093980ca0521510f64183 gimp-1.2.5.ebuild 3202
+MD5 f4ee70356bf8aa8f588d0d41e194c584 gimp-2.0.4.ebuild 3203
+MD5 542c10ced4b60c3b5f6d181da2c008d4 gimp-2.2.0.ebuild 3512
+MD5 23321eb2aa740463c9181ddcacb2c9bd gimp-2.0.6.ebuild 3247
+MD5 048fe53de8f7cc82bd2fb50b9e0996f3 gimp-2.2.6-r1.ebuild 4220
+MD5 d1408045732090298ce2185a2eba1aa6 ChangeLog 15889
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 7878202fbf35cdba9a2907b735cbf90c gimp-2.0.5.ebuild 3216
+MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
+MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
+MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 397055832117d5c76e873af50a2e6f30 files/digest-gimp-2.0.5 134
-MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6 134
 MD5 8bf83fb83ce1c66006a27a7d9ec29dd7 files/pygimp-logo.png 19823
-MD5 675541af3f64fc4acdd1bd3e759b607d files/digest-gimp-2.2.3 134
+MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6-r1 134
 MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
-MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
-MD5 0d3108f9120d6976ce4ccb29a131aea7 files/digest-gimp-2.0.4 133
-MD5 204a8065e28141810fbda423e4118b9e files/digest-gimp-2.2.0 134
-MD5 1f2afa6b0785b0547e956d5aff63cf4d files/digest-gimp-2.0.2 65
 MD5 568ba885fc51613466e3b0039e21946c files/digest-gimp-2.0.0 65
-MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
-MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
+MD5 1f2afa6b0785b0547e956d5aff63cf4d files/digest-gimp-2.0.2 65
+MD5 0d3108f9120d6976ce4ccb29a131aea7 files/digest-gimp-2.0.4 133
+MD5 397055832117d5c76e873af50a2e6f30 files/digest-gimp-2.0.5 134
 MD5 bbe7cd6ece5455900adcaeed9b467679 files/digest-gimp-2.0.6 134
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCaTJdKf2g/qXtneoRAmW3AJ9oaxPfWomfoOar/4lTvEM0QvIaNwCffiQt
-cSalpFiFjcOn3IqqH8ez8ow=
-=qO4U
------END PGP SIGNATURE-----
+MD5 204a8065e28141810fbda423e4118b9e files/digest-gimp-2.2.0 134
+MD5 675541af3f64fc4acdd1bd3e759b607d files/digest-gimp-2.2.3 134
+MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6 134
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.6-r1 b/media-gfx/gimp/files/digest-gimp-2.2.6-r1
new file mode 100644
index 000000000000..4ff3355ba400
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.2.6-r1
@@ -0,0 +1,2 @@
+MD5 cf7de255739bf5abc2e90d7882eda6c9 gimp-2.2.6.tar.bz2 13990261
+MD5 aee429af1f99e3d1f9e23d5d4a6d3622 gimp-help-2-0.7.tar.gz 15500754
diff --git a/media-gfx/gimp/gimp-2.2.6-r1.ebuild b/media-gfx/gimp/gimp-2.2.6-r1.ebuild
new file mode 100644
index 000000000000..aae97cb1ae28
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.2.6-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.6-r1.ebuild,v 1.1 2005/05/10 12:54:05 allanonjl Exp $
+
+inherit flag-o-matic libtool eutils fdo-mime
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+LICENSE="GPL-2"
+
+P_HELP="gimp-help-2-0.7" #gimp-help-2-{version}
+S_HELP="$WORKDIR/${P_HELP}"
+SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
+	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
+
+SLOT="2"
+KEYWORDS="x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha"
+#IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
+IUSE="aalib altivec debug doc gtkhtml gimpprint jpeg mmx mng png python sse svg tiff wmf"
+
+# FIXME : some more things can be (local) USE flagged
+# a few options are detection only, fix them to switch
+
+#	X? ( virtual/x11 )"
+RDEPEND="virtual/x11
+	>=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/libgtkhtml-2* )
+
+	png? ( >=media-libs/libpng-1.2.1 )
+	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 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	dev-util/intltool
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# 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=
+
+	replace-flags "-march=k6*" "-march=i586"
+
+	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
+	filter-flags "-fno-inline"
+
+	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
+	use doc || myconf="${myconf} --disable-devel-docs"
+
+	# 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_with tiff libtiff` \
+		`use_with mng libmng` \
+		`use_with aalib aa` \
+		`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() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	touch --no-create /usr/share/icons/hicolor
+	if [ -x ${ROOT}/usr/bin/gtk-update-icon-cache ]
+	then
+		einfo "Updating shared icon cache ..."
+		gtk-update-icon-cache -q /usr/share/icons/hicolor
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	touch --no-create /usr/share/icons/hicolor
+	if [ -x ${ROOT}/usr/bin/gtk-update-icon-cache ]
+	then
+		einfo "Updating shared icon cache ..."
+		gtk-update-icon-cache -q /usr/share/icons/hicolor
+	fi
+}
diff --git a/media-gfx/gimp/gimp-2.2.6.ebuild b/media-gfx/gimp/gimp-2.2.6.ebuild
index 3feedce9cb9f..d56011c90b2d 100644
--- a/media-gfx/gimp/gimp-2.2.6.ebuild
+++ b/media-gfx/gimp/gimp-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.6.ebuild,v 1.2 2005/04/22 17:20:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.6.ebuild,v 1.3 2005/05/10 12:54:05 allanonjl Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
 	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
 
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha ~ia64"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha"
 #IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
 IUSE="aalib altivec debug doc gtkhtml gimpprint jpeg mmx mng png python sse svg tiff wmf"