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

(Portage version: 2.1.1_pre2-r4)

3 files changed, 179 insertions, 1 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/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
+}