gentoo resync : 14.05.2020

3 files changed, 3 insertions, 145 deletions

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index b9852a8441c4..e3617690d757 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -15,6 +15,5 @@ DIST xpdf-korean.tar.gz 526847 BLAKE2B e1640f6df0bc1e126b2e0f010403fc3ff068a8171
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
-EBUILD xpdf-4.02-r2.ebuild 3529 BLAKE2B e62d10500bfcc6628a57604fa0cf2b7a66cde0fdf58b834fdca6adfed338002d5b952982cfeca612a3b6736c936c305df4d9db1d160bc5d2b983b25cff783bd0 SHA512 c105a43366383599563e041f4ba31021f8f2931ebe101211e0ecbd766263f7c19fe95d2d317b50fa5e3ef3c35ffe39e711557fd2d9c80359e5e1604bc9891198
-EBUILD xpdf-4.02-r3.ebuild 3727 BLAKE2B 0e7df0801131196087a64a19e76790b5296ef8cb1fd17391ff4998ede1a612415791a1377ffc0b6281ecfd3bb301c4d38348822eb37033ec19e16b4757741265 SHA512 04282a62462a1049361233a6dc260909f1a7a302476ef7afc15c99169daafa96f23eeba8d7ce8212659b2be9ddb50daaa03772134f004d4e3ffe4db4c81b337d
+EBUILD xpdf-4.02-r4.ebuild 3731 BLAKE2B 718d8442527cf68dc6ffa3bb3a94b8431ed0afd87dd78056f3b31d4a5e36c48ee65aac4c4e4cc827b8894aa6fbe2af1987d190eac9df00707efc79238f9b1649 SHA512 8444474a1f8e8cf2cc6adf361ac5ac0543f583d7ad148106d0c65010367f3fea77cb9a72e723c29ce3e67c7585972749aa76f1461af3b7374f1709ba37e5082f
 MISC metadata.xml 992 BLAKE2B da5a96221c19ec9db95204df4ddd68644d14f3940ef4fc367bbf2fad9a6c69368401f8a299d14210fb6706d479b7950621360967c7549f7c78c2cda87398767d SHA512 2916fbad9b12267929b58fa8b385df4bdfa8cbe0e32d51c9298e421f2e21729c920b18faec4f648b87aab37150c67b1aad441e36a3d6014e45f226d9baa0a568
diff --git a/app-text/xpdf/xpdf-4.02-r2.ebuild b/app-text/xpdf/xpdf-4.02-r2.ebuild
deleted file mode 100644
index c942b87ba90b..000000000000
--- a/app-text/xpdf/xpdf-4.02-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com"
-SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
-	i18n? (
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
-	)"
-
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups i18n icons +libpaper metric opi png +textselect utils"
-
-BDEPEND="
-	icons? ( media-gfx/inkscape )
-"
-DEPEND="
-	cups? (
-		dev-qt/qtprintsupport:5
-		net-print/cups
-	)
-	libpaper? ( app-text/libpaper )
-	utils? ( png? ( media-libs/libpng:0 ) )
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/freetype
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	media-fonts/urw-fonts
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-automagic.patch
-	"${FILESDIR}"/${PN}-visibility.patch
-	"${FILESDIR}"/${PN}-shared-libs.patch
-	"${FILESDIR}"/${PN}-CVE-2019-17064.patch
-)
-
-src_prepare() {
-	sed -i \
-		"s|/usr/local/etc|${EPREFIX}/etc|;
-		 s|/usr/local|${EPREFIX}/usr|" \
-		doc/sample-xpdfrc || die
-
-	if use i18n; then
-		sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DA4_PAPER=$(usex metric)
-		-DNO_TEXT_SELECT=$(usex textselect off on)
-		-DOPI_SUPPORT=$(usex opi)
-		-DSPLASH_CMYK=$(usex cmyk)
-		-DWITH_LIBPAPER=$(usex libpaper)
-		-DWITH_LIBPNG=$(usex png)
-		-DXPDFWIDGET_PRINTING=$(usex cups)
-		-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use icons; then
-		sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
-		cd xpdf-qt
-		mkdir $sizes
-		local i
-		for i in $sizes; do
-			inkscape xpdf-icon.svg -w $i -h $i -e $i/xpdf.png
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu "${FILESDIR}/xpdf.desktop"
-	newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
-	if use icons; then
-		local i
-		for i in $sizes; do
-			doicon -s $i xpdf-qt/$i/xpdf.png
-		done
-		unset sizes
-	fi
-
-	insinto /etc
-	newins doc/sample-xpdfrc xpdfrc
-
-	local d i
-	if use utils; then
-		for d in "bin" "share/man/man1"; do
-			pushd "${ED}/usr/${d}" || die
-			for i in pdf*; do
-				mv "${i}" "x${i}" || die
-			done
-			popd || die
-		done
-
-		einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions"
-		einfo "with other packages"
-	else
-		rm -rf "${ED}"/usr/bin/pdf* \
-			   "${ED}"/usr/share/man/man1/pdf* \
-			   "${ED}"/usr/$(get_libdir) || die
-	fi
-
-	if use i18n; then
-		for i in arabic chinese-simplified chinese-traditional cyrillic greek \
-				 hebrew japanese korean latin2 thai turkish; do
-			insinto "/usr/share/xpdf/${i}"
-			doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \
-				! -name README ! -name add-to-xpdfrc || die)
-
-			cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die
-		done
-	fi
-}
diff --git a/app-text/xpdf/xpdf-4.02-r3.ebuild b/app-text/xpdf/xpdf-4.02-r4.ebuild
index aa94d174acd6..4311f1b32efa 100644
--- a/app-text/xpdf/xpdf-4.02-r3.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
 
 BDEPEND="
@@ -32,7 +32,7 @@ BDEPEND="
 "
 DEPEND="
 	cups? (
-		dev-qt/qtprintsupport:5
+		dev-qt/qtprintsupport:5[cups]
 		net-print/cups
 	)
 	fontconfig? ( media-libs/fontconfig )