gentoo auto-resync : 12:01:2024 - 19:10:40

4 files changed, 140 insertions, 6 deletions

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 9f2342a0ae13..0a45d6816a4d 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,6 +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
 DIST exiv2-0.28.1.tar.gz 45225200 BLAKE2B a26f8e54cf6284c56ff429c13d5a8985dc6181a36b4c13ea6f2e59bc00016a2a8d915ddbc0cedb441b8283e30f18312a500900ffd89ca984006ac84807a03852 SHA512 7b872a3c0cbe343014b1ca4618cecaf6ee8d78dec7ef83accfce95cb8eadc6b52116977a41e1f1be5c6149a47bdd9457fadc08d73708aa2a6ab69795fd3de23b
-EBUILD exiv2-0.27.7.ebuild 2806 BLAKE2B f562fe2587be570e17da851d505c1a3a0dbdd06a800ae9b563375d85e8ee726b984c576875a6f2e215d0097b1846a36155f742e3a770e41873badaad3a5d06ab SHA512 88b0e6b3721916791f91d5028d5b7a237141bf9520750fc33b989072a310cc40a934f8876723db2cc170af32340a0f6376ee58c0bc956a158f0eb945a4cced44
-EBUILD exiv2-0.28.1-r1.ebuild 3272 BLAKE2B 94c8914165e4f01316ce94285ceb7ffadfc6511915faf06f194f4a71b03ff198e6744a44f2132fb645d45d8626553a72b2d7f48f8e3bf334dc0b63890b51610a SHA512 d497e94b322b4e872303b9d0eb8f035b5be4757f2686ddd46e4d77f7587b09fdcb05dcafe1978efc5edcb8bd3fe510478bca324df76241e1b06970f6b4c86f92
+EBUILD exiv2-0.27.7.ebuild 2807 BLAKE2B f1001b87d785f752b13535bf08ff064d36e5f06a209d2a25ae971f5e9cd496c3095355d379d3b8139aa08c207bcb2bd3e3a85855aca424597d1d0e354c66cdcd SHA512 a2ae95268c8064ff618db77a6ce9fd87cad60fc81766e3ac6b13941c44366b8edd655b40868d028ab41f81afb7ee3a5ef5b7c0aa022858b7cba338dbabc4d09c
+EBUILD exiv2-0.28.1-r1.ebuild 3273 BLAKE2B 5d0c0807a387162fea1a007cdda6bf6796a92fe44bb682925478e01456e4c677746a499a8107d29afdd2b788318b688374e2046685e747d6281f36dff82394bf SHA512 b0a350a8998a6a2f037dfc3ef11ccc6da44439b81cc9d9f780e9898d949affd218fa3d29842948a2e32989f5cba2aeebde8bafb1fb8c57d834e4892e9b0bfeef
+EBUILD exiv2-0.28.1-r2.ebuild 3306 BLAKE2B 5752cd3fb53293f093177735ee5e11a11609663e1cba588579e98905c3f26b7324aad7f1d495f31c43481b69206137930144fbf7598945205c0a8afa349f434c SHA512 cc5835bdd23ba574f85a563bbb3bb662298442789b4b0c62c3c766d617d35f2cc8d008d8d0d2bbc84445d9dfb7c3d98f94a6146795cc822b05ea65ccadf5f18d
 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
index 3f3d4cf0e6ee..8f4d81ffa87d 100644
--- a/media-gfx/exiv2/exiv2-0.27.7.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ DEPEND="${DEPEND}
 BDEPEND="
 	doc? (
 		${PYTHON_DEPS}
-		app-doc/doxygen
+		app-text/doxygen
 		dev-libs/libxslt
 		media-gfx/graphviz
 		virtual/pkgconfig
diff --git a/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild b/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild
index 2a25a6991b29..2543df2e47d4 100644
--- a/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,7 +41,7 @@ DEPEND="
 BDEPEND="
 	doc? (
 		${PYTHON_DEPS}
-		app-doc/doxygen
+		app-text/doxygen
 		dev-libs/libxslt
 		media-gfx/graphviz
 		virtual/pkgconfig
diff --git a/media-gfx/exiv2/exiv2-0.28.1-r2.ebuild b/media-gfx/exiv2/exiv2-0.28.1-r2.ebuild
new file mode 100644
index 000000000000..d1b14f77aa91
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.28.1-r2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+	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"
+fi
+
+LICENSE="GPL-2"
+# Upstream hope to have stable ABI in 1.0. Until then, go off ${PV}.
+# We may be able to change it to $(ver_cut 1-2) once e.g.
+# https://github.com/Exiv2/exiv2/pull/917 is merged.
+SLOT="0/$(ver_cut 1-2)"
+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}] )
+	webready? (
+		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
+	)
+	test? ( ${PYTHON_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+
+# https://github.com/Exiv2/exiv2/pull/2832
+PATCHES=( "${FILESDIR}/${P}-exiv2lib.patch" ) # bug 917483
+
+pkg_setup() {
+	if use doc || use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+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=(
+		-DEXIV2_BUILD_SAMPLES=NO
+		-DEXIV2_ENABLE_BROTLI=OFF
+		-DEXIV2_ENABLE_NLS=$(usex nls)
+		-DEXIV2_ENABLE_PNG=$(usex png)
+		-DEXIV2_ENABLE_CURL=$(usex webready)
+		-DEXIV2_ENABLE_INIH=ON # must be enabled (bug #921937)
+		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
+		-DEXIV2_ENABLE_XMP=$(usex xmp)
+		-DEXIV2_ENABLE_BMFF=$(usex bmff)
+
+		# We let users control this.
+		-DBUILD_WITH_CCACHE=OFF
+		# Our toolchain sets this by default.
+		-DBUILD_WITH_STACK_PROTECTOR=OFF
+
+		$(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
+	)
+
+	if use doc || use test ; then
+		mycmakeargs+=(
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+
+	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
+}