gentoo resync : 15.12.2019

6 files changed, 7 insertions, 292 deletions

diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 1690771ed8d8..987dbb9ab708 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,9 +1,4 @@
-AUX geeqie-1.4-exiv2-0.27.patch 2052 BLAKE2B db7bb4d2631d566e4c9dbc89cad262cfb173df96b92ea83a690bdcdbbb7d3c873e9e5bd5a581c45b3a4af42c3c7711c65080e1822eaa31be97632b57d4e34713 SHA512 b8108f9a77022f1a0d1354883d1f7a1981a8079e675e765aa67fac16606ed42ecc169ad5cb8a6baf86e919d6ddf018ed54bf5950b9601d2cd1ff647f7fa47bca
-DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
-DIST geeqie-1.5.tar.xz 1585780 BLAKE2B 6dc0a30c26f25988cbd3fa81a916642504e9f6f280b03d78c820cbf5b453d8a392d3c8da8d482de24b3c39e7e9ba0663879d651c60a8061b8034d2c526007944 SHA512 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722
-EBUILD geeqie-1.4-r1.ebuild 2396 BLAKE2B 4fe4b8aee881eb138f5b8bf2a7199c18858d45586220c549173d13d8ab5e200b143e8aca3ab623bb9e507419d6b5e5027c63a47d72d4606355a3e9adc03381ea SHA512 5b4b13476620aeee811cd06f357c2fc49a1e732f68a0508715ba113b02688440738edb4799f53adf2a79c713e22c3ed19ef376981b2aed9be884bedd70880bf0
-EBUILD geeqie-1.5.1.ebuild 2277 BLAKE2B da3871fd0cf5af559c1443bb711c2b4a2b78402c4b7b1310930dafdeb41775adfee11862471bbb829531901d5f0bc518de56933880507d6de1aebf713163e2f4 SHA512 b1106f2714c659432ccf384671bd15a0f39cf5bd5d1a883088a15f0bac57ca2749184ed795103d21e6ff48e45818c6330b91702724deb37cb06033cd36f8c87b
-EBUILD geeqie-1.5.ebuild 2277 BLAKE2B da3871fd0cf5af559c1443bb711c2b4a2b78402c4b7b1310930dafdeb41775adfee11862471bbb829531901d5f0bc518de56933880507d6de1aebf713163e2f4 SHA512 b1106f2714c659432ccf384671bd15a0f39cf5bd5d1a883088a15f0bac57ca2749184ed795103d21e6ff48e45818c6330b91702724deb37cb06033cd36f8c87b
-EBUILD geeqie-9999.ebuild 2269 BLAKE2B 719319e9805f58a4f1dfaea869c911f1ade15e762ba46add49975f17b38a6e3909b74e0db223082c06ae55c0aa655389ab5a10e75d4d1dc85552e55105fe29d0 SHA512 8435b9882a9a767af7592bfb59e32d47f0f01e932eac23f920bf0933ae1ae3044302205dd6902fe490c6f995d669b1eaf62b141cc66538444bd5d57d39d896b4
+EBUILD geeqie-1.5.1.ebuild 2211 BLAKE2B 60e09480c32ed15924e77dde7dd598ef5ffe231ff306ec69748302775a9407a59d7402c1c9a711b732ab74e091cc0d78062c0d018aa75415f0b4152d6b69e968 SHA512 27edac026322f122ad0e92bb285a207fcb29e4a7300dc9a332874ebb9eca26e34e2b3485b0891d1a8d80af1fe0783778c9906b1ed01bbdeefac222312b2f3ce0
+EBUILD geeqie-9999.ebuild 2205 BLAKE2B 66b7e06022214a479a57bfc9d162a054411f409074ceec3d0a5ff07b8917c1b7ada20451b5af30d0377e5046f408347ba7fcb6d2e5b5db205ca34f3adea687dc SHA512 f9808d2f779af157583c44b0c1ce8ca2cca71663487aa5918340f19c429da53e186b3eca865a92e49b033456e3de0134f2ac4d9deed2d408a35651785d5a0fa4
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch
deleted file mode 100644
index b9a3bde0db2e..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 13859e2ec3a1afc74f109cfffdf0de39030cde86 Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
-Date: Wed, 2 Jan 2019 01:04:45 +0100
-Subject: [PATCH] fix build against exiv2-0.27.x
-
-fixes #654
----
- src/exiv2.cc | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/exiv2.cc b/src/exiv2.cc
-index b3c80657..f40b725e 100644
---- a/src/exiv2.cc
-+++ b/src/exiv2.cc
-@@ -22,17 +22,27 @@
- 
- #ifdef HAVE_EXIV2
- 
-+// Don't include the <exiv2/version.hpp> file directly
-+// Early Exiv2 versions didn't have version.hpp and the macros.
-+#include <exiv2/exiv2.hpp>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
- #include <iostream>
- #include <string>
- 
- // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
-+#ifdef EXIV2_VERSION
- #ifndef EXIV2_TEST_VERSION
--# define EXIV2_TEST_VERSION(major,minor,patch) \
-+#define EXIV2_TEST_VERSION(major,minor,patch) \
- 	( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
- #endif
-+#else
-+#define EXIV2_TEST_VERSION(major,minor,patch) (false)
-+#endif
- 
-+#if EXIV2_TEST_VERSION(0,27,0)
-+#define HAVE_EXIV2_ERROR_CODE
-+#endif
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -40,6 +50,10 @@
- #include <fcntl.h>
- #include <sys/mman.h>
- 
-+#if EXIV2_TEST_VERSION(0,27,0)
-+#define EXV_PACKAGE "exiv2"
-+#endif
-+
- #if !EXIV2_TEST_VERSION(0,17,90)
- #include <exiv2/tiffparser.hpp>
- #include <exiv2/tiffcomposite.hpp>
-@@ -374,7 +388,11 @@
- #endif
- 			Exiv2::Image *image = imageData_->image();
- 
--			if (!image) Exiv2::Error(21);
-+#ifdef HAVE_EXIV2_ERROR_CODE
-+			if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
-+#else
-+			if (!image) throw Exiv2::Error(21);
-+#endif
- 			image->setExifData(exifData_);
- 			image->setIptcData(iptcData_);
- #if EXIV2_TEST_VERSION(0,16,0)
-@@ -394,8 +412,12 @@
- 			sidecar->setXmpData(xmpData_);
- 			sidecar->writeMetadata();
- #else
-+#ifdef HAVE_EXIV2_ERROR_CODE
-+			throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
-+#else
- 			throw Exiv2::Error(3, "xmp");
- #endif
-+#endif
- 			}
- 	}
- 
diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
deleted file mode 100644
index 5cf44c8bfe1d..000000000000
--- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="http://www.geeqie.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
-
-RDEPEND="
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	gpu-accel? ( media-libs/clutter-gtk )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
-	map? ( media-libs/libchamplain:0.12 )
-	tiff? ( media-libs/tiff:0 )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="gpu-accel? ( gtk3 )
-	map? ( gpu-accel )"
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674044
-
-src_prepare() {
-	default
-
-	# Missing from release tarball, and requires git tree to generate
-	sed -e "/readme_DATA/s/ChangeLog\(.html\)\?//g" -i Makefile.am || die
-
-	# Remove -Werror (gcc changes may add new warnings)
-	sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking
-		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable debug debug-log)
-		$(use_enable ffmpegthumbnailer)
-		$(use_enable gpu-accel)
-		$(use_enable gtk3)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(use_enable map)
-		$(use_enable tiff)"
-
-	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
-	else
-		myconf="${myconf} --disable-exiv2"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f "${D}/usr/share/doc/${PF}/COPYING"
-	# Application needs access to the uncompressed file
-	docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild
index 5323596a4a94..88c65fbe11e3 100644
--- a/media-gfx/geeqie/geeqie-1.5.1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools xdg-utils
+inherit autotools xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org"
@@ -11,7 +11,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
 
 RDEPEND="
@@ -83,13 +83,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 
 	elog "Some plugins may require additional packages"
 	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
 	elog "- RAW images plugin: media-gfx/ufraw"
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/geeqie/geeqie-1.5.ebuild b/media-gfx/geeqie/geeqie-1.5.ebuild
deleted file mode 100644
index 5323596a4a94..000000000000
--- a/media-gfx/geeqie/geeqie-1.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg-utils
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="http://www.geeqie.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
-
-RDEPEND="
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	gpu-accel? ( media-libs/clutter-gtk )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
-	map? ( media-libs/libchamplain:0.12 )
-	pdf? ( >=app-text/poppler-0.62[cairo] )
-	tiff? ( media-libs/tiff:0 )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="gpu-accel? ( gtk3 )
-	map? ( gpu-accel )"
-
-src_prepare() {
-	default
-
-	# Remove -Werror (gcc changes may add new warnings)
-	sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking
-		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable debug debug-log)
-		$(use_enable ffmpegthumbnailer)
-		$(use_enable gpu-accel)
-		$(use_enable gtk3)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(use_enable map)
-		$(use_enable nls)
-		$(use_enable pdf)
-		$(use_enable tiff)"
-
-	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
-	else
-		myconf="${myconf} --disable-exiv2"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f "${D}/usr/share/doc/${PF}/COPYING"
-	# Application needs access to the uncompressed file
-	docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index e7ca05a8bf03..3f25e162490a 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools git-r3 xdg-utils
+inherit autotools git-r3 xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org"
@@ -84,13 +84,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 
 	elog "Some plugins may require additional packages"
 	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
 	elog "- RAW images plugin: media-gfx/ufraw"
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}