new version, new version of gimp-help as well. remove restart marker patch and configure patch, they have been applied upstream. bump fixes #110650

(Portage version: 2.0.51.22-r3)

4 files changed, 192 insertions, 7 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index c7205b42c5ab..978d7f079cf7 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.132 2005/10/07 05:30:07 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.133 2005/10/28 00:46:29 allanonjl Exp $
+
+*gimp-2.2.9 (28 Oct 2005)
+
+  28 Oct 2005; John N. Laliberte <allanonjl@gentoo.org> +gimp-2.2.9.ebuild:
+  new version, new version of gimp-help as well. remove restart marker patch
+  and configure patch, they have been applied upstream. bump fixes #110650
 
   07 Oct 2005; Hardave Riar <hardave@gentoo.org> gimp-2.2.8-r1.ebuild:
   Stable on mips.
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index a76a6ef5d465..88ae16b32ee1 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,12 +1,14 @@
-MD5 0691e39aad2762f2b514ddfad5a0f7b0 ChangeLog 19112
+MD5 326e632efd23ae195f7be64beaaa659d gimp-2.2.8-r1.ebuild 4424
 MD5 2649b2a2f35aa2549ab4d81e750ea2d2 gimp-1.2.5.ebuild 3279
 MD5 39d4983eff8a926fd6bc0b8bc122ee3f gimp-2.2.6-r1.ebuild 4307
-MD5 326e632efd23ae195f7be64beaaa659d gimp-2.2.8-r1.ebuild 4424
+MD5 75219cf936d2e4bcf998e4c7d33d81e8 ChangeLog 19368
+MD5 43550edaaa5ce6cc78a724d9b81fed6a gimp-2.2.9.ebuild 4253
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
-MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
+MD5 9d903731e90f07c2492aab4bd55f0e62 files/gimp-2.2.8-restart-marker.patch 611
+MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
+MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
 MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6-r1 134
 MD5 aebd823dc72aefe0a0e4596da64c7277 files/digest-gimp-2.2.8-r1 134
 MD5 ff17b80bceb6bd818e20556c23647b0f files/gimp-2.2.8-configure-fix.patch 2423
-MD5 9d903731e90f07c2492aab4bd55f0e62 files/gimp-2.2.8-restart-marker.patch 611
-MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
+MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
+MD5 1fec061bf029a6b9159111d1b54df32c files/digest-gimp-2.2.9 134
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.9 b/media-gfx/gimp/files/digest-gimp-2.2.9
new file mode 100644
index 000000000000..ea9a50c3453d
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.2.9
@@ -0,0 +1,2 @@
+MD5 737f4e74044427c12e30217dff0f29f5 gimp-2.2.9.tar.bz2 12811906
+MD5 c2f5c20cc5d861e7d403dda8e46d1c97 gimp-help-2-0.9.tar.gz 27227286
diff --git a/media-gfx/gimp/gimp-2.2.9.ebuild b/media-gfx/gimp/gimp-2.2.9.ebuild
new file mode 100644
index 000000000000..649409c20af1
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.2.9.ebuild
@@ -0,0 +1,175 @@
+# 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.9.ebuild,v 1.1 2005/10/28 00:46:29 allanonjl 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.9"
+S_HELP="$WORKDIR/${P_HELP}"
+SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
+	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~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="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 )
+	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
+}
+
+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)
+	# gimp uses floating point math, needs accuracy (#98685)
+	filter-flags "-fno-inline" "-ffast-math"
+
+	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 /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() {
+	rm /usr/share/pixmaps/wilber-icon.png
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}