From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- app-text/xpdf/Manifest | 5 +- app-text/xpdf/files/xpdf-CVE-2019-17064.patch | 24 +++++ app-text/xpdf/xpdf-4.02-r1.ebuild | 140 ------------------------ app-text/xpdf/xpdf-4.02-r2.ebuild | 141 ++++++++++++++++++++++++ app-text/xpdf/xpdf-4.02-r3.ebuild | 147 ++++++++++++++++++++++++++ app-text/xpdf/xpdf-4.02.ebuild | 113 -------------------- 6 files changed, 315 insertions(+), 255 deletions(-) create mode 100644 app-text/xpdf/files/xpdf-CVE-2019-17064.patch delete mode 100644 app-text/xpdf/xpdf-4.02-r1.ebuild create mode 100644 app-text/xpdf/xpdf-4.02-r2.ebuild create mode 100644 app-text/xpdf/xpdf-4.02-r3.ebuild delete mode 100644 app-text/xpdf/xpdf-4.02.ebuild (limited to 'app-text/xpdf') diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest index 82961b71cc7c..b9852a8441c4 100644 --- a/app-text/xpdf/Manifest +++ b/app-text/xpdf/Manifest @@ -1,3 +1,4 @@ +AUX xpdf-CVE-2019-17064.patch 760 BLAKE2B 59e9c01ecc107345cd3bf360cfd04611f997bbc18eb9cc1cddb6b5ca95aceddc0b013b074367b153ee5cfc4b562839bcb90ff9d93262cb558f5515bae6f71746 SHA512 328dcfa5f01f9621f8da6995f2ae63a6184bef38a1bfb73fb89c330fced2b52602cfb45b0e8f72f09bac8050f8abc94ba5bbd76c13b39189a086485888c4deda AUX xpdf-automagic.patch 924 BLAKE2B df4d7a245d8f710568d455660b29a81fd4d4dcfb21fccf60d5f2db959a7a2e2e64eb36cc7cbc0aea7e1cd21bdc6a11cb0ae7ae43e9293164ba5ef88685aa1653 SHA512 8bdeafe1553fea67b6d30afd1eb6e6abbd57f470a79b982b2b545fc91f12bc00c34a1639a05e8ef589ce1518886cc8de45c54303c4528c7e3d721ff624a0d27e AUX xpdf-shared-libs.patch 2286 BLAKE2B 63d668f5ab910ede26c85ec8fb379baa39112c0056ab61d3d8192447d76a5d455a3d3eb43ac1f0f3e275ed38d8cfaa56ed45432cf2f0d22a5eeaa63fa8e794e6 SHA512 560bf773fea8aed81678710aebb5733c8134ea7c088a761e20726c8758a98219c977a32437bd6f425271ed7c76a2742705074e11db108cb4bf71c0530b10276c AUX xpdf-visibility.patch 414 BLAKE2B 835bdfdbb39297859d1886a5ebd76bec23a8b8df744f627a475d8c00ae3cdcfe219ec039f00b7b6a7305e6c451399c422fafdea0599bf22d2ef34bd4912eae4c SHA512 a1f87523aeb657484181005b3e40a90eaaee2d00452bfc50bc23913d6e1e5a9117600959b3800e789be50f6d12d726f875caf02b73ec41dc9d98e1215b2e964e @@ -14,6 +15,6 @@ 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-r1.ebuild 3489 BLAKE2B 3e817d477b70bb75600203641464a8c8b966feaac3346abbada46a1f23808517528e09b4cd954bbe9e088711f13911c39fc2d69f1667a0bdbfdf6eafd6759077 SHA512 2693535810d8744f7be68af66655f6bcd54a40641fb359993281cafbfb7738b0ec47fe937af7c9ec8cf59f8a2db3a91d38fcd4047caf91c16a438393dbd70b9e -EBUILD xpdf-4.02.ebuild 2983 BLAKE2B 7005023c4f179f8306d0af2e6bbe1841eacd72a9075c070b945d2bea1a25c09586a61d05625f85d418a3172c92345d811390c2febcf6ad1df931b0a98c831919 SHA512 bd7ebba70d9bba16b88caa9b5feac37dc12f0ec82048e7ca94ae63066a45f7fce3bb83b773624d0c1bcfe95ef00fb9977edf22cf89c7ec97dadc5e9b33815f19 +EBUILD xpdf-4.02-r2.ebuild 3529 BLAKE2B e62d10500bfcc6628a57604fa0cf2b7a66cde0fdf58b834fdca6adfed338002d5b952982cfeca612a3b6736c936c305df4d9db1d160bc5d2b983b25cff783bd0 SHA512 c105a43366383599563e041f4ba31021f8f2931ebe101211e0ecbd766263f7c19fe95d2d317b50fa5e3ef3c35ffe39e711557fd2d9c80359e5e1604bc9891198 +EBUILD xpdf-4.02-r3.ebuild 3727 BLAKE2B 0e7df0801131196087a64a19e76790b5296ef8cb1fd17391ff4998ede1a612415791a1377ffc0b6281ecfd3bb301c4d38348822eb37033ec19e16b4757741265 SHA512 04282a62462a1049361233a6dc260909f1a7a302476ef7afc15c99169daafa96f23eeba8d7ce8212659b2be9ddb50daaa03772134f004d4e3ffe4db4c81b337d MISC metadata.xml 992 BLAKE2B da5a96221c19ec9db95204df4ddd68644d14f3940ef4fc367bbf2fad9a6c69368401f8a299d14210fb6706d479b7950621360967c7549f7c78c2cda87398767d SHA512 2916fbad9b12267929b58fa8b385df4bdfa8cbe0e32d51c9298e421f2e21729c920b18faec4f648b87aab37150c67b1aad441e36a3d6014e45f226d9baa0a568 diff --git a/app-text/xpdf/files/xpdf-CVE-2019-17064.patch b/app-text/xpdf/files/xpdf-CVE-2019-17064.patch new file mode 100644 index 000000000000..c4f84a4604c0 --- /dev/null +++ b/app-text/xpdf/files/xpdf-CVE-2019-17064.patch @@ -0,0 +1,24 @@ +Fix CVE-2019-17064 + +Fix NULL pointer dereference by initializing field before use. +https://forum.xpdfreader.com/viewtopic.php?f=3&t=41890#p42672 + +diff '--color=auto' -Naurd xpdf-4.02.orig/xpdf/Catalog.cc xpdf-4.02/xpdf/Catalog.cc +--- xpdf-4.02.orig/xpdf/Catalog.cc 2019-09-25 22:54:33.000000000 +0300 ++++ xpdf-4.02/xpdf/Catalog.cc 2020-03-01 12:05:43.235486706 +0300 +@@ -159,6 +159,7 @@ + baseURI = NULL; + form = NULL; + embeddedFiles = NULL; ++ pageLabels = NULL; + #if MULTITHREADED + gInitMutex(&pageMutex); + #endif +@@ -241,7 +242,6 @@ + // get the ViewerPreferences object + catDict.dictLookupNF("ViewerPreferences", &viewerPrefs); + +- pageLabels = NULL; + if (catDict.dictLookup("PageLabels", &obj)->isDict()) { + readPageLabelTree(&obj); + } diff --git a/app-text/xpdf/xpdf-4.02-r1.ebuild b/app-text/xpdf/xpdf-4.02-r1.ebuild deleted file mode 100644 index e64446609706..000000000000 --- a/app-text/xpdf/xpdf-4.02-r1.ebuild +++ /dev/null @@ -1,140 +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 -) - -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-r2.ebuild b/app-text/xpdf/xpdf-4.02-r2.ebuild new file mode 100644 index 000000000000..c942b87ba90b --- /dev/null +++ b/app-text/xpdf/xpdf-4.02-r2.ebuild @@ -0,0 +1,141 @@ +# 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-r3.ebuild new file mode 100644 index 000000000000..aa94d174acd6 --- /dev/null +++ b/app-text/xpdf/xpdf-4.02-r3.ebuild @@ -0,0 +1,147 @@ +# 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 +fontconfig i18n icons +libpaper metric opi png +textselect utils" + +BDEPEND=" + icons? ( media-gfx/inkscape ) +" +DEPEND=" + cups? ( + dev-qt/qtprintsupport:5 + net-print/cups + ) + fontconfig? ( media-libs/fontconfig ) + 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} + dev-qt/qtsvg:5 + 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_FONTCONFIG=$(usex fontconfig off on) + -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 + local inkarg="-e" + has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o" + + 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 $inkarg $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.ebuild b/app-text/xpdf/xpdf-4.02.ebuild deleted file mode 100644 index 4263e9c9ad4e..000000000000 --- a/app-text/xpdf/xpdf-4.02.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -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 +libpaper metric opi png +textselect utils" - -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 -) - -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_install() { - cmake-utils_src_install - - 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 -} -- cgit v1.2.3