media-gfx/nufraw: version and EAPI bump

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Manifest-Sign-Key: 0xEBA2FFB10026658D
Signed-off-by: Markus Meier <maekke@gentoo.org>

3 files changed, 24 insertions, 53 deletions

diff --git a/media-gfx/nufraw/Manifest b/media-gfx/nufraw/Manifest
index fff52de..02fae11 100644
--- a/media-gfx/nufraw/Manifest
+++ b/media-gfx/nufraw/Manifest
@@ -1,24 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX nufraw-0.42-exiv2-0.27.patch 855 BLAKE2B 3b0de953de637813a7f2c2aaa85dab259b465721c1b8f41a5318a59ad9849d24eb3f72347910a33655867e96ee2319bedcfebdeb1e441397b2cc5f1db2546bf1 SHA512 a44ff7aaf24632479211788fe18ea04085b21480a1d7b72d5de4891c8d503af614ae4e941649acfe6b35fa93ecc566342622be8dbde2802eb7b68e34b41d346f
 AUX ufraw-0.17-cfitsio-automagic.patch 933 BLAKE2B 06de9b807a9a491af2db83bfc07e3727409494a0925f01c0493e7cc5ce7b4a326f9c041d11dc30a38c6c71b42cc07e83017ffb01873a2d4f44d78a65a5c7c3ed SHA512 84aadb7dc41927a26ac37a801e136628380e79f032f87a925e737ec76c349c96c410750234f4870fe2fa61680085472a028e47c13cf01b2bd7fc7a55dad6de1b
 AUX ufraw-0.22-fix-unsigned-char.patch 748 BLAKE2B 30a8dfcfb71f78449838ade5f77074d667fc1e71ca079f8042869a9e82ff8b9422ddbdc892c7458e05ad411d552352b5f530ae2da4a629d449857a1e62be0c78 SHA512 0ea99fe69adeeae1e6c07bcf9d583f6b8247ad0f01ddf3435edb605618b0c24d80c5662442250020b92352ebba12757bb69ad7b107ab8a8f464d5cf2b642664b
 AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
-DIST nufraw-0.42.tar.gz 3355661 BLAKE2B 88cbef7829fa81591246f6e357748288495674ad384f40f4f11b3d28d560e10bea9af5be016fb349bfd9a5ed8c98d6df9f4ee07748a8e7bd881cf959c7f923ad SHA512 43c864e41e30e80b7d6bab68810646a6a5cee070cf0941321b35213bdfc68fd8ec41694de1add294163c1f6753f6afc12e11be25b1124d4cd7acd5b7c0de13a9
-EBUILD nufraw-0.42.ebuild 1985 BLAKE2B 4a9e5e18d93e0bbc355e74389e43cc155af91f7a8daa6e1b734cc3d90a78970f5cd3cdc683d595717a0df7666de8e84a52176c821954de304d79961775efc6fe SHA512 382ea58d8e9f08de43c3d66482668bf2c9897f3907922367dad4be0d16b361eed6e50ec807bc2375cda8a84a8973b8074875be95ff11aba7944fc7e77a74f9a7
+DIST nufraw-0.43-3.tar.gz 945294 BLAKE2B 79d2217dab044c62c9e8e72bb011469e3702f64efbe6807abaa460c39796617dd745499bbcfffd6be3264ee38a338ffc3d634aff10fbc36a14f0b1d40a18e3b7 SHA512 60a6d764ca0248f8c388f4b16ff67cded954f642515bb706d1d45bdab189d159593c93f29ec83bbe6cbe4597d6f229a1839f32a450d5ee1d73a135a825933ec8
+EBUILD nufraw-0.43.3.ebuild 1926 BLAKE2B 6252a6df153bd201099174bd795a609728cda9a7c097a0ab787d4f57422a397a2d11165d9db9478f75370e3fc2216540991b7b063fd6bffb56db0d69fe411057 SHA512 cee135c104fb4c192067b863080bf3d6eb29d3743f6b886f038e8758774fcbd8d3748c71df638907ab412a07de720955aff4b97849b39a9c2918be3ea4233bba
 MISC metadata.xml 589 BLAKE2B e7ca34bb660d42d0b907bc574c8f5e7345350905b1d8f3a2d1b351c2059358907f844c909e62c0ea12357c20264925160ec18e755063e67f3f2a739cb15eec2a SHA512 824ac3872bfb11ddfc766120278dd794f4670d4a365631e071e76202bfb2eff95fcdeb8bf86624b92a193ed127bfce6d7e7e357ddd4bfe789aa044293bb790fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGTBAEBCAB9FiEEO7vfxj/1NCgzMht7hGSR/kUngVoFAl6bXOtfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNC
-QkJERkM2M0ZGNTM0MjgzMzMyMUI3Qjg0NjQ5MUZFNDUyNzgxNUEACgkQhGSR/kUn
-gVpxugf+PercMOtSp51xIjt4QSlrIQsPuA09+TegajHxkelUpPsCbs6m/+Fw3IkK
-kCwQyO/eR0u09klKyYRplsr7mZcwLDVCVM/vqtKLb3+h9KNegnHapp/oOaDl7uHQ
-CUi+rWwclX3SmnP8nhNEKoayQ4cznZITBVzG+i5SafXWUiuqOuM3di2m5BEkrLcF
-EL/OHGXXkoxJJFN9UaCRPqm2FUuaCnbe2ksZUDV5voK71iR3308gCL4nB7iKpvRV
-2rY9YxNsLG899EbcwNoG8iJ8Xmfd260wcZFM3SR7Znf2M6wmFJV7geIp/wq6yLnq
-a7gFOtJNnITXSt7PwnygfpGVYCaPaw==
-=Qsvs
+iQGTBAEBCAB9FiEEFpAmG9rbc11oli8L66L/sQAmZY0FAl/fEmpfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE2
+OTAyNjFCREFEQjczNUQ2ODk2MkYwQkVCQTJGRkIxMDAyNjY1OEQACgkQ66L/sQAm
+ZY2Lqgf/ad1YUuS7aqc57wLjm0vqEU8OG4jXJkSjudXhOkQpG/3UL1dq+Oppf2Li
+d8wsmgwht2SVYA+TzE6GQfWBcczssgt99rdN45ZEh59P5oiI9Mf4hgMJBqswA83U
+ZEAsquwN/cMngL0Aefk9R52jdbeNSB2kZTwOVK4b1eoJZ57Kra3JQZyEFthKb+fS
+4BEg8cGwEghJbbd1BkurNUbz+Nt8nZ2Cu5UsSjaJ+R/2ntc83zbMH6pmHKEewZro
+QZ1huVqZZbk5yeCqgpwg5f6jWpn2U7IvmU7VyZKy3uJbe1+KFELyHt+avZ0876c0
+E001kIseFs8/a6VZIuFJX0cxMAqfhw==
+=Q9oE
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/nufraw/files/nufraw-0.42-exiv2-0.27.patch b/media-gfx/nufraw/files/nufraw-0.42-exiv2-0.27.patch
deleted file mode 100644
index fe748a8..0000000
--- a/media-gfx/nufraw/files/nufraw-0.42-exiv2-0.27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru nufraw-0.42.orig/nufraw_exiv2.cc nufraw-0.42/nufraw_exiv2.cc
---- nufraw-0.42.orig/nufraw_exiv2.cc	2019-11-07 03:53:25.969939652 +0700
-+++ nufraw-0.42/nufraw_exiv2.cc	2019-11-07 03:54:15.020942603 +0700
-@@ -15,9 +15,8 @@
- #include "nufraw.h"
- 
- #ifdef HAVE_EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
-+#include <iostream>
- #include <sstream>
- #include <cassert>
- 
-@@ -67,7 +66,11 @@
-         if (exifData.empty()) {
-             std::string error(uf->filename);
-             error += ": No Exif data found in the file";
-+#if EXIV2_TEST_VERSION(0,27,0)
-+            throw Exiv2::Error(Exiv2::kerErrorMessage, error);
-+#else
-             throw Exiv2::Error(1, error);
-+#endif
-         }
- 
-         /* List of tag names taken from exiv2's printSummary() in actions.cpp */
diff --git a/media-gfx/nufraw/nufraw-0.42.ebuild b/media-gfx/nufraw/nufraw-0.43.3.ebuild
index 4b03a1d..77333da 100644
--- a/media-gfx/nufraw/nufraw-0.42.ebuild
+++ b/media-gfx/nufraw/nufraw-0.43.3.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools fdo-mime gnome2-utils toolchain-funcs
+inherit autotools gnome2-utils toolchain-funcs xdg-utils
+
+MY_PV="$(ver_cut 1-2)-$(ver_cut 3)"
+MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="A new version of the popular raw digital images manipulator ufraw."
 HOMEPAGE="http://matteolucarelli.altervista.org/nufraw/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -39,13 +42,9 @@ PATCHES=(
 	"${FILESDIR}"/ufraw-0.17-cfitsio-automagic.patch
 	"${FILESDIR}"/ufraw-0.22-jasper-automagic.patch
 	"${FILESDIR}"/ufraw-0.22-fix-unsigned-char.patch
-	"${FILESDIR}"/${P}-exiv2-0.27.patch
 )
 
-src_unpack() {
-	# work around https://sourceforge.net/p/nufraw/tickets/3/
-	nonfatal unpack ${A}
-}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
@@ -54,7 +53,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-jasper
+		--disable-jasper \
 		$(use_enable contrast) \
 		$(use_with fits cfitsio) \
 		$(use_with gimp) \
@@ -81,15 +80,15 @@ pkg_preinst() {
 
 pkg_postinst() {
 	if use gnome; then
-		fdo-mime_mime_database_update
-		fdo-mime_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_desktop_database_update
 		gnome2_gconf_install
 	fi
 }
 
 pkg_postrm() {
 	if use gnome; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_mimeinfo_database_update
+		xdg_desktop_database_update
 	fi
 }