gentoo auto-resync : 19:02:2024 - 23:39:38

4 files changed, 31 insertions, 122 deletions

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 7862172fe855..cd2ce214070c 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,7 +1,7 @@
 AUX exiv2-0.28.1-exiv2lib.patch 1234 BLAKE2B 9e1763763e5bbb84850152b9d67bd1a8f20df6e8936d4bed7809214a80cb25f4d8512b98ddea47463401f1736f55c064752799082b164f43e122ae2057686fe2 SHA512 21228d11844b0868073f26b0d4817e82a2e4219af21902547bfc1d11447d5bffe4931f7d3dcf0abd68a08ed0ae3f6e762e46edb854b8f24b71bb1da771bb91e1
-DIST exiv2-0.27.7-Source.tar.gz 32290404 BLAKE2B ac83c36dd15c7f6aa2d6607542a12b981d1b58bed671047d3dbfdc9eea64a977630863e4c4abe1e9c2e3e8af05adf6849a05d70e42cde4bb0d6f4a3fbb9b2e49 SHA512 8f12b056439867a05b6dfe4b93a82e02d9e5032554b590e399bcf38d73208a783f8349e66870cc030ad2a47650389d96522b60086b308145121646c9fa93d8ae
+AUX exiv2-0.28.2-errors-localisation.patch 835 BLAKE2B af7821671a1f852d3169eb1577814f390e5943165fff73ea568906e71253a381c72ebe5b3fc623668a7d37f6bfd988e7eff3b505e04f0fb8f6f95b3a8398cc20 SHA512 d228eed586b257e992566d1ebb655753a7bec6ce6ab56773dc7feeb93fa479b4f98a1db4ac64e95eed2447ed27ee434eed40d9c4a230be6fe6f8788fa9d5ed7f
 DIST exiv2-0.28.1.tar.gz 45225200 BLAKE2B a26f8e54cf6284c56ff429c13d5a8985dc6181a36b4c13ea6f2e59bc00016a2a8d915ddbc0cedb441b8283e30f18312a500900ffd89ca984006ac84807a03852 SHA512 7b872a3c0cbe343014b1ca4618cecaf6ee8d78dec7ef83accfce95cb8eadc6b52116977a41e1f1be5c6149a47bdd9457fadc08d73708aa2a6ab69795fd3de23b
-EBUILD exiv2-0.27.7.ebuild 2807 BLAKE2B f1001b87d785f752b13535bf08ff064d36e5f06a209d2a25ae971f5e9cd496c3095355d379d3b8139aa08c207bcb2bd3e3a85855aca424597d1d0e354c66cdcd SHA512 a2ae95268c8064ff618db77a6ce9fd87cad60fc81766e3ac6b13941c44366b8edd655b40868d028ab41f81afb7ee3a5ef5b7c0aa022858b7cba338dbabc4d09c
-EBUILD exiv2-0.28.1-r1.ebuild 3273 BLAKE2B 5d0c0807a387162fea1a007cdda6bf6796a92fe44bb682925478e01456e4c677746a499a8107d29afdd2b788318b688374e2046685e747d6281f36dff82394bf SHA512 b0a350a8998a6a2f037dfc3ef11ccc6da44439b81cc9d9f780e9898d949affd218fa3d29842948a2e32989f5cba2aeebde8bafb1fb8c57d834e4892e9b0bfeef
+DIST exiv2-0.28.2.tar.gz 45224206 BLAKE2B 9d1d05c99804032dfb9b740e543d1e3cceae011b17853c8565ccad87e726ce1d0f410c13bf4fa8839bc8e0fecdf170a3acac568f14aad4628b3b844f6c21dd7e SHA512 197cc607c0271b5731714713283756250031cef81ba7ed5d9c3e222b4c2397966cc2bbdbceaae706598329dde6f8a9729597d0ae4c36ac264c76546942e4e37b
 EBUILD exiv2-0.28.1-r2.ebuild 3305 BLAKE2B 78d91a71fea56cd4dd27916871dcb3d917ccccca7fe5334ce9729129dbf74c0d15fb496d5916ceedd685d8ed8fcf3b93f2a2a6db8f397f37a04439485d716a1a SHA512 41b659f75e7797dfdbd44c96acdc78789c8b00a773cafce3312e26fa521d7d633329dc7d61ff7a8dad385c56130b016123d06cd8188b50c200b10a404bb58d26
+EBUILD exiv2-0.28.2.ebuild 3265 BLAKE2B 31c74e35ef98fe2d52b23af81dc37262861b067e96866cf9fff94ab0892651c2223f934964d0d8f254843bfbd57f1b5c4e174c5a36c36aaa8f00d7d742015738 SHA512 388415be958c8c9d406213617bfe90b422ed062ad294b616973cfb9b2a1c552db6c3850af6d9d9d96574647d89457a5926e65d2dc01bf34660339104433723a2
 MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e
diff --git a/media-gfx/exiv2/exiv2-0.27.7.ebuild b/media-gfx/exiv2/exiv2-0.27.7.ebuild
deleted file mode 100644
index 8f4d81ffa87d..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.7.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN^}/${PN}/releases/download/v${PV}/${P}-Source.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-	S="${WORKDIR}/${P}-Source"
-fi
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://exiv2.org/"
-
-LICENSE="GPL-2"
-# In 0.27.5, ABI seemed to be broken for bmff functions
-SLOT="0/27.5"
-IUSE="+bmff doc examples nls +png test webready +xmp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	webready? (
-		>net-libs/libssh-0.9.1[sftp,${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-DEPEND="${DEPEND}
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-text/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# FIXME @upstream:
-	einfo "Converting doc/cmd.txt to UTF-8"
-	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
-	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
-	cmake_src_prepare
-
-	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD=14
-		-DEXIV2_BUILD_SAMPLES=NO
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		-DEXIV2_ENABLE_BMFF=$(usex bmff)
-		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
-		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
-		$(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && eninja doc
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd "${BUILD_DIR}"/bin || die
-		./unit_tests || die "Failed to run tests"
-	fi
-}
-
-multilib_src_install_all() {
-	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild b/media-gfx/exiv2/exiv2-0.28.2.ebuild
index 2543df2e47d4..c7e62ae426fc 100644
--- a/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.28.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -26,6 +26,7 @@ IUSE="+bmff doc examples nls +png test webready +xmp"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	dev-libs/inih[${MULTILIB_USEDEP}]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
 	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
@@ -34,8 +35,7 @@ RDEPEND="
 	)
 	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
 "
-DEPEND="
-	${DEPEND}
+DEPEND="${DEPEND}
 	test? ( dev-cpp/gtest )
 "
 BDEPEND="
@@ -52,8 +52,7 @@ BDEPEND="
 
 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
-# https://github.com/Exiv2/exiv2/pull/2832
-PATCHES=( "${FILESDIR}/${P}-exiv2lib.patch" ) # bug 917483
+PATCHES=( "${FILESDIR}/${P}-errors-localisation.patch" )
 
 pkg_setup() {
 	if use doc || use test ; then
@@ -79,7 +78,7 @@ multilib_src_configure() {
 		-DEXIV2_ENABLE_NLS=$(usex nls)
 		-DEXIV2_ENABLE_PNG=$(usex png)
 		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_INIH=OFF # multilib/libdir logic is broken
+		-DEXIV2_ENABLE_INIH=ON # must be enabled (bug #921937)
 		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
 		-DEXIV2_ENABLE_XMP=$(usex xmp)
 		-DEXIV2_ENABLE_BMFF=$(usex bmff)
diff --git a/media-gfx/exiv2/files/exiv2-0.28.2-errors-localisation.patch b/media-gfx/exiv2/files/exiv2-0.28.2-errors-localisation.patch
new file mode 100644
index 000000000000..7799232d74a8
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.28.2-errors-localisation.patch
@@ -0,0 +1,23 @@
+From a3985001b13132ce4841bf1170626f7ef8f9dae7 Mon Sep 17 00:00:00 2001
+From: Jim Easterbrook <jim@jim-easterbrook.me.uk>
+Date: Thu, 15 Feb 2024 16:41:35 +0000
+Subject: [PATCH] Restore localisation of error messages/exceptions
+
+Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk>
+---
+ src/error.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/error.cpp b/src/error.cpp
+index c4ce1f2e01..135f4730d8 100644
+--- a/src/error.cpp
++++ b/src/error.cpp
+@@ -163,7 +163,7 @@ const char* Error::what() const noexcept {
+ }
+ 
+ void Error::setMsg(int count) {
+-  std::string msg{errList.at(static_cast<size_t>(code_))};
++  std::string msg{_(errList.at(static_cast<size_t>(code_)))};
+   auto pos = msg.find("%0");
+   if (pos != std::string::npos) {
+     msg.replace(pos, 2, std::to_string(static_cast<int>(code_)));