gentoo resync : 02.08.2019

3 files changed, 0 insertions, 159 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a25c99c3d415..ea2d642083e9 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,13 +3,10 @@ AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
-AUX poppler-0.78.0-fix-text-selection.patch 1016 BLAKE2B cca99e473a41e68c1fe91ee7503e9a0832082fe58dbd9ea844fa865d27827a57859dd7ccfb422f42902117f82c807ca47345752f9fa68aa5c02ca9f54e0c9908 SHA512 84e95aaeb1d6887c01ebcfaef411d917991b8ce1b36b55a3bfadf3f0f5e54a550dd549bf44159f511dc911a3ea614cb26c358ba6a204b8130fbe2112016fe8af
 AUX poppler-0.78.0-respect-cflags.patch 1140 BLAKE2B 59e87b6957a5aff35cf6ebc8092c0552b8ece31e2fc73765789ac73dc5ac01ba69928f9308de9660ba3cf6b38b921ca341dcf6c5bce1d360b1bcf1a4005e4115 SHA512 713f7a3e3e2ae950fd6406ed076d4e6d2079619e40f00de7ec7d7df587df520373b923d343494902da454423adf29174f1ced11cb874a12851febfc1860988f4
 DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040
-DIST poppler-0.78.0.tar.xz 1540264 BLAKE2B ab3c598667c6169a1c4ff5f7592fa957b5a7d3d4c4a01fcea42b59a8c16f29ca137920e84731b430c5bd3c07d5c7326a371cc45c4f6c9749cce30aadb62b88bd SHA512 738916916be1d94d90b0201c6b225c51c1ae5a93421e8c52e799d8443fbdfcda80c8088ab5f04a9319bc3a2fa1c361d4e781efe585da5bf4cd47b80fe20465ac
 DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
 EBUILD poppler-0.77.0.ebuild 3515 BLAKE2B 6891a220705d7abde2096ff11b8f66dfee40dff5bb19fa4581ed72473a7476c6356d7c608760565a93c538f41e2447a65d520c2f4487f7a2651e4d700aab5f15 SHA512 70a9b2b6930071532d224eb93560555f4ee47409fa58d2a6282dff648763603575367ce5b80e2402d1a3bba015349936925ae78ef092773251b8c531a777de50
-EBUILD poppler-0.78.0-r1.ebuild 3592 BLAKE2B 23a14b34bbacab50d3669aa921156f15177fdea8a561d12ee59be85ceea90465c573bf2b7ed07639cc4a0aa07edfef0ed7162778d81eaadd47aa908710276642 SHA512 77a6e9413d9ab6bf42585df8989b4187171299c4cca1e72f25448a7a14f470f8a8040b34d210d15e26e3cbf59dcc26a512893b19c4b300638d9ddef5dd44f61e
 EBUILD poppler-0.79.0-r1.ebuild 3529 BLAKE2B 6aa26e84d2030230eae7625f55acc15e3448ac9caa7493c79cb32ddd06145caadec663b115471eedeaf67a3648a059196220b49064bbea4959414077ece059ac SHA512 a4faa580f3605bdca2e6499b93ebbd4146ee01f6074b6721ad16e8f9d90e435467dff3fd8e3374f09be05b4ed0e4a45371cf925efedf2659d9c519f84aa1c949
 EBUILD poppler-9999.ebuild 3529 BLAKE2B a443f6eea15d1e41eca59f5c9f5433cb6def0b4ebbae5fcfb881157bd4dbbe0d31bfbf6c10e8ccc78553e2a825f5d0615a7bef1b2ca9ca6783d0f019aa2eef87 SHA512 3904299dead5c2666709277469161c4795057b9651c685619cf56ee70d48230a684ded4528a288dffa4df1f4e6145d07c5066808ddc59de2d4e4458b0da0697b
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/files/poppler-0.78.0-fix-text-selection.patch b/app-text/poppler/files/poppler-0.78.0-fix-text-selection.patch
deleted file mode 100644
index 8a9c3a760f3b..000000000000
--- a/app-text/poppler/files/poppler-0.78.0-fix-text-selection.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2d191b49ea074cc69ba4c68a572f26c8bdb55abd Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 10 Jul 2019 01:10:22 +0200
-Subject: [PATCH] Fix mistake on 093531cd0d0878b892d92ebc56c26936e5de3712
-
-These i should have been j too
----
- poppler/TextOutputDev.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
-index e62e088c..645e38fd 100644
---- a/poppler/TextOutputDev.cc
-+++ b/poppler/TextOutputDev.cc
-@@ -4791,8 +4791,8 @@ void TextSelectionPainter::endPage()
-         if (j != begin && sel->word->charPos[j] == sel->word->charPos[j - 1])
-           continue;
- 
--	out->drawChar(state, sel->word->textMat[i].m[4], sel->word->textMat[i].m[5], 0, 0, 0, 0,
--		      sel->word->charcode[i], 1, nullptr, 0);
-+	out->drawChar(state, sel->word->textMat[j].m[4], sel->word->textMat[j].m[5], 0, 0, 0, 0,
-+		      sel->word->charcode[j], 1, nullptr, 0);
-       }
-       out->endString(state);
-       delete string;
--- 
-2.21.0
-
diff --git a/app-text/poppler/poppler-0.78.0-r1.ebuild b/app-text/poppler/poppler-0.78.0-r1.ebuild
deleted file mode 100644
index b71b9d457722..000000000000
--- a/app-text/poppler/poppler-0.78.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils 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
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/89"   # 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"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-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 )
-"
-
-DOCS=( AUTHORS NEWS README README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-	"${FILESDIR}/${PN}-0.78.0-fix-text-selection.patch" # bug 689660
-)
-
-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 -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
-
-	# we need to up the C++ version, bug #622526, #643278
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-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-utils_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	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
-}