public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/
Date: Wed,  8 Feb 2017 14:08:39 +0000 (UTC)	[thread overview]
Message-ID: <1486562903.7cb09f8d234d4fd0e6effdb55b777470dc954908.sping@gentoo> (raw)

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) \


             reply	other threads:[~2017-02-08 14:08 UTC|newest]

Thread overview: 251+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-08 14:08 Sebastian Pipping [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-21 13:10 [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/ Sam James
2025-02-19 18:26 Sam James
2025-02-19 18:22 Sam James
2025-02-12  5:00 Sam James
2024-12-30 23:41 Sam James
2024-12-01 11:54 Sam James
2024-11-08 13:27 Joonas Niilola
2024-11-08 13:27 Joonas Niilola
2024-11-08 13:27 Joonas Niilola
2024-10-05  7:31 Viorel Munteanu
2024-09-25 13:59 Joonas Niilola
2024-09-25 13:58 Joonas Niilola
2024-08-30 12:05 Joonas Niilola
2024-07-13  8:03 Joonas Niilola
2024-06-23  7:52 Viorel Munteanu
2024-06-02  8:09 Joonas Niilola
2024-04-14  0:43 Sam James
2024-04-14  0:43 Sam James
2024-04-14  0:43 Sam James
2024-04-14  0:43 Sam James
2024-03-21  2:50 Sam James
2024-01-21 17:12 Sam James
2023-12-08  8:46 Arthur Zamarin
2023-12-08  8:41 Arthur Zamarin
2023-11-17 11:09 Sam James
2023-11-17  8:12 Joonas Niilola
2023-11-17  8:12 Joonas Niilola
2023-11-08  5:35 Sam James
2023-11-08  5:35 Sam James
2023-10-27 15:20 Michał Górny
2023-08-20  7:16 Joonas Niilola
2023-08-20  7:16 Joonas Niilola
2023-07-16 18:34 Sam James
2023-07-13  8:25 Sam James
2023-06-28  6:59 Sam James
2023-05-30 21:56 Sam James
2023-05-20  6:57 Sam James
2023-05-20  6:57 Sam James
2023-05-05 13:37 Arthur Zamarin
2023-05-05 13:36 Arthur Zamarin
2023-05-05 12:58 Arthur Zamarin
2023-05-05 10:28 Arthur Zamarin
2023-04-16  0:24 Sam James
2023-04-16  0:24 Sam James
2023-02-26 21:23 Sam James
2023-02-24 19:09 Joonas Niilola
2023-01-01 14:48 David Seifert
2022-12-23  8:03 Sam James
2022-12-16  4:30 Sam James
2022-12-01  3:21 WANG Xuerui
2022-11-25  7:52 Sam James
2022-11-25  7:52 Sam James
2022-10-30  9:40 Sam James
2022-10-20  4:16 Sam James
2022-10-08 18:34 Sam James
2022-10-04  9:25 Sam James
2022-08-31 22:26 Sam James
2022-07-11 22:50 John Helmert III
2022-07-11 22:50 John Helmert III
2022-07-10 19:13 Sam James
2022-07-09 10:23 Arthur Zamarin
2022-07-09 10:23 Arthur Zamarin
2022-07-09 10:23 Arthur Zamarin
2022-06-21 22:39 Sam James
2022-06-21 22:39 Sam James
2022-06-15 20:58 Sam James
2022-05-15  1:00 Sam James
2022-04-27 13:19 Joonas Niilola
2022-04-27 13:19 Joonas Niilola
2022-03-27  8:24 Joonas Niilola
2022-03-24 12:46 Joonas Niilola
2022-03-15  4:20 John Helmert III
2022-03-01  0:02 Sam James
2022-03-01  0:01 Sam James
2022-02-28 23:56 Sam James
2022-02-27 13:54 Jakov Smolić
2022-02-26 12:08 David Seifert
2022-02-26  2:16 Sam James
2022-02-26  2:16 Sam James
2022-02-18 22:58 Sam James
2022-01-18 22:12 Sam James
2022-01-18 12:36 Sam James
2022-01-18 12:36 Sam James
2022-01-06 10:39 David Seifert
2021-12-24  4:45 Sam James
2021-11-16  2:53 Sam James
2021-10-29 16:05 Sam James
2021-10-29 11:16 Sam James
2021-10-23 13:51 Sam James
2021-10-22  2:47 Sam James
2021-10-22  2:47 Sam James
2021-10-10  4:32 Yixun Lan
2021-10-09 19:48 Sam James
2021-10-09 19:47 Sam James
2021-09-18  3:04 Sam James
2021-09-08  6:46 Sam James
2021-09-08  6:38 Sam James
2021-08-12  3:10 Yixun Lan
2021-05-17 23:25 Sam James
2021-05-17 23:25 Sam James
2021-04-11  8:09 Joonas Niilola
2021-04-11  8:09 Joonas Niilola
2021-02-21 10:19 Andreas Sturmlechner
2021-02-21 10:19 Andreas Sturmlechner
2021-02-19 17:17 Sam James
2021-02-19 12:11 Sam James
2021-02-18 22:19 Sam James
2021-02-18 21:01 Sam James
2021-01-11 15:26 Lars Wendler
2020-12-29  1:54 Sam James
2020-12-29  1:54 Sam James
2020-12-26 23:18 Marek Szuba
2020-11-08 12:02 Sam James
2020-11-08 12:02 Sam James
2020-11-04 12:42 Mikle Kolyada
2020-10-31 11:20 Mikle Kolyada
2020-10-21  5:59 Joonas Niilola
2020-10-20 12:54 Joonas Niilola
2020-10-08  3:07 Sam James
2020-09-23  4:06 Sam James
2020-09-22 19:46 Sam James
2020-09-20 22:40 Thomas Deutschmann
2020-09-20 15:09 Sam James
2020-08-30  7:58 Andreas Sturmlechner
2020-08-22 16:07 Andreas Sturmlechner
2020-08-22 16:07 Andreas Sturmlechner
2020-08-22  6:16 Michał Górny
2020-08-22  6:16 Michał Górny
2020-08-11  7:18 Sergei Trofimovich
2020-07-24 23:53 Sam James
2020-07-23  5:15 Kent Fredric
2020-07-21 23:15 Kent Fredric
2020-07-17  0:35 Sam James
2020-07-05  8:24 Joonas Niilola
2020-07-05  8:24 Joonas Niilola
2020-06-25  8:08 Joonas Niilola
2020-05-25 12:17 Mikle Kolyada
2020-05-24 12:31 Jeroen Roovers
2020-05-10 17:42 Mart Raudsepp
2020-05-06  7:18 Sergei Trofimovich
2020-04-30 21:28 Andreas Sturmlechner
2020-04-09 22:02 Sergei Trofimovich
2020-04-07 10:21 Mart Raudsepp
2020-03-18 18:57 Georgy Yakovlev
2020-03-18  0:05 Matt Turner
2020-03-09 21:04 Mart Raudsepp
2020-03-06 15:55 Joonas Niilola
2020-03-05 12:21 Joonas Niilola
2020-02-09 16:29 Michał Górny
2020-01-27 14:25 Agostino Sarubbo
2020-01-27 12:46 Agostino Sarubbo
2020-01-27  7:54 Sergei Trofimovich
2020-01-25 22:41 Andreas Sturmlechner
2020-01-25 21:09 Andreas Sturmlechner
2020-01-07  6:20 Joonas Niilola
2019-12-26 12:56 Georgy Yakovlev
2019-12-18 16:32 Joonas Niilola
2019-12-13 13:49 Joonas Niilola
2019-12-01  3:18 Andreas Sturmlechner
2019-12-01  3:18 Andreas Sturmlechner
2019-08-28  8:19 David Seifert
2019-07-25 12:14 Aaron Bauman
2019-07-07 18:17 Sebastian Pipping
2019-05-08 19:21 Mikle Kolyada
2019-05-06 11:05 Pacho Ramos
2019-05-06 11:05 Pacho Ramos
2019-05-06 11:05 Pacho Ramos
2019-04-25 22:32 Pacho Ramos
2019-04-22 16:16 Sebastian Pipping
2019-02-04 18:13 Matt Turner
2018-11-25 19:48 Sebastian Pipping
2018-11-18 21:06 Sebastian Pipping
2018-10-14 18:25 Sebastian Pipping
2018-10-12 16:15 Michał Górny
2018-10-06  7:18 Miroslav Šulc
2018-09-25 16:31 Sebastian Pipping
2018-09-25 16:31 Sebastian Pipping
2018-09-24 20:38 Sebastian Pipping
2018-09-10 21:38 Sebastian Pipping
2018-09-07 19:12 Sebastian Pipping
2018-08-30 21:23 Sebastian Pipping
2018-08-25 19:17 Sebastian Pipping
2018-07-19 20:41 Sebastian Pipping
2018-07-08 21:34 Sebastian Pipping
2018-07-08 18:26 Sebastian Pipping
2018-06-13 17:36 Sebastian Pipping
2018-04-22 21:34 Aaron Bauman
2018-04-22 21:04 Matt Turner
2018-04-21 20:56 Sebastian Pipping
2018-03-31 18:01 Sebastian Pipping
2018-03-21 22:24 Sergei Trofimovich
2018-03-20  7:15 Sergei Trofimovich
2018-03-18 22:23 Sergei Trofimovich
2018-02-03 10:40 Sergei Trofimovich
2018-01-20 16:49 Tobias Klausmann
2018-01-15 22:41 Sergei Trofimovich
2018-01-06 17:53 Agostino Sarubbo
2018-01-06 11:57 Ulrich Müller
2018-01-03 19:17 Sebastian Pipping
2017-12-13 19:02 Sebastian Pipping
2017-10-25 22:57 Sebastian Pipping
2017-10-25 21:42 Sergei Trofimovich
2017-08-30 17:04 Sebastian Pipping
2017-08-29 23:16 Guilherme Amadio
2017-08-29 19:28 Sebastian Pipping
2017-08-27 20:56 Sebastian Pipping
2017-08-26 19:45 Sebastian Pipping
2017-07-02 14:52 Sergei Trofimovich
2017-06-06 11:31 Agostino Sarubbo
2017-06-05 14:36 Sebastian Pipping
2017-05-12 21:00 Sebastian Pipping
2017-04-08 22:17 Sebastian Pipping
2017-04-08 17:15 Sebastian Pipping
2017-04-08 15:30 Sebastian Pipping
2017-02-08 17:13 Sebastian Pipping
2017-02-08 14:08 Sebastian Pipping
2016-12-04 19:29 Sebastian Pipping
2016-11-12 23:37 David Seifert
2016-10-31 18:46 Sebastian Pipping
2016-10-17 22:27 Sebastian Pipping
2016-09-28 11:28 Tobias Klausmann
2016-09-20 19:43 Sebastian Pipping
2016-09-18 14:34 Sebastian Pipping
2016-08-23 19:01 Markus Meier
2016-08-23 17:18 Sebastian Pipping
2016-08-13 22:26 Sebastian Pipping
2016-07-29 17:14 Sebastian Pipping
2016-07-26  6:49 Jeroen Roovers
2016-07-23 12:47 Sebastian Pipping
2016-07-22 17:43 Sebastian Pipping
2016-07-22 13:40 Sebastian Pipping
2016-07-20 17:08 Sebastian Pipping
2016-07-18 18:14 Sebastian Pipping
2016-07-18 17:51 Sebastian Pipping
2016-07-08 12:46 Sebastian Pipping
2016-07-08 12:02 Agostino Sarubbo
2016-07-03 10:02 Jeroen Roovers
2016-07-02 11:08 Jeroen Roovers
2016-06-30 12:22 Tobias Klausmann
2016-06-27  8:47 Agostino Sarubbo
2016-06-27  8:23 Agostino Sarubbo
2016-02-21 15:23 Sebastian Pipping
2016-01-31 18:34 Pacho Ramos
2015-12-31 18:47 Sebastian Pipping
2015-12-24  0:31 Sebastian Pipping
2015-12-10 22:13 Sebastian Pipping
2015-12-07 21:59 Sebastian Pipping
2015-12-05  7:51 Jeroen Roovers
2015-12-05  1:42 Sebastian Pipping
2015-09-07 15:27 Sebastian Pipping

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1486562903.7cb09f8d234d4fd0e6effdb55b777470dc954908.sping@gentoo \
    --to=sping@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox