poppler: upgraded package to upstream
Upgraded app-text/poppler to version 21.07.0 on amd64, arm, arm64
Latest stable version from Gentoo is required so poppler
can be built against glib 2.68.
BUG=b:196986748
TEST=Local builds on arm64, arm, arm64; CQ.
Disallow-Recycled-Builds: test-failures
Change-Id: I20c576256aaa3a080c9e48b92ae47f252c44f00a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3107148
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ce1163b..9046ece 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1 +1,2 @@
-DIST poppler-21.01.0.tar.xz 1680536 BLAKE2B 5f8d283cd26f4713c09b0c102dd3295bc7ae1c2ad2ba0f51d12fdaed5f89a864d98d10be7176e17c5613aa4579da3bea1aca56aff3cec4e5c53e977a1e84659f SHA512 aec130446df73a2fc66851a563a14cb40299212a2de4a0d03668b0fecb28312fffa70d0a82431c774d0c0e3f7293788bd2bdf28c8136aa09ad80edbca4cf0ddd
+DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
+DIST poppler-21.08.0.tar.xz 1717372 BLAKE2B f617b41ebacee183730f20233273a2cc773c12b6c9d045850f8e738985b9079338c0e86b66d598a5dd4fd0227f70989604164a38fd45150b239e603c4da7e42f SHA512 266583279fb5c6b5300d23f8ba5b9da3e1f475fe21341a82ed7350dd9e321e243f3ef051944006c4f242c2d63a8c46bcda565a56017eb3a68caa5680ce719211
diff --git a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch b/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
deleted file mode 100644
index f0a8d3c..0000000
--- a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7178d25..934f38f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -119,6 +119,18 @@ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSIO
- message("-- CMake >= 2.8.8 is needed to enable Qt5")
- endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
-
-+#
-+# Ugly workaround: Manually patch library paths for Qt4 and Qt5:
-+#
-+IF( "${CMAKE_CXX_FLAGS}" MATCHES "-m32")
-+ GET_CMAKE_PROPERTY(_res VARIABLES)
-+ FOREACH(_var ${_res})
-+ IF(_var MATCHES "^QT" AND ${_var} MATCHES "lib64")
-+ STRING(REPLACE "lib64" "lib32" ${_var} "${${_var}}")
-+ ENDIF()
-+ ENDFOREACH()
-+ENDIF()
-+
- macro_optional_find_package(Cairo ${CAIRO_VERSION})
- if(CAIRO_FOUND)
- set(HAVE_CAIRO ${CAIRO_FOUND})
diff --git a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch
deleted file mode 100644
index 259be15..0000000
--- a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From af70882d85999b1912f9909f506ee7d22cc58ca7 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Fri, 6 Oct 2017 08:52:10 +0200
-Subject: [PATCH] [Qt5] Drop unused dependencies
-
----
- CMakeLists.txt | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7485b2ad..04327568 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,10 +147,8 @@ if (ENABLE_QT5)
- find_package(Qt5Core)
- 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()
---
-2.14.2
-
diff --git a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
deleted file mode 100644
index a75b84b..0000000
--- a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- poppler-0.61.0/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.61.0/cmake/modules/PopplerMacros.cmake
-@@ -98,8 +98,6 @@
- set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-
--if(CMAKE_COMPILER_IS_GNUCXX)
-- # set the default compile warnings
- set(_warn "-Wall -Wextra -Wpedantic")
- set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers")
- set(_warn "${_warn} -Wcast-align")
-@@ -124,39 +122,6 @@
- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
-
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
-- poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
-- if(GCC_HAS_AS_NEEDED)
-- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
-- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
-- endif(GCC_HAS_AS_NEEDED)
--endif (CMAKE_COMPILER_IS_GNUCXX)
--
--if(CMAKE_C_COMPILER MATCHES "icc")
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}")
--endif(CMAKE_C_COMPILER MATCHES "icc")
--
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-+
-\ Kein Zeilenumbruch am Dateiende.
diff --git a/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch b/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch
deleted file mode 100644
index 9845c09..0000000
--- a/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 083bc159ce35e21ab5bb942e91e98a95ce1f8f99 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 2 Nov 2020 14:30:22 +0100
-Subject: [PATCH] build: respect cflags
-
----
- cmake/modules/PopplerMacros.cmake | 41 -------------------------------
- 1 file changed, 41 deletions(-)
-
-diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index 6e5f0050..1a3d0f9f 100644
---- a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -145,47 +145,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
-
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
-- set(_warn "-Wall -Wextra -Wpedantic")
-- set(_warn "${_warn} -Wno-unused-parameter")
-- set(_warn "${_warn} -Wcast-align")
-- set(_warn "${_warn} -Wformat-security")
-- set(_warn "${_warn} -Wframe-larger-than=65536")
-- set(_warn "${_warn} -Wmissing-format-attribute")
-- set(_warn "${_warn} -Wnon-virtual-dtor")
-- set(_warn "${_warn} -Woverloaded-virtual")
-- set(_warn "${_warn} -Wmissing-declarations")
-- set(_warn "${_warn} -Wundef")
-- set(_warn "${_warn} -Wzero-as-null-pointer-constant")
-- set(_warn "${_warn} -Wshadow")
-- set(_warn "${_warn} -Wweak-vtables")
--
-- # set extra warnings
-- set(_warnx "${_warnx} -Wconversion")
--
-- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
-- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
-- set(CMAKE_CXX_FLAGS_DEBUG "-g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
-- set(CMAKE_C_FLAGS_DEBUG "-g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
--endif()
--
- if(CMAKE_C_COMPILER MATCHES "icc")
- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
---
-2.29.2
-
diff --git a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
similarity index 81%
rename from app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
rename to app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
index 4b389fa..8781bbe 100644
--- a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
+++ b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
@@ -1,17 +1,18 @@
-From 37f8326557eeb291d78a866d5ff78d79b32f6f8b Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 2 Dec 2020 09:29:33 +0100
+From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001
+From: Theo Anderson <telans@posteo.de>
+Date: Wed, 14 Apr 2021 10:16:11 +1200
Subject: [PATCH] build: respect cflags
+Signed-off-by: Theo Anderson <telans@posteo.de>
---
- cmake/modules/PopplerMacros.cmake | 81 +------------------------------
- 1 file changed, 2 insertions(+), 79 deletions(-)
+ cmake/modules/PopplerMacros.cmake | 77 ++-----------------------------
+ 1 file changed, 4 insertions(+), 73 deletions(-)
diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index 707e7497..882cf11b 100644
+index fe1182da..b77eaa3e 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
-@@ -79,8 +79,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+@@ -79,14 +79,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
set(CMAKE_BUILD_TYPE RelWithDebInfo)
endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -20,10 +21,17 @@
set(_warn "-Wall -Wextra -Wpedantic")
set(_warn "${_warn} -Wno-unused-parameter")
set(_warn "${_warn} -Wcast-align")
-@@ -105,80 +103,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(_warn "${_warn} -Wformat-security")
+ set(_warn "${_warn} -Wframe-larger-than=65536")
+- set(_warn "${_warn} -Wlogical-op")
+ set(_warn "${_warn} -Wmissing-format-attribute")
+ set(_warn "${_warn} -Wnon-virtual-dtor")
+ set(_warn "${_warn} -Woverloaded-virtual")
+@@ -102,22 +99,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+
set(DEFAULT_COMPILE_WARNINGS "${_warn}")
set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
-
+-
- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
@@ -39,14 +47,15 @@
- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}")
- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
-
-- poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
-- if(GCC_HAS_AS_NEEDED)
-- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
-- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
-- endif(GCC_HAS_AS_NEEDED)
--endif (CMAKE_COMPILER_IS_GNUCXX)
--
++
++if(CMAKE_COMPILER_IS_GNUCXX)
+ poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+ if(GCC_HAS_AS_NEEDED)
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+@@ -126,57 +109,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ endif(GCC_HAS_AS_NEEDED)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-# set the default compile warnings
- set(_warn "-Wall -Wextra -Wpedantic")
@@ -104,5 +113,5 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
--
-2.29.2
+2.31.1
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 3f8d6be..c2171ad 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -17,12 +17,16 @@
<email>office@gentoo.org</email>
<description>Please CC on stabilisation bugs</description>
</maintainer>
+<upstream>
+ <remote-id type="cpe">cpe:/a:freedesktop:poppler</remote-id>
+</upstream>
<use>
+ <flag name="boost">Use boost::small_vector for a serious performance gain</flag>
<flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
<flag name="utils">Install command-line PDF converters and various utilities.</flag>
</use>
<slots>
<subslots>Reflects ABI compatibility of libpoppler.so only,
- NOT libpoppler-{glib,qt4,cpp}.so!</subslots>
+ NOT libpoppler-{glib,qt5,cpp}.so!</subslots>
</slots>
</pkgmetadata>
diff --git a/app-text/poppler/poppler-21.01.0.ebuild b/app-text/poppler/poppler-21.07.0.ebuild
similarity index 89%
rename from app-text/poppler/poppler-21.01.0.ebuild
rename to app-text/poppler/poppler-21.07.0.ebuild
index 5ef1a58..a483c4a 100644
--- a/app-text/poppler/poppler-21.01.0.ebuild
+++ b/app-text/poppler/poppler-21.07.0.ebuild
@@ -12,14 +12,14 @@
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
KEYWORDS="*"
- SLOT="0/106" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/111" # 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="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
# No test data provided
RESTRICT="test"
@@ -53,12 +53,15 @@
RDEPEND="${DEPEND}
cjk? ( app-text/poppler-data )
"
+DEPEND+="
+ boost? ( dev-libs/boost )
+"
DOCS=( AUTHORS NEWS README.md README-XPDF )
PATCHES=(
"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
- "${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
)
@@ -85,8 +88,9 @@
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT5_TESTS=OFF
-DBUILD_CPP_TESTS=OFF
+ -DBUILD_MANUAL_TESTS=OFF
-DRUN_GPERF_IF_PRESENT=OFF
- -DENABLE_SPLASH=ON
+ -DENABLE_BOOST="$(usex boost)"
-DENABLE_ZLIB=ON
-DENABLE_ZLIB_UNCOMPRESS=OFF
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
diff --git a/metadata/md5-cache/app-text/poppler-21.01.0 b/metadata/md5-cache/app-text/poppler-21.07.0
similarity index 83%
rename from metadata/md5-cache/app-text/poppler-21.01.0
rename to metadata/md5-cache/app-text/poppler-21.07.0
index e0de4d1..f5e1bfa 100644
--- a/metadata/md5-cache/app-text/poppler-21.01.0
+++ b/metadata/md5-cache/app-text/poppler-21.07.0
@@ -1,15 +1,15 @@
BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja dev-util/cmake
DEFINED_PHASES=compile configure install prepare 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 )
+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 ) boost? ( dev-libs/boost )
DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
EAPI=7
HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
+IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
KEYWORDS=*
LICENSE=GPL-2
RDEPEND=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 ) cjk? ( app-text/poppler-data )
RESTRICT=test
-SLOT=0/106
-SRC_URI=https://poppler.freedesktop.org/poppler-21.01.0.tar.xz
+SLOT=0/111
+SRC_URI=https://poppler.freedesktop.org/poppler-21.07.0.tar.xz
_eclasses_=cmake b22e256fd899c7e0c747e8834eff121a eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing c3cf317581e5bd068a4b851f03dd8cba ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc76f487096fc67d7cbbf67802505719
+_md5_=bb62323b1edddc14511120458cf87812