remove old gimp ebuilds

(Portage version: 2.1.7.17/cvs/Linux x86_64)

13 files changed, 9 insertions, 961 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/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
-}