gentoo resync : 24.12.2018

3 files changed, 41 insertions, 30 deletions

diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index e8126cab3793..36900d82a2e3 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,5 +1,5 @@
-DIST gthumb-3.4.5.tar.xz 3391492 BLAKE2B 62b3cd9be6954f734f3ae6d9e2d06364350a78b7415945d44526d35100b18617ef83359eb794a6b7d16fcb226b3c42aee0afb2a6a517b8c0b8055287b1879a29 SHA512 a709e9af9626578a6121fc6d60aa8ec2ee9f1758e9078f2e77498cbfc28cd0f1c8631aeb5c9312496b344ff889f4545935871409af5e3cd625c9a62df5d22d85
 DIST gthumb-3.6.1.tar.xz 3415564 BLAKE2B 363c1c927557f69a4dc0980174b31dd414267c0110205b4406f7fbf02953fd9ad00255d327363c6dcab663e10401b42a7aa23bc33796e944540ad21e778db67d SHA512 8b545626b041f91b8a3ad9caa5930aa431529f660c5a705efff667c78ddccd25683e598f7b1fc08f8e73553cedec00f0187387833e6081f504fc67ebd86f7a42
-EBUILD gthumb-3.4.5.ebuild 2289 BLAKE2B 8c98f4b9d534a11cdf789d823626a52e92fb949aaf867ab2caf7a776c2b545bcdb4bab4086911990cb11d2eda8feb2d26f19a81a36856dfb7a1b42ff4238cb91 SHA512 be7f25a32c4f313769a93964e5dbf06c2327ea23bfa755e74a9e9fb7cca3957375ab34f183587f22d7b9df8031fda7ef2a321e88deb8cac4cc8c0cc2de4d30aa
-EBUILD gthumb-3.6.1.ebuild 2579 BLAKE2B f13c9c84ea8466ab95b9dc75e724df532ab19fc967bec165c22619442976ee543da4515d701ee9f1322495d5faebb4ad5f9abd66210d3fab8329cff567814a0d SHA512 4ab95396f427e5daf332e17a8af023ff691b2a9cfee8b0a067add47ff8d8360a4cec0debf1749002990eb97e2e8831ce1951c19611c72886d5f7b9c66e3e7ebf
+DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
+EBUILD gthumb-3.6.1.ebuild 2595 BLAKE2B 64912212a1e032ee927272bd77fee83367a678569d7ef58b67e27629404019b5fd101445973a81a870563c756f49de3ee290a9ae50a50abc0b61e913bc02f4ce SHA512 4f7ab17a2331dc0b592a267254d70e7f80d3ecd66aa069200500acf8488f0bdbbfdd1874829468556e25d71c38a0e7d6ead8d894e5085ee68100abe9bfd4c424
+EBUILD gthumb-3.6.2.ebuild 2594 BLAKE2B a6c6a68c0914793b7cde5cc13e730944a0e3476dbfe6f2d47a4e61e3d60d2217dadd42e44355ac59f492422493d02c8ba35cb0ddc8dbd32635c6807f50bfefe3 SHA512 fea6507344884d23a5f298d98295f17b220d1987612f9f027ab07df1d06649acad8ce0bffad57ab1cfbe7ce18f6d85ae2e120195f6dd2cb9d1b2a653a75fcf3c
 MISC metadata.xml 573 BLAKE2B 889924db658e5280c09c581c76fe0d90d7306a454f0ad462131d87164cc4791a0002f17a2eb191c11f61959d93539d4ea5dd22b66d8879ceee259f30e0a268c8 SHA512 e9daac77f6276d354005dc123ba92053139c264a19dedbf4b79b6d3df7aea00e95330bb182b960d2606a65f6c8d68e19e82cb699999b9ede4fad1dd8cbaab16e
diff --git a/media-gfx/gthumb/gthumb-3.6.1.ebuild b/media-gfx/gthumb/gthumb-3.6.1.ebuild
index 52269a4056d9..8f1c52090c00 100644
--- a/media-gfx/gthumb/gthumb-3.6.1.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
 
 RDEPEND="
@@ -44,6 +44,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-text/yelp-tools
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1
 	sys-devel/bison
 	sys-devel/flex
diff --git a/media-gfx/gthumb/gthumb-3.4.5.ebuild b/media-gfx/gthumb/gthumb-3.6.2.ebuild
index e2b90746de92..1eab1eda6c7d 100644
--- a/media-gfx/gthumb/gthumb-3.4.5.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,12 +11,12 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cdr debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
 
 RDEPEND="
 	>=dev-libs/glib-2.36.0:2[dbus]
-	>=x11-libs/gtk+-3.10.0:3
+	>=x11-libs/gtk+-3.16.0:3
 	exif? ( >=media-gfx/exiv2-0.21:= )
 	slideshow? (
 		>=media-libs/clutter-1.12.0:1.0
@@ -33,17 +33,19 @@ RDEPEND="
 	json? ( >=dev-libs/json-glib-0.15.0 )
 	webkit? ( >=net-libs/webkit-gtk-1.10.0:4 )
 	lcms? ( >=media-libs/lcms-2.6:2 )
+	colord? ( >=x11-misc/colord-1.3
+		>=media-libs/lcms-2.6:2 )
 
 	media-libs/libpng:0=
 	sys-libs/zlib
 	>=gnome-base/gsettings-desktop-schemas-0.1.4
 	jpeg? ( virtual/jpeg:0= )
 	tiff? ( media-libs/tiff:= )
-	!raw? ( media-gfx/dcraw )
 "
 DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -63,23 +65,31 @@ src_prepare() {
 src_configure() {
 	# Upstream says in configure help that libchamplain support
 	# crashes frequently
-	gnome2_src_configure \
-		--disable-static \
-		--disable-libchamplain \
-		$(use_enable cdr libbrasero) \
-		$(use_enable debug) \
-		$(use_enable exif exiv2) \
-		$(use_enable gnome-keyring libsecret) \
-		$(use_enable gstreamer) \
-		$(use_enable http libsoup) \
-		$(use_enable jpeg) \
-		$(use_enable json libjson-glib) \
-		$(use_enable lcms lcms2) \
-		$(use_enable raw libraw) \
-		$(use_enable slideshow clutter) \
-		$(use_enable svg librsvg) \
-		$(use_enable test test-suite) \
-		$(use_enable tiff) \
-		$(use_enable webkit webkit2) \
+	local myeconfargs=(
+		--disable-static
+		--disable-libchamplain
+		$(use_enable cdr libbrasero)
+		$(use_enable colord)
+		$(use_enable debug)
+		$(use_enable exif exiv2)
+		$(use_enable gnome-keyring libsecret)
+		$(use_enable gstreamer)
+		$(use_enable http libsoup)
+		$(use_enable jpeg)
+		$(use_enable json libjson-glib)
+		$(use_enable raw libraw)
+		$(use_enable slideshow clutter)
+		$(use_enable svg librsvg)
+		$(use_enable test test-suite)
+		$(use_enable tiff)
+		$(use_enable webkit webkit2)
 		$(use_enable webp libwebp)
+	)
+	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
+	if use lcms || use colord; then
+		myeconfargs+=( --enable-lcms2 )
+	else
+		myeconfargs+=( --disable-lcms2 )
+	fi
+	gnome2_src_configure "${myeconfargs[@]}"
 }