media-gfx/gthumb: security cleanup

Bug: https://bugs.gentoo.org/712932
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

4 files changed, 1 insertions, 133 deletions

diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 5d943f080fff..9ebf6b38ec48 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,2 +1 @@
 DIST gthumb-3.10.0.tar.xz 7550040 BLAKE2B 183ffa4c567728375c34a3f84c72d44f266a893fa8d4be7b8270faa2a120bf2e6c61d5e35494aa5e4d4e14366017adbb020f7a3dc8c51b6f012e8f18cee1a72f SHA512 d7bcac6b260bf7d5816af69ea89953517cbc43ea289227ccceebd0700b753a7d97349e6a30ec6bbb42690c56abff5b69dc3fc073f1ee2831ae1aa7d220722efd
-DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
diff --git a/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch
deleted file mode 100644
index 2bd8b94c3c11..000000000000
--- a/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Patch kindly borrowed from Mageia.
-
-* asturm@gentoo.org: Dropped unnecessary and backwards incompatible
-xmp_exiv2.hpp include.
-
-https://gitlab.gnome.org/GNOME/gthumb/issues/30
-
-diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
---- a/extensions/exiv2_tools/exiv2-utils.cpp	2018-06-17 08:24:44.000000000 +0200
-+++ b/extensions/exiv2_tools/exiv2-utils.cpp	2018-12-31 15:51:50.912329232 +0100
-@@ -32,7 +32,7 @@
- #include <sstream>
- #include <vector>
- #include <iomanip>
--#include <exiv2/xmp.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <gthumb.h>
- #include "exiv2-utils.h"
- 
-@@ -1073,7 +1073,11 @@
- 
- 	try {
- 		if (exifData.empty()) {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+			throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file");
-+#else
- 			throw Exiv2::Error(1, " No Exif data found in the file");
-+#endif
- 		}
- 		Exiv2::ExifData::const_iterator end = exifData.end();
- 		for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
diff --git a/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild b/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild
deleted file mode 100644
index d5b0510c3e92..000000000000
--- a/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-RESTRICT="!test? ( test )"
-
-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
-		media-plugins/gst-plugins-gtk: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}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674092
-
-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 0ba6dde6a358..7277ae1b1da6 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -6,8 +6,7 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<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="http">Enable webservice integration through <pkg>net-libs/webkit-gtk</pkg></flag>
 		<flag name="slideshow">Enable slideshow plugin</flag>
 	</use>
 </pkgmetadata>