gentoo resync : 15.12.2019

28 files changed, 876 insertions, 110 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 5dcec3fac1d0..21c80fa00f4a 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/brlaser/Manifest b/net-print/brlaser/Manifest
index d36af8c8bb1e..251485899312 100644
--- a/net-print/brlaser/Manifest
+++ b/net-print/brlaser/Manifest
@@ -1,3 +1,3 @@
 DIST brlaser-4.tar.gz 21963 BLAKE2B 03d5e16ff9b6a6838c82b197bec4a868e6be5752ad9a1df393b646b35642da8f2e1528031b10ece3b0cd7c6c426ff76d1df83c73a51bcac7abac803cd0a66535 SHA512 1e08091adc371a35f75c245fd86f132aae7811a00bd7e9d194c47038dc9aa29296fbf8769cef6b8ea42d82467857195ba8024a9d6de8048174ecc44e0bb76067
-EBUILD brlaser-4.ebuild 430 BLAKE2B ca42545943bbfce93615be1da5b47e49f839e198ec72b55bcf49db147cb490ad6f6ec23fadc37a37208ad139c2d30a0d726d3729b4c55eb50794cb20ebacb006 SHA512 86ec44062640f2ec78f6a3d49f7d6a1bb45a95052030197ab22cefa00ad5a380e94ad09e154cc238d0f8dc57e0588f58940174fd0abcee8dc6b3825ca6a72c27
+EBUILD brlaser-4.ebuild 425 BLAKE2B 7f00a81d641549355c179df3a23aceda8123fbb03ba2c435998e348024eaee2bd7fd0d357f96c5c978ffa64f70bda794a6ddf12961c4c4777200643573c9c25d SHA512 7daf3afc30fb45d95d68706d6ffe5b13dea0041f4604ebc2b44ad7341e31be2800e1d9a7f8193237b0d215896493176ff56673187de7c6a0f9f9f672665d6cc4
 MISC metadata.xml 493 BLAKE2B 12ad209b87255457d7f70dcd68fe65d38252473d905c92cfa529996d2e117070011b0b91e1230806a5790611b3935cfdbf2bf484da65dcd50045a43fb1be8191 SHA512 4cdf7aa5a98fefdd13150b4d03534f9586429ae00b294bace8bbb25c59e11205b3d74a7f281707e7c60aa1a04c5b3a671865bf6d078ebc7f237b33bd23569418
diff --git a/net-print/brlaser/brlaser-4.ebuild b/net-print/brlaser/brlaser-4.ebuild
index 8682e2455c83..e307a20fbeca 100644
--- a/net-print/brlaser/brlaser-4.ebuild
+++ b/net-print/brlaser/brlaser-4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pdewacht/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="net-print/cups"
 RDEPEND="
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 4d186ab1d147..45a81538f5f6 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,5 +1,5 @@
 DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97 SHA512 d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc
-EBUILD cndrvcups-common-lb-3.60-r1.ebuild 2928 BLAKE2B a1527ab6b8688adceda6d7db2f3d02de39e6c1ef0783f67c9444fa005b394ead97944460f655688a8dc6d7565f57eae339027187813280c7a91a44428be06472 SHA512 deccd0ca33f9f5868deaa6c9dcc19c780af8e406ede0cf8a0c28d81f9a69eaaf1242db1964a1f2be77959aa85a8d6e00010442ccd944c7a9d06434cf3b1c917d
-EBUILD cndrvcups-common-lb-3.70.ebuild 3058 BLAKE2B 03d02d8d8f73f569dd11478a5cabb1629dc0b9ee8b34d80c1c335e3cce38602f79c24a6bff09da665fb603a5f66b178ace98ce87cdcbb8d0ff7ba211d9667b10 SHA512 b47cfdaf5cbf4e1371379b3e09520e2eabb8092d5f3a05aa7267282a99aaa96691ead262abfab431e5f64710956f67351b3f481b69f40102b8148faaf7a76021
+EBUILD cndrvcups-common-lb-3.60-r1.ebuild 2922 BLAKE2B f002fb0784954843a02d04f216bcaa2901c728d337831e96c9dd6a4ba1b1060dca91407704d943bdd510313cb00d31afab83ce295850912e5241581721ca2719 SHA512 8765fba45ca858827f7b0cb7ca655a31376ef22a7694d1ffb0416b7807e80b2383523d850dcd825e6b6b1aac48de14a6957b5422f3089ad190a1ff573feac35f
+EBUILD cndrvcups-common-lb-3.70.ebuild 3052 BLAKE2B 489d4875edfed37ba6c5102c6575f0824c1ed797683fbac6ac3928b87297420f7c6fd4d8830c9946562a884c4dd72cee5451aeba0b2d2d727c08d716a258dd46 SHA512 6f22bb4da8a3e098085e884316150bb62ffa61f72d79a546ecc2be59dc177e2728857c74c485ed0dd0be87f7933715c83b63b30ea563bdfc081ee4a7d439308b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
index 9e25fae92195..cbdab7f9b8cb 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
@@ -77,7 +77,8 @@ src_compile() {
 	change_dir emake
 
 	# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-	( cd "${S}/c3plmod_ipc" && emake ) || die
+	cd "${S}/c3plmod_ipc" || die
+	emake
 }
 
 src_install() {
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index 92dd9f05754d..23e5c3724b52 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -80,7 +80,8 @@ src_compile() {
 	change_dir emake
 
 	# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-	( cd "${S}/c3plmod_ipc" && emake ) || die
+	cd "${S}/c3plmod_ipc" || die
+	emake
 }
 
 src_install() {
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 54e2384351aa..36d2819d76db 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,10 +1,9 @@
 AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
-AUX cups-filters-1.25.12-browsed_segfault.patch 2633 BLAKE2B cd87b9b700290fc31d75d759cc80be8c39831fd92c3b43a3d61a6dfce7709f6e9aa78a4f85c501fd978d4fb2a78d22a222106b23fb07debf01b8b60ec6a2fe13 SHA512 d5455c5368b63aa50fc1a77a4e9df566e736764ce8b99e8c1c19a4886c3e58990a6e4c341cf950f1186a8c06195b4cdaf5f973ea94bde4336fdb493aeed695b0
-DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a
 DIST cups-filters-1.25.11.tar.xz 1482792 BLAKE2B 67801904dbe025933d1209817e23ff74b661b35c3af560081f12d4f9a26102e009bac9d4741e15dc257dd477967b18ae23911647f8f56b361e9f8d51b0d619f2 SHA512 67e7c624952b5e2db33a698ac1287a3448a4787fa28000cefc5a982c2fa18a4f56e11e3ba65da8a6e565a53a193c6eb31ba1867ad36ca8dc7e61250f11232681
-DIST cups-filters-1.25.12.tar.xz 1484148 BLAKE2B 55f05d9c5bf8ae7eb3416de8b1bc2fe919a43875753ee0c02a1fae319d72e7d71a2e46ae8888e840972ba79bb39d515a54b276729648c872ac6c59bfbca02fa0 SHA512 587b8d550923fb5be9f71172e613af7b2bd0e70f780143574482c5efcc2cf869f7d715f63323e63a8f00acd3f08f7e0803cc5a723cdd903229389e7ce11b0c16
-EBUILD cups-filters-1.21.6.ebuild 3504 BLAKE2B 189ce8e693bcf5622ba85657e43806f3796070c51d1c2d1ef011a64026b1569af586ba4c2b588cdbbf46afc708af9068f82474bda30c47133458ae5b521e7510 SHA512 f3c50647657eb47924473d8a18e3af4dc01985156212cc93989ddbc6fe209eb76ac0d19e3271fc4433716174e5ffc46c89f5d73abb1e75801bf1b10fe49c9f85
+DIST cups-filters-1.25.13.tar.xz 1485860 BLAKE2B 03fbbbefdd36e8f619fabf17e6e13d051f48f68f87260747a181f6976ff88728d7d01b646227cd5f054e0321f6fe0e64e4c6b1bdba631d9d703304ad98a625eb SHA512 4b5ef647870235436276db68f3ef1879b578807338a025100a1d43115a7330a8f506be631df9c43edb2f1ec15f9a42f15f7cdc725bb5d39612b37bae04631611
+DIST cups-filters-1.26.0.tar.xz 1489308 BLAKE2B 4a0c67f9dba60c409cd62c3f47e167b79be01fd53c51d08c368e62919020d9f1ebe72ebd570e773537053ae4cc42846f426c166675faa0a18392afdb1d66c284 SHA512 a6e0a1b8dfec2e46cb2475639b33f60da3a74090718334883564711530e13c7524952b9f145303c1063e1ae21eb585dce1fd9c87e4ce7884ec687fdef58f2124
 EBUILD cups-filters-1.25.11.ebuild 3447 BLAKE2B f270561ecee97afe4ad639fefad16e69d4ac16fd2054d1f96d87f7762402bbce2ed3255f403dbd97c6b770c4f51b0cdf34eb801c3a75cc41f519da3340c07be0 SHA512 08e18378d689e5c2ccaf531e033419a61654f780a4041c40845229f6ada602e8c8ecc4d322b5e4fb2389a73c51521e05c6ec06b13f9bb85d8d44a37d178b40b7
-EBUILD cups-filters-1.25.12-r1.ebuild 3522 BLAKE2B 962b74c64a6921633f8ece1606c70be6d8308dd90af8d031d79fcf30b05d4f4855ee3fac90b7cdbf661cda4e882c5b5975713884be82adcd52692a8f86424c27 SHA512 6476a362f73deb4a95150d247617e7fb88a4a5aa19e3194a7b36a3316a43153f32dbc042ec6815b4e4a6070b8f95eb01a0d3d5938d18adeb5ea4f05287bbfe67
+EBUILD cups-filters-1.25.13.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176
+EBUILD cups-filters-1.26.0.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176
 EBUILD cups-filters-9999.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild b/net-print/cups-filters/cups-filters-1.25.13.ebuild
index 1179f01061e1..cc938610ec4f 100644
--- a/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.13.ebuild
@@ -53,10 +53,6 @@ BDEPEND="
 	test? ( media-fonts/dejavu )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-browsed_segfault.patch" #700024
-)
-
 src_prepare() {
 	default
 	[[ "${PV}" == "9999" ]] && eautoreconf
diff --git a/net-print/cups-filters/cups-filters-1.21.6.ebuild b/net-print/cups-filters/cups-filters-1.26.0.ebuild
index ba9153b902a4..cc938610ec4f 100644
--- a/net-print/cups-filters/cups-filters-1.21.6.ebuild
+++ b/net-print/cups-filters/cups-filters-1.26.0.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
 
 inherit perl-module systemd flag-o-matic
 
 if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr autotools
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+	inherit autotools 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"
+	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"
@@ -25,7 +25,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.1.0:=
+	>=app-text/qpdf-8.3.0:=
 	dev-libs/glib:2
 	media-libs/fontconfig
 	media-libs/freetype:2
@@ -38,7 +38,6 @@ RDEPEND="
 	foomatic? ( !net-print/foomatic-filters )
 	jpeg? ( virtual/jpeg:0 )
 	ldap? ( net-nds/openldap )
-	pclm? ( >=app-text/qpdf-8.1.0:= )
 	pdf? ( app-text/mupdf )
 	perl? ( dev-lang/perl:= )
 	png? ( media-libs/libpng:0= )
@@ -46,8 +45,11 @@ RDEPEND="
 	tiff? ( media-libs/tiff:0 )
 	zeroconf? ( net-dns/avahi[dbus] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
 	test? ( media-fonts/dejavu )
 "
 
@@ -61,7 +63,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--enable-imagefilters
 		--localstatedir="${EPREFIX}"/var
 		--with-browseremoteprotocols=DNSSD,CUPS
@@ -77,7 +78,6 @@ src_configure() {
 		$(use_enable pclm)
 		$(use_enable pdf mutool)
 		$(use_enable postscript ghostscript)
-		$(use_enable postscript ijs)
 		$(use_enable static-libs static)
 		$(use_enable zeroconf avahi)
 		$(use_with jpeg)
diff --git a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch b/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch
deleted file mode 100644
index 8ab644155c32..000000000000
--- a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9bf6937633b35cc92bbf30e9eec91ef3c4bb6aad Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Wed, 13 Nov 2019 18:49:01 +0100
-Subject: [PATCH] cups-browsed: Added missing memory allocations leading to a
- segfault.
-
----
- NEWS                 |  5 +++++
- utils/cups-browsed.c | 21 ++++++++++++---------
- 2 files changed, 17 insertions(+), 9 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 67d1c18f..2de5dab4 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,6 +1,11 @@
- NEWS - OpenPrinting CUPS Filters v1.25.12 - 2019-11-12
- ------------------------------------------------------
- 
-+CHANGES IN V1.25.13
-+
-+	- cups-browsed: Added some missing memory allocations leading
-+	  to a segfault (Issue #175).
-+
- CHANGES IN V1.25.12
- 
- 	- libcupsfilters: Use the text names "Draft", "Normal", and
-diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
-index adbf5002..f0e05746 100644
---- a/utils/cups-browsed.c
-+++ b/utils/cups-browsed.c
-@@ -2837,6 +2837,15 @@ void get_cluster_default_attributes(ipp_t** merged_attributes,
-       debug_printf("Default MediaType: %s\n", media_type);
-     }
-       
-+    if (temp->media_type == NULL) {
-+      if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
-+					   "media-type-supported")) {
-+        temp->media_type = (char*)malloc(sizeof(char)*32);
-+        strcpy(temp->media_type, AUTO_OPTION);
-+        debug_printf("Default MediaType: " AUTO_OPTION "\n");
-+      }
-+    }
-+
-     if ((media_attr = ippFindAttribute(media_col, "media-source",
- 				       IPP_TAG_KEYWORD)) != NULL) {
-       pwg_ppdize_name(ippGetString(media_attr, 0, NULL), media_source,
-@@ -2852,18 +2861,12 @@ void get_cluster_default_attributes(ipp_t** merged_attributes,
-     if (temp->media_source == NULL) {
-       if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
- 					   "media-source-supported")) {
--        strcpy(temp->media_source,AUTO_OPTION);
--        debug_printf("Default MediaSource: %s\n", media_source);
-+        temp->media_source = (char*)malloc(sizeof(char)*32);
-+        strcpy(temp->media_source, AUTO_OPTION);
-+        debug_printf("Default MediaSource: " AUTO_OPTION "\n");
-       }
-     }
- 
--    if (temp->media_type == NULL) {
--      if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
--					   "media-type-supported")) {
--        strcpy(temp->media_type, AUTO_OPTION);
--        debug_printf("Default MediaType: %s\n", media_type);
--      }
--    }
-     media_col_default = ippAddCollection(*merged_attributes, IPP_TAG_PRINTER,
- 					 "media-col-default", NULL);
-     current_media = create_media_col(temp->x, temp->y, temp->left_margin,
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index fba05f373dd5..622be03b9174 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -5,8 +5,12 @@ AUX cups-2.2.0-dont-compress-manpages.patch 319 BLAKE2B b03a0ab815751055d7947542
 AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c5fd13b10727fa4e40793b7072c88c3856c580e408180819acc1668da06024b30173fd71f725175981305c739aaa40b7ba65 SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
 DIST cups-2.2.12-source.tar.gz 10409313 BLAKE2B 126ea81f7108b3b62f5e062ed522898dd48d4e5b4077c834e8fe89012445dd0a903bafa62f593551ed5f1c92cce4fbd22f56834e0615ed65ca4a6ae84dc2ca1c SHA512 b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6
+DIST cups-2.2.13-source.tar.gz 10410121 BLAKE2B 662ad7fe95a9cb82748a6035cf61bad8a823656522259fc8eafe4426cc57541beb29da9116174f9d6750ec207eacb83ab4e314021506d6a342577f03ff25b0cd SHA512 dc323bdcec86f11ec98e4881c540aa8be24f82d289c8a4f866e42bfd6f107b686346f1418b6347b3794dabac3c23d6e604e212aa8e169879c58b746fb1bc490d
 DIST cups-2.3.0-source.tar.gz 8129049 BLAKE2B 738dbc7ee5ddcc9ffee44083cd93d8a0e75f4d3bf0b704dd643dc59db2cc2381dd65f676c0979bc65fee03438d160d9d650ceb93f8c702102eb1449d306a81a3 SHA512 c51f173b5fbae1554a3f4a3786fb3b5566e50d9f775473788ee3553922ac7e02e4785492c87c93fd46f159f50d97cc10ff6feafb3397cd9c1840840f3a9cdfae
-EBUILD cups-2.2.12.ebuild 9754 BLAKE2B 9cd4860d8f13efd8351091ca188177e6e8ea475b62a6e2cdb87c6d990671e2fed04707e6f547fa1899da428505c705d952d8de7afb5a831b41cd624c3b668e5e SHA512 8b8677a3c83b7c0004e2131e81afc27d7bd43d8ada6283d7418a934afb9e67a22920f9ddaf700e8bfcd060c2bd79d8b5b48b61a1a286577ce93490eb89d5ef47
-EBUILD cups-2.3.0.ebuild 9612 BLAKE2B 12fbb4ca4f31a2910d07cb5f8a4c1386943007a8f27fd097f7a3b8d21d9634a87aff82121f7c55b3f6595aba8a9255cc7a0436be21278e5e7872b12e8c14cd71 SHA512 a718024c0a1c2eb0ccad9083d23838814048d0aafb8e0978762801389da765b213d079fb4b555933a9b86f8016b81229408958ee95b83128144333e199611e7a
-EBUILD cups-9999.ebuild 9612 BLAKE2B 12fbb4ca4f31a2910d07cb5f8a4c1386943007a8f27fd097f7a3b8d21d9634a87aff82121f7c55b3f6595aba8a9255cc7a0436be21278e5e7872b12e8c14cd71 SHA512 a718024c0a1c2eb0ccad9083d23838814048d0aafb8e0978762801389da765b213d079fb4b555933a9b86f8016b81229408958ee95b83128144333e199611e7a
+DIST cups-2.3.1-source.tar.gz 8135891 BLAKE2B fab46dfeb8a1846c4d8c8a1c166b465e72928ecc5b52dedd9d6a6328619f6eda822a85da9545c405b7bc7375acd2f2677497b94ab00735979487417537438831 SHA512 e3f3ad9e78c1c723d46cc2276957ac67495483882f639421203d9dad227eacbb1259717a92489e710995fdc89e2d575202e4b43117aff08ff1230dcf06674376
+EBUILD cups-2.2.12.ebuild 9731 BLAKE2B e6638d4a3cd7ac4ef5358d8c4285ecc99e5a094e5d27183c4c860713a2195794ceb5bdc7c9b6af99c14e677977b450cf47907e5288223e2f4a5638f08b842bc8 SHA512 a4b7a20f063467093f387b32dbc557f6d873416021ab2780687fd0b726c7952d0c7e098b6c292040388b78bc05b4004486ca4c8f6f8af5dfc23ca81f39e70b29
+EBUILD cups-2.2.13.ebuild 9742 BLAKE2B bf58df1963cd055d49f94cfbd0d545d3558d74539249aee052ddfde1998c9ee66637a72bffd125f0c54b6a966ee0c4f2d9d098c8b232fb75e9e05e2900d342ac SHA512 5b98c7ef7d508610e6e0963cee8369f29cdd7ad49e151ae88b8fcbac1fc690d4a0647013013ecc837fa69f1cf7be56e3da699315219badb53a4c9b2450d45964
+EBUILD cups-2.3.0.ebuild 9589 BLAKE2B e43f169ce612f1c5e0d4641522cd16d1d289c28190314aa594505ea1bb0d5909d820bf47a1d41fb7ed1ea51f5c5d00a965b051a70703c7dc970a6f1953a42212 SHA512 5db7879351520d8c478687b3ad74b8f6574d0c20a2b6319a098c501c6c82de4623e13898a014122e25740f362542f4d935ec210cd4eb984d8bfa82a23f66c09e
+EBUILD cups-2.3.1.ebuild 9589 BLAKE2B e43f169ce612f1c5e0d4641522cd16d1d289c28190314aa594505ea1bb0d5909d820bf47a1d41fb7ed1ea51f5c5d00a965b051a70703c7dc970a6f1953a42212 SHA512 5db7879351520d8c478687b3ad74b8f6574d0c20a2b6319a098c501c6c82de4623e13898a014122e25740f362542f4d935ec210cd4eb984d8bfa82a23f66c09e
+EBUILD cups-9999.ebuild 9589 BLAKE2B e43f169ce612f1c5e0d4641522cd16d1d289c28190314aa594505ea1bb0d5909d820bf47a1d41fb7ed1ea51f5c5d00a965b051a70703c7dc970a6f1953a42212 SHA512 5db7879351520d8c478687b3ad74b8f6574d0c20a2b6319a098c501c6c82de4623e13898a014122e25740f362542f4d935ec210cd4eb984d8bfa82a23f66c09e
 MISC metadata.xml 733 BLAKE2B 2014cd9267e3f7f1a4f73124ab6bb9f4ba80b95ef08c9a781a03a95bbb3f97dadeb9e1a239d8dea5a6f6678d99eb906a2835df0168c13ba5456baff8ab3c6e0f SHA512 e4e2342cb4b0598fc23486753d9296254da78eb7d448fbdc250a2ba181e5692002e1e671799971c9cfaf25d40e034e3e2752836067b1b24813cfb3ed1b682e22
diff --git a/net-print/cups/cups-2.2.12.ebuild b/net-print/cups/cups-2.2.12.ebuild
index 70574c1dd3d0..972e518ff81a 100644
--- a/net-print/cups/cups-2.2.12.ebuild
+++ b/net-print/cups/cups-2.2.12.ebuild
@@ -265,7 +265,7 @@ multilib_src_install_all() {
 		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
 			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
 		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+		fperms u+w /etc/xinetd.d/cups-lpd
 	else
 		# always configure with --with-xinetd= and clean up later,
 		# bug #525604
diff --git a/net-print/cups/cups-2.2.13.ebuild b/net-print/cups/cups-2.2.13.ebuild
new file mode 100644
index 000000000000..b6b538b9e4f7
--- /dev/null
+++ b/net-print/cups/cups-2.2.13.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic linux-info xdg multilib-minimal pam python-single-r1 user java-pkg-opt-2 systemd toolchain-funcs
+
+MY_P="${P/_rc/rc}"
+MY_P="${MY_P/_beta/b}"
+MY_PV="${PV/_rc/rc}"
+MY_PV="${MY_PV/_beta/b}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+else
+	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~m68k-mint"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+CDEPEND="
+	app-text/libpaper
+	sys-libs/zlib
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.6:* )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${CDEPEND}"
+BDEPEND="
+	acct-group/lp
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	acct-group/lp
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+pkg_setup() {
+	#enewgroup lp -> acct-group/lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	use python && python-single-r1_pkg_setup
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					elog "Your USB printers will be managed via libusb. In case you run into problems, "
+					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
+					elog "usblp kernel module."
+					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove ".SILENT" rule for verbose output (bug 524338).
+	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	local myeconfargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		--with-exe-file-perm=755
+		--with-rundir="${EPREFIX}"/run/cups
+		--with-cups-user=lp
+		--with-cups-group=lp
+		--with-docdir="${EPREFIX}"/usr/share/cups/html
+		--with-languages="${LINGUAS}"
+		--with-system-groups=lpadmin
+		--with-xinetd="${EPREFIX}"/etc/xinetd.d
+		$(multilib_native_use_enable acl)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable debug debug-guards)
+		$(use_enable debug debug-printfs)
+		$(multilib_native_use_with java)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable pam)
+		$(multilib_native_use_with python python "${PYTHON}")
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd)
+		$(multilib_native_use_enable usb libusb)
+		$(use_enable zeroconf avahi)
+		--disable-dnssd
+		--without-perl
+		--without-php
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
+	)
+
+	if tc-is-static-only; then
+		myeconfargs+=(
+			--disable-shared
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+
+	# additional path corrections needed for prefix, see bug 597728
+	sed \
+		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
+		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
+		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
+		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
+		-i Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,CREDITS,README}.md
+
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices=(
+		$(usex zeroconf avahi-daemon '')
+		$(usex dbus dbus '')
+	)
+	[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
+	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/${neededservices}/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd
+	else
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/log/cups /var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	if ! use X ; then
+		rm -r "${ED}"/usr/share/applications || die
+	fi
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following file is now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	xdg_pkg_postinst
+
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! ver_test ${v} -ge 2.2.2-r2 ; then
+			echo
+			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
+			ewarn "cupsd will fail the next time. To fix this, please run once as root"
+			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
+			echo
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		echo
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		echo
+		break
+	done
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	xdg_pkg_postrm
+}
diff --git a/net-print/cups/cups-2.3.0.ebuild b/net-print/cups/cups-2.3.0.ebuild
index 5d1def034fe6..46eed6927902 100644
--- a/net-print/cups/cups-2.3.0.ebuild
+++ b/net-print/cups/cups-2.3.0.ebuild
@@ -262,7 +262,7 @@ multilib_src_install_all() {
 		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
 			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
 		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+		fperms u+w /etc/xinetd.d/cups-lpd
 	else
 		# always configure with --with-xinetd= and clean up later,
 		# bug #525604
diff --git a/net-print/cups/cups-2.3.1.ebuild b/net-print/cups/cups-2.3.1.ebuild
new file mode 100644
index 000000000000..46eed6927902
--- /dev/null
+++ b/net-print/cups/cups-2.3.1.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic linux-info xdg multilib-minimal pam user systemd toolchain-funcs
+
+MY_PV="${PV/_rc/rc}"
+MY_PV="${MY_PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+else
+	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
+	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~m68k-mint"
+	fi
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+CDEPEND="
+	app-text/libpaper
+	sys-libs/zlib
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( sys-libs/pam )
+	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${CDEPEND}"
+BDEPEND="
+	acct-group/lp
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	acct-group/lp
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+REQUIRED_USE="
+	usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	#enewgroup lp -> acct-group/lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					elog "Your USB printers will be managed via libusb. In case you run into problems, "
+					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
+					elog "usblp kernel module."
+					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove ".SILENT" rule for verbose output (bug 524338).
+	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	# Do not add -Werror even for live ebuilds
+	sed '/WARNING_OPTIONS/s@-Werror@@' \
+		-i config-scripts/cups-compiler.m4 || die
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	local myeconfargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		--with-exe-file-perm=755
+		--with-rundir="${EPREFIX}"/run/cups
+		--with-cups-user=lp
+		--with-cups-group=lp
+		--with-docdir="${EPREFIX}"/usr/share/cups/html
+		--with-languages="${LINGUAS}"
+		--with-system-groups=lpadmin
+		--with-xinetd="${EPREFIX}"/etc/xinetd.d
+		$(multilib_native_use_enable acl)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable debug debug-guards)
+		$(use_enable debug debug-printfs)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable pam)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd)
+		$(multilib_native_use_enable usb libusb)
+		$(use_enable zeroconf avahi)
+		--disable-dnssd
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
+	)
+
+	if tc-is-static-only; then
+		myeconfargs+=(
+			--disable-shared
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+
+	# additional path corrections needed for prefix, see bug 597728
+	sed \
+		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
+		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
+		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
+		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
+		-i Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,CREDITS,README}.md
+
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices=(
+		$(usex zeroconf avahi-daemon '')
+		$(usex dbus dbus '')
+	)
+	[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
+	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/${neededservices}/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd
+	else
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/log/cups /var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	if ! use X ; then
+		rm -r "${ED}"/usr/share/applications || die
+	fi
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following file is now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	xdg_pkg_postinst
+
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! ver_test ${v} -ge 2.2.2-r2 ; then
+			echo
+			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
+			ewarn "cupsd will fail the next time. To fix this, please run once as root"
+			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
+			echo
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		echo
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		echo
+		break
+	done
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	xdg_pkg_postrm
+}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 5d1def034fe6..46eed6927902 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -262,7 +262,7 @@ multilib_src_install_all() {
 		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
 			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
 		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+		fperms u+w /etc/xinetd.d/cups-lpd
 	else
 		# always configure with --with-xinetd= and clean up later,
 		# bug #525604
diff --git a/net-print/dymo-cups-drivers/Manifest b/net-print/dymo-cups-drivers/Manifest
index 4674703f88ce..5dcae1d9c18b 100644
--- a/net-print/dymo-cups-drivers/Manifest
+++ b/net-print/dymo-cups-drivers/Manifest
@@ -2,6 +2,6 @@ AUX dymo-cups-drivers-1.2.0-cxxflags.patch 601 BLAKE2B f34dddaf64e3336744bf5493b
 AUX dymo-cups-drivers-1.4.0.5-flexible-tests.patch 426 BLAKE2B 4a4cab04846ad26e97f9af9d8b3c1c9abae9cf8257e25af8f9f77c7ad74f96f2ee2a8702f2a2756a04a328e0a73afa8a48da452a2c7cb07fcfce83a98180036a SHA512 3188ed2e07156cbbda377476532b62b39c14a1b94004d50bba6624b63ffb75b97edf4c4b0714e015a192fda45ffd3762b67edce14c5e244e81279c78fd1233f2
 AUX port_to_newer_cups_headers.patch 2222 BLAKE2B e5e27e9e8cdc16a1e9a6b85b4759c0b71bf977528775513cb75514900d6c53d27f5bb148a3b6fdb6857b065f45bbbbb7a3532a983e58d3dc7e1163fee0de916e SHA512 55398c498e41a5ce106756f51bbd6dbfc4d7602eeb001e4d1bd104b91c8607ae36a1719eba2a2c9e1124493d5b743370b379b05b093b88cbf9346b8931bf976a
 DIST dymo-cups-drivers-1.4.0.tar.gz 420068 BLAKE2B 586b1d044ea0bb499790b8955a1b7341eaeae92f5c56f0f1d5edb1ebaaa545bdf27371cbe783ac906ddf23946ab757bbaeb0567dabafdc5fd23df2548056383a SHA512 e8c375fa0bc87fa96b18db6213e308a1f32050004c0c8c7d516b548f9d369162431f5f56ebcbb1231be60f5d7a946dcca184c6ff4302952bf3744ba42521cd5c
-EBUILD dymo-cups-drivers-1.4.0-r1.ebuild 1630 BLAKE2B 80ae8b35c8833fd98bfbdc311ee94d9bc3d83b43dfba681cdce3622d85bb535715f012b6ec9d11f440c78c8cf186840adb57b3ef9cdbb9d3243dd39158b90a39 SHA512 9ef1e0fea2cea5dc38551a19336c5dd86c17cb1384140bd357ff47e2cf082ea36faa3423e78b326c2aa8701ec2215a7e7df5333cb13b15785f6fd9e26eb968f1
+EBUILD dymo-cups-drivers-1.4.0-r1.ebuild 1596 BLAKE2B ecd383750f2d5a204d8d0f688de57e54a90db1bba3110900b81647664d62390a01faae3fb540f05c808b7f5870107ca11ed694c4b4b20bc1ec64e5efbdc286ff SHA512 ee12781df59ddb4d2c08f2360096d92c8102b6cf2d385cd214287de4a323119d1321614a5045f5e8bfa70c2cb33c2923343b8c26ccfaeb53882b50e29977c615
 EBUILD dymo-cups-drivers-1.4.0.ebuild 834 BLAKE2B f7550d5f148a959ccb526783bd4696a3949732c4fe7765f6d76b1032daf8f5efc3347b54fff93b5f95851d257ecd9ea728b5e4a9ff9ad0a09567780f0c2b41fa SHA512 3421eeba6021798c3da43037e672f523b1382d91c28e5347adfea62c999ae80b47174f2ea2e3e9d770bc2f4f6c384dcdb91b71395d373fff5734198addd9acbd
 MISC metadata.xml 412 BLAKE2B a5c13d60ae5fdaffa75cb13ec0c1a0e1098a833443326b4b3cf8ef0587377c77ccbb950a98e67ae9c1a8457b80ceedf262f466ce87f95c47577ffade2e61c3bb SHA512 9c907b28318e22a9c72e4fdb00bc9d13d6e30bffcbc3116a441bb2388d9dcbb9ce82df68cd3c413c98d27e8408836fd7e4dfb678be99c133042e94a740f6195e
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild
index b6390ae9d51f..f5dba4224b3f 100644
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild
+++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild
@@ -13,6 +13,7 @@ S="${WORKDIR}/${P}.5"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test usb_modeswitch"
+RESTRICT="!test? ( test )"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -46,10 +47,10 @@ src_test() {
 	# upstream tests are designed to be run AFTER make install, because they depend on final paths.
 	testroot="${T}/testroot"
 	mkdir -p "${testroot}"
-	emake install DESTDIR="${testroot}" || die "Failed to install for testing"
+	emake install DESTDIR="${testroot}"
 	# -W filters is because CUPS tries really hard for secure filters: they must be root/root for the filter tests to pass
 	#chown root:root "${testroot}"/usr/libexec/cups/filter/{raster2dymolm,raster2dymolw} || die "failed to set ownership for tests"
 	# This will trigger the following warning repeatedly
 	#Bad permissions on cupsFilter file "..${testroot}/usr/libexec/cups/filter/raster2dymolm"
-	emake check CUPSTESTPPD_OPTS="-R ${testroot} -W filters" || die "failed tests"
+	emake check CUPSTESTPPD_OPTS="-R ${testroot} -W filters"
 }
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index 67cfcac4c6dc..8f9d453773c2 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,4 +1,4 @@
 AUX foo2zjs-udev.patch 379 BLAKE2B 697ce0d25fa46941e6cd80f3d800d0b90af153d56f4385957b970ddaf1c2f15fb40cbed5b7d06288fc6764268a5f1ff1620fcf7be6207afe047202e4bd9727e8 SHA512 91810416934e0d92ca7717262bfed26fbf275b6193bc236566f2b7b6f34a1a38ab98f0b1a3e074b16f8e3822d67e3d4bf8b8e4562f3e6155090ae1dc82abb8f9
 AUX foo2zjs-usbbackend.patch 479 BLAKE2B 0b5e8af8e302d0b239da31aa9a238bff7cb4ebd70f87fb2f9dfebc4638d3f27ed70220905522359868efc038dd874ff8a404e962fe44fe6d3624d158aef496b5 SHA512 a37b3bc193a619992a2a0c24f947d96185919cab6f2cb61c0dcc76d942274ea2eb7c325bc960e05cf9ee8969ef17361ab45053a6932d601fe0f68ee19808395c
-EBUILD foo2zjs-99999999.ebuild 1787 BLAKE2B 59a3e3fab614fb7a67a9ef441c1a7ed9cb173c1f6ca4be4318209c6db2ab19cc2e6facfb662369a430c53accb0df6dc460fd121a945821c83b608505b3c4795c SHA512 fdc440397edd582b972b5d7c0ee86ae02dc4fc5dd3d77d9fdb74d3eb46631c207cf3be24d56f2851e92480062619d8be44afaad756b4e0d7827ea73c8375d831
+EBUILD foo2zjs-99999999.ebuild 1800 BLAKE2B 514242d60fac59d450512261d457cfd5b495ee6f7d3e4147ba19cf5ae21aef1624c190a97a672aa296052186a5acb6e61f022ce715e7e41b70819483f418fc7c SHA512 9eef4bb2332cc272cbdc74380810f9f779b1ac38835c9c7d59274680a0c94a3863ce339bfc79f08316fbde96af7e050fcc815add57dbb7636cdedcea5a4027e3
 MISC metadata.xml 265 BLAKE2B 90437751c83b28b75582d0e1588732b99bfc1da98cfeedf982178e01192da161352633d821465f38c4f31a6a75c562b54c5d1a6dff0173ff6c064d524073d56c SHA512 6546f5402491a7065802409af29815ec26d09fc6fe196be110860059a5af6511b01abfc8bb4c8dbe4954c90d2fb2c85fe9ffb221c0dadc90b302fb58369d2ba4
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index d1309102958b..53f4e1dcf6aa 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="test"
 
-RESTRICT="bindist"
+RESTRICT="bindist !test? ( test )"
 
 RDEPEND="net-print/cups
 	net-print/foomatic-db-engine
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 76f373bbe3db..c78fd9f7f501 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -3,6 +3,8 @@ AUX gutenprint-5.2.4-CFLAGS.patch 781 BLAKE2B a1b29ce970b66eb56d9429ba9116380cd8
 AUX gutenprint-5.3.1-cflags.patch 659 BLAKE2B 90beb435d0b9a036f31e25f78afedca178b2b6d7bba3cf294ae45699e139d136bbc996dfca86db65d64a61ef004c343ba55f7e097e7304b1d6392efe0ed9cc31 SHA512 f7bac5fd0cff9c1e5b47c965c0304ffda47478241f715de4ada829a295ec54adf198046699bab866166f974c692ac525207f0541e7ba6959e18d63765128327d
 DIST gutenprint-5.2.13.tar.bz2 6995005 BLAKE2B 7f9fe4bfee907fa6fe6de9bde674368701a221ea12459438053c231cc0e181601eb4fc700a95531135aecff2de6b2f41c2c78d89ad4445773efe0c11a8f45a35 SHA512 6a60a5e462bfd754ac4389b7e926715c06847c660df17e40d48cd57ece99a7ea6098bfd16c067cb27d8aef7ef705a2fdca9f05209d1f3ebf168b0ab16af4e36e
 DIST gutenprint-5.3.1.tar.xz 5153260 BLAKE2B 03465158944a77af93bfaf13878f821f13e63eac1bd92f9e33ba003b49a4cc1864e0ddf2bd3d72cec9fd2759401f90304f62ec068c3b62b0c210c53d1265c0d1 SHA512 214d07e6f78130e95c8c9d98f0862921d26f74a7c302afabdb138b35ef5f02f52fa143411983867fd7015477c16ca18cf8001e6552c27cd4a12c08ff77e92986
+DIST gutenprint-5.3.3.tar.xz 5050624 BLAKE2B dbcf74169d0756d991bbdad7338a6e6f995f8eeedc2610677b327abee6aecc787d1cc35949f73c1d93ad274de7d467542b72a5fe0abf58fbc4ec6f21667cbad7 SHA512 d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6
 EBUILD gutenprint-5.2.13.ebuild 2074 BLAKE2B a7f893ce22a51924689fea248bd1fdc6237201d737418f47b3e4ab9f3c91b4e4c232c4b452d3ab3a36ed41dff5bf0620947c212dfa9af21e7bdf5162b4d9ba2a SHA512 7e2cda6ea2de1215bb999a1ea373e16e29d314068a6d9833ff4b16b57b25db30bdae3cfb7a018c6a225042fbbd60627f65e857a19bc0f693fc1b4cd6c5efc9d0
 EBUILD gutenprint-5.3.1.ebuild 2016 BLAKE2B 0fb73b60a14f3d5977557422c56501069fd64162e40af06fa431e37d4cb21a7ed0163d796d9f6af3552cd8d44c1a3e602b3de2dfc6e6935a22ce087daaf393b8 SHA512 42cfa73d715d1f0257aad0e0ff06ca9618009cab33148feebe2ccc8162c6b6dd1624fa58e7b7a3459a0b8066af994e634861384aca0864d36a0f53298d44c56b
+EBUILD gutenprint-5.3.3.ebuild 1851 BLAKE2B aa3c708ea3091b0246f54bdff5ab4f7d51d9ef920eda8601fc1a9ce911183035c5678ca76ec2fc8a0860518ead5ee4c092de4b43594c7fcd2a9cefdec98cf495 SHA512 2ec2b61bdcafd1e427b01f9d9903b1b69975d6ec32f70baf7b1fde697d155cbd8facac534a19b90c5da0103909d36ea9a796c4e1f3160b83ca30a4f0d9a1e100
 MISC metadata.xml 339 BLAKE2B 1090eefd725cc9e37f9c8e77daddb80c3791098af5ba2405dd2746426a46722bef0ed8706654100559735d9f29c2be45eec525cadc0653776dda60453abca786 SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6
diff --git a/net-print/gutenprint/gutenprint-5.3.3.ebuild b/net-print/gutenprint/gutenprint-5.3.3.ebuild
new file mode 100644
index 000000000000..e27ce396ee4c
--- /dev/null
+++ b/net-print/gutenprint/gutenprint-5.3.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Ghostscript and cups printer drivers"
+HOMEPAGE="http://gutenprint.sourceforge.net"
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="cups gimp gtk nls readline ppds static-libs"
+REQUIRED_USE="gimp? ( gtk )"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+CDEPEND="
+	dev-lang/perl
+	readline? ( sys-libs/readline:0= )
+	cups? ( >=net-print/cups-1.1.14 )
+	gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.3.1-cflags.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		--enable-test
+		--disable-translated-cups-ppds
+		$(use_enable gtk libgutenprintui2)
+		$(use_with gimp gimp2)
+		$(use_with gimp gimp2-as-gutenprint)
+		$(use_with cups)
+		$(use_enable nls)
+		$(use_with readline)
+		$(use_enable static-libs static)
+	)
+
+	if use cups && use ppds; then
+		myeconfargs+=( --enable-cups-ppds --enable-cups-level3-ppds )
+	else
+		myeconfargs+=( --disable-cups-ppds )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc doc/FAQ.html
+	dodoc -r doc/gutenprintui2/html
+	rm -r "${ED}"/usr/share/gutenprint/doc || die
+
+	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == / ]] && [[ -x /usr/sbin/cups-genppdupdate ]]; then
+		elog "Updating installed printer ppd files"
+		elog $(/usr/sbin/cups-genppdupdate)
+	else
+		elog "You need to update installed ppds manually using cups-genppdupdate"
+	fi
+}
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 6cae7d0603e4..cf19dcec9966 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST hplip-3.18.12-plugin.run 10486821 BLAKE2B e48940b1b5fe94dc216383b63bee7807bce9ad265b7c454c201c0ed22ec1964e6c5adf653c3c230789c042cffaaf50bd604bae6f66f407a85f98248934307158 SHA512 82b90aa8245f787e088a1bebfa7892a7f2b97fd04b3702c46eed27306640e562aeec63b4b5b45c24943abe4672f2627d1821bdcdf58a5c1ac4e1d06c7270535f
+DIST hplip-3.19.11-plugin.run 11517119 BLAKE2B d7eefde4e579abbb019cfbb5bf7541360884b0d18240c87c0b532981ad3542a60dae139a623db0eaee3057d6fb5e805287ad5bddb2ec87df5b85ffd604f748f4 SHA512 9ef568aa297eb58370e7f01e54d83c53fbfb02494a0f4cfa3b9f92fd11bfae7b9f54d60516d5cf0436a882864505aab68f70b462b820e918a6ad4104987c9295
 DIST hplip-3.19.6-plugin.run 11517158 BLAKE2B c44707e29b104b45c110729c70ebeba1f392ad753eb98d8677657f735e547cdecfab357b348a30545274b51c18249ddb9102df49aa73d726a8e9145a302a8a0c SHA512 3636d655ba289331572f0762a5de2e0bf2f3108ac3f7ca9cb8bbec126942be954fe9c07c882bd8272e30ac46d67231d86a3c4249a6fe31e2d3e8d5e568bbbd8b
 EBUILD hplip-plugin-3.18.12.ebuild 1635 BLAKE2B 421610d7a88268aced86e4b30a4e6798fcdb07fd1b321b3caf65c1e444d9034b461e606f42fe75879a6f19cddc7b5d6264a02febb24e11d126a073b50c517b9c SHA512 3ec01211d1ce65e56e3b2a904390a7ead68a4fec8681b26ed36d2dae7daf7c78d79fec06684b1fccf675290bfed8214693f429b58c2a395ce682016750337865
+EBUILD hplip-plugin-3.19.11.ebuild 1582 BLAKE2B c154a00fae8a57e1b210714728fac79256f14fc8e850936caa1fd6273199f60087cb8cbaf96ba3d0afaf0109638031f9de010812f585676e6af8cca4e2d6cad6 SHA512 eca251a0e72c19a4bf4809a84de741b9704ee20fb82bf669eaeb4f4e9125ead78b3635002120e96c4fd1fbda2060bc8672a8d81caea048eb240ee7305bea7b51
 EBUILD hplip-plugin-3.19.6.ebuild 1582 BLAKE2B c154a00fae8a57e1b210714728fac79256f14fc8e850936caa1fd6273199f60087cb8cbaf96ba3d0afaf0109638031f9de010812f585676e6af8cca4e2d6cad6 SHA512 eca251a0e72c19a4bf4809a84de741b9704ee20fb82bf669eaeb4f4e9125ead78b3635002120e96c4fd1fbda2060bc8672a8d81caea048eb240ee7305bea7b51
 MISC metadata.xml 334 BLAKE2B 8f1a0784c57af6204db98f443bdb09df2a6432674d711a5ecf577c20e29f04a030549ea19c6e04f51cd9a36e60a6da94bebafbfcc10d52da87109e59c32d42ee SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c
diff --git a/net-print/hplip-plugin/hplip-plugin-3.19.11.ebuild b/net-print/hplip-plugin/hplip-plugin-3.19.11.ebuild
new file mode 100644
index 000000000000..b497f4a93fa1
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.19.11.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
+SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	~net-print/hplip-${PV}
+	virtual/libusb:0
+	virtual/udev
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PRESTRIPPED="
+	/usr/share/hplip/fax/plugins/fax_marvell.so
+	/usr/share/hplip/prnt/plugins/hbpl1.so
+	/usr/share/hplip/prnt/plugins/lj.so
+	/usr/share/hplip/scan/plugins/bb_escl.so
+	/usr/share/hplip/scan/plugins/bb_marvell.so
+	/usr/share/hplip/scan/plugins/bb_soapht.so
+	/usr/share/hplip/scan/plugins/bb_soap.so
+"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_install() {
+	local hplip_arch
+	case "${ARCH}" in
+		amd64) hplip_arch="x86_64" ;;
+		arm)   hplip_arch="arm32"  ;;
+		x86)   hplip_arch="x86_32" ;;
+		*)     die "Unsupported architecture." ;;
+	esac
+
+	insinto "${HPLIP_HOME}"/data/firmware
+	doins *.fw.gz
+
+	for plugin in *-${hplip_arch}.so; do
+		local plugin_type=prnt
+		case "${plugin}" in
+			fax_*) plugin_type=fax ;;
+			bb_*)  plugin_type=scan ;;
+		esac
+
+		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+		newexe ${plugin} ${plugin/-${hplip_arch}}
+	done
+
+	insinto /var/lib/hp
+	newins - hplip.state <<-_EOF_
+		[plugin]
+		installed = 1
+		eula = 1
+		version = ${PV}
+	_EOF_
+}
diff --git a/net-print/kyocera-mita-ppds/Manifest b/net-print/kyocera-mita-ppds/Manifest
index e8fd648c4d19..72ec9fe993ae 100644
--- a/net-print/kyocera-mita-ppds/Manifest
+++ b/net-print/kyocera-mita-ppds/Manifest
@@ -1,3 +1,3 @@
 DIST Linux_PPDs_KSL8_4.zip 6468249 BLAKE2B fdfa3a2ee119cd0cc0acb75b9b7dcb67f45605ff0e5dfc6011f46310298d7807d226887e54f81969b979551577e1acbc65f99c9d45dd66b0fe1f94b4d9ac05a9 SHA512 4e98f9972f6158262878b4fe811165ab05de8582d608c60400568a1eaaa1721fbe13394ad6e9aa93e21ed2ff30265856b64ecd1f3ae69ba49c7f9d88a7911833
-EBUILD kyocera-mita-ppds-8.4-r1.ebuild 1242 BLAKE2B 8e863a08b61afa6f2928e7cd0bf98cead3ee85bac10ff0195038500dbb403eb42a841cce608da956dd7aba658cf42ad3cce986bf7aeacee79e0156c7f0beb0a0 SHA512 35682e7e01d2f6553e78aec447e9926e581343edfb860a1dd796651414162d94f0e04c7a135c7de5d765d65268b26162a5700e1700c62b563473edfd49599f5e
+EBUILD kyocera-mita-ppds-8.4-r1.ebuild 1207 BLAKE2B 94f7b3885c0c1a511ac6c04af8924138e38309183a04aa608597f9bf4da8e66643d1abeaadf18ac434ba31266ee825def444902f9384b8633b83bebb8c9ae1cc SHA512 e4df8170fcc6b55da6e40cc8db8d0149471d865b5fea57f617d69a890f0d083a36d15989a6490e6560b50dfe4192eb4dec52d9b794d25ea5dae19a319e26870e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild
index 8c66696feaf6..739a186c508c 100644
--- a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild
+++ b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild
@@ -32,7 +32,7 @@ src_install() {
 
 	inslanguage() {
 		if use l10n_$1; then
-			doins $2/*.ppd || die "failed to install $2 ppds"
+			doins $2/*.ppd
 		fi
 	}
 
diff --git a/net-print/pykota/Manifest b/net-print/pykota/Manifest
index 2fa540badbad..5251bc150851 100644
--- a/net-print/pykota/Manifest
+++ b/net-print/pykota/Manifest
@@ -1,3 +1,3 @@
 DIST pykota-1.26.tar.xz 1377656 BLAKE2B f39998a072ddf273a63a1b412f5d03d6a5d2095faf7facce8b7552ab456a57916cdeefda737e3d7323ff44e28c782aeefe2f6706a58dd3a781d2ff4c704c820e SHA512 b6b0b274a52b031837ff3ad267dcfd84e0292bf0210b46f09ed84d19c83e586297b4e0667f3338aa50cf9db13e750723c5d12868f5bfeb2079c343208cd72c1c
-EBUILD pykota-1.26-r1.ebuild 1864 BLAKE2B 4c87cdb312d0e16548e402e5cc06df230517dfc128601ef958dbf2baf06d43d16dc4a193e99cd5c204c0b40469f8fe8cb7e263918cbdf5f8260749773d0caa19 SHA512 2eedc56266347a7657eb7e27e5c5f61a394eb4fcb63269777726a995108bc3407e96b5a7dfdbe5e5d4ba4c9588438724f76629b37d62bc0cc2fa80ea50ded381
+EBUILD pykota-1.26-r1.ebuild 1857 BLAKE2B 9e852429a5822817b7ac68d6a6330b08260e612bc376f10410c39aa89153ea6951b61d680c1d6e05d754ff5fd1363f1cc224d1fa07463a568154ed82b226ec53 SHA512 88b297a5035d2b1e3af3271e3ebec03816c1fe1cac3d77e8783dfc1b7718c5c71118dce20cfaec1ed793cbe3d8d55aaa4e7727ae02a5471c472bf6efd981310e
 MISC metadata.xml 538 BLAKE2B b9f4df455bca355541a70f4c3509f531119f79c2a5fa6ef48dddc70e6e9ebc5733908f9cdb81bbfc0aece190d7cd878d8a325124637fbb3fcd6c0988f8301046 SHA512 8bdf5ee52db9031b7d89bed73fd0f0ef0d8c95292f4182a7835acb80d847a5671f28421a9c9f81be2b4764c503624f555d0a2121e21568abe9e6179f92060207
diff --git a/net-print/pykota/pykota-1.26-r1.ebuild b/net-print/pykota/pykota-1.26-r1.ebuild
index f7181c518167..ccab1c34b787 100644
--- a/net-print/pykota/pykota-1.26-r1.ebuild
+++ b/net-print/pykota/pykota-1.26-r1.ebuild
@@ -57,7 +57,7 @@ python_install_all() {
 	doins -r initscripts/*
 
 	# Fixes permissions for bug 155865
-	fperms 0700 /usr/share/pykota/cupspykota || die
+	fperms 0700 /usr/share/pykota/cupspykota
 
 	rm "${ED%/}"/usr/share/doc/${PN}/{LICENSE,COPYING} || die
 	mv "${ED%/}"/usr/share/doc/{${PN},${PF}} || die