app-text/poppler: Version bump 0.42.0, bug #577604

Package-Manager: portage-2.2.28

3 files changed, 133 insertions, 0 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 4b382af1161d..7bb337be4d1f 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,3 +2,4 @@ DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8
 DIST poppler-0.38.0.tar.xz 1637772 SHA256 6f0c0d49c8346d7c0cfe6348124e7f19cc901b5d35c9cd89944aac6e454e8a8b SHA512 1b8643c0f58eb1e1c3d98266c38d311c66458168188146af72c99c9f374882bdc616aa3febd8833538b286652c21a567e6240aa590111bcebcba5ee845e6bad9 WHIRLPOOL 05a75ca4ed3741273eefe003026caa1f9bb1e3d9f08d1e3885d2fddd7704349434b6deb1f9e755312d7a5b040e85435b0baa92f4934c4d220b1ea8625ebff4f5
 DIST poppler-0.40.0.tar.xz 1642708 SHA256 bc0da278d6038ffc9cd2b8c1bba530a6ec7c072a593219a48f0a52a600ee6ead SHA512 0f26f342a4f70ebc65848c61e5eb1a182d539a8e4cdc5fa499c52765d15867e13ee7c595773d2e8d6f2eb3e83e1c19f35cc6bb47f8aeb87a8ad92e45ecff50cd WHIRLPOOL 00d887401f8438718fcee34e326c7a71970ce7e1c3071a142cef365bdd77301d77b1c9488fa80a58a0baca8fb0c8a2fb0a327867b8b8381b8eecb5f14609bec2
 DIST poppler-0.41.0.tar.xz 1655448 SHA256 420abaab63caed9e1ee28964a0ba216d1979506726164bc99ad5ade289192a1b SHA512 b2b99ac056efaae26f0bffc20756f17524011b7718a554ff48901422e7ab8caa4f879b800eacce1af5ae468346fa0beb569a4378f028a7d7cf0c9cc45f0d2402 WHIRLPOOL 565bc504b5b02ac612b267bb5d5746dc9d90b2c7f8959e2fecc58bdcc4c588f8f234d4bc9cc8086846c23643fa0abc8dba352c8a083056b95d58056281a5bc7a
+DIST poppler-0.42.0.tar.xz 1674024 SHA256 9fef076ffe2a4f18a4e0da547d814ef5c5e6f8a283afe3387504a0bb1a418010 SHA512 ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19 WHIRLPOOL 095986b44875847d471ecda35194eeb894051b689a754dc8ae55caa04100b4e2ebd57fe868008972502d27346eeb98699fa9660b414ececef4d0eafe53265736
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 2ea98abfb596..f6980580a3b4 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -14,6 +14,7 @@
 	<name>Gentoo Printing Project</name>
 </maintainer>
 <use>
+	<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>
diff --git a/app-text/poppler/poppler-0.42.0.ebuild b/app-text/poppler/poppler-0.42.0.ebuild
new file mode 100644
index 000000000000..d7c5ef7461db
--- /dev/null
+++ b/app-text/poppler/poppler-0.42.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_WARN_UNUSED_CLI=1
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/59"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
+)
+
+src_prepare() {
+	cmake-utils_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 [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_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
+}