gimp: remove old versions

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64

7 files changed, 3 insertions, 586 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 608b676788ac..72ce5d6cd1c6 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,26 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gimp-2.6-file-uri.patch 1626 RMD160 02ac1485a6d5014a4cba1bce374233a90933b73a SHA1 fc6b42f2f8ba6bfc951c5ecd9988f2f6ac9a32b6 SHA256 0958c507c54cac22e0b990e2b5ccf40af50be273428d3cc0df2889563ed4577b
-AUX gimp-2.6.0-file-psd-needs-jpeg.patch 1120 RMD160 1ad0645d0c25275876cb655e6fdbc3cc33a5c906 SHA1 43f53e5b590b6719e0bfa0e8c94c5a0f4f8d54d1 SHA256 59895bda07c11a0b36d0d134eeca615d284cb767c19618133770687c99a6136d
 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.2.tar.bz2 17777846 RMD160 f9da1008c29746379eb728f27e9b0d452ba2318f SHA1 4913a411abde3fccae5350e00a9bd20742715367 SHA256 00393b2d2aa163a7791dc4456306bf903d920d345aeee162d0e2ce85cfae5fb1
-DIST gimp-2.4.5.tar.bz2 17819962 RMD160 963a139e417354d898abd2499a5f31ecfc0da75b SHA1 70cf6af5700cf6db73fca898510873394eb95581 SHA256 dadf13c2e605245572f1bdb948969c3f3ef3d2b18a9ca1f64d6f9383ac48d5ae
 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.0.tar.bz2 15897821 RMD160 66dae43b362298314befc39916bb3e01b9098b50 SHA1 187effb5722a1d5943c48ec74a3be96c836215f6 SHA256 f4055ea8f1815d7dcca6bf0159af70489243d63a14dcfaf2a994af062d829ca8
-DIST gimp-2.6.1.tar.bz2 15939661 RMD160 4cf18ae63a813ccf35a0b33ede3b24a304b47b03 SHA1 c03c737496444c811c73772d356db3dbf886fd68 SHA256 095f0ca02d4b426ec0f6929397cdd641e6f0031395e43b276132ab1a40678a0a
 DIST gimp-2.6.2.tar.bz2 15918673 RMD160 baba90572478200f9422d447437c6f669140fc03 SHA1 b6ae56413263d8ea3d4a26af74960eb406ed86fa SHA256 31abf898738f975d3b4e19926a196c0719497f3a2300ceb15fcb440090c5ab2d
 DIST gimp-2.6.3.tar.bz2 15978924 RMD160 ac736b1e49918f4aa23215fce9ab56c359c586f0 SHA1 5e64c03d9d05fa28656c6041039c26cd7c09deab SHA256 08e4d272471d377cd7c6cac6a6089a540436961c00ddd09de4f29a3148ec71ef
 EBUILD gimp-2.3.19.ebuild 3420 RMD160 6b764050ce4a20bc249fdf34246b9036c9498f4b SHA1 0f394608c2b25669ad886ee13b61407c474bc02c SHA256 0550dc8499e285dcaff590f31f014d5e5303ee6e03978f80eb49a810d3dbec7b
-EBUILD gimp-2.4.2.ebuild 3687 RMD160 3663e7a85f32416c99a4c7a83b6f81962f4e7f7f SHA1 7c499615c56d63ea10208e2d692789f6440471d9 SHA256 2f60b463680e951cb810436f5da1c99f9793b8a8365658cffad3dae70843ffd8
-EBUILD gimp-2.4.5.ebuild 4092 RMD160 fe15f6da7cbb8f6f32eb85d9c9e1987f2efd8abc SHA1 2434b9f1c07aea1da493e8868686a358f3efb46e SHA256 5439c52f7ee4eb7bd39cae7db5b143910df450b8da4261c997cc5016ea1ec5f6
 EBUILD gimp-2.4.6.ebuild 3844 RMD160 1d071e845eaea37a31c346190cc2d68445664cc6 SHA1 f4f828712e7fdeb9c3929c859f927f515346fd61 SHA256 ab657c07a9676324282b18c9e400e4515a944d107520bef7cf660373f2539233
 EBUILD gimp-2.4.7.ebuild 3851 RMD160 1c4e786a176b229acd6f4ec4d1d89201ea04deab SHA1 e583b34bafb4b52cf71ceff4a3303ebad55fb472 SHA256 0d4234105fa5df9f3feba2442f46ec24150ab15b4b82c94d041684339335994c
-EBUILD gimp-2.6.0.ebuild 3238 RMD160 991a9fc123a36a303d69d7371f5c51c5e9eb2ef2 SHA1 9b326c763a5b9cf185daa99c86ca204af627897c SHA256 4b1d51bdc7c890912cf098c1d3a3e214b8bd38d52bd2227ac0c276d25cd22e29
-EBUILD gimp-2.6.1.ebuild 3147 RMD160 f82f0d7fd06e4fb803efbc4ea92a0a0da77b09b5 SHA1 47bd3c404f2a267cce5f2ac9a8f4b93b9ab5239c SHA256 08a11b7c21195bd3ac0e8d5d50ae6ca7015d8ac607ec30ade5cf141fb75f6213
 EBUILD gimp-2.6.2.ebuild 3015 RMD160 227ee55d15a3e8e67561e56aa4ef8345e3ce7641 SHA1 5e37dedab4da0e75ca7ce4ffb1ad3cbfa11fdfd8 SHA256 fe1a6d20dc169135fee74c5f730883795a050131278454c51759af883cec2a0e
 EBUILD gimp-2.6.3.ebuild 3015 RMD160 25d6796fe09d90435e6c2e1ff97d9e07faa66584 SHA1 f11f24586fbe10ec272d024dffbb7f7ab47df38b SHA256 3367ec1e677578b9349587cf7ce98c62b8469bbc8a1d2c089e588b60d5146cad
 EBUILD gimp-9999.ebuild 3765 RMD160 4eb85d08786ba8d73536e5bb60118fe2f9b42382 SHA1 c8a20283d95e2e8d274bde17cb97bb2a255a56b4 SHA256 b24670ec12036af85fab20131f8a0c0e377dd889a4d7bc8168ad124af187f464
@@ -29,7 +19,7 @@ MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkoXqAACgkQr2QksT29OyBFfACfedf9BfKDepPPWpgxaCm40CRB
-ZswAn2DGJlFNMAIttNjwUlMrAFaBnNga
-=0neJ
+iEYEARECAAYFAkkuXpoACgkQr2QksT29OyCZmQCfcP6BJI92PEghA0yw1voQNIiC
+gqQAn1eOQqFpj/PPN7Wl5xZMpwn2kOBH
+=llAp
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/gimp-2.6-file-uri.patch b/media-gfx/gimp/files/gimp-2.6-file-uri.patch
deleted file mode 100644
index 251573b79063..000000000000
--- a/media-gfx/gimp/files/gimp-2.6-file-uri.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur gimp-2.6.0.orig/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.0/plug-ins/file-uri/uri-backend-libcurl.c
---- gimp-2.6.0.orig/plug-ins/file-uri/uri-backend-libcurl.c     2008-10-02 10:34:43.000000000 +0300
-+++ gimp-2.6.0/plug-ins/file-uri/uri-backend-libcurl.c          2008-10-02 10:34:57.000000000 +0300
-@@ -21,6 +21,8 @@
- 
- #include "config.h"
- 
-+#include <errno.h>
-+
- #include <curl/curl.h>
- #include <curl/types.h>
- #include <curl/easy.h>
-@@ -161,6 +161,6 @@
-     {
-       g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
-                    _("Could not open '%s' for writing: %s"),
--                   gimp_filename_to_utf8 (filename),  g_strerror (errno));
-+                   gimp_filename_to_utf8 (tmpname),  g_strerror (errno));
-       return FALSE;
-     }
-diff -Naur gimp-2.6.0.orig/plug-ins/file-uri/uri-backend-wget.c gimp-2.6.0/plug-ins/file-uri/uri-backend-wget.c
---- gimp-2.6.0.orig/plug-ins/file-uri/uri-backend-wget.c	2008-10-03 15:06:32.000000000 +0300
-+++ gimp-2.6.0/plug-ins/file-uri/uri-backend-wget.c	2008-10-03 15:06:42.000000000 +0300
-@@ -91,7 +91,7 @@
- 
-   if (pipe (p) != 0)
-     {
--      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,,
-+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    "pipe() failed: %s", g_strerror (errno));
-       return FALSE;
-     }
-@@ -101,7 +101,7 @@
- 
-   if ((pid = fork()) < 0)
-     {
--      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,,
-+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    "fork() failed: %s", g_strerror (errno));
-       return FALSE;
-     }
diff --git a/media-gfx/gimp/files/gimp-2.6.0-file-psd-needs-jpeg.patch b/media-gfx/gimp/files/gimp-2.6.0-file-psd-needs-jpeg.patch
deleted file mode 100644
index e8cdaa3554d3..000000000000
--- a/media-gfx/gimp/files/gimp-2.6.0-file-psd-needs-jpeg.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur gimp-2.6.0-old/plug-ins/Makefile.am gimp-2.6.0/plug-ins/Makefile.am
---- gimp-2.6.0-old/plug-ins/Makefile.am	2008-08-21 13:35:22.000000000 +0200
-+++ gimp-2.6.0/plug-ins/Makefile.am	2008-10-09 17:03:04.000000000 +0200
-@@ -10,6 +10,7 @@
- 
- if BUILD_JPEG
- file_jpeg = file-jpeg
-+file_psd = file-psd
- endif
- 
- if BUILD_PRINT
-@@ -57,7 +58,7 @@
- 	file-fli		\
- 	$(file_ico)		\
- 	$(file_jpeg)		\
--	file-psd		\
-+	$(file_psd)		\
- 	file-sgi		\
- 	$(file_uri)		\
- 	$(file_xjt)		\
-diff -Naur gimp-2.6.0-old/plug-ins/Makefile.in gimp-2.6.0/plug-ins/Makefile.in
---- gimp-2.6.0-old/plug-ins/Makefile.in	2008-09-29 19:23:20.000000000 +0200
-+++ gimp-2.6.0/plug-ins/Makefile.in	2008-10-09 17:05:56.000000000 +0200
-@@ -385,6 +385,7 @@
- 
- @BUILD_HELP_BROWSER_TRUE@help_browser = help-browser
- @BUILD_JPEG_TRUE@file_jpeg = file-jpeg
-+@BUILD_JPEG_TRUE@file_psd = file-psd
- @BUILD_PRINT_TRUE@print = print
- @BUILD_PYTHON_TRUE@pygimp = pygimp
- @BUILD_SCRIPT_FU_TRUE@script_fu = script-fu
-@@ -405,7 +406,7 @@
- 	file-fli		\
- 	$(file_ico)		\
- 	$(file_jpeg)		\
--	file-psd		\
-+	$(file_psd)		\
- 	file-sgi		\
- 	$(file_uri)		\
- 	$(file_xjt)		\
diff --git a/media-gfx/gimp/gimp-2.4.2.ebuild b/media-gfx/gimp/gimp-2.4.2.ebuild
deleted file mode 100644
index 98bbcfdff381..000000000000
--- a/media-gfx/gimp/gimp-2.4.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.2.ebuild,v 1.8 2008/05/18 02:08:03 hanno Exp $
-
-inherit fdo-mime flag-o-matic multilib python
-
-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 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.14a-r1 )
-	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-bindings-0.3.1 )
-	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 )"
-
-pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	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"
-	# gimp assumes char is signed (fixes preview corruption)
-	if use ppc || use ppc64; then
-		append-flags "-fsigned-char"
-	fi
-
-	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"
-
-	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.5.ebuild b/media-gfx/gimp/gimp-2.4.5.ebuild
deleted file mode 100644
index 92db6c11f91d..000000000000
--- a/media-gfx/gimp/gimp-2.4.5.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.5.ebuild,v 1.6 2008/10/07 02:54:22 jer Exp $
-
-inherit 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-1.0.14a-r1 )
-	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-bindings-0.3.1 )
-	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 )"
-
-pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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_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"
-	# gimp assumes char is signed (fixes preview corruption)
-	if use ppc || use ppc64; then
-		append-flags "-fsigned-char"
-	fi
-
-	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 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) \
-		|| 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
-
-	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.6.0.ebuild b/media-gfx/gimp/gimp-2.6.0.ebuild
deleted file mode 100644
index c6090af47bc9..000000000000
--- a/media-gfx/gimp/gimp-2.6.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.0.ebuild,v 1.3 2008/10/09 21:27:04 hanno Exp $
-
-inherit gnome2 fdo-mime flag-o-matic multilib python eutils
-
-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="~amd64 ~x86"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gtkhtml gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
-
-RDEPEND=">=dev-libs/glib-2.18.1
-	>=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
-	media-libs/gegl
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	gnome? ( gnome-base/gvfs
-		>=gnome-base/libgnomeui-2.10.0
-		>=gnome-base/gnome-keyring-0.4.5 )
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )
-	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-bindings-0.3.1 )
-	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.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-src_unpack() {
-	gnome2_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/gimp-2.6-file-uri.patch" || die "epatch failed"
-	epatch "${FILESDIR}/${P}-file-psd-needs-jpeg.patch" || die "epatch failed"
-}
-
-pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	fi
-
-	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 gtkhtml gtkhtml2) \
-		$(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.1.ebuild b/media-gfx/gimp/gimp-2.6.1.ebuild
deleted file mode 100644
index 7cb301f18768..000000000000
--- a/media-gfx/gimp/gimp-2.6.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.1.ebuild,v 1.2 2008/11/14 00:54:30 hanno Exp $
-
-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="~amd64 ~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.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
-	media-libs/gegl
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	gnome? ( gnome-base/gvfs
-		>=gnome-base/libgnomeui-2.10.0
-		>=gnome-base/gnome-keyring-0.4.5 )
-	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-bindings-0.3.1 )
-	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_unpack() {
-	gnome2_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-2.6.0-file-psd-needs-jpeg.patch" || die "epatch failed"
-}
-
-pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	fi
-
-	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
-}