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

[Sebastian Pipping]

commit:     7cb09f8d234d4fd0e6effdb55b777470dc954908
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 14:05:49 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=7cb09f8d

media-gfx/gimp: Move torwards --without-webkit for security (bug #608600)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../{gimp-9999.ebuild => gimp-2.8.14-r3.ebuild}    | 106 ++++++++-------------
 .../{gimp-9999.ebuild => gimp-2.8.16-r2.ebuild}    | 106 ++++++++-------------
 .../{gimp-9999.ebuild => gimp-2.8.18-r1.ebuild}    | 105 ++++++++------------
 .../{gimp-9999.ebuild => gimp-2.9.2-r3.ebuild}     |  56 +++++------
 .../{gimp-9999.ebuild => gimp-2.9.4-r2.ebuild}     |  55 +++++------
 media-gfx/gimp/gimp-9999.ebuild                    |   7 +-
 6 files changed, 176 insertions(+), 259 deletions(-)

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-2.8.14-r3.ebuild
similarity index 60%
copy from media-gfx/gimp/gimp-9999.ebuild
copy to media-gfx/gimp/gimp-2.8.14-r3.ebuild
index 9704f35641..1ab36d16c0 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-2.8.14-r3.ebuild
@@ -1,87 +1,80 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1 git-r3
-
-EGIT_REPO_URI="git://git.gnome.org/gimp"
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
-SRC_URI=""
-
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS=""
+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 udev webkit wmf xpm"
+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 wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
 done
 
-RDEPEND=">=dev-libs/glib-2.40.0:2
+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/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/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
+	>=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 )
-	virtual/jpeg:0
+	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.2:2
+	exif? ( >=media-libs/libexif-0.6.15 )
+	lcms? ( >=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
+	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}]
 	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.36.0:2
+	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
+	bzip2? ( app-arch/bzip2 )
 	postscript? ( app-text/ghostscript-gpl )
 	udev? ( virtual/libgudev:= )"
 DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
 	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/autoconf-2.54
 	>=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() {
@@ -91,16 +84,25 @@ pkg_setup() {
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(use_enable altivec) \
-		$(use_with webkit) \
+		$(use_with bzip2) \
+		$(use_with curl libcurl) \
+		$(use_with dbus) \
+		$(use_with gnome gvfs) \
+		--without-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 openexr) \
 		$(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 \
@@ -113,44 +115,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	epatch "${FILESDIR}"/${P}-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
+	epatch "${FILESDIR}"/${PN}-2.9.2-CVE-2016-4994.patch  # bug 586666
 
-	echo '#!/bin/sh' > py-compile
-	chmod a+x py-compile || die
-	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
-	local myconf
-	if ! use doc; then
-	    myconf="${myconf} --disable-gtk-doc"
-	fi
-	./autogen.sh ${myconf} || die
-
-	# Fix "libtoolize --force" of autogen.sh (bug #476626)
-	rm install-sh ltmain.sh || die
-	_elibtoolize --copy --install || die
+	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() {
-	GEGL=/usr/bin/gegl-0.3 gnome2_src_configure
-}
-
-src_compile() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		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
@@ -180,7 +155,8 @@ src_install() {
 	prune_libtool_files --all
 
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+	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
 }

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-2.8.16-r2.ebuild
similarity index 60%
copy from media-gfx/gimp/gimp-9999.ebuild
copy to media-gfx/gimp/gimp-2.8.16-r2.ebuild
index 9704f35641..8aaf05886b 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-2.8.16-r2.ebuild
@@ -1,87 +1,80 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1 git-r3
-
-EGIT_REPO_URI="git://git.gnome.org/gimp"
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
-SRC_URI=""
-
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS=""
+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 udev webkit wmf xpm"
+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 wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
 done
 
-RDEPEND=">=dev-libs/glib-2.40.0:2
+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/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/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
+	>=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 )
-	virtual/jpeg:0
+	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.2:2
+	exif? ( >=media-libs/libexif-0.6.15 )
+	lcms? ( >=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
+	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}]
 	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.36.0:2
+	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
+	bzip2? ( app-arch/bzip2 )
 	postscript? ( app-text/ghostscript-gpl )
 	udev? ( virtual/libgudev:= )"
 DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
 	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/autoconf-2.54
 	>=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() {
@@ -91,16 +84,25 @@ pkg_setup() {
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(use_enable altivec) \
-		$(use_with webkit) \
+		$(use_with bzip2) \
+		$(use_with curl libcurl) \
+		$(use_with dbus) \
+		$(use_with gnome gvfs) \
+		--without-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 openexr) \
 		$(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 \
@@ -113,44 +115,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	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
+	epatch "${FILESDIR}"/${PN}-2.9.2-CVE-2016-4994.patch  # bug 586666
 
-	echo '#!/bin/sh' > py-compile
-	chmod a+x py-compile || die
-	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
-	local myconf
-	if ! use doc; then
-	    myconf="${myconf} --disable-gtk-doc"
-	fi
-	./autogen.sh ${myconf} || die
-
-	# Fix "libtoolize --force" of autogen.sh (bug #476626)
-	rm install-sh ltmain.sh || die
-	_elibtoolize --copy --install || die
+	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() {
-	GEGL=/usr/bin/gegl-0.3 gnome2_src_configure
-}
-
-src_compile() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		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
@@ -180,7 +155,8 @@ src_install() {
 	prune_libtool_files --all
 
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+	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
 }

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-2.8.18-r1.ebuild
similarity index 60%
copy from media-gfx/gimp/gimp-9999.ebuild
copy to media-gfx/gimp/gimp-2.8.18-r1.ebuild
index 9704f35641..2b54547456 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-2.8.18-r1.ebuild
@@ -1,87 +1,80 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1 git-r3
-
-EGIT_REPO_URI="git://git.gnome.org/gimp"
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
-SRC_URI=""
-
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS=""
+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 udev webkit wmf xpm"
+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 wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
 done
 
-RDEPEND=">=dev-libs/glib-2.40.0:2
+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/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/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
+	>=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 )
-	virtual/jpeg:0
+	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.2:2
+	exif? ( >=media-libs/libexif-0.6.15 )
+	lcms? ( >=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
+	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}]
 	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.36.0:2
+	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
+	bzip2? ( app-arch/bzip2 )
 	postscript? ( app-text/ghostscript-gpl )
 	udev? ( virtual/libgudev:= )"
 DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
 	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/autoconf-2.54
 	>=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() {
@@ -91,16 +84,25 @@ pkg_setup() {
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(use_enable altivec) \
-		$(use_with webkit) \
+		$(use_with bzip2) \
+		$(use_with curl libcurl) \
+		$(use_with dbus) \
+		$(use_with gnome gvfs) \
+		--without-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 openexr) \
 		$(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 \
@@ -113,44 +115,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	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
 
-	echo '#!/bin/sh' > py-compile
-	chmod a+x py-compile || die
-	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
-	local myconf
-	if ! use doc; then
-	    myconf="${myconf} --disable-gtk-doc"
-	fi
-	./autogen.sh ${myconf} || die
-
-	# Fix "libtoolize --force" of autogen.sh (bug #476626)
-	rm install-sh ltmain.sh || die
-	_elibtoolize --copy --install || die
+	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() {
-	GEGL=/usr/bin/gegl-0.3 gnome2_src_configure
-}
-
-src_compile() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		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
@@ -180,7 +154,8 @@ src_install() {
 	prune_libtool_files --all
 
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+	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
 }

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-2.9.2-r3.ebuild
similarity index 75%
copy from media-gfx/gimp/gimp-9999.ebuild
copy to media-gfx/gimp/gimp-2.9.2-r3.ebuild
index 9704f35641..c3a66bfa73 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-2.9.2-r3.ebuild
@@ -1,30 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1 git-r3
-
-EGIT_REPO_URI="git://git.gnome.org/gimp"
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
-SRC_URI=""
-
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS=""
+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 udev webkit wmf xpm"
+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 wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
 done
 
-RDEPEND=">=dev-libs/glib-2.40.0:2
+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
@@ -41,13 +38,12 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.14
-	>=media-libs/gegl-0.3.4:0.3[cairo]
+	>=media-libs/gegl-0.3.6: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
@@ -59,8 +55,8 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 		${PYTHON_DEPS}
 		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
 	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.36.0:2
+	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
@@ -69,29 +65,30 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	postscript? ( app-text/ghostscript-gpl )
 	udev? ( virtual/libgudev:= )"
 DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
 	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/autoconf-2.54
 	>=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) \
+		--without-webkit \
 		$(use_with jpeg2k libjasper) \
 		$(use_with postscript gs) \
 		$(use_enable cpu_flags_x86_mmx mmx) \
@@ -101,6 +98,8 @@ pkg_setup() {
 		$(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 \
@@ -113,26 +112,20 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	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}"/${PN}-2.9.2-gegl-0.3.8.patch  # bug 586828
+	epatch "${FILESDIR}"/${P}-CVE-2016-4994.patch  # bug 586666
 
-	echo '#!/bin/sh' > py-compile
-	chmod a+x py-compile || die
-	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
-	local myconf
-	if ! use doc; then
-	    myconf="${myconf} --disable-gtk-doc"
-	fi
-	./autogen.sh ${myconf} || die
-
-	# Fix "libtoolize --force" of autogen.sh (bug #476626)
-	rm install-sh ltmain.sh || die
-	_elibtoolize --copy --install || die
+	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() {
-	GEGL=/usr/bin/gegl-0.3 gnome2_src_configure
+	gnome2_src_configure \
+			GDBUS_CODEGEN=/bin/false
 }
 
 src_compile() {
@@ -180,7 +173,8 @@ src_install() {
 	prune_libtool_files --all
 
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+	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
 }

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-2.9.4-r2.ebuild
similarity index 79%
copy from media-gfx/gimp/gimp-9999.ebuild
copy to media-gfx/gimp/gimp-2.9.4-r2.ebuild
index 9704f35641..c90a175cb2 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-2.9.4-r2.ebuild
@@ -1,30 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1 git-r3
-
-EGIT_REPO_URI="git://git.gnome.org/gimp"
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
-SRC_URI=""
-
+SRC_URI="https://www.hartwork.org/public/${P}-r1.tar.xz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS=""
+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 udev webkit wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
 done
 
-RDEPEND=">=dev-libs/glib-2.40.0:2
+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
@@ -35,19 +32,19 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=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.14
-	>=media-libs/gegl-0.3.4:0.3[cairo]
+	>=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
@@ -58,6 +55,7 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	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
 	>=gnome-base/librsvg-2.36.0:2
@@ -69,19 +67,19 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	postscript? ( app-text/ghostscript-gpl )
 	udev? ( virtual/libgudev:= )"
 DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
 	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/autoconf-2.54
 	>=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}-r1
+
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 pkg_setup() {
@@ -91,7 +89,7 @@ pkg_setup() {
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(use_enable altivec) \
-		$(use_with webkit) \
+		--without-webkit \
 		$(use_with jpeg2k libjasper) \
 		$(use_with postscript gs) \
 		$(use_enable cpu_flags_x86_mmx mmx) \
@@ -101,10 +99,12 @@ pkg_setup() {
 		$(use_enable python) \
 		$(use_enable smp mp) \
 		$(use_enable cpu_flags_x86_sse sse) \
+		--with-librsvg \
 		$(use_with udev gudev) \
 		$(use_with wmf) \
 		--with-xmc \
 		$(use_with xpm libxpm) \
+		$(use_enable vector-icons) \
 		--without-xvfb-run"
 
 	if use python; then
@@ -113,26 +113,22 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch  # bug 395695, comment 9 and 16
 
-	echo '#!/bin/sh' > py-compile
-	chmod a+x py-compile || die
-	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
-	local myconf
-	if ! use doc; then
-	    myconf="${myconf} --disable-gtk-doc"
-	fi
-	./autogen.sh ${myconf} || die
+	# Bug 589394
+	rm icons/Symbolic-Inverted/Makefile.in || die
+	epatch "${FILESDIR}"/${PN}-2.9.4-mkdir-makefile.patch
 
-	# Fix "libtoolize --force" of autogen.sh (bug #476626)
-	rm install-sh ltmain.sh || die
-	_elibtoolize --copy --install || die
+	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() {
-	GEGL=/usr/bin/gegl-0.3 gnome2_src_configure
+	gnome2_src_configure \
+			GEGL=/usr/bin/gegl-0.3 \
+			GDBUS_CODEGEN=/bin/false
 }
 
 src_compile() {
@@ -180,7 +176,8 @@ src_install() {
 	prune_libtool_files --all
 
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+	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
 }

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 9704f35641..ff6f036685 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ SLOT="2"
 KEYWORDS=""
 
 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 udev webkit wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
@@ -47,7 +47,6 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	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
@@ -91,7 +90,7 @@ pkg_setup() {
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(use_enable altivec) \
-		$(use_with webkit) \
+		--without-webkit \
 		$(use_with jpeg2k libjasper) \
 		$(use_with postscript gs) \
 		$(use_enable cpu_flags_x86_mmx mmx) \