[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     aa1dbc09c176db2ba49a90d105f306fc8ead2ebc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 09:53:09 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 20:46:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa1dbc09

app-text/poppler: drop 23.09.0, 23.11.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/poppler/Manifest                          |   4 -
 .../poppler/files/poppler-20.12.1-qt5-deps.patch   |  49 -------
 app-text/poppler/poppler-23.09.0.ebuild            | 152 ---------------------
 app-text/poppler/poppler-23.11.0.ebuild            | 152 ---------------------
 4 files changed, 357 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 8682f0739976..e26d11f2bbf9 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,7 +1,3 @@
-DIST poppler-23.09.0.tar.xz 1888836 BLAKE2B 910bd83a94268673c348f554114cbefd02186ed70f8cf9bbe83e4754758f585e74ed418e711b883f8bc39fb680372583229f7196c847a4b749c04018c1ab7407 SHA512 8657845ec02fca6fe9791823ebeed6c44971c524edc56cb945501dfefb3dc72a6d86fff751bfb708a862a7862cfdcc57bf7b3f825e2bafe25a1e6679c7171a4c
-DIST poppler-23.09.0.tar.xz.sig 833 BLAKE2B 3d8277e8e9779b655003bb73637f2e763f82388f58a25010ed5af0078199a75e1c0872f00ee8b0893660a6912b558a5c69bd11309204493d9dbb6e2cbefd41ba SHA512 2b091e2f96d6ed1737e2c208228c969196e3d6f927664759f259a04f0e35b79d2b00ee0da5882f622d0269eea7ab470014f30e6d55659fd1e8fb9cdc23db68a6
-DIST poppler-23.11.0.tar.xz 1894712 BLAKE2B a5083e30c6d0e5494541f5fb7282390647fedf738bccbc99c246649fdee13166638507f314fd7b069af6aca5829319840883bd8d8f50fd4685c54c7ac6fe3b6b SHA512 0312472ff80c10aaec0c06e6bfd3f74257672c2001301db4d44e28051387ad5ddd8126d45e82c75ff4585cfde8e34a68bcab2d979aa58c904c60dc3efb1b6f3d
-DIST poppler-23.11.0.tar.xz.sig 833 BLAKE2B 50b0de45f56370aa493ba2929d5aaf6355ea8fd1a4fc3dc10e1fe6e58ba688d03d9867736814f6d5c6d452df820e2fb081e250fcda00255f533661022e75d887 SHA512 f3f743ff614b839f270ee1113ed728b0f1d390e2c2e53828b0a42573040b6e6b4edbcec2c6b3b198088474a89a24e3af9ccb8717bf37734222436dd8049a8d6e
 DIST poppler-23.12.0.tar.xz 1895580 BLAKE2B c63699d4ba62fd739b49cd94fd9510abedf9accc2f07cf2cd361da5fb561ce4289c3537343341defe3fb4fb31587a39b3967324e1f357799dc8b140f8c9eedbf SHA512 f28962f6842091a68edfb18e5f76e29fdf65d2a7cca6cb4be4202a35bab3e80a2dbe10b86ab8bc4fff7e555a077a41314b9892e19d0d7d89724b9ebb3db93852
 DIST poppler-23.12.0.tar.xz.sig 833 BLAKE2B b8dbbde8d6324fd65e583ad5eda04ae531ab364e3afd925c082ac102e6a00368b5c966a890e1b84089845f866b4afb324383d6d47e3d509356e2a5a857f4cdf9 SHA512 817ac3210a191535b037ebac78ebf4d67d3ac055cc54be2a0614ddaf757f6fa4aa5de4f1aecfd1a26a2290c190e14830a925fd83d102aca7afdd6e8fb1e98281
 DIST poppler-24.01.0.tar.xz 1895736 BLAKE2B 16c87a4338c73fcccfac3ac477807a7f96c8e95e68efff484d9d544da10815972f20d40f71091c6092913d82b205ca0d1bd25acbaba79277e1a1bf19ba397e6d SHA512 ddfd924f6559e482daa6c87b4201f8a318038bdf654f7449e33aec296c393438a3f1c6dc9ede5956c7f1d9ef02e3aaedf3031dff166665fbb0a762587ec00caa

diff --git a/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch b/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch
deleted file mode 100644
index 234be8222146..000000000000
--- a/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e5927c7250afd6b715a9de520851b26e41b7f422 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 9 Dec 2020 01:28:25 +0100
-Subject: [PATCH] Move Qt5 test dependencies into test dir
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt     |  6 ++----
- qt5/CMakeLists.txt | 10 ++++++++--
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1573249a..ab91d537 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -157,10 +157,8 @@ if (ENABLE_QT5)
-   find_package(Qt5Core 5.5)  # Update QT_DISABLE_DEPRECATED_BEFORE in qt5/CMakeLists.txt when increasing this
-   find_package(Qt5Gui)
-   find_package(Qt5Xml)
--  find_package(Qt5Widgets)
--  find_package(Qt5Test)
--  if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND))
--    message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
-+  if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND))
-+    message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
-     set(ENABLE_QT5 OFF)
-   endif()
- endif()
-diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
-index 58b42f5e..e3b26cc2 100644
---- a/qt5/CMakeLists.txt
-+++ b/qt5/CMakeLists.txt
-@@ -9,5 +9,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050500)
- add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
- 
- add_subdirectory(src)
--add_subdirectory(tests)
--add_subdirectory(demos)
-+
-+if(BUILD_QT5_TESTS)
-+  find_package(Qt5Widgets REQUIRED)
-+  find_package(Qt5Test REQUIRED)
-+
-+  add_subdirectory(tests)
-+  add_subdirectory(demos)
-+endif()
--- 
-2.29.2
-

diff --git a/app-text/poppler/poppler-23.09.0.ebuild b/app-text/poppler/poppler-23.09.0.ebuild
deleted file mode 100644
index e4cde6f45d4c..000000000000
--- a/app-text/poppler/poppler-23.09.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2005-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
-	inherit verify-sig
-
-	TEST_COMMIT="e3cdc82782941a8d7b8112f83b4a81b3d334601a"
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
-	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/131"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 test tiff +utils"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.13
-	>=media-libs/freetype-2.10
-	sys-libs/zlib
-	cairo? (
-		>=dev-libs/glib-2.64:2
-		>=x11-libs/cairo-1.16
-		introspection? ( >=dev-libs/gobject-introspection-1.64:= )
-	)
-	curl? ( net-misc/curl )
-	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
-	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.49 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND="${COMMON_DEPEND}
-	boost? ( >=dev-libs/boost-1.71 )
-	test? ( qt5? (
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-	) )
-"
-BDEPEND="
-	>=dev-util/glib-utils-2.64
-	virtual/pkgconfig
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
-fi
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if tc-is-clang ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	append-lfs-flags # bug #898506
-
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=$(usex test $(usex qt5))
-		-DBUILD_CPP_TESTS=$(usex test)
-		-DBUILD_MANUAL_TESTS=$(usex test)
-		-DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_Gpgmepp=$(usex gpgme)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}

diff --git a/app-text/poppler/poppler-23.11.0.ebuild b/app-text/poppler/poppler-23.11.0.ebuild
deleted file mode 100644
index 3e674c1cd6fd..000000000000
--- a/app-text/poppler/poppler-23.11.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2005-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
-	inherit verify-sig
-
-	TEST_COMMIT="e3cdc82782941a8d7b8112f83b4a81b3d334601a"
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
-	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/133"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 test tiff +utils"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.13
-	>=media-libs/freetype-2.10
-	sys-libs/zlib
-	cairo? (
-		>=dev-libs/glib-2.64:2
-		>=x11-libs/cairo-1.16
-		introspection? ( >=dev-libs/gobject-introspection-1.64:= )
-	)
-	curl? ( net-misc/curl )
-	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
-	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.49 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND="${COMMON_DEPEND}
-	boost? ( >=dev-libs/boost-1.71 )
-	test? ( qt5? (
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-	) )
-"
-BDEPEND="
-	>=dev-util/glib-utils-2.64
-	virtual/pkgconfig
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
-fi
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if tc-is-clang ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	append-lfs-flags # bug #898506
-
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=$(usex test $(usex qt5))
-		-DBUILD_CPP_TESTS=$(usex test)
-		-DBUILD_MANUAL_TESTS=$(usex test)
-		-DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DENABLE_GPGME=$(usex gpgme)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_LCMS=$(usex lcms)
-		-DENABLE_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		-DENABLE_QT5=$(usex qt5)
-		-DENABLE_LIBTIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}