From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 89420158041 for ; Tue, 9 Apr 2024 20:02:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF140E2A07; Tue, 9 Apr 2024 20:02:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9478E2A07 for ; Tue, 9 Apr 2024 20:02:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC84A343289 for ; Tue, 9 Apr 2024 20:02:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54EA216AB for ; Tue, 9 Apr 2024 20:02:26 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1712692909.d6aee3e115eda4618765835194dc9dc766473cc1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/exiv2/Manifest media-gfx/exiv2/exiv2-0.28.1-r2.ebuild media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch X-VCS-Directories: media-gfx/exiv2/files/ media-gfx/exiv2/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d6aee3e115eda4618765835194dc9dc766473cc1 X-VCS-Branch: master Date: Tue, 9 Apr 2024 20:02:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 48033e9b-4e68-4149-8ccd-c37213c892b6 X-Archives-Hash: 4e338d2d1f5c1fb90096e09c843fcfa9 commit: d6aee3e115eda4618765835194dc9dc766473cc1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 9 19:49:27 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 9 20:01:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6aee3e1 media-gfx/exiv2: drop 0.28.1-r2 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/exiv2/Manifest | 1 - media-gfx/exiv2/exiv2-0.28.1-r2.ebuild | 133 ---------------------- media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch | 31 ----- 3 files changed, 165 deletions(-) diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 0d500799da92..4e187fdd9709 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,2 +1 @@ -DIST exiv2-0.28.1.tar.gz 45225200 BLAKE2B a26f8e54cf6284c56ff429c13d5a8985dc6181a36b4c13ea6f2e59bc00016a2a8d915ddbc0cedb441b8283e30f18312a500900ffd89ca984006ac84807a03852 SHA512 7b872a3c0cbe343014b1ca4618cecaf6ee8d78dec7ef83accfce95cb8eadc6b52116977a41e1f1be5c6149a47bdd9457fadc08d73708aa2a6ab69795fd3de23b DIST exiv2-0.28.2.tar.gz 45224206 BLAKE2B 9d1d05c99804032dfb9b740e543d1e3cceae011b17853c8565ccad87e726ce1d0f410c13bf4fa8839bc8e0fecdf170a3acac568f14aad4628b3b844f6c21dd7e SHA512 197cc607c0271b5731714713283756250031cef81ba7ed5d9c3e222b4c2397966cc2bbdbceaae706598329dde6f8a9729597d0ae4c36ac264c76546942e4e37b diff --git a/media-gfx/exiv2/exiv2-0.28.1-r2.ebuild b/media-gfx/exiv2/exiv2-0.28.1-r2.ebuild deleted file mode 100644 index bd92d0fbec8b..000000000000 --- a/media-gfx/exiv2/exiv2-0.28.1-r2.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# 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 -} diff --git a/media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch b/media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch deleted file mode 100644 index dba8fd3e2896..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4f6d0b806714a702ccbe9e10c5155eb6a1699380 Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Tue, 14 Nov 2023 07:23:32 +0100 -Subject: [PATCH] cmake: restore a "exiv2lib" target - -Commit a8c3455e5cd7ee65acc5f398581e1386f7df5108 and -commit eb05551ed2d21079299f2f4da2f463df6857b884 changed the target of -the exiv2 library ("exiv2lib"), exporting it in the "Exiv2" namespace, -so making it usable as "Exiv2::exiv2lib" instead. An ALIAS to "exiv2lib" -was added, however cmake does not install or export ALIAS targets [1]. - -Hence, restore compatibility with the existing cmake users of exiv2: -manually create an ALIAS target in the cmake config files after all the -targets are loaded and checked. - -[1] https://cmake.org/cmake/help/latest/command/add_library.html ---- - cmake/exiv2Config.cmake.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/cmake/exiv2Config.cmake.in b/cmake/exiv2Config.cmake.in -index 63c9362ff7..c9e2eba9b5 100644 ---- a/cmake/exiv2Config.cmake.in -+++ b/cmake/exiv2Config.cmake.in -@@ -14,3 +14,6 @@ endif() - include("${CMAKE_CURRENT_LIST_DIR}/exiv2Export.cmake") - - check_required_components(exiv2) -+ -+# compatibility with non-aliased users -+add_library(exiv2lib ALIAS Exiv2::exiv2lib)