gentoo resync : 15.12.2017

3 files changed, 2 insertions, 149 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 2b7442cd7779..bd005c77faab 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -26,8 +26,7 @@ DIST poppler-0.59.0.tar.xz 1712004 BLAKE2B ddffe0361097b54dccb3eb7df7cb2e879c902
 DIST poppler-0.60.1.tar.xz 1432712 BLAKE2B 9c4e8645a5e5a3848ef9f65268e3cb757478c8e0fb46b0071e318e2afc35a05a0d1628d66af8f8815d1ff324a16c70ec8fa2c02cbe36621cb0252331594342b0 SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc
 DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774dd47ac94c22474efe4a52af228aeb2abbb8ab268667acaa83fb41293246266124a111740df764eeedbe229fa70aa SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
-EBUILD poppler-0.57.0-r1.ebuild 4349 BLAKE2B 7afd8b7d19e856ac10d7fb6b19684fb8661a558c36611e3d160914cfd380dc249b15efe384f49b85b3c7ae0cf221d3308f23e2884c7bdc5ce861bffbfaad44a5 SHA512 bfc5bb3b19a1586a0bb997cc705337d01f2584c1d7b7f26b32bf66d885aba51fcf3d187020281162ab3bebb27b656b34e2812fc8f3a03258b0b10d65afc3127c
-EBUILD poppler-0.57.0.ebuild 3858 BLAKE2B c4e998308076d2458384d364e684e6cd73233b873e258e50ca907ddab0b63fb4baa840b6cba30efb57d32b39a3e342bf8f2f538e68320938facdfe8f12d36d74 SHA512 7ac898f6ae7e4535acd582966abf08ebad92d957257da548a0c330998d82a6f6e82b7e4990c6c333f2625f34b84ddc41a973af43e68da3d9d081c0243c3a21fe
+EBUILD poppler-0.57.0-r1.ebuild 4348 BLAKE2B 066b4f63c5347e883078bd8c7af3c345d0962dd12b824d53cb1024b4f40671141436bf4992774a0c1b6f18867c57b4bc88e007ad9d7370b3349dc2b9c8640bc0 SHA512 a93fb043158a88df8f52ef3f426dcc88645b5e9c3dacd5eef7939ab1ee0d016546c04c5508596162326765b3bad07579259bb6985cd33cd1695329dbecf69484
 EBUILD poppler-0.58.0.ebuild 3866 BLAKE2B 6cc87db70c2d396a98ed240b96458be5172b8b5fdb70d5da903d89cc0611e9b9f683ddba219dc97c0c8eb4dd93ba0a1a43d81e7645348abcd6dd4e2dab5ba248 SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218
 EBUILD poppler-0.59.0.ebuild 3866 BLAKE2B ef874dc127c9802e730a6b9136029461091b0a0b44d1b2105264fe452483a39c76c9f899abadbb7489a2b3a1634898c3a26f6f527a0ff181b80c58b7469f65ce SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70
 EBUILD poppler-0.60.1.ebuild 3861 BLAKE2B fa45fb8b44eebdcfa1513923a86071766ee4e5864631e81127b87a81f3c47bb00ba88d1af4f1dcc1915b938b584d17c89544320a50d766033079a130645c18d3 SHA512 973c61d28678966e7e3282121d0edf27a94680710fafbe3eae8c8a20a2edad72621a4b1ed8831f22fb3c527d85b6f800edb9ec17847b252abdda6e33b88585bb
diff --git a/app-text/poppler/poppler-0.57.0-r1.ebuild b/app-text/poppler/poppler-0.57.0-r1.ebuild
index c717ca9db263..080f267b477f 100644
--- a/app-text/poppler/poppler-0.57.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.57.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.57.0.ebuild b/app-text/poppler/poppler-0.57.0.ebuild
deleted file mode 100644
index a4a64847c65f..000000000000
--- a/app-text/poppler/poppler-0.57.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="https://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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/68"   # 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 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.7 )
-"
-
-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.53.0-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
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-
-	if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
-		# we need to up the C++ version, bug #622526
-		export CXX="$(tc-getCXX) -std=c++11"
-	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 jpeg; then
-		mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
-	else
-		mycmakeargs+=(-DENABLE_DCTDECODER=none)
-	fi
-	if use jpeg2k; then
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
-	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
-}