gentoo auto-resync : 29:11:2023 - 10:51:05

3 files changed, 2 insertions, 133 deletions

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 88381fbb73f0..9f2342a0ae13 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,8 +1,6 @@
 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.0.tar.gz 45138274 BLAKE2B 6ccdc4e6a7dbd4aa2a892e61306f0c63659d804075cae9e771096cfdc21ec0aff0df22232c036551f4e321f497184e7ad100fb9c2011c14cd0315e8118c3e85f SHA512 35e483c6123f099167ed8647fae7c6e5512434c24d0afe684180ba6a5114068d5678280a01c8e6cfee0d1e555e1dc2a1606989d46950ce3ef1a3859caeed4dad
 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.0.ebuild 3171 BLAKE2B ab540aa9f8ee8f7876ecf8304818cc650840554ab6b1e4065c05d5c3d7c13c1d3db971984494e0f6b5a549d8ad5b71cc67ceff05a10856f102a6c0b7ef27a068 SHA512 bd858b12c5554eb1ed1d1ed857c7bf4576d4289a61d2bffcd694f13db542c855fbc03c9efa1276e5b4145a584316933a992888f0663ed180ef7c5106dd86d0e6
-EBUILD exiv2-0.28.1-r1.ebuild 3274 BLAKE2B 2a96f4aed6646bf5249b26d795719b08f67e6857bdd9c657c145c6cb54877eeb9891d047adf1bf0d8fbca6c21cb199a51ab277ba9c453255cdd8715bbac99c6f SHA512 9d0756e2f2f4dc7796ee3fc0b71e221d48498033b98bc9d0f1ae382511b157bf355e10466cd2365ae337dfc4cb511cee8e6fdb75a7da05872b9296a26c629429
+EBUILD exiv2-0.28.1-r1.ebuild 3272 BLAKE2B 94c8914165e4f01316ce94285ceb7ffadfc6511915faf06f194f4a71b03ff198e6744a44f2132fb645d45d8626553a72b2d7f48f8e3bf334dc0b63890b51610a SHA512 d497e94b322b4e872303b9d0eb8f035b5be4757f2686ddd46e4d77f7587b09fdcb05dcafe1978efc5edcb8bd3fe510478bca324df76241e1b06970f6b4c86f92
 MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e
diff --git a/media-gfx/exiv2/exiv2-0.28.0.ebuild b/media-gfx/exiv2/exiv2-0.28.0.ebuild
deleted file mode 100644
index 94eb6f257b1b..000000000000
--- a/media-gfx/exiv2/exiv2-0.28.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 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="
-	>=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-doc/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=OFF
-		-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_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/exiv2/exiv2-0.28.1-r1.ebuild b/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild
index abd1f86a3020..2a25a6991b29 100644
--- a/media-gfx/exiv2/exiv2-0.28.1-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.28.1-r1.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"