gentoo resync : 21.07.2018

3 files changed, 98 insertions, 1 deletions

diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index b3f9f7518a24..2634ca19e9c3 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,3 +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
-MISC metadata.xml 556 BLAKE2B 74024079deff060412c8f987f3ab5365b9eff217abacc24c62aed3ee93214f5bc9f9894614fe8373ee488dbc893ea7c0d158742fa5df0d7c09e6400ca44b83b7 SHA512 93979d481efa334ef94d23abc755ac4a333d327154c110da091d213a73f0c4d0ab216e73af0085b0842af7a782c25e4d69e4b9bd76fffc610272c043f37bad4b
+EBUILD gthumb-3.6.1.ebuild 2579 BLAKE2B f13c9c84ea8466ab95b9dc75e724df532ab19fc967bec165c22619442976ee543da4515d701ee9f1322495d5faebb4ad5f9abd66210d3fab8329cff567814a0d SHA512 4ab95396f427e5daf332e17a8af023ff691b2a9cfee8b0a067add47ff8d8360a4cec0debf1749002990eb97e2e8831ce1951c19611c72886d5f7b9c66e3e7ebf
+MISC metadata.xml 637 BLAKE2B 413b52edeb5c603edf87cddd583bc805fc64bed853f7cbb05f38f26d4583c2a28332b4b6ed1d88e0b16072a4ecbce1f77adb06e9abea88661def2a8e8289e2c4 SHA512 c184a357c96fde1278e991b7ed6a4088481b6fcc3a3943275cd367b8c565006805294df009f0b140c34bb9bce60a059d6b6ce29a245a4ff59e58e7f0369b8bdb
diff --git a/media-gfx/gthumb/gthumb-3.6.1.ebuild b/media-gfx/gthumb/gthumb-3.6.1.ebuild
new file mode 100644
index 000000000000..52269a4056d9
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.6.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Image viewer and browser for Gnome"
+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 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.16.0:3
+	exif? ( >=media-gfx/exiv2-0.21:= )
+	slideshow? (
+		>=media-libs/clutter-1.12.0:1.0
+		>=media-libs/clutter-gtk-1:1.0 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	raw? ( >=media-libs/libraw-0.14:= )
+	http? ( >=net-libs/libsoup-2.42.0:2.4 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
+	cdr? ( >=app-cdr/brasero-3.2 )
+	svg? ( >=gnome-base/librsvg-2.34:2 )
+	webp? ( >=media-libs/libwebp-0.2.0 )
+	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:= )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )
+"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# Remove unwanted CFLAGS added with USE=debug
+	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
+		-i configure.ac -i configure || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Upstream says in configure help that libchamplain support
+	# crashes frequently
+	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[@]}"
+}
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 13064f965256..8f93a7caa21c 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
+		<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management</flag>
 		<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
 		<flag name="json">Compile code that uses the libjson-glib library</flag>
 		<flag name="slideshow">Enable slideshow plugin</flag>