remove old gimp ebuilds

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

14 files changed, 20 insertions, 981 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 151e10bf968d..06bf9a7453e9 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.307 2010/02/10 13:54:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.308 2010/02/14 23:56:57 hanno Exp $
+
+  14 Feb 2010; Hanno Boeck <hanno@gentoo.org> -gimp-2.3.19.ebuild,
+  -gimp-2.4.6.ebuild, -gimp-2.4.7.ebuild, -files/gimp-2.6.3-asneeded.diff,
+  -gimp-2.6.4.ebuild, -gimp-2.6.5.ebuild, -gimp-2.6.6.ebuild,
+  -gimp-2.6.7.ebuild, -gimp-2.6.7-r1.ebuild,
+  -files/gimp-2.6.7-bmp-overflow.patch, -files/gimp-svg.diff,
+  -files/gimp-web-browser.patch:
+  Cleanup of old versions with security issues.
 
   10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> gimp-2.3.19.ebuild,
   gimp-2.4.6.ebuild, gimp-2.4.7.ebuild, gimp-2.6.4.ebuild,
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 9628fb8a515b..8b51b1a974ff 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,24 +1,15 @@
-AUX gimp-2.6.3-asneeded.diff 249 RMD160 71043fe5e1278ac578004fe5ab5d7bf8b8d954b5 SHA1 b429eb840e21d136c5e930bec53475914c247d72 SHA256 a9196e29f5dbdf6ff43004c5915e5a838d6d4da1e52b485eaf20b56c7eb39088
-AUX gimp-2.6.7-bmp-overflow.patch 1543 RMD160 1633f3b58cd06a0c5cada912f4e2a13b9b4b8b57 SHA1 ebdc44f0b6295c66b959e22524b2b734ab28f0c7 SHA256 0640fad5f05064798101e8d5865f55344115025b93bca366374954d6617dc9aa
-AUX gimp-svg.diff 1080 RMD160 ef80ab1b82622dc28d38a3a606dec40b36685a04 SHA1 636d112dcf71e1b2fc31d3c941e0b49c8bdf422a SHA256 f8dc78958f3e7e0a921bbcb9c0deabed9f0354b3d17257f1740e355b9f456c44
-AUX gimp-web-browser.patch 1579 RMD160 33fd018a83b8ade7ced9bbd4c80b9c29468781fd SHA1 af9742a1aa6d07547d5753dcd34661be6f5e36a4 SHA256 f6329bb38be785a7c8c49cc8de61e41ce3a12a118849a713a54212e91de2a747
-DIST gimp-2.3.19.tar.bz2 16803491 RMD160 3ea293372ef0656543912c0a63ab287fd9ae72ca SHA1 f04efda774e8ed57ded5058d37091f7a8d7b17b2 SHA256 f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0
-DIST gimp-2.4.6.tar.bz2 18365363 RMD160 17d61da426950f8a7286f7e82259d23b46adb1fd SHA1 6cbfda0da19bf5a2221013afe32643e3c09aeeda SHA256 99aef9e70edf80e4f3605727ba2979286c568a02cadf6e8c5d37a5ce6cce0bea
-DIST gimp-2.4.7.tar.bz2 18977384 RMD160 79062e60db1fe172e2a91ff0601462462d3a61cb SHA1 fd6dac4fd107f3b741168ffcaf4425a9dd179327 SHA256 d398eef058faf81053c624690ba3192a8d517b1370c6f35d10e0eae2190109c9
-DIST gimp-2.6.4.tar.bz2 16012685 RMD160 64aa55def0e97cfc85f27dc7461f18455619ed41 SHA1 f68ca1e1dce7ef8c100ce74e0c1ee5c493a589a1 SHA256 86d27a45b45f3df3bf6de28718f691e8bedaf1de7dae287b39054eaddad797e2
-DIST gimp-2.6.5.tar.bz2 16043778 RMD160 1de4ffdf13d3edd47e150e4289a8d93677d3f538 SHA1 ee57298fe5572ecce17137ff879e4aad6509d289 SHA256 6209081f5c29fc22e0d376367b017618f7afb0b179f994b16b4cc68106cbe521
-DIST gimp-2.6.6.tar.bz2 16075908 RMD160 9a171baf6007d3a8acfce6ff5e880e412f4225ae SHA1 71aec5cd671a2431daa91dea91abb6d3822a896b SHA256 53c261fa5045f4ca4b5e887a1eb394d28ebb08d108f065ef55bde33c892f0751
-DIST gimp-2.6.7.tar.bz2 16341756 RMD160 c576674ba6547e4d31c34d6bb82c4d416addbaf1 SHA1 0661d162fecfd907e183ce42853dd5b9d3cb4c51 SHA256 a401c5fbe59e812413cb4d0b37607680089bf254056d8b5853aa79e03a6fe115
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gimp-2.6.8.tar.bz2 16342377 RMD160 da02fedcc00ebaac04bfd21c153a7130d3ff5e08 SHA1 a550943f086abc9bf6b96d576741337b7186a4f4 SHA256 d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332
-EBUILD gimp-2.3.19.ebuild 3173 RMD160 f278317524bd75cfb5c1dcbeff47004224afea0a SHA1 61f0ba4afd42e8fb1e06265040778790d61641fe SHA256 564a1851ac863433519ca78e354b5aaa46178f2fe6635b23ebd0d050661b5f58
-EBUILD gimp-2.4.6.ebuild 3500 RMD160 a830877cf60726a6560d8c261133a712f55f295a SHA1 fde225e3b80e57cf402c7c3aa435971442809192 SHA256 02ced5244d662ed61a6a447f91988ceb1231573e95ae83a426613895a8851354
-EBUILD gimp-2.4.7.ebuild 3509 RMD160 7be20ba84c71ff55ec15add78f855b2f4b70e40b SHA1 e98c043292f89f55249423d3591799b0639ef736 SHA256 04af2a6c22aa337e750e67913b9db5693b729d363f0a22c7ff711df7723253dd
-EBUILD gimp-2.6.4.ebuild 2544 RMD160 c04d650e3e16223ae2862f44d1818f008f96d174 SHA1 c771ca1dae2f1dc1bec76c774532b0c4403252fa SHA256 242f6529b596afb76136e3fd27557100568e4002cf5fa1b8a35c665e13680795
-EBUILD gimp-2.6.5.ebuild 2514 RMD160 6fa8c89490201876604025d51ca25afeced4889e SHA1 7777bd50bbb4353acebb32017b40a6064cf5993e SHA256 a5a9a956bd81b92281471d320d000b54ac734aa9af82f9417425d3a2f5508f9c
-EBUILD gimp-2.6.6.ebuild 2519 RMD160 9fa36930e18da9614151a4e404191cae49acece4 SHA1 49bf5ff54267b413531792502aeae1501f6950ef SHA256 e2cfda4c864f192dceaba9e95758befcac5a28874b634949f76f5b33bd840801
-EBUILD gimp-2.6.7-r1.ebuild 2585 RMD160 7fc1ee1036f50dff0b0e4d40082b9f5281139b2f SHA1 5dc102596cf1f649ed75890964e593c230647d62 SHA256 b20c2ffb241aca1c050d919de97b0acd878a203cea88b9ca685bc23f2778ad24
-EBUILD gimp-2.6.7.ebuild 2520 RMD160 d57e2487b937165e06794a672faf26e6b5f68816 SHA1 81603124f1c685458f0b23cd25f7e7dd82586f43 SHA256 da29ff291b6af8e2d9bf1c81e32ebc61d502a41122aa65e0c5361f732b77e8e4
 EBUILD gimp-2.6.8.ebuild 2514 RMD160 88b152cebeca93279bbc650eb7dafb5543045167 SHA1 5c84a4fb42e3ced251138b738fb7954901e6d90c SHA256 00e86255581b32540be6613191943b57ef3a74fbd6a4959b3b22378df0c8c665
 EBUILD gimp-9999.ebuild 2624 RMD160 c456309be34433faa5f5b1546a35f1f0c48947d3 SHA1 c6bfdc0aaea2dfd3022420e2bb6916888942edd4 SHA256 3055570b7c0ee593174165dc6d115ad4e2accb3c8323396e04697e50d27d1695
-MISC ChangeLog 41310 RMD160 ef4388f5912bc1e10caaea167ef55d12a6d19445 SHA1 2983eb47f47999aaa761e03f2ea8aa29c8415399 SHA256 4df8893e38080966c38057ad1e87d85610714a9399358ac5df405dfe0c5a63fb
+MISC ChangeLog 41699 RMD160 d39355d0d3c88b953f3fbe5663a6b6732a4cafd1 SHA1 e1f5ef961fedcdd234ddc8069c467688e10ad258 SHA256 8c05d6e906962b21dcd4a5757891e1a9127bf6ea1b0cf04d6562bcd964f2c0c8
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt4jc8ACgkQr2QksT29OyCQcQCeLVmzhlTlID8mxkmRBTzyJW2Z
+qKgAnAgBAWfzgX8atXB+SiFPbC7YXwSu
+=kz9E
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/gimp-2.6.3-asneeded.diff b/media-gfx/gimp/files/gimp-2.6.3-asneeded.diff
deleted file mode 100644
index f46aa35f4ab4..000000000000
--- a/media-gfx/gimp/files/gimp-2.6.3-asneeded.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- gimp-2.6.3/app/Makefile.am	2008-11-20 23:43:08.000000000 +0100
-+++ gimp-2.6.3-1/app/Makefile.am	2008-11-26 17:37:56.000000000 +0100
-@@ -141,6 +141,7 @@
- 	$(GEGL_LIBS)			\
- 	$(RT_LIBS)			\
- 	$(INTLLIBS)			\
-+	$(GLIB_LIBS)			\
- 	$(GIMPICONRC)
- 
- 
diff --git a/media-gfx/gimp/files/gimp-2.6.7-bmp-overflow.patch b/media-gfx/gimp/files/gimp-2.6.7-bmp-overflow.patch
deleted file mode 100644
index 10432b571a25..000000000000
--- a/media-gfx/gimp/files/gimp-2.6.7-bmp-overflow.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From df2b0aca2e7cdb95ebfd3454c65aaba0a83e9bbe Mon Sep 17 00:00:00 2001
-From: Simon Budig <simon@gimp.org>
-Date: Mon, 09 Nov 2009 23:08:59 +0000
-Subject: Harden the BMP plugin against integer overflows.
-
-Issues discovered by Stefan Cornelius, Secunia Research, advisory SA37232
-and CVE identifier CVE-2009-1570. Fixes bug #600484.
----
-diff --git a/plug-ins/file-bmp/bmp-read.c b/plug-ins/file-bmp/bmp-read.c
-index a1ebe47..7d7133a 100644
---- a/plug-ins/file-bmp/bmp-read.c
-+++ b/plug-ins/file-bmp/bmp-read.c
-@@ -424,7 +424,8 @@ ReadBMP (const gchar  *name,
-       return -1;
-     }
- 
--  if (Bitmap_Head.biWidth < 0)
-+  if (Bitmap_Head.biWidth < 0 ||
-+      ABS (Bitmap_Head.biHeight) < 0)
-     {
-       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    _("'%s' is not a valid BMP file"),
-@@ -448,6 +449,18 @@ ReadBMP (const gchar  *name,
-       return -1;
-     }
- 
-+  /* protect against integer overflows caused by malicious BMPs */
-+
-+  if (((guint64) Bitmap_Head.biWidth) * Bitmap_Head.biBitCnt > G_MAXINT32 ||
-+      ((guint64) Bitmap_Head.biWidth) * ABS (Bitmap_Head.biHeight) > G_MAXINT32 ||
-+      ((guint64) Bitmap_Head.biWidth) * ABS (Bitmap_Head.biHeight) * 4 > G_MAXINT32)
-+    {
-+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+                   _("'%s' is not a valid BMP file"),
-+                   gimp_filename_to_utf8 (filename));
-+      return -1;
-+    }
-+
-   /* Windows and OS/2 declare filler so that rows are a multiple of
-    * word length (32 bits == 4 bytes)
-    */
---
-cgit v0.8.2
diff --git a/media-gfx/gimp/files/gimp-svg.diff b/media-gfx/gimp/files/gimp-svg.diff
deleted file mode 100644
index 3b830c02f556..000000000000
--- a/media-gfx/gimp/files/gimp-svg.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- desktop/gimp.desktop.in.in~	2007-12-30 23:34:46.000000000 +0100
-+++ desktop/gimp.desktop.in.in	2007-12-30 23:34:46.000000000 +0100
-@@ -16,4 +15,4 @@
- X-GNOME-Bugzilla-Version=@GIMP_VERSION@
- X-GNOME-Bugzilla-OtherBinaries=gimp-@GIMP_APP_VERSION@
- StartupNotify=true
--MimeType=image/bmp;image/g3fax;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-compressed-xcf;image/x-fits;image/x-gray;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-sun-raster;image/x-tga;image/x-xbitmap;image/x-xcf;image/x-xpixmap;image/x-xwindowdump;
-+MimeType=image/bmp;image/g3fax;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-compressed-xcf;image/x-fits;image/x-gray;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-sun-raster;image/x-tga;image/x-xbitmap;image/x-xcf;image/x-xpixmap;image/x-xwindowdump;image/svg+xml;
diff --git a/media-gfx/gimp/files/gimp-web-browser.patch b/media-gfx/gimp/files/gimp-web-browser.patch
deleted file mode 100644
index 51ef87d2750b..000000000000
--- a/media-gfx/gimp/files/gimp-web-browser.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -u -r gimp-2.4.5/app/config/gimpguiconfig.c gimp-2.4.5.new/app/config/gimpguiconfig.c
---- gimp-2.4.5/app/config/gimpguiconfig.c	2007-11-20 10:31:08.000000000 +0100
-+++ gimp-2.4.5.new/app/config/gimpguiconfig.c	2008-03-25 14:13:13.000000000 +0100
-@@ -40,7 +40,7 @@
- #ifdef G_OS_WIN32
- #  define DEFAULT_WEB_BROWSER      "not used on Windows"
- #else
--#  define DEFAULT_WEB_BROWSER      "firefox %s"
-+#  define DEFAULT_WEB_BROWSER      "xdg-open %s"
- #endif
- 
- 
-Sólo en gimp-2.4.5.new/app/config: gimpguiconfig.c~
-diff -u -r gimp-2.4.5/docs/gimprc.5.in gimp-2.4.5.new/docs/gimprc.5.in
---- gimp-2.4.5/docs/gimprc.5.in	2008-01-30 11:45:12.000000000 +0100
-+++ gimp-2.4.5.new/docs/gimprc.5.in	2008-03-25 14:13:51.000000000 +0100
-@@ -788,7 +788,7 @@
- web-browser.
- 
- .TP
--(web-browser "firefox %s")
-+(web-browser "xdg-open %s")
- 
- Sets the external web browser to be used.  This can be an absolute path or the
- name of an executable to search for in the user's PATH. If the command
-Sólo en gimp-2.4.5.new/docs: gimprc.5.in~
-diff -u -r gimp-2.4.5/etc/gimprc gimp-2.4.5.new/etc/gimprc
---- gimp-2.4.5/etc/gimprc	2008-01-30 11:45:12.000000000 +0100
-+++ gimp-2.4.5.new/etc/gimprc	2008-03-25 14:14:30.000000000 +0100
-@@ -625,7 +625,7 @@
- # appended to the command with a space separating the two.  This is a single
- # filename.
- # 
--# (web-browser "firefox %s")
-+# (web-browser "xdg-open %s")
- 
- # The window type hint that is set on the toolbox. This may affect how your
- # window manager decorates and handles the toolbox window.  Possible values
-Sólo en gimp-2.4.5.new/etc: gimprc~
diff --git a/media-gfx/gimp/gimp-2.3.19.ebuild b/media-gfx/gimp/gimp-2.3.19.ebuild
deleted file mode 100644
index e7fffbe50caf..000000000000
--- a/media-gfx/gimp/gimp-2.3.19.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.19.ebuild,v 1.10 2010/02/10 13:54:28 ssuominen Exp $
-
-EAPI=2
-
-inherit fdo-mime flag-o-matic multilib python
-
-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 ~x86-fbsd"
-
-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.13
-	>=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 )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib
-		sys-apps/hal )
-	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.15 )
-	lcms? ( media-libs/lcms )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.2.1
-		>=dev-python/pygtk-2.10.4 )
-	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 )"
-
-src_configure() {
-	# 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_with curl) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_with dbus) \
-		$(use_with gnome) \
-		$(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) \
-		$(use_with wmf) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	# workaround portage variable leakage
-	local AA=
-
-	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
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-2.4.6.ebuild b/media-gfx/gimp/gimp-2.4.6.ebuild
deleted file mode 100644
index eb2b1d59b990..000000000000
--- a/media-gfx/gimp/gimp-2.4.6.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.12 2010/02/10 13:54:28 ssuominen Exp $
-
-EAPI=2
-
-inherit gnome2 fdo-mime flag-o-matic multilib python eutils autotools
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.4/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 -mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gtkhtml gnome hal lcms mmx mng pdf png python smp sse svg tiff wmf"
-# jpeg temporarily removed, disabling jpeg requires upstream fix which will come in 2.5
-
-RDEPEND=">=dev-libs/glib-2.12.3
-	>=x11-libs/gtk+-2.10.13
-	>=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-misc/xdg-utils
-	x11-themes/hicolor-icon-theme
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	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* )
-	>=media-libs/jpeg-6b-r2
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( media-libs/lcms )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.2.1
-		>=dev-python/pygtk-2.10.4 )
-	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
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with hal) \
-		$(use_with gnome gnomevfs) \
-		$(use_with gtkhtml gtkhtml2) \
-		--with-libjpeg \
-		$(use_with exif 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) \
-		$(use_with wmf)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}/gimp-web-browser.patch"
-
-	# Workaround for MIME-type, this is fixed in gimp trunk, so we can
-	# remove this with >= 2.5
-	use svg && epatch "${FILESDIR}/gimp-svg.diff"
-
-	eautoreconf
-}
-
-src_configure() {
-	# 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"
-	# gimp assumes char is signed (fixes preview corruption)
-	if use ppc || use ppc64; then
-		append-flags "-fsigned-char"
-	fi
-	gnome2_src_configure
-}
-
-src_compile() {
-	# workaround portage variable leakage
-	local AA=
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog
-	elog "If you want Postscript file support, emerge ghostscript."
-	elog
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-2.4.7.ebuild b/media-gfx/gimp/gimp-2.4.7.ebuild
deleted file mode 100644
index c97bb89327b7..000000000000
--- a/media-gfx/gimp/gimp-2.4.7.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.7.ebuild,v 1.6 2010/02/10 13:54:28 ssuominen Exp $
-
-EAPI=2
-
-inherit gnome2 fdo-mime flag-o-matic multilib python eutils autotools
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.4/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gtkhtml gnome hal lcms mmx mng pdf png python smp sse svg tiff wmf"
-# jpeg temporarily removed, disabling jpeg requires upstream fix which will come in 2.5
-
-RDEPEND=">=dev-libs/glib-2.12.3
-	>=x11-libs/gtk+-2.10.13
-	>=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-misc/xdg-utils
-	x11-themes/hicolor-icon-theme
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	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* )
-	>=media-libs/jpeg-6b-r2
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( media-libs/lcms )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.2.1
-		>=dev-python/pygtk-2.10.4 )
-	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
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
-
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with hal) \
-		$(use_with gnome gnomevfs) \
-		$(use_with gtkhtml gtkhtml2) \
-		--with-libjpeg \
-		$(use_with exif 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) \
-		$(use_with wmf)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}/gimp-web-browser.patch"
-
-	# Workaround for MIME-type, this is fixed in gimp trunk, so we can
-	# remove this with >= 2.5
-	use svg && epatch "${FILESDIR}/gimp-svg.diff"
-
-	eautoreconf
-}
-
-src_configure() {
-	# 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"
-	# gimp assumes char is signed (fixes preview corruption)
-	if use ppc || use ppc64; then
-		append-flags "-fsigned-char"
-	fi
-
-	gnome2_src_configure
-}
-
-src_compile() {
-	# workaround portage variable leakage
-	local AA=
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog
-	elog "If you want Postscript file support, emerge ghostscript."
-	elog
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-2.6.4.ebuild b/media-gfx/gimp/gimp-2.6.4.ebuild
deleted file mode 100644
index 39ca80544ae4..000000000000
--- a/media-gfx/gimp/gimp-2.6.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.4.ebuild,v 1.11 2010/02/10 13:54:28 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-RDEPEND=">=dev-libs/glib-2.18.1
-	>=x11-libs/gtk+-2.12.5
-	>=x11-libs/pango-1.18.0
-	>=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-misc/xdg-utils
-	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( net-libs/webkit-gtk )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( media-libs/lcms )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.5.0
-		>=dev-python/pygtk-2.10.4 )
-	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.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with hal) \
-		$(use_with gnome gvfs) \
-		--without-gnomevfs \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif 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) \
-		$(use_with wmf)"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-2.6.5.ebuild b/media-gfx/gimp/gimp-2.6.5.ebuild
deleted file mode 100644
index 2a41e472f841..000000000000
--- a/media-gfx/gimp/gimp-2.6.5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.5.ebuild,v 1.6 2010/02/10 13:54:28 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-RDEPEND=">=dev-libs/glib-2.18.1
-	>=x11-libs/gtk+-2.12.5
-	>=x11-libs/pango-1.18.0
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-misc/xdg-utils
-	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( net-libs/webkit-gtk )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( media-libs/lcms )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.5.0
-		>=dev-python/pygtk-2.10.4 )
-	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.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with hal) \
-		$(use_with gnome gvfs) \
-		--without-gnomevfs \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif 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) \
-		$(use_with wmf)"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-2.6.6.ebuild b/media-gfx/gimp/gimp-2.6.6.ebuild
deleted file mode 100644
index fde69660f16f..000000000000
--- a/media-gfx/gimp/gimp-2.6.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.6.ebuild,v 1.7 2010/02/10 13:54:28 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-RDEPEND=">=dev-libs/glib-2.18.1
-	>=x11-libs/gtk+-2.12.5
-	>=x11-libs/pango-1.18.0
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-misc/xdg-utils
-	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( net-libs/webkit-gtk )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( media-libs/lcms )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.5.0
-		>=dev-python/pygtk-2.10.4 )
-	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.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with hal) \
-		$(use_with gnome gvfs) \
-		--without-gnomevfs \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif 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) \
-		$(use_with wmf)"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-2.6.7-r1.ebuild b/media-gfx/gimp/gimp-2.6.7-r1.ebuild
deleted file mode 100644
index 5eb3dcb4a31f..000000000000
--- a/media-gfx/gimp/gimp-2.6.7-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.7-r1.ebuild,v 1.4 2010/02/10 13:54:28 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-RDEPEND=">=dev-libs/glib-2.18.1
-	>=x11-libs/gtk+-2.12.5
-	>=x11-libs/pango-1.18.0
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-misc/xdg-utils
-	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( net-libs/webkit-gtk )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( media-libs/lcms )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.5.0
-		>=dev-python/pygtk-2.10.4 )
-	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.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-bmp-overflow.patch"
-}
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with hal) \
-		$(use_with gnome gvfs) \
-		--without-gnomevfs \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif 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) \
-		$(use_with wmf)"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-2.6.7.ebuild b/media-gfx/gimp/gimp-2.6.7.ebuild
deleted file mode 100644
index 93363017c9d9..000000000000
--- a/media-gfx/gimp/gimp-2.6.7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.7.ebuild,v 1.2 2010/02/10 13:54:28 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-RDEPEND=">=dev-libs/glib-2.18.1
-	>=x11-libs/gtk+-2.12.5
-	>=x11-libs/pango-1.18.0
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-misc/xdg-utils
-	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( net-libs/webkit-gtk )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( media-libs/lcms )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.5.0
-		>=dev-python/pygtk-2.10.4 )
-	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.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with hal) \
-		$(use_with gnome gvfs) \
-		--without-gnomevfs \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif 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) \
-		$(use_with wmf)"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}