gentoo auto-resync : 05:01:2024 - 20:03:55

3 files changed, 213 insertions, 0 deletions

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 4966ed14899f..3a81d4d028ff 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,3 +1,4 @@
+AUX xpdf-4.04-font-paths.patch 4233 BLAKE2B d698b963b979dd8f59596ebd04c08bbc18bb669fdd345b00d42cef572c15e844f3ae10e6753e4ae3bf81e7b3eb4e034ca938718d4404462c30e4d556c95a8a9b SHA512 87ea182534df31a8ab283ab9943e5e47f27d924df015f8aed08126056a4a2685388f9e34aa01e02b52d7c5066c0fa84fe5f20ee827eae618f6680511ba59b7d2
 AUX xpdf-4.04-libpaper-2.patch 484 BLAKE2B 4d749a21909e6fa6eaf64a0d9c337bc6cb6bdfe086ea93230696c0775e079434c45aa7bcd186d80fc1d79cddcc981b7d1261990fd94293a0252f90a79b0d3804 SHA512 d9f5f5b6c0de979ada6488af6ab7e74f01bfb5b54ce7d5aff2d0e279779c4a7948988492c42f5fb7aaf3d989b5f78062c36f681842a7b7758428f2ef2bb429d7
 AUX xpdf-automagic.patch 924 BLAKE2B df4d7a245d8f710568d455660b29a81fd4d4dcfb21fccf60d5f2db959a7a2e2e64eb36cc7cbc0aea7e1cd21bdc6a11cb0ae7ae43e9293164ba5ef88685aa1653 SHA512 8bdeafe1553fea67b6d30afd1eb6e6abbd57f470a79b982b2b545fc91f12bc00c34a1639a05e8ef589ce1518886cc8de45c54303c4528c7e3d721ff624a0d27e
 AUX xpdf-shared-libs.patch 2286 BLAKE2B 63d668f5ab910ede26c85ec8fb379baa39112c0056ab61d3d8192447d76a5d455a3d3eb43ac1f0f3e275ed38d8cfaa56ed45432cf2f0d22a5eeaa63fa8e794e6 SHA512 560bf773fea8aed81678710aebb5733c8134ea7c088a761e20726c8758a98219c977a32437bd6f425271ed7c76a2742705074e11db108cb4bf71c0530b10276c
@@ -17,4 +18,5 @@ DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
 EBUILD xpdf-4.04-r1.ebuild 4159 BLAKE2B e72fb259627243413cb09621b517892cd2635aff0e84e702915313adf885d98f2a89b9316a2d2829c0c14a453fbc20ac683574041ba3bd9b7228625c45368444 SHA512 02c2fa7d633c636fc3ad01a8fa8a8561676248b9af8a85737b0ec3d0233466af6d60ac31f62662d15822da98ec3addc75b2ebfeeea0302e6ee9fdd7c35661ada
+EBUILD xpdf-4.04-r2.ebuild 4204 BLAKE2B f961be6875a588236ec5ea70095fd0a34680de7ad9d0adb76eb025cfadf67459cc154d123859ae692642e506ef6fa6647d336854d0c8eebeae3ddae1e4548a27 SHA512 fbf2d929293997058d7351b1d52c5aa6b132bb7ed34b09475d19fd92f7f5974da567c2be4261aaa965f83f3923d78e3170e268397230f51de9bdcf3b07d822f1
 MISC metadata.xml 993 BLAKE2B 14996cd8a901c0cee2ff357b6d7e0ba523cef08d39997b4e3266b9f07e75e31fcbbee940d25eb318bcfc7144781d490a8604a9c57d8dd883ce08f51323139099 SHA512 b0245e750f66aeb07c9a35ad8bcc2d6fa01debf62870104b87ba824c79350dc4dbb620d8d4a535c774709f49b47d2808baeb9ddb88d209e48e3cfd6309fd8628
diff --git a/app-text/xpdf/files/xpdf-4.04-font-paths.patch b/app-text/xpdf/files/xpdf-4.04-font-paths.patch
new file mode 100644
index 000000000000..04c4994f4667
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-4.04-font-paths.patch
@@ -0,0 +1,48 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=1509862
+https://bugs.gentoo.org/916446
+--- a/xpdf/GlobalParams.cc
++++ b/xpdf/GlobalParams.cc
+@@ -84,20 +84,20 @@
+   const char *obliqueFont;	// name of font to oblique
+   double obliqueFactor;		// oblique sheer factor
+ } displayFontTab[] = {
+-  {"Courier",               "n022003l.pfb", "cour.ttf",    "Courier",      "Courier",                NULL,             0},
+-  {"Courier-Bold",          "n022004l.pfb", "courbd.ttf",  "Courier",      "Courier Bold",           NULL,             0},
+-  {"Courier-BoldOblique",   "n022024l.pfb", "courbi.ttf",  "Courier",      "Courier Bold Oblique",   "Courier-Bold",   0.212557},
+-  {"Courier-Oblique",       "n022023l.pfb", "couri.ttf",   "Courier",      "Courier Oblique",        "Courier",        0.212557},
+-  {"Helvetica",             "n019003l.pfb", "arial.ttf",   "Helvetica",    "Helvetica",              NULL,             0},
+-  {"Helvetica-Bold",        "n019004l.pfb", "arialbd.ttf", "Helvetica",    "Helvetica Bold",         NULL,             0},
+-  {"Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf", "Helvetica",    "Helvetica Bold Oblique", "Helvetica-Bold", 0.212557},
+-  {"Helvetica-Oblique",     "n019023l.pfb", "ariali.ttf",  "Helvetica",    "Helvetica Oblique",      "Helvetica",      0.212557},
+-  {"Symbol",                "s050000l.pfb", NULL,          "Symbol",       "Symbol",                 NULL,             0},
+-  {"Times-Bold",            "n021004l.pfb", "timesbd.ttf", "Times",        "Times Bold",             NULL,             0},
+-  {"Times-BoldItalic",      "n021024l.pfb", "timesbi.ttf", "Times",        "Times Bold Italic",       NULL,             0},
+-  {"Times-Italic",          "n021023l.pfb", "timesi.ttf",  "Times",        "Times Italic",           NULL,             0},
+-  {"Times-Roman",           "n021003l.pfb", "times.ttf",   "Times",        "Times Roman",            NULL,             0},
+-  {"ZapfDingbats",          "d050000l.pfb", NULL,          "ZapfDingbats", "Zapf Dingbats",          NULL,             0},
++  {"Courier",               "NimbusMonoPS-Regular.t1",    "cour.ttf",    "Courier",      "Courier",                NULL,             0},
++  {"Courier-Bold",          "NimbusMonoPS-Bold.t1",       "courbd.ttf",  "Courier",      "Courier Bold",           NULL,             0},
++  {"Courier-BoldOblique",   "NimbusMonoPS-BoldItalic.t1", "courbi.ttf",  "Courier",      "Courier Bold Oblique",   "Courier-Bold",   0.212557},
++  {"Courier-Oblique",       "NimbusMonoPS-Italic.t1",     "couri.ttf",   "Courier",      "Courier Oblique",        "Courier",        0.212557},
++  {"Helvetica",             "NimbusSans-Regular.t1",      "arial.ttf",   "Helvetica",    "Helvetica",              NULL,             0},
++  {"Helvetica-Bold",        "NimbusSans-Bold.t1",         "arialbd.ttf", "Helvetica",    "Helvetica Bold",         NULL,             0},
++  {"Helvetica-BoldOblique", "NimbusSans-BoldItalic.t1",   "arialbi.ttf", "Helvetica",    "Helvetica Bold Oblique", "Helvetica-Bold", 0.212557},
++  {"Helvetica-Oblique",     "NimbusSans-Italic.t1",       "ariali.ttf",  "Helvetica",    "Helvetica Oblique",      "Helvetica",      0.212557},
++  {"Symbol",                "StandardSymbolsPS.t1",       NULL,          "Symbol",       "Symbol",                 NULL,             0},
++  {"Times-Bold",            "NimbusRoman-Bold.t1",        "timesbd.ttf", "Times",        "Times Bold",             NULL,             0},
++  {"Times-BoldItalic",      "NimbusRoman-BoldItalic.t1",  "timesbi.ttf", "Times",        "Times Bold Italic",       NULL,             0},
++  {"Times-Italic",          "NimbusRoman-Italic.t1",      "timesi.ttf",  "Times",        "Times Italic",           NULL,             0},
++  {"Times-Roman",           "NimbusRoman-Regular.t1",     "times.ttf",   "Times",        "Times Roman",            NULL,             0},
++  {"ZapfDingbats",          "D050000L.t1", NULL,          "ZapfDingbats", "Zapf Dingbats",          NULL,             0},
+   {NULL}
+ };
+ 
+@@ -109,6 +109,7 @@
+ };
+ #else
+ static const char *displayFontDirs[] = {
++  "/usr/share/fonts/urw-fonts",
+   "/usr/share/ghostscript/fonts",
+   "/usr/local/share/ghostscript/fonts",
+   "/usr/share/fonts/default/Type1",
+
diff --git a/app-text/xpdf/xpdf-4.04-r2.ebuild b/app-text/xpdf/xpdf-4.04-r2.ebuild
new file mode 100644
index 000000000000..11c66d17c05a
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.04-r2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/xpdf.asc
+inherit cmake desktop verify-sig xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com"
+SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
+	i18n? (
+		https://dl.xpdfreader.com/xpdf-arabic.tar.gz
+		https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
+		https://dl.xpdfreader.com/xpdf-greek.tar.gz
+		https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
+		https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-latin2.tar.gz
+		https://dl.xpdfreader.com/xpdf-thai.tar.gz
+		https://dl.xpdfreader.com/xpdf-turkish.tar.gz
+	)
+	verify-sig? ( https://dl.xpdfreader.com/${P}.tar.gz.sig )"
+
+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? ( gnome-base/librsvg )
+	verify-sig? ( sec-keys/openpgp-keys-xpdf )
+"
+DEPEND="
+	cups? (
+		dev-qt/qtprintsupport:5[cups]
+		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}-4.04-libpaper-2.patch
+	"${FILESDIR}"/${PN}-4.04-font-paths.patch
+)
+
+DOCS=( ANNOUNCE CHANGES README )
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
+	fi
+	default
+}
+
+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
+
+	xdg_environment_reset
+	cmake_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"
+		# Bug 910166
+		# https://forum.xpdfreader.com/viewtopic.php?p=45052#p45052
+		# Likely fixed in 4.05
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_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
+			rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
+		done
+	fi
+}
+
+src_install() {
+	cmake_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
+}