gentoo resync : 25.08.2020

13 files changed, 169 insertions, 240 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 624ae0d67559..0f9d68d6c1bb 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index a8129ecdae66..8384872e6b91 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,5 +1,3 @@
-DIST linux-UFRII-drv-v510-uken-08.tar.gz 106569187 BLAKE2B 46017d4e82653314e1555b32c6e3a73ae8c9c7cef95e4f70d51d62e15f26831cf0ea8d1b180503cd63a880d637621427fe6c69971b40d9ee0119ecd493772515 SHA512 dbc8b8e600ec29e73afa4ba8a760fd643d58ee2017f6c3c35e63c7f2186cf0cb675adb0ea344b0bd04d0b4fa7f13763b5ce97e8264790356134e6ded3069bf54
 DIST linux-UFRII-drv-v510-uken-19.tar.gz 106848526 BLAKE2B afc6b158db038c4b5bacbd4965e8576a7dc4c6e4dcb8362823b69630372d60f8ecb82e1a7e9123fb251bbf8e459fb5fc314447e46dd1ad95058b912ac610fe56 SHA512 64f6af6fbd437076ca786b5904bf00145f49a19c3eb559fcc85316360e82aa90ab90c5763ff4f4c83d34608c4941a3fae78f93debb01f9c63f93fcc7615ae044
-EBUILD cnrdrvcups-lb-5.10-r1.ebuild 5861 BLAKE2B 6e23a4b1d8a738f05d6a04a3af88df4e4a09c9e8d05c52fcd5573271b7b018ea06c390e82f2f152f35648335cde708b4e5d68cfe266d1c9e87cbd5f873ef37c0 SHA512 aba47f6ac8270174a4988d9d7d200a069a6d52bc97a213f27d9b923fd5d48e02bf501099426b802168d8c09c13a82f181ad907677cf21362f58ef178e1a3c12f
-EBUILD cnrdrvcups-lb-5.10.ebuild 5861 BLAKE2B ef1239ec71304073bb62ce0c3462e8f91fcf878c3e635c07f4948434ebc733f904501f08a8c5192459d8c6248ddb27cee5d54697f9b5b32af9dc66c015f88dcd SHA512 5ca49ba0c375ebfeb0d51ec45c18312ca6c72c15ded1f55ee2e2d7e19daa2ee0fd59a2a1915d0a6849547764d6cab11be6c28d8e9b288dffd458147b2f06cdda
+EBUILD cnrdrvcups-lb-5.10-r1.ebuild 5859 BLAKE2B c412351e6b53e1b494262565e9f029a8191a528a177145c8308d4adb407cc4a875e8b04f7c6f12bd9d10f992a5e812d2c185858af3379cc80880a2bd606d85ea SHA512 08f16df8d5caba2515d5587ef80c55aef40569759e9d42889a05aec1285d0c9960b87e099b5c4888f3ffe6afb51139aacc155179c5d730e1994212fdd0023b19
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
index 07e540c258f3..892991608452 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
deleted file mode 100644
index aa8c33c74545..000000000000
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic
-
-MY_DOWNLOAD_ID="8/0100007658/13"
-MY_PV="${PV//\./}"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
-SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}-uken-08.tar.gz"
-
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2:2
-	gnome-base/libglade:2.0
-	media-libs/jbigkit
-	net-print/cups
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	!net-print/cndrvcups-common-lb
-	!net-print/cndrvcups-lb"
-
-HTML_DOCS=(
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.1xUK.html
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
-)
-
-S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
-
-pkg_setup() {
-	QA_PREBUILT="/usr/bin/cnsetuputil2
-		/usr/bin/cnrsdrvufr2
-		/usr/bin/cnpkmoduleufr2r
-		/usr/bin/cnpkbidir
-		/usr/bin/cnpdfdrv
-		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
-		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
-		/usr/$(get_libdir)/libcnlbcmr.so.1.0
-		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
-		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
-		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
-		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
-		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
-
-	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
-	unpack ./${P}-1.tar.gz
-}
-
-common_op() {
-	local i
-	for i in backend buftool cngplp cnjbig rasterfilter; do
-		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-driver_op() {
-	local i
-	for i in cngplp cngplp/files cpca pdftocpca; do
-		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-src_prepare() {
-	default
-
-	common_op mv configure.in configure.ac || die "failed to move configure.in"
-	driver_op mv configure.in configure.ac || die "failed to move configure.in"
-
-	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-
-	# This should work with autoreconf
-	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-
-	# Other components already depend on compiled product
-	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
-
-	common_op eautoreconf
-	driver_op eautoreconf
-
-	# Fix a QA issue with .desktop file,
-	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
-		die "Failed to modify cnsetuputil2.desktop file."
-
-	append-cflags -fcommon
-}
-
-src_configure() {
-	common_op econf
-	driver_op econf
-}
-
-src_compile() {
-	common_op emake
-	driver_op emake
-}
-
-src_install() {
-	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-
-	insinto /usr/share/cups
-	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
-
-	if use amd64; then
-		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
-	elif use x86; then
-		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
-	else
-		die "I don't know what directory to switch into!"
-	fi
-
-	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
-		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
-		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
-		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
-
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
-
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
-
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
-
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
-
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
-
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
-
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
-
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
-
-	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
-
-	insinto /usr/share/caepcm/ufr2
-	doins ./cnpkbidir_info*
-
-	insinto /usr/share/ufr2filterr
-	doins ./ThLB*
-
-	cd "${S}" || die "Failed to switch back into ${S} during installation."
-
-	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
-	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
-	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
-
-	insinto /usr/share/caepcm/ufr2
-	doins -r "${S}"/lib/data/ufr2/
-
-	insinto /usr/share/cups/model
-	doins ${P}/ppd/*.ppd
-
-	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
-	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
-
-	einstalldocs
-	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
-	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index d1d738651cd0..bcee0e81bf5a 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,6 +1,9 @@
 AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
 AUX cups-filters-1.27.4-make-missing-testfont-non-fatal.patch 510 BLAKE2B 9b48f841b7034b4c56ed6ea7d229696aacc232b9d78c9984dad6db8f6e967e239c77dbb35886230ac968966ee04912add135a5932ca1483674e1bf2c087e81fc SHA512 ce14af0a4d2db1e67471b8986290261ac17709720fe5a52a6a81bda19e4ae7e4ab92a8f1e954b82b792690f9eae8116c59ee3a11594256a36bf8cff32846e97c
+AUX cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch 451 BLAKE2B 0dc63e4c494bb60aa8ac5ae157b5640f903e0852a2454d115456f200888c3d074d43c877e56e01789a0ac38d50a89f44ce20658da14119cd1953e834b33f890c SHA512 306eed342d323cbc99d586ad83aa748af5d1b41896d6000a9df34bd2eac3fe2773f5f979f2befb0441d83509d43438d293ce97125f88300b731624502b5bf774
 DIST cups-filters-1.27.4.tar.xz 1493860 BLAKE2B 424c3ba73ec7d6f4683eaedde86d657b1a2da17670c84097f5f3f8ef525cc8cc6d7843a88d35013a5f48bba8a903f7504df9054427b9a63d748ce39de458e71f SHA512 8005e94bb6b06d0a15fa4dfd8455d0bc67418478bf517e205af1c8c0018681a97ae9ea486db07570050ebeeb7f63f75319a8fe012c112c6d16c0941299eaa50e
+DIST cups-filters-1.27.5.tar.xz 1494864 BLAKE2B 457968139f0bc1a5fd4c587dfe4a88d1904eb0ca9ee2aa88c1360785eb53b59e7eb823535ef01a9f81551628514441077562e91487a55a9f0c9e6c9dbdba98b7 SHA512 8bc917b2a168add1062d091d02d99c39d72861c0d0cb1242c34b2bf117c9943e7fdc1fe002de7cde4cb1919fbce41073adc34916c328fc99e66e389b0a4fe103
 EBUILD cups-filters-1.27.4.ebuild 3599 BLAKE2B eb2b2f3dce938b6516342c4926f962f35b51fcc8eb6d1ff5c3d2311515c78c68febfd1fd59633d120cc3fee71b2ed6119d1503e1937e1084560b10b2b4527abe SHA512 78120456764f960f89ae41405286f7b1105be5db5c3cf6cd852bb620120bb56a96798d08a469580947616851d3d23d4f47e5d28830476c8833a8194c6d9e2f8e
+EBUILD cups-filters-1.27.5.ebuild 3611 BLAKE2B b99ea19205844335e42753ae5dd3d443fa327b533293594aa4d2ed43cd20f29691539fd095268f30cf9dfec435ce09941c4761b8263eeadb774117bec10f7ef3 SHA512 f1404c9aa04f7fa5c49ffa1836666f4d3b044f617c4983af273f50d6258fc4a095fe91b93c72cadb1ab2e5e07e5bf57acb8be4544283adb294a58fc871bc353b
 EBUILD cups-filters-9999.ebuild 3537 BLAKE2B b632ca69c758df9a0a3c77a3f410b2212288f945cce61d3782249325eaf04cc5885172cb0f7e02b4f953c608a296889c13f4c16b9be0cd6994bcdad4b6c2b4e1 SHA512 6f506cbfb556e3a0d5e404a6cd802ce63d6bdf90ef7bbbbdd6ce5b6d45f12dd025e4324ee30df36d1d2ce23684550512743cb3ca95f04023ac945ae72aaa5999
 MISC metadata.xml 444 BLAKE2B 43542e8e11bcce56517af18fe24258495e3032a72bec385a513c741bb1b48f9b77d83b2d8ebcd52f83a16b099762e9e85ff4a91e688203cbfc4461b4a68a34fb SHA512 8eafb557741f3d771b445424c4bfeef6e4de60c7aca36c1a1e3541d234d2bcd5e459602bbb7b3b5327403993486d803f8e837ec51dfde64fcdbfa522ad131950
diff --git a/net-print/cups-filters/cups-filters-1.27.5.ebuild b/net-print/cups-filters/cups-filters-1.27.5.ebuild
new file mode 100644
index 000000000000..c56df8567443
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.27.5.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-8.3.0:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( media-fonts/dejavu )
+"
+
+src_prepare() {
+	local need_eautoreconf=
+
+	default
+
+	if ! use test ; then
+		eapply "${FILESDIR}"/${PN}-1.27.5-make-missing-testfont-non-fatal-r1.patch
+		need_eautoreconf=yes
+	elif [[ "${PV}" == "9999" ]] ; then
+		need_eautoreconf=yes
+	fi
+
+	[[ -n ${need_eautoreconf} ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
new file mode 100644
index 000000000000..43aa6bf3b5aa
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -791,7 +791,10 @@ AC_ARG_WITH([test-font-path],
+ 
+ AS_IF([test -f "$with_test_font_path"],
+ 	[AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])],
+-	[AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)]
++	[
++		AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test failures!)
++		AC_DEFINE([TESTFONT])
++	]
+ )
+ 
+ # ================
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 29a2a7cb8e93..0d41439d1370 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -5,6 +5,6 @@ AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c
 AUX cups-2.3.3-user-AR.patch 593 BLAKE2B 4794e162b156075a507707296a045226af5f6342870fb7173017ff530aa052b4467cc64c03cfc80d4e2d3500e584e6c313414ed7237acaeda8a8107c3ed2e65a SHA512 ec570a3a7bd6710f50e8e702755a106158f8a2fd9b7e2efad6e345f12210bbd79e450f60ae0d30ae838f1abf1b4c7fd89d13363d2e4bbacd653177b60f05786c
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
 DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
-EBUILD cups-2.3.3-r1.ebuild 9669 BLAKE2B 3e5176e8489b9c1fb71054f0081daf723ed0472e2bb72afd574dcfa6929bb20a190173e49c29ebf50648dc9b2a273e03c354fee48a87c41e6e887b46f4112a41 SHA512 987e89faa67760aa987f509099926e5cbc1508d6cae5de92b5895415c65423fd6f99a98095fbdf8b32bbfb3a7c701d79f6ca880be87f5c2ab6f5d26087134426
-EBUILD cups-9999.ebuild 9637 BLAKE2B 8790be1a982a75e70c7aee3b09a5c7be45bc6846a17313ad1ec7ff8838fa39f87c1b2ef89334330adb71540e3a68955490d59ba9699c3fb727c1251638714fd8 SHA512 e565b74c705798090368a0601331303df8574a66f7975c1c63a2531e3ac9e2124a45c11003051997c58babfa37f1720f3fcbaf217385d1bd40b2b119ddb3165f
+EBUILD cups-2.3.3-r1.ebuild 9640 BLAKE2B 35fe5f719c8e0f48ce56c3d7e13db1ed09244141767dd25310a07e21f79eff45a3d53a071f19dc86f395edf0e486326522886eaa4e1a76c438bb4af708103010 SHA512 ffc939b113e2c1855490a33b1fbe47a7242e11b4df5cd4b6cd018269fafbb6ade765472c3ff56930fb0e887be9c1de913a754d87267e2ac56cb322e2c2db7634
+EBUILD cups-9999.ebuild 9608 BLAKE2B f00c84c9e7569248eb65cbf5bad8300ada68ba0de9159dacf69f7f8820072282f95de539b1bf3e0e207b1eb0b27a09e5619f0a7fb219c57c6a37aa3f196e75db SHA512 8bc64e5b23666b35c1b2797a8687cb59e62675de53e280d0c614991f094ba9c20a2fcf8c21b05ca4d9b71aa13db5fd6c8ddf00bfa9a6dcfdcbf51bddbd3d26ca
 MISC metadata.xml 527 BLAKE2B 432203e09b4b13065dd0fa3a799e1b707f079b146e4d89583fcde60b1a4d09ac21805573faee9c67fecbcb0fc364c22cda310d2b4ecc92be3f39c985b20fcbd5 SHA512 0f1469c396e9e47504ec44a1e4a8db2c6dbf34e4e8cd36862cee7b58d0402873273cb9b3b24ef9b676566cafa10aed6547f8d4b50233af7257ab1d8d828b483d
diff --git a/net-print/cups/cups-2.3.3-r1.ebuild b/net-print/cups/cups-2.3.3-r1.ebuild
index 5db9ba18dbbf..bea27f4f8bdb 100644
--- a/net-print/cups/cups-2.3.3-r1.ebuild
+++ b/net-print/cups/cups-2.3.3-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
 inherit autotools flag-o-matic linux-info xdg multilib-minimal pam systemd toolchain-funcs
 
 MY_PV="${PV/_rc/rc}"
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index e037ec1076ca..c6db11f59160 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
 inherit autotools flag-o-matic linux-info xdg multilib-minimal pam systemd toolchain-funcs
 
 MY_PV="${PV/_rc/rc}"
diff --git a/net-print/pkpgcounter/Manifest b/net-print/pkpgcounter/Manifest
deleted file mode 100644
index 53fbdaf9b28f..000000000000
--- a/net-print/pkpgcounter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pkpgcounter-3.50.tar.gz 195579 BLAKE2B b0ea8ab88da9fafdc50beb993077fc299f3fe0972d25d551ee6fc04b17b8ab3e235c25a51498319d4cf8f0c27c663f6a127d8b969878ff31988fcbbe678c0f3c SHA512 d0c597cacc6b315faf002677ff456bd3dcb4fe8337b407e027b0edb6b27fd0e23da69fed6d148d7f5e28c2b91f7207d63779307e5e284cc714954dcb7ebe6346
-EBUILD pkpgcounter-3.50-r2.ebuild 582 BLAKE2B e1812d4b9f866897697449e227d39081cb389326bb5d5d71d182ea1700c7ced1d224f455932f6d7401c2c65ebc9c1690c478c627a8b5732f682e3ff8f45c48af SHA512 d7c0508ba39e902e84deb968057c2a118e2422e8def8dc52af0924d9a10efdfb7aded85e1b7d20cd3e63a9f9ab16c25af5f2dcd595e8af14f19f9cf80a0c02b2
-MISC metadata.xml 444 BLAKE2B 632d0d8e9ae46ecd136221dd2aabf1e2379fe89d56c8e3a37136ebf19fb971a583b704d70221d46539165cf065790debc39f949999300a33b5c378434f7616f3 SHA512 457d762c93c74c23308f9b30229b80d911fad33daf0d9c31162197a99136d2ea342ad3cee6cf7fb4e18775a549d51395c74a196ad43cfff60e9c58313ef18f1e
diff --git a/net-print/pkpgcounter/metadata.xml b/net-print/pkpgcounter/metadata.xml
deleted file mode 100644
index 99680c0f44fc..000000000000
--- a/net-print/pkpgcounter/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-	<longdescription lang="en">
-		pkpgcounter is a python generic PDL (Page Description Language) parser
-		which main feature is to count the number of pages in printable files.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-print/pkpgcounter/pkpgcounter-3.50-r2.ebuild b/net-print/pkpgcounter/pkpgcounter-3.50-r2.ebuild
deleted file mode 100644
index 8f349b12d39f..000000000000
--- a/net-print/pkpgcounter/pkpgcounter-3.50-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic PDL (Page Description Language) parser in Python"
-HOMEPAGE="http://www.pykota.com/software/pkpgcounter"
-SRC_URI="http://www.pykota.com/software/${PN}/download/tarballs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-
-	rm -r "${ED%/}/usr/share/doc/${PN}" || die
-}