commit:     e0f5295b0f3dd0e338a8c36ed72c63f1ddf08664
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 18:14:22 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 19:29:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f5295b

app-text/poppler: Drop 0.78.0-r1

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/poppler/Manifest                          |   1 -
 .../files/poppler-0.78.0-fix-text-selection.patch  |  28 -----
 app-text/poppler/poppler-0.78.0-r1.ebuild          | 128 ---------------------
 3 files changed, 157 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 3683ac48c74..81c062d105d 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,2 @@
 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

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 8a9c3a760f3..00000000000
--- 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 <aa...@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 b71b9d45772..00000000000
--- 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
-}

Reply via email to