media-gfx/gimp: Cleanup of vulnerable ebuilds, disable automagic detection for dbus.

Package-Manager: portage-2.1.2.7

8 files changed, 37 insertions, 319 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index fff3d46fe586..b43bb470368a 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.198 2007/05/08 14:25:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.199 2007/05/09 04:44:12 hanno Exp $
+
+  09 May 2007; Hanno Boeck <hanno@gentoo.org> -gimp-2.2.12.ebuild,
+  -gimp-2.3.15.ebuild, gimp-2.3.16.ebuild, gimp-9999.ebuild:
+  Cleanup of vulnerable ebuilds, disable automagic detection for dbus.
 
   08 May 2007; Jeroen Roovers <jer@gentoo.org> gimp-2.2.14.ebuild:
   Stable for HPPA, despite that it does not run (bug #176226 and bug #168131).
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index fa09d55b9420..dbd27e4993f0 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gimp-sunras-bufferoverflow.diff 1530 RMD160 a6f50ed18481b698062bfed1316f36d79937e515 SHA1 4c6263b35b7a7324fb896a12cf8fa7bdb8aced94 SHA256 9114422a655884ec0ad64f3af15a39b7d45e8c48c59f3490c20e0b132ffef2f1
 MD5 48de54f51b3b6226fcc6b791a40efb78 files/gimp-sunras-bufferoverflow.diff 1530
 RMD160 a6f50ed18481b698062bfed1316f36d79937e515 files/gimp-sunras-bufferoverflow.diff 1530
@@ -6,50 +9,41 @@ AUX ltmain_sh-1.5.0-fix-relink.patch 1718 RMD160 dd7bfaef61da7474e003d2ce2cc5dc4
 MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 RMD160 dd7bfaef61da7474e003d2ce2cc5dc4fbbe297dc files/ltmain_sh-1.5.0-fix-relink.patch 1718
 SHA256 8335de81c1b94ecf25f1f68421af6a76be571a0c131277f165818ab6a37541fe files/ltmain_sh-1.5.0-fix-relink.patch 1718
-DIST gimp-2.2.12.tar.bz2 12875447 RMD160 31a4ee1344f799619dd9b38ea78e8748556fe7cb SHA1 f0368b069e0230e0411a18e7cb6f5fcc30325f1a SHA256 fd8368522f8d5d9db16d930f1ef702c5f052e513ab9801ac1fb91f7f26205baa
 DIST gimp-2.2.14.tar.bz2 12836732 RMD160 cf43fb0436a6086a0bc85fd4a33b009bee557aa0 SHA1 cf0926b9f0ca910b31219bafa8188a8b7ebabe10 SHA256 f672f123118b7b52dfce5833ba26512463295e29d542f32d629ba39870112b4f
-DIST gimp-2.3.15.tar.bz2 16080133 RMD160 8c2017dccf188fe2b76e8a15acdc91c338c3457a SHA1 7447afd00d2940e2dd02edfc92575715d3a52936 SHA256 419f42a6e9b305a6b7870771ef072e64265f9332f8dcfa341ba14f5216aa0ac7
 DIST gimp-2.3.16.tar.bz2 16370057 RMD160 f67d58f48b0997082024088ca37ef52c3b18c6bc SHA1 1987971e620a7b6a40a7f7ac8ac2b505277cce13 SHA256 fdccaed39f868a24ad408b4a84e5f13b2c8448562b17bdc5ca53f0ddda4f96f4
-EBUILD gimp-2.2.12.ebuild 4253 RMD160 8395551155852be50e5820aae58a14d994280df1 SHA1 1e3b92f5d6b1c243ccf9dfc90311a5111ef0b69c SHA256 2e2d6a2e9283a35a4e85df3a02c9178f4bf6ec3978dc812f0fd590b2675bb45b
-MD5 92856753c11adbe4bcdf42ef4641578c gimp-2.2.12.ebuild 4253
-RMD160 8395551155852be50e5820aae58a14d994280df1 gimp-2.2.12.ebuild 4253
-SHA256 2e2d6a2e9283a35a4e85df3a02c9178f4bf6ec3978dc812f0fd590b2675bb45b gimp-2.2.12.ebuild 4253
 EBUILD gimp-2.2.14.ebuild 4514 RMD160 abbc91bbf2f6556a06fc0828f83ce373d73b3c2a SHA1 f9aa9cd0a8d424acd2352413eba0206d5d6b6877 SHA256 b966e89ddf4f88f6b2d9df5e598112de81ffa30c462a63aac0415aebe902bddc
 MD5 6d08e0741e48c95aa5846cbd8ad003ee gimp-2.2.14.ebuild 4514
 RMD160 abbc91bbf2f6556a06fc0828f83ce373d73b3c2a gimp-2.2.14.ebuild 4514
 SHA256 b966e89ddf4f88f6b2d9df5e598112de81ffa30c462a63aac0415aebe902bddc gimp-2.2.14.ebuild 4514
-EBUILD gimp-2.3.15.ebuild 3091 RMD160 d2bcf5d142c028e1425e91af2056699ee282f224 SHA1 e33e0680680f44e744a7a0c10ac7ac202440593a SHA256 1d89edfbd5c8a5a2699cafe4bc50c5b458f7ded3f25be67a81f5d11df6ed78a2
-MD5 26097a0f5a5f6f6b2cc4202f2d17e9fa gimp-2.3.15.ebuild 3091
-RMD160 d2bcf5d142c028e1425e91af2056699ee282f224 gimp-2.3.15.ebuild 3091
-SHA256 1d89edfbd5c8a5a2699cafe4bc50c5b458f7ded3f25be67a81f5d11df6ed78a2 gimp-2.3.15.ebuild 3091
-EBUILD gimp-2.3.16.ebuild 3462 RMD160 07eb4433ddc2b167303c1ab7fd095286128a785a SHA1 c2b4d6f2444f8735d449bf12c2f593f1ec80f545 SHA256 fe1de087fd110fc496167377efe65b5184068859a029ad8ab6617b24fbf37d0d
-MD5 c5d4d7da053ebf59a78d72f926812c79 gimp-2.3.16.ebuild 3462
-RMD160 07eb4433ddc2b167303c1ab7fd095286128a785a gimp-2.3.16.ebuild 3462
-SHA256 fe1de087fd110fc496167377efe65b5184068859a029ad8ab6617b24fbf37d0d gimp-2.3.16.ebuild 3462
-EBUILD gimp-9999.ebuild 3446 RMD160 0ba7c1169ffe71eccc881d13f03aa66a999ba9c5 SHA1 9ad955ce83d77d23f359e723ecd0fff6f32d58a8 SHA256 b4cec52bada0393d5eafc40f12500ce9ab13dbf7066275aeba77948a5d149369
-MD5 3705c6397348d71bda2858f5c564cd30 gimp-9999.ebuild 3446
-RMD160 0ba7c1169ffe71eccc881d13f03aa66a999ba9c5 gimp-9999.ebuild 3446
-SHA256 b4cec52bada0393d5eafc40f12500ce9ab13dbf7066275aeba77948a5d149369 gimp-9999.ebuild 3446
-MISC ChangeLog 28183 RMD160 3263895c3ea4ae2c4bc844b50d968e3a4d04c0a1 SHA1 7851cbf6d17715566429a42c79eaac503b6c8243 SHA256 abcd458d290af4794e44422e77d0f7b377c0523c8158e9c4579552de0d40ee47
-MD5 bfbb97694f790bac74198357205f57ef ChangeLog 28183
-RMD160 3263895c3ea4ae2c4bc844b50d968e3a4d04c0a1 ChangeLog 28183
-SHA256 abcd458d290af4794e44422e77d0f7b377c0523c8158e9c4579552de0d40ee47 ChangeLog 28183
+EBUILD gimp-2.3.16.ebuild 3533 RMD160 9aec5a16a7df959174f3776ac85b55d44dc7c517 SHA1 e221c6bd62741d8ac4967640db9df4090650c7a1 SHA256 2c1fda5a99d82072cfbe33435f483cfc4da42310962282b2789d53334a90982e
+MD5 126336e0522b5e1a6ea780ce5aa3c7c5 gimp-2.3.16.ebuild 3533
+RMD160 9aec5a16a7df959174f3776ac85b55d44dc7c517 gimp-2.3.16.ebuild 3533
+SHA256 2c1fda5a99d82072cfbe33435f483cfc4da42310962282b2789d53334a90982e gimp-2.3.16.ebuild 3533
+EBUILD gimp-9999.ebuild 3517 RMD160 943095f62954e4e17e0bf471fc9feb467746d5aa SHA1 4b1ccf538cac15325801300846dcbc03fb3e5854 SHA256 66b3eb84ab6cf94f48ae26ff7161fafc5a68d4ab7c8c7c6b55fb62f0c2815273
+MD5 8d4e25a15d917b3f5980eb1f0f95bf69 gimp-9999.ebuild 3517
+RMD160 943095f62954e4e17e0bf471fc9feb467746d5aa gimp-9999.ebuild 3517
+SHA256 66b3eb84ab6cf94f48ae26ff7161fafc5a68d4ab7c8c7c6b55fb62f0c2815273 gimp-9999.ebuild 3517
+MISC ChangeLog 28385 RMD160 046860faa7de493ce58fea1f7b85b7d689b11587 SHA1 84322879c2f1c43d1c6b5a9970ba4273d2d232fe SHA256 c5d919a1a56658be21842e65e406a7471608bf1de80a29626d0f7e25da688d7f
+MD5 318b65f703155589138b434e922eefcb ChangeLog 28385
+RMD160 046860faa7de493ce58fea1f7b85b7d689b11587 ChangeLog 28385
+SHA256 c5d919a1a56658be21842e65e406a7471608bf1de80a29626d0f7e25da688d7f ChangeLog 28385
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
 MD5 8fee4c6e0af48517b726cceb49fa580a metadata.xml 220
 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 metadata.xml 220
 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081 metadata.xml 220
-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 9afd8c1e90b3fdf2a6433b2719f6b7b0 files/digest-gimp-2.2.14 244
 RMD160 6c125bd082d91a20f3c645a619e47d3c87f37afd files/digest-gimp-2.2.14 244
 SHA256 cf1ffa6f5b69db90627506914fe970ffdfe9c3ddb7663375f32ee03bee2a83c9 files/digest-gimp-2.2.14 244
-MD5 fddf11595b6a7e078d2b271151d260f0 files/digest-gimp-2.3.15 244
-RMD160 3b318aa9d4fb1ab54a16423889a5b1b59f5d6e4a files/digest-gimp-2.3.15 244
-SHA256 15ce5e6b827e78b317cad30d6c499bbf7334b75535a87b15560df1d728840fbc files/digest-gimp-2.3.15 244
 MD5 fb64286ef3cdb0d669d1d9bbd639505b files/digest-gimp-2.3.16 244
 RMD160 6241fa34d1e316c3f99b12ee88f3642dd548ad38 files/digest-gimp-2.3.16 244
 SHA256 9e28c37f77a9046d208921dca60ece4f8833ee211ab18b59d625dc8153df1edf files/digest-gimp-2.3.16 244
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gimp-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gimp-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gimp-9999 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGQVGRr2QksT29OyARAu9GAJ4jJiWnXUGjDVAqDgk99V62IBBseACgj4RJ
+lWoR+VXewSVu85Cxc4sdG2s=
+=ichv
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.12 b/media-gfx/gimp/files/digest-gimp-2.2.12
deleted file mode 100644
index ccb24da9eee4..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.2.12
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-gimp-2.3.15 b/media-gfx/gimp/files/digest-gimp-2.3.15
deleted file mode 100644
index 3131eb7debbf..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.3.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ca1ac6c338866020b9ebe98d134bd749 gimp-2.3.15.tar.bz2 16080133
-RMD160 8c2017dccf188fe2b76e8a15acdc91c338c3457a gimp-2.3.15.tar.bz2 16080133
-SHA256 419f42a6e9b305a6b7870771ef072e64265f9332f8dcfa341ba14f5216aa0ac7 gimp-2.3.15.tar.bz2 16080133
diff --git a/media-gfx/gimp/gimp-2.2.12.ebuild b/media-gfx/gimp/gimp-2.2.12.ebuild
deleted file mode 100644
index e09e0e5cbe78..000000000000
--- a/media-gfx/gimp/gimp-2.2.12.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2007 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.13 2007/04/30 21:53:08 genone 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="alpha 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=">=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
-	elog ""
-	elog "If you want Postscript file support, emerge ghostscript."
-	elog ""
-}
-
-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
-}
diff --git a/media-gfx/gimp/gimp-2.3.15.ebuild b/media-gfx/gimp/gimp-2.3.15.ebuild
deleted file mode 100644
index 285e8d6276e1..000000000000
--- a/media-gfx/gimp/gimp-2.3.15.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.15.ebuild,v 1.2 2007/04/30 21:53:08 genone Exp $
-
-inherit fdo-mime flag-o-matic
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.3/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="alsa aalib altivec debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
-
-RDEPEND=">=dev-libs/glib-2.12.3
-		>=x11-libs/gtk+-2.8.20-r1
-		>=x11-libs/pango-1.12.2
-		>=media-libs/freetype-2.1.7
-		>=media-libs/fontconfig-2.2.0
-		>=media-libs/libart_lgpl-2.3.8-r1
-		sys-libs/zlib
-		dev-libs/libxml2
-		dev-libs/libxslt
-		x11-themes/hicolor-icon-theme
-		aalib? ( media-libs/aalib )
-		alsa? ( >=media-libs/alsa-lib-1.0.0 )
-		doc? ( app-doc/gimp-help )
-		gnome? ( >=gnome-base/gnome-vfs-2.10.0
-			>=gnome-base/libgnomeui-2.10.0
-			>=gnome-base/gnome-keyring-0.4.5 )
-		gtkhtml? ( =gnome-extra/gtkhtml-2* )
-		jpeg? ( >=media-libs/jpeg-6b-r2
-			>=media-libs/libexif-0.6.0 )
-		lcms? ( media-libs/lcms )
-		mng? ( media-libs/libmng )
-		pdf? ( >=app-text/poppler-bindings-0.3.1 )
-		png? ( >=media-libs/libpng-1.2.2 )
-		python?	( >=dev-lang/python-2.2.1
-			>=dev-python/pygtk-2.8 )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		svg? ( >=gnome-base/librsvg-2.8.0 )
-		wmf? ( >=media-libs/libwmf-0.2.8 )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.12.0
-		>=dev-util/intltool-0.31
-		doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		eerror "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-		eerror
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
-}
-
-src_compile() {
-	# workaround portage variable leakage
-	local AA=
-
-	# gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078)
-	# gimp uses floating point math, needs accuracy (#98685)
-	filter-flags "-fno-inline" "-ffast-math"
-
-	econf --enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_with gtkhtml gtkhtml2) \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg libexif) \
-		$(use_with lcms) \
-		$(use_enable mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS README*
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	elog
-	elog "If you want Postscript file support, emerge ghostscript."
-	elog
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/gimp/gimp-2.3.16.ebuild b/media-gfx/gimp/gimp-2.3.16.ebuild
index a808373f6671..f1b3c41a8ea7 100644
--- a/media-gfx/gimp/gimp-2.3.16.ebuild
+++ b/media-gfx/gimp/gimp-2.3.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.16.ebuild,v 1.5 2007/05/06 16:50:48 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.16.ebuild,v 1.6 2007/05/09 04:44:12 hanno Exp $
 
 inherit fdo-mime flag-o-matic multilib python
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="alsa aalib altivec curl debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
+IUSE="alsa aalib altivec curl dbus debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
 
 RDEPEND=">=dev-libs/glib-2.12.3
 	>=x11-libs/gtk+-2.10.6
@@ -27,6 +27,8 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	aalib? ( media-libs/aalib )
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	curl? ( net-misc/curl )
+	dbus? ( dev-libs/dbus-glib
+		sys-apps/hal )
 	doc? ( app-doc/gimp-help )
 	gnome? ( >=gnome-base/gnome-vfs-2.10.0
 		>=gnome-base/libgnomeui-2.10.0
@@ -80,6 +82,7 @@ src_compile() {
 		$(use_with curl) \
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
+		$(use_with dbus) \
 		$(use_with gnome) \
 		$(use_with gtkhtml gtkhtml2) \
 		$(use_with jpeg libjpeg) \
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index f4db68737cff..f755caa53a5a 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.12 2007/05/06 16:50:48 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.13 2007/05/09 04:44:12 hanno Exp $
 
 inherit subversion fdo-mime flag-o-matic multilib python
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS=""
 
-IUSE="alsa aalib altivec curl debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
+IUSE="alsa aalib altivec curl dbus debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
 
 RDEPEND=">=dev-libs/glib-2.12.3
 	>=x11-libs/gtk+-2.10.6
@@ -29,6 +29,8 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	aalib? ( media-libs/aalib )
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	curl? ( net-misc/curl )
+	dbus? ( dev-libs/dbus-glib
+		sys-apps/hal )
 	doc? ( app-doc/gimp-help )
 	gnome? ( >=gnome-base/gnome-vfs-2.10.0
 		>=gnome-base/libgnomeui-2.10.0
@@ -79,6 +81,7 @@ src_compile() {
 		$(use_with curl) \
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
+		$(use_with dbus) \
 		$(use_with gnome) \
 		$(use_with gtkhtml gtkhtml2) \
 		$(use_with jpeg libjpeg) \