gentoo resync : 06.08.2019

3 files changed, 8 insertions, 10 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 17b51fa580b0..9afbbf7a7b9f 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -17,7 +17,7 @@ DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26
 EBUILD gimp-2.10.10-r1.ebuild 6019 BLAKE2B 95f0b465a05852fa14ee4ec2ba24cd9e950a3f8ca177934ad44a557612eb05401c83bb178d76d82993fce4fd4d44ff07ba6c49b67c1474a42a1ead89aa4303e7 SHA512 67daa7288ced9a24f25be60b66774a3a62c9b65625b00b7928a3de80dec36e1bd951614e32c55df47a1f48a7a5997961b435f96a95b0afd17b37e8a3d3ff8f68
 EBUILD gimp-2.10.12.ebuild 6019 BLAKE2B aa9cfa85ba3ac683e7ca56565f15faf6487fc59824ab6d7127b86f10e93277e14fda86aee22cdb81c4f864c0cf8158df13257519f323ab5e96deed817f7b2805 SHA512 43865076a7ce5fe24c732fd95d3e12ca70b712fd0b87a8a96c0377eb73a5ae395b4407c5edfdf69923d9d71ec6db1b3093476ac07d96ef5d6a183787208859ae
 EBUILD gimp-2.10.8-r1.ebuild 6103 BLAKE2B 6425ca47c627119df035049ad207952a63a73db746d5a0555c039db4005eeb50c43751957eacbf47e75ec7ecd2d76a07194241fff733126bc9c0a13eb9bb94f2 SHA512 ff9dc9525d10911d121e44e8c613497771d74f7f271642f58a8c2381c41aae1ef3dc8430161035f551db1a570ee59859a94ed23816d21f9f5a4f405de0b2844c
-EBUILD gimp-2.8.22-r1.ebuild 5175 BLAKE2B 01d76aae6190f14fdc12ad47a22109610a6622b0ee45e2d00ad352ff2a5e1f5b37ee36f15e6bf270cb842ce7f87ec13e92ce386ac908628115a8453706e95bc2 SHA512 f34e4a3d1e7ae474e07b985e5a0c9162bbdb6beec2e65473e0bb421d188e5fae37fe5a2618b9479511b625e3798f29e500f82d0e392b0b820257ebc542cf281c
-EBUILD gimp-2.9.8-r1.ebuild 5712 BLAKE2B f09f553f5d7eb8e8df0af0a316d2d98e9b0a32a204bb43c563927eae5a6dcb3bb4f5ff882bc05ce6ef3f8914939be6296683c382af45bcab877889042c96bc66 SHA512 7474ecdd5a1c785684b79c0007d77f45e475d7220f74960c48e686e7f6b15d82145b154caa802e2774eb34b46b03c5c4a1fc43a8ebc3716fb5f836be4d412886
+EBUILD gimp-2.8.22-r1.ebuild 5123 BLAKE2B e3bc8adfa913bccfdf030ef2a12529a4ca130f033b5cdd0fcb435b99e2a8b0d33ee8ddc73a79e23e031d9474fff35ea8e69fe31568189c5f8a6c2dc605e14744 SHA512 255a75d03da42e7685790dec17afe29185341a7393fe4f5c2166f5dfa0f3eef470f014ccd04d00803a3fc1b1da46402c41773a18019bae05e4e0e1d88531d7e9
+EBUILD gimp-2.9.8-r1.ebuild 5660 BLAKE2B 7ec76e1a703cd5534741651016f86f2d1eb4787f3a93cc52e02b1337c0730b1e08ec7c6a033b96d9e6172754fa8da14ef0e5511d872e09dfe3dcc0016f89a54a SHA512 9266ba66630e65f58c3eb36cb17299ce7bc548e3c9a8f1583160d942d6bfdd59a4284ee7e2d6a7205bf66f3140caecb0e8ad11af3a22727d6866275de93741ea
 EBUILD gimp-9999.ebuild 6006 BLAKE2B 32d782ef463075d2d38662dfba2b04efc4ca2cffa68daecac66cafd496d7466ee5c16ca0dd6ef23b2907562d2297b55265588773745630810e34baca105f7dae SHA512 662bf161d64551f1ce1727ea7be016cb6bbd4ab354c1b3734c87eb3f18d41255158f68cf17a55094791542ea41b6a05537f4ace9f1ba326e919ff02b827e9479
 MISC metadata.xml 474 BLAKE2B 7beaaa52a35415b9460b23f5031f71464008417e589105db607f0f86519cb7f19c9621dc77acea9aa9e67a1bf8f5887415761a69a29eb77aa205a89cc8b586ac SHA512 f1a58ab4fc0c7a4257648f35027d0860ee7b088ebd61703dde7622078bcc345168f3b747e79d71206ae36c479334925aac137e96c0d2134413f9e62aa27cee53
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index e81e1b0f1e14..34511189e6a0 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="2"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-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 wmf xpm"
+IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.2.0
@@ -38,7 +38,6 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	dbus? ( dev-libs/dbus-glib )
 	gnome? ( gnome-base/gvfs )
 	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 )
@@ -85,7 +84,7 @@ pkg_setup() {
 		$(use_with gnome gvfs) \
 		--without-webkit \
 		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
+		--without-libjasper \
 		$(use_with exif libexif) \
 		$(use_with lcms lcms lcms2) \
 		$(use_with postscript gs) \
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index 73c30b3307ba..1898a4be6a86 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~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 vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=dev-libs/atk-2.2.0
@@ -40,7 +40,6 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	aqua? ( x11-libs/gtk-mac-integration )
 	gnome? ( gnome-base/gvfs )
 	virtual/jpeg:0
-	jpeg2k? ( media-libs/jasper:= )
 	>=media-libs/lcms-2.8:2
 	mng? ( media-libs/libmng )
 	openexr? ( >=media-libs/openexr-1.6.1 )
@@ -119,7 +118,7 @@ src_configure() {
 		$(use_enable altivec)
 		--with-appdata-test
 		--without-webkit
-		$(use_with jpeg2k libjasper)
+		--without-libjasper
 		$(use_with postscript gs)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_with mng libmng)