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 54F32158091 for ; Sun, 19 Jun 2022 09:13:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96C4DE09C1; Sun, 19 Jun 2022 09:13:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7B3D1E09C1 for ; Sun, 19 Jun 2022 09:13:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6972341843 for ; Sun, 19 Jun 2022 09:13:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41185448 for ; Sun, 19 Jun 2022 09:13:06 +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: <1655629964.7feedffd8c03010b8735e20342912419f2743f47.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler/Manifest app-text/poppler/poppler-22.03.0.ebuild X-VCS-Directories: app-text/poppler/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7feedffd8c03010b8735e20342912419f2743f47 X-VCS-Branch: master Date: Sun, 19 Jun 2022 09:13:06 +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: 01b108b4-4031-46cc-9c5c-088c1a5d398e X-Archives-Hash: ca6855d17f21e149696c510af5a0377c commit: 7feedffd8c03010b8735e20342912419f2743f47 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 19 07:01:08 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 19 09:12:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7feedffd app-text/poppler: Cleanup vulnerable 22.03.0 Bug: https://bugs.gentoo.org/843149 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 1 - app-text/poppler/poppler-22.03.0.ebuild | 126 -------------------------------- 2 files changed, 127 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 289d85ec8d84..0258caecbc77 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,4 +1,3 @@ -DIST poppler-22.03.0.tar.xz 1809940 BLAKE2B 0307e9225645b289105fe5a55a712ab821a0961a5dd53467b7db41432d74ec763e9ab0494f6b4d1bed94f7b0c2a74cb849878ad5f0c877fa4df0888f97a10ef6 SHA512 f87bbff4f394f192095da0c00bdf8b5c70b7eb864941225aad2025e91283c3c42a0016a772e7e9ea73a86746251928fc64500f923e8fd841adae1c6e67d72569 DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737 DIST poppler-22.06.0.tar.xz 1834980 BLAKE2B 6988480dc30f5fe67be0170f8f006bdb4d3e6b0e0ad8643aa6cbf4fe017d52d8747f108267a30aee5ec4567aa5d2fcc9ce9824fc4dac45a1d37291fa668c2dfe SHA512 79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3 DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de5219cbbc35d04142a902f569fc7c558cbda9a2379fde6f9f933b701fabe98f93de71a0676837b2a21104f919a097bc8 SHA512 b61f706e52c57209bb180fbe5a65e366e2a841743ac2c24fc0828dc4bab8ae52da12330e4694e8dade1e1963112fc7b01c0c1b30141be2b7c8c0cf2aaab059c5 diff --git a/app-text/poppler/poppler-22.03.0.ebuild b/app-text/poppler/poppler-22.03.0.ebuild deleted file mode 100644 index f6a73f037df2..000000000000 --- a/app-text/poppler/poppler-22.03.0.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 2005-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake 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 - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/119" # 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 +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" - -DEPEND=" - media-libs/fontconfig - media-libs/freetype - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - x11-libs/cairo - introspection? ( dev-libs/gobject-introspection:= ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) - lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) - png? ( media-libs/libpng:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtxml:5 - ) - tiff? ( media-libs/tiff:0 ) -" -RDEPEND="${DEPEND} - cjk? ( app-text/poppler-data ) -" -DEPEND+=" - boost? ( dev-libs/boost ) -" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" - -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_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 - local mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DBUILD_MANUAL_TESTS=OFF - -DRUN_GPERF_IF_PRESENT=OFF - -DENABLE_BOOST="$(usex boost)" - -DENABLE_ZLIB=ON - -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_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 -}