gentoo resync : 28.04.2021

4 files changed, 80 insertions, 4 deletions

diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index 682980d9e8e1..36d06326a944 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1,3 +1,5 @@
+AUX cups-pdf-3.0.1-ghostscript-gpl-9.54-compat.patch 2328 BLAKE2B fa03f0a69cbafe03387777645528132721a42d364df3d70bcf6abee1492ac6c4a74c27c30d2c66c395ad5939cbae7895d4470b7faafa59e65c67c158e096fbbf SHA512 679fa1229e34378e809699ae89024bdd624d54b22565cbc23029f01e9a3ba3fde37c0d6b52b9365cd3436a234055a5c1cc80d1c2a5482d4b2649a929ee89b3c7
 DIST cups-pdf_3.0.1.tar.gz 29754 BLAKE2B f964358c5e465447e703848a697f6c801624a1836e2a0a4026c507c66048cf4bef92327508598ec7e9a356d4f57894a6b610e55b7a9a34e942cf2b88c6c55b85 SHA512 a06580f3056dddbb883c8db0c71b37b883482ae1ac8aa9bcfd85e679c4dcb44278006b7110d2988173d0eeb05b0f19fb39081fad49bf26839235e97fbe27a818
-EBUILD cups-pdf-3.0.1.ebuild 894 BLAKE2B eb8a6cef7ed2789e863a28bae90bea9ffec5edd48425d639e10cc2a5df19fe51eded95c2aa9060046e1cd8cb6b3b240c33d6116e310e5b05d90dbceb8e8e824a SHA512 7eeca7e60f19c0d072b5ebeab3b7c49faf34cfd1893b48cd2f16d92c28e9e32d9787652fa7c5f690ec35a2b78e954abbd50246d0369b3772e8731e16ecb290fd
+EBUILD cups-pdf-3.0.1-r1.ebuild 899 BLAKE2B 4602a2a84fd40676884649eac0a19efc3b33cc020566902c93d769d9fb310d69bb5e6ff711c2835327c99ebd958dd2f0e7427ed1488c138a1b2f0ec49f8cc5fa SHA512 475cd35f72f173bddfd30abec814d2d3287c00413c7f46a31c53d020761491a5f69321ffc660ec18d0ebe48507ef35b35ce9466f24ba6d104a62fd0830456772
+EBUILD cups-pdf-3.0.1-r2.ebuild 991 BLAKE2B 5fa91bd611eec9e1fb18bd553a2ac79f7577fbe2a4761fa7fb7b7f9fb1b50e2a4382dd903cf367a63a82881e268682534f7e2dbc15a3d3725f0804c392ed25d7 SHA512 11ed060c0fc6b47cfd4411aa8a2d73a816d954f42868457f322db029423af3f363a82fe359e2c78b4ddf9822b16a21e5106863c50b3e06e69cfe4df427994d86
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/cups-pdf/cups-pdf-3.0.1.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1-r1.ebuild
index c2856b42381b..f775a9ed1b83 100644
--- a/net-print/cups-pdf/cups-pdf-3.0.1.ebuild
+++ b/net-print/cups-pdf/cups-pdf-3.0.1-r1.ebuild
@@ -8,6 +8,7 @@ inherit toolchain-funcs
 DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
 HOMEPAGE="https://www.cups-pdf.de/"
 SRC_URI="https://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
+S=${WORKDIR}/${PN}-${PV/_}
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -16,12 +17,10 @@ IUSE="+ppds"
 
 RDEPEND="
 	net-print/cups
-	app-text/ghostscript-gpl
+	<app-text/ghostscript-gpl-9.54
 "
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}-${PV/_}
-
 src_compile() {
 	pushd src >/dev/null
 	$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -o ${PN} -lcups || die
diff --git a/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..a27e4fb17d9e
--- /dev/null
+++ b/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
+HOMEPAGE="https://www.cups-pdf.de/"
+SRC_URI="https://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
+S=${WORKDIR}/${PN}-${PV/_}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+ppds"
+
+DEPEND="net-print/cups"
+
+RDEPEND="${DEPEND}
+	>=app-text/ghostscript-gpl-9.54"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.1-ghostscript-gpl-9.54-compat.patch )
+
+src_compile() {
+	pushd src &>/dev/null || die
+	$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -o ${PN} -lcups || die
+	popd &>/dev/null || die
+}
+
+src_install() {
+	exeinto /usr/libexec/cups/backend
+	exeopts -m0700
+	doexe src/cups-pdf
+
+	insinto /etc/cups
+	doins extra/cups-pdf.conf
+
+	insinto /usr/share/cups/model
+	if use ppds; then
+		doins extra/CUPS-PDF_opt.ppd
+	else
+		doins extra/CUPS-PDF_noopt.ppd
+	fi
+
+	dodoc ChangeLog README
+}
diff --git a/net-print/cups-pdf/files/cups-pdf-3.0.1-ghostscript-gpl-9.54-compat.patch b/net-print/cups-pdf/files/cups-pdf-3.0.1-ghostscript-gpl-9.54-compat.patch
new file mode 100644
index 000000000000..3890743107e5
--- /dev/null
+++ b/net-print/cups-pdf/files/cups-pdf-3.0.1-ghostscript-gpl-9.54-compat.patch
@@ -0,0 +1,28 @@
+https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=180419375973b9ce4664286a67106d712260ef7f
+
+--- a/extra/cups-pdf.conf
++++ b/extra/cups-pdf.conf
+@@ -250,9 +250,9 @@
+ ### Key: GSCall (config)
+ ## command line for calling GhostScript (!!! DO NOT USE NEWLINES !!!)
+ ## MacOSX: for using pstopdf set this to %s %s -o %s %s
+-### Default: %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s
++### Default: %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c -f %s
+ 
+-#GSCall %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s
++#GSCall %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c -f %s
+ 
+ ### Key: PDFVer (config, ppd, lptopions)
+ ##  PDF version to be created - can be "1.5", "1.4", "1.3" or "1.2" 
+--- a/src/cups-pdf.h
++++ b/src/cups-pdf.h
+@@ -58,7 +58,7 @@ struct {
+   { "AnonDirName", SEC_CONF|SEC_PPD, { "/var/spool/cups-pdf/ANONYMOUS" } },
+   { "AnonUser", SEC_CONF|SEC_PPD, { "nobody" } },
+   { "GhostScript", SEC_CONF|SEC_PPD, { "/usr/bin/gs" } },
+-  { "GSCall", SEC_CONF|SEC_PPD, { "%s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s" } },
++  { "GSCall", SEC_CONF|SEC_PPD, { "%s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c -f %s" } },
+   { "Grp", SEC_CONF|SEC_PPD, { "lp" } },
+   { "GSTmp", SEC_CONF|SEC_PPD, { "TMPDIR=/var/tmp" } },
+   { "Log", SEC_CONF|SEC_PPD, { "/var/log/cups" } },
+