[gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/

[Sebastian Pipping]

commit:     3ac351746793425556546cdbe4148d65be3ad84e
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 13:52:15 2017 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 14:08:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac35174

media-gfx/gimp: Remove old revisions

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/gimp/Manifest             |   1 -
 media-gfx/gimp/gimp-2.8.16.ebuild   | 169 --------------------------------
 media-gfx/gimp/gimp-2.9.2-r1.ebuild | 168 --------------------------------
 media-gfx/gimp/gimp-2.9.2.ebuild    | 166 -------------------------------
 media-gfx/gimp/gimp-2.9.4.ebuild    | 189 ------------------------------------
 5 files changed, 693 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 0b9654a71e..bce522a902 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -3,4 +3,3 @@ DIST gimp-2.8.16.tar.bz2 20847212 SHA256 95e3857bd0b5162cf8d1eda8c78b741eef968c3
 DIST gimp-2.8.18.tar.bz2 20824198 SHA256 39dd2247c678deaf5cc664397d3c6bd4fb910d3472290fd54b52b441b5815441 SHA512 64b259aa5aa9d5afbf1da148ec7f162841f62db2f903c480710273362df62f00344e276b705a13619855e54948aabcd1d9a3788993360f2a52a58189b62fec2f WHIRLPOOL bd9c2b76ecf8de027ad1d99613135c065226be1cf2db28da50515ede376fb73800d4862944603adf9a14e5982ea389c52f4be183e3fa3bc3f61e25c9e1863c5d
 DIST gimp-2.9.2.tar.bz2 21370301 SHA256 85bed436b868b2e45ffab48d1bf5743006932770e8cca3322e345aefc000e29e SHA512 5c870a36d62de5fde0c7799dd28b78daca2d349bb7fdbc7b940db89ab00fc025256408b581ba6b4d795d6db9bc25672cf6a45552b22c3eae053ce94a2201fa37 WHIRLPOOL cfa5300659f97c75b7b4f4fbc6f3ad3d03a7c0e97153749d224859b8b618d041f8cbe9232578d720803589d8a48bc7ea9a785294991b626ba7b458512a3d4b2e
 DIST gimp-2.9.4-r1.tar.xz 18510496 SHA256 c3f3cab83f70c1c2c11c6b94157def3a40f1fd335ffda2ef3e191865fc89d97a SHA512 60691506ad021d34a9728a76529fb7ff653f679979f23346ba84f1f9c36606c6bc118b611e92be79af894cba93746c8bdaeeb00012300c23fe995e50c3204025 WHIRLPOOL a042ac4ccbb8172526cc9fa2ff2df7ac35bd9fcd6283778e03f451766176422ddf250229d9a074821b7a991c24bb14058abe49d9739815681d250f6201467a75
-DIST gimp-2.9.4.tar.bz2 24290911 SHA256 c13ac540fd0bd566d7bdd404afe8a04ec0cb1e547788995cd4e8b218c1057b8a SHA512 fb7e4bb08a3e3a87948bfeb4688d624ff8f9e452a1cd27b583bf40cda1a176b44d7d1dca6cfb52fbd930a728ab5550a1fa74730cc1dd1e7f7f8b9cb131e0f434 WHIRLPOOL 9c073f3a30f43bd36f7377b70037f09a74c033ff591b6fff06cd6cb91ca8b44109d4c6b67248c4b75715900f8f3108bc3f32c8a54ae9ca9caac9054711cac415

diff --git a/media-gfx/gimp/gimp-2.8.16.ebuild b/media-gfx/gimp/gimp-2.8.16.ebuild
deleted file mode 100644
index cebe4a7cd7..0000000000
--- a/media-gfx/gimp/gimp-2.8.16.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
-	>=x11-libs/cairo-1.10.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0:0
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch  # bug 558878
-	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}

diff --git a/media-gfx/gimp/gimp-2.9.2-r1.ebuild b/media-gfx/gimp/gimp-2.9.2-r1.ebuild
deleted file mode 100644
index 72deb14fb1..0000000000
--- a/media-gfx/gimp/gimp-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	dev-util/gtk-update-icon-cache
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/gexiv2-0.6.1
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.14
-	>=media-libs/gegl-0.3.4:0.3[cairo]
-	>=dev-libs/glib-2.43
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	dev-util/gdbus-codegen
-	gnome? ( gnome-base/gvfs )
-	webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
-	virtual/jpeg:0
-	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.2:2
-	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
-	>=media-libs/libpng-1.2.37:0
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		--without-libmypaint \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with webkit) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with openexr) \
-		$(use_with pdf poppler) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.2-version.patch
-	epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${P}-CVE-2016-4994.patch  # bug 586666
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}

diff --git a/media-gfx/gimp/gimp-2.9.2.ebuild b/media-gfx/gimp/gimp-2.9.2.ebuild
deleted file mode 100644
index 3a775c77cd..0000000000
--- a/media-gfx/gimp/gimp-2.9.2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	dev-util/gtk-update-icon-cache
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/gexiv2-0.6.1
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.14
-	>=media-libs/gegl-0.3.4:0.3[cairo]
-	>=dev-libs/glib-2.43
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	dev-util/gdbus-codegen
-	gnome? ( gnome-base/gvfs )
-	webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
-	virtual/jpeg:0
-	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.2:2
-	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
-	>=media-libs/libpng-1.2.37:0
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		--without-libmypaint \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with webkit) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with openexr) \
-		$(use_with pdf poppler) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.2-version.patch
-	epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch  # bug 395695, comment 9 and 16
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}

diff --git a/media-gfx/gimp/gimp-2.9.4.ebuild b/media-gfx/gimp/gimp-2.9.4.ebuild
deleted file mode 100644
index 3777bdc139..0000000000
--- a/media-gfx/gimp/gimp-2.9.4.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg udev webkit wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	dev-util/gtk-update-icon-cache
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/gexiv2-0.6.1
-	>=media-libs/libmypaint-1.3.0_beta0[gegl]
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.18
-	>=media-libs/gegl-0.3.8:0.3[cairo]
-	>=dev-libs/glib-2.43
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
-	virtual/jpeg:0
-	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.2:2
-	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
-	>=media-libs/libpng-1.2.37:0
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-	)
-	>=media-libs/tiff-3.5.7:0
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with webkit) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with openexr) \
-		$(use_with pdf poppler) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.9.4-gegl-bin.patch
-
-	# Bug 589394
-	rm icons/Symbolic-Inverted/Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-2.9.4-mkdir-makefile.patch
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-			GDBUS_CODEGEN=/bin/false
-}
-
-src_compile() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia[0-9] ; do
-		[[ -e "${nv}" ]] && addwrite "${nv}"
-	done
-	addwrite /dev/dri/  # bug #574038
-	addwrite /dev/ati/  # bug 589198
-	addwrite /proc/mtrr  # bug 589198
-
-	export XDG_DATA_DIRS=/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}