gentoo auto-resync : 18:02:2025 - 00:14:44

5 files changed, 132 insertions, 2 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6d2688526133..d336d7165693 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index bd142f75681b..abb28ee64794 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,3 +1,5 @@
 DIST exiv2-0.28.3.tar.gz 46480702 BLAKE2B 73ebdca376d69514a89261d2f78604c5d7ccbc6e73e5c5d61f8caa596fd6b60dd4d06df19cb9f93e402d9a76f1511955f77cfd74b407310a13952092ecfbf0ef SHA512 c8338a118feefa104d73932890c732247c884ab9ce1d170c43a22ab5884517a0e2a7fd1febde7705b8290fbbbc29e64738610404816e4db2b56a70fc444ca049
+DIST exiv2-0.28.4.tar.gz 46932087 BLAKE2B 609925c8615ee787f16087065dae503311ce9ca4af89724c6b680ec03f883697a75d0f55297e05d7d17cdda846356d0d8c3b3cf6b6570bd5120fbdc152645030 SHA512 2a10a25bd2a6226ecb1faee4fb02bcc9c91143bec73fe9ca5439ce2ed5fe66e68bb407a080916e8902de35efccc904af9eaf83a31a69cfab816adb91fdc0f2a9
 EBUILD exiv2-0.28.3.ebuild 3261 BLAKE2B 6801c92f63122d21fc5c93e5a65f1c260ce458e12967e6362a51ddba454b757a7da1aeea0b229fe9ef3eca3b0a4906ca0be4bea16079e9c288ad21dbf53e12c0 SHA512 642977da6b3cb8963e350bcbb7a48be4e75042b72e333858b89ac932bf682ce0034384c5ec07977ebfc689a446f02717eb1ec5361067a94e773e082d1324ca9a
+EBUILD exiv2-0.28.4.ebuild 3268 BLAKE2B b52d4c24d99c1856997e5f5db50a067e3841ebe50e3e5cb1e61ccd8c9e15b7b98e1f80083c3cd90c370dfd7e9dc5ebbada492e5c19a32c18f3b960128ca10380 SHA512 7894d816e0883cf1147c447ed92fd78f87ca3b9323e0b9a6d132322e88701095abf3892e081e42e77f00126a00dcd36192e79386538f10f9262ba8ca33a85e7a
 MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e
diff --git a/media-gfx/exiv2/exiv2-0.28.4.ebuild b/media-gfx/exiv2/exiv2-0.28.4.ebuild
new file mode 100644
index 000000000000..42c69715bd8e
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.28.4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+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 ~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 jpegxl nls +png test webready +xmp"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/inih[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	jpegxl? ( app-arch/brotli:=[${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="${RDEPEND}
+	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 )
+
+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=$(usex jpegxl)
+		-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
+}
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 45d80c280664..c88dec2ac5d4 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,5 +1,5 @@
 DIST plantuml-1.2024.8.tar.gz 12543887 BLAKE2B 719602cb8f21e5908fea32778257f0fca830746796e0130bd76f48dc7c829a528d2d0bf8b6f1a0a4ab4fc73c60e8c0b37559108f4afbaf5994597207e6497df2 SHA512 32ee9cb80171ee467b68fe98ca74a3a084bd64410de34d50c79cb40ca972d6092b9c65e0e6ee96647393fa44f152e2ecd3bdafc3f22010afbe73630573996b64
 DIST plantuml-1.2025.0.tar.gz 12278815 BLAKE2B e4ae5b7f76294f060d6a598b6e145bb97af3e37127bcea64cf812d6072e946153de564ddb4d3985f7923fd7584911f08016cee79e26fd48dbf822b385e761b52 SHA512 cdae9effb752af43df913eef21d5c575fa803786d2afeb06732870a36a8a7c71204a8a24817640d9cc99e6361d8cae34a7490bb2a8e5ae034ee31edc1d51afb2
 EBUILD plantuml-1.2024.8.ebuild 1374 BLAKE2B 0f09d29f7740d522aa6ca68781b3acf862c62365dfca7b3223f45de2bd9c57c98d1da3756b9e1d58f1ca7c8dd49e5fd4072ce346f69015cdb9658cbc9294cb33 SHA512 51d1069d2617cf7393d1db274f8891c0c25b8d71107e31bd50ca09c32bed895b0c5df71f61a01de8f6333d7b3c3919f7212a3b5f55e476a6f52ba74717e5d5a0
-EBUILD plantuml-1.2025.0.ebuild 1375 BLAKE2B 898c4e81dc5f7300ee7992de73685c58ce3633275abfb5ba13b5b54de37de9e107cb190f484681fa5bf07f453b327bb946eb8a96cb7d40899a26646ef9d702a0 SHA512 cb1269d9554b70604bed6b35dacc6e638d937cbf547555ca1b504fa4231eae6d17296ad8533a1ecea6679a873885ada1110a543c84a55a6aa39699ed5471e9a9
+EBUILD plantuml-1.2025.0.ebuild 1374 BLAKE2B fdf54fa04f1547c97898f22e5ec1ddcde9e87e502701c3750d94076a72a62ca41a5e93056d306151982e7a8026d20efb68b602e5c421c596d223f733c4825853 SHA512 bbe009e91bc03d8f45e27e46304c9e6ae7426fcd48637f6462cf391268618f8859f6cbf3265fc1617dc281ce8b0bd5469270218cff8990dea195d3c9ad342b09
 MISC metadata.xml 975 BLAKE2B 3a847073b2f3b5f14adb59f8dec5183533eef81f8b10e5633b356743cb45c3927dfc2f8427f26f1e2b3eef01976b0a8e5884b5f9492310e87884c26759dbfed8 SHA512 2cd56c421b1566a679afb739ca82377d5c8b47519fd2cc44307424f5cd88fa0f8b2144842943a7da6abef7ad79254101818292819fdef97631746815a892e7a5
diff --git a/media-gfx/plantuml/plantuml-1.2025.0.ebuild b/media-gfx/plantuml/plantuml-1.2025.0.ebuild
index d8529060072a..e986be8c2043 100644
--- a/media-gfx/plantuml/plantuml-1.2025.0.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2025.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="ant-task"
 
 DEPEND=">=virtual/jdk-1.8:*