added symlink to icon in /usr/share/pixmaps to fix themed icons. submitted configure.in patch upstream.

(Portage version: 2.0.51.19)

4 files changed, 202 insertions, 1 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index dce501b51212..7455d6a7a61d 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.116 2005/05/24 11:17:31 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.117 2005/06/15 01:53:23 allanonjl Exp $
+
+*gimp-2.2.7-r1 (15 Jun 2005)
+
+  15 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +gimp-2.2.7-r1.ebuild:
+  added symlink to icon in /usr/share/pixmaps. submitted configure.in patch
+  upstream.
 
   24 May 2005; John N. Laliberte <allanonjl@gentoo.org> gimp-2.2.7.ebuild:
   add svg to econf section, fixes #93787
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index b9c24a1bb65c..d0e23490d33a 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -4,6 +4,7 @@ MD5 0c8f35412e83518ba717b652b05e4c85 gimp-2.0.2.ebuild 2569
 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 1822f824383329391b6293ee5b08fbcf gimp-2.2.7-r1.ebuild 4517
 MD5 542c10ced4b60c3b5f6d181da2c008d4 gimp-2.2.0.ebuild 3512
 MD5 23321eb2aa740463c9181ddcacb2c9bd gimp-2.0.6.ebuild 3247
 MD5 7989ef1fed772c8b156a68bd17e0aacc gimp-2.2.7.ebuild 4425
@@ -18,6 +19,7 @@ MD5 ff17b80bceb6bd818e20556c23647b0f files/gimp-2.2.7-configure-fix.patch 2423
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
 MD5 8bf83fb83ce1c66006a27a7d9ec29dd7 files/pygimp-logo.png 19823
 MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6-r1 134
+MD5 2162d2ea38409b9e373a4086797a4c49 files/digest-gimp-2.2.7-r1 134
 MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
 MD5 568ba885fc51613466e3b0039e21946c files/digest-gimp-2.0.0 65
 MD5 1f2afa6b0785b0547e956d5aff63cf4d files/digest-gimp-2.0.2 65
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.7-r1 b/media-gfx/gimp/files/digest-gimp-2.2.7-r1
new file mode 100644
index 000000000000..cb5b67314b31
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.2.7-r1
@@ -0,0 +1,2 @@
+MD5 fb2871717998e5958a84f4c26d143d95 gimp-2.2.7.tar.bz2 13975346
+MD5 2058eb88fe7a9d230bf3284546445c65 gimp-help-2-0.8.tar.gz 19038567
diff --git a/media-gfx/gimp/gimp-2.2.7-r1.ebuild b/media-gfx/gimp/gimp-2.2.7-r1.ebuild
new file mode 100644
index 000000000000..4e4ba845bc6d
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.2.7-r1.ebuild
@@ -0,0 +1,190 @@
+# 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.7-r1.ebuild,v 1.1 2005/06/15 01:53:23 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.8"
+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 scanner 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 )
+
+	scanner? ( media-gfx/xsane
+		media-gfx/sane-backends
+		media-gfx/sane-frontends
+		)"
+
+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
+	epatch ${FILESDIR}/${P}-configure-fix.patch
+
+	# fix for configure patch
+	aclocal
+	libtoolize --force --copy
+	autoconf
+}
+
+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
+
+	# 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_enable lcms` \
+		`use_enable gtkhtml` \
+		`use_enable svg` \
+		`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
+
+	# if use scanner, create the symlink see bug #93018
+	if use scanner; then
+		dosym /usr/bin/xscanimage /usr/lib/gimp/2.0/plug-ins/
+	fi
+}
+
+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
+}