gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-print
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
43 files changed, 231 insertions, 1071 deletions
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index dae3a1bfbbf0..ebaf1c4ec856 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/brlaser/Manifest b/net-print/brlaser/Manifest
index 251485899312..4a1f79f75bf5 100644
--- a/net-print/brlaser/Manifest
+++ b/net-print/brlaser/Manifest
@@ -1,3 +1,5 @@
 DIST brlaser-4.tar.gz 21963 BLAKE2B 03d5e16ff9b6a6838c82b197bec4a868e6be5752ad9a1df393b646b35642da8f2e1528031b10ece3b0cd7c6c426ff76d1df83c73a51bcac7abac803cd0a66535 SHA512 1e08091adc371a35f75c245fd86f132aae7811a00bd7e9d194c47038dc9aa29296fbf8769cef6b8ea42d82467857195ba8024a9d6de8048174ecc44e0bb76067
+DIST brlaser-6.tar.gz 22807 BLAKE2B be8041c1b6ddb8c4e5055fa35edc2c764562b2b4e52cad17aa968a51886621264d6bf289bd7bb5af0148098bb72aa96adea603091b38c3a245068d60737e80fc SHA512 d7e0e63b64be9ae7633381622c13ba0589e5fe58d277212bce4f5bb712a291ed0b0f2ac3d450dce61c7f9052c1ce7323fec66b5005c5cb3da1314b284d20f06f
 EBUILD brlaser-4.ebuild 425 BLAKE2B 7f00a81d641549355c179df3a23aceda8123fbb03ba2c435998e348024eaee2bd7fd0d357f96c5c978ffa64f70bda794a6ddf12961c4c4777200643573c9c25d SHA512 7daf3afc30fb45d95d68706d6ffe5b13dea0041f4604ebc2b44ad7341e31be2800e1d9a7f8193237b0d215896493176ff56673187de7c6a0f9f9f672665d6cc4
+EBUILD brlaser-6.ebuild 421 BLAKE2B 87d923c261444873473640b80b77c583f39ae123923033f54a9de3101a44cd6c1bfd2e43ae177a79f2432a3c099e3bc78177453cfb298334f43c01cea8ac2e62 SHA512 7f2f93b1c74d4eb3fc3c6a41f9a2d7823a412abe5a801500a0da3fdf9efa97752cae508c8ca7d4eaf2656f1042c2a75480c2248f73aa6fa34060290a03e1bb33
 MISC metadata.xml 493 BLAKE2B 12ad209b87255457d7f70dcd68fe65d38252473d905c92cfa529996d2e117070011b0b91e1230806a5790611b3935cfdbf2bf484da65dcd50045a43fb1be8191 SHA512 4cdf7aa5a98fefdd13150b4d03534f9586429ae00b294bace8bbb25c59e11205b3d74a7f281707e7c60aa1a04c5b3a671865bf6d078ebc7f237b33bd23569418
diff --git a/net-print/brlaser/brlaser-6.ebuild b/net-print/brlaser/brlaser-6.ebuild
new file mode 100644
index 000000000000..1faee9ad08d7
--- /dev/null
+++ b/net-print/brlaser/brlaser-6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Brother laser printer driver"
+HOMEPAGE="https://github.com/pdewacht/brlaser"
+SRC_URI="https://github.com/pdewacht/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-print/cups"
+RDEPEND="
+	${DEPEND}
+	app-text/ghostscript-gpl"
diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index c0b7a60c6dcd..989b0b867395 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,5 +1,3 @@
-DIST linux-UFRII-drv-v500-uken-06.tar.gz 107038301 BLAKE2B f02a8c9ea1052c4bf60d375eec8d896a81ab07358f9b794ba24fe70c4d21d66dd6bdb814c1d5774d281bb2657d59bf7cbfdaff1887f548bf3213951f4c171f1c SHA512 56ef4f53de630651e3953c17525f473b51b804853425f987b05ef1ee797234be01efde594f25b0a89d80098e5f5a2987cffd9eabee836dde0e3916c30cd25cf3
 DIST linux-UFRII-drv-v510-uken-08.tar.gz 106569187 BLAKE2B 46017d4e82653314e1555b32c6e3a73ae8c9c7cef95e4f70d51d62e15f26831cf0ea8d1b180503cd63a880d637621427fe6c69971b40d9ee0119ecd493772515 SHA512 dbc8b8e600ec29e73afa4ba8a760fd643d58ee2017f6c3c35e63c7f2186cf0cb675adb0ea344b0bd04d0b4fa7f13763b5ce97e8264790356134e6ded3069bf54
-EBUILD cnrdrvcups-lb-5.00.ebuild 5838 BLAKE2B 4498ea2b3bbf1ec09ce33cf3416b75974fc279a507ede4ba17dba7bb328bd9884705e04511dff7cc68fd87aff2d67790e26ba049b34b7bd5e1add1422c456e58 SHA512 1bc151ae25cb5cb291cd37232f8026588816faa13bd2ff969018e91e55a3476e9fa0fe746afa89327c157b9e863fd77eadf731b7823c00228c83882ca654dc07
-EBUILD cnrdrvcups-lb-5.10.ebuild 5838 BLAKE2B 5c5ef8997fe11f997cebbeb518ea93e6eb16d497874316896b83d89bf939b3eadb3d0f5e59c28713579a291d62462f12e9e05d6cfd86d1b630aad9ec49fb0308 SHA512 b44e827af6e32f3d10bb9103fa2d0e98a18b1b3e00230dd407267682151a2fa262a421cb60eaa89e4236ab46489b4626d7024455262bb783a82ab5425a3369b8
+EBUILD cnrdrvcups-lb-5.10.ebuild 5836 BLAKE2B e8c47eaf72467101a44e129e44b101c5cdc9716160c2a7ac07cd0675f09efcd88e092077115a64216f1f5fcfa199063ad9c5b88bf85d00655c590ef62e53a9e0 SHA512 a1c83fe52a04971dc9229043aa48e98b871f20fa11b7eb4152eedb08d343da74d24fa791a6543d796af29088990245ec4fe1819260f684f75ddc1471aac5d7ad
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
deleted file mode 100644
index d59b7d2cb2cc..000000000000
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
+++ /dev/null
@@ -1,187 +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/11"
-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-06.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.0xUK.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."
-}
-
-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/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
index 20747dde650d..78e55a879950 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.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/cups-filters/Manifest b/net-print/cups-filters/Manifest
index ac240d6158d5..d112f5f40ef0 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,10 +2,12 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711
 DIST cups-filters-1.25.11.tar.xz 1482792 BLAKE2B 67801904dbe025933d1209817e23ff74b661b35c3af560081f12d4f9a26102e009bac9d4741e15dc257dd477967b18ae23911647f8f56b361e9f8d51b0d619f2 SHA512 67e7c624952b5e2db33a698ac1287a3448a4787fa28000cefc5a982c2fa18a4f56e11e3ba65da8a6e565a53a193c6eb31ba1867ad36ca8dc7e61250f11232681
 DIST cups-filters-1.25.13.tar.xz 1485860 BLAKE2B 03fbbbefdd36e8f619fabf17e6e13d051f48f68f87260747a181f6976ff88728d7d01b646227cd5f054e0321f6fe0e64e4c6b1bdba631d9d703304ad98a625eb SHA512 4b5ef647870235436276db68f3ef1879b578807338a025100a1d43115a7330a8f506be631df9c43edb2f1ec15f9a42f15f7cdc725bb5d39612b37bae04631611
 DIST cups-filters-1.26.2.tar.xz 1490192 BLAKE2B 6bc5033c648e42a4590a941fd089c3bf3a901a36e26f12b3cdc892ea41943071903b2df2ef5730b7948270f4f59419083c9423af9482e032958360144fb04e9b SHA512 59a5eaba00e0f384f2b1498e58ea3d7272e42923a69eaa0c107ac103dc539c9bf14a94b7a91a73e7185d8a347b4ac7f4a7a655b1ffc373983da807c582e10264
-DIST cups-filters-1.27.1.tar.xz 1492256 BLAKE2B 30e4915bfc9a4f308defdcf13acc246330499008648edbce4df3efcf29fc960ac2c9a868ebe7cafcffb16b07763a2235ddd3d29a849ea18892b8da1d0f167775 SHA512 3fde635735138fa5ef511466b07f396f96860efcc51d9a01f5b95e86fc71ef48b9d17ba1bbe2eeb29585c3afc8bf26370b8f07df76a3adea2335be90e3fdb91b
-EBUILD cups-filters-1.25.11.ebuild 3448 BLAKE2B 8f46f393cd53acb06f6d6026f09d2ce6fe43dc3b548be94859b4e7a72b533c94a2b338198fc68f783b8c646367fbfe8b3cbfb7fe4b5fce19e1ec737ef3ff983f SHA512 804343def2f49f7be59154a5e088e0d61190f0991a54392941760ffd4de1d2c501c3462cefd516ae4351081696198198138b2317ee787de3129c04dba35ef862
+DIST cups-filters-1.27.2.tar.xz 1493220 BLAKE2B 4c767d114e59bc94a976056cbb5456464464a4226072b4448bc0de63cfb06b28023f4ef3857f6eee32bb2c1b13f9abc2b576557c6bb6328191af781ba3d680a6 SHA512 c0e1456dd3f512ae2215e566f853e47b66de46d0d1301fc5a6f3674ac7d1ddb03c3bb236b0419b20168742076381c58581cc3e582cf7abf76139367d549a6c46
+DIST cups-filters-1.27.4.tar.xz 1493860 BLAKE2B 424c3ba73ec7d6f4683eaedde86d657b1a2da17670c84097f5f3f8ef525cc8cc6d7843a88d35013a5f48bba8a903f7504df9054427b9a63d748ce39de458e71f SHA512 8005e94bb6b06d0a15fa4dfd8455d0bc67418478bf517e205af1c8c0018681a97ae9ea486db07570050ebeeb7f63f75319a8fe012c112c6d16c0941299eaa50e
+EBUILD cups-filters-1.25.11.ebuild 3449 BLAKE2B 70f5e8ed635a76f439b479a9ea318c166c18df43ddf213a292cd430876de28dfe1b8e0b400f19d217e6ce3b36c52778e066c0aedf9368998c0b754745a706019 SHA512 17b8acfee4f31cb9ecfa8d780c7e35a6b5c9beaef1eeb450adc2144e47ba8d7d8fdd1d21b5404fa3b2b6552972941c901d24241d52e392bdb35850e12b273e49
 EBUILD cups-filters-1.25.13.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176
 EBUILD cups-filters-1.26.2.ebuild 3458 BLAKE2B 422cc3d8c474df23b15b94116dff3cb5cfff4eddaef554743e695e2e58717151370cebaf0b1d600f4d4a185c74af7aa45489be9ebc33f664588d85ae9245b800 SHA512 b31915b570574a117b6ef9e20807990d04085b8850206cf12dc8a9c222571974fb98738a7b6d4d36dc6a186722c797c73da401f85537f897c15f418aacee14c4
-EBUILD cups-filters-1.27.1.ebuild 3458 BLAKE2B 422cc3d8c474df23b15b94116dff3cb5cfff4eddaef554743e695e2e58717151370cebaf0b1d600f4d4a185c74af7aa45489be9ebc33f664588d85ae9245b800 SHA512 b31915b570574a117b6ef9e20807990d04085b8850206cf12dc8a9c222571974fb98738a7b6d4d36dc6a186722c797c73da401f85537f897c15f418aacee14c4
-EBUILD cups-filters-9999.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176
+EBUILD cups-filters-1.27.2.ebuild 3392 BLAKE2B 61ab3e8b8e4ff3739adaf77bf45ed5e1237fbd156a9eaf21819ee5d13cd64cb1aba977962c554c96c0a0430136554401e30d9e2f4e0b903e8420e2fc89352d03 SHA512 98b9e1ca9385871cb04c8ccb7b3d9bd5f37fcfc8e585cbb99d71b383b974cd5c5420a9f7b220d8aa8456dd1d395301ff7d781731e9ee97e9c0b1063358200638
+EBUILD cups-filters-1.27.4.ebuild 3392 BLAKE2B 61ab3e8b8e4ff3739adaf77bf45ed5e1237fbd156a9eaf21819ee5d13cd64cb1aba977962c554c96c0a0430136554401e30d9e2f4e0b903e8420e2fc89352d03 SHA512 98b9e1ca9385871cb04c8ccb7b3d9bd5f37fcfc8e585cbb99d71b383b974cd5c5420a9f7b220d8aa8456dd1d395301ff7d781731e9ee97e9c0b1063358200638
+EBUILD cups-filters-9999.ebuild 3392 BLAKE2B 61ab3e8b8e4ff3739adaf77bf45ed5e1237fbd156a9eaf21819ee5d13cd64cb1aba977962c554c96c0a0430136554401e30d9e2f4e0b903e8420e2fc89352d03 SHA512 98b9e1ca9385871cb04c8ccb7b3d9bd5f37fcfc8e585cbb99d71b383b974cd5c5420a9f7b220d8aa8456dd1d395301ff7d781731e9ee97e9c0b1063358200638
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.25.11.ebuild b/net-print/cups-filters/cups-filters-1.25.11.ebuild
index 4f5594ee02e1..a804cc5230b5 100644
--- a/net-print/cups-filters/cups-filters-1.25.11.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.11.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	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"
diff --git a/net-print/cups-filters/cups-filters-1.27.1.ebuild b/net-print/cups-filters/cups-filters-1.27.2.ebuild
index 7d3a3240e736..6cb600e6a3ad 100644
--- a/net-print/cups-filters/cups-filters-1.27.1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.27.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
 
 RESTRICT="!test? ( test )"
 
@@ -73,7 +73,6 @@ src_configure() {
 		--without-php
 		$(use_enable dbus)
 		$(use_enable foomatic)
-		$(use_enable ipp_autosetup auto-setup-driverless)
 		$(use_enable ldap)
 		$(use_enable pclm)
 		$(use_enable pdf mutool)
diff --git a/net-print/cups-filters/cups-filters-1.27.4.ebuild b/net-print/cups-filters/cups-filters-1.27.4.ebuild
new file mode 100644
index 000000000000..6cb600e6a3ad
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.27.4.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	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"
+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() {
+	default
+	[[ "${PV}" == "9999" ]] && 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/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index cc938610ec4f..6cb600e6a3ad 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
 
 RESTRICT="!test? ( test )"
 
@@ -73,7 +73,6 @@ src_configure() {
 		--without-php
 		$(use_enable dbus)
 		$(use_enable foomatic)
-		$(use_enable ipp_autosetup auto-setup-driverless)
 		$(use_enable ldap)
 		$(use_enable pclm)
 		$(use_enable pdf mutool)
diff --git a/net-print/cups-windows/Manifest b/net-print/cups-windows/Manifest
index 1e241713a438..c9142399431c 100644
--- a/net-print/cups-windows/Manifest
+++ b/net-print/cups-windows/Manifest
@@ -1,3 +1,3 @@
 DIST cups-windows-6.0-source.tar.bz2 38284 BLAKE2B 67722a99dc906ac9c39ba9a93b7fbbb24a44b7400de6209ac5d0ddedc4f891b48ad0284d6cfa8336400697af6eaa006e79349931cefe55cf72b428546c6ff43e SHA512 03bd66d210ee191d25139d9e462543a01d30e8a0dc797a9ee62673e84cfa9d057cc6d327792c74941a17e5021a7ffe52c40bcb52a3f3f4186f59f04796c809df
-EBUILD cups-windows-6.0-r1.ebuild 571 BLAKE2B d10588a872d323ce251d3cd592899a67c03f94e3bead89f9edc1d7954f0dc23794d5db1074b3a9960631de09b3032d8e0c6548b50e68b8a57c90bf82c1413d23 SHA512 3c0ddd80025afb423b000e7ea9a1735fe4f3d7da338d35d79804522610c3e6bcba2794225d82e5606d5c22a8e90f8ac485924e474b69571c8336883e8e81d542
+EBUILD cups-windows-6.0-r1.ebuild 569 BLAKE2B d04de0683f5b8f4c556887d9457587d6811605e3990a65453e287e96014fc6f064e6b922bb3281aea4a76b0b4e3f4c0a49898bba2eddf480fbbcc19342e5beaa SHA512 010e09e08ffc5ae61cdb0acf15c001d3d59de183dcad24d76f89cc36ce10dfdeef3f2d0a7726588ecbffb49bbccc129bd57403cd61d5745ab29c41a7a5a5cd0d
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/cups-windows/cups-windows-6.0-r1.ebuild b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
index 3239233637b5..ad095f4a6ea5 100644
--- a/net-print/cups-windows/cups-windows-6.0-r1.ebuild
+++ b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=net-print/cups-1.2"
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index bc72affdfad3..be59fd6f633a 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -4,13 +4,9 @@ AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6e
 AUX cups-2.2.0-dont-compress-manpages.patch 319 BLAKE2B b03a0ab815751055d79475423242bbc407e934cdc00e4596ab05e3d7f87ca0feb7201f6696a8eef59fdb73630431364f12146f1d32743e272de054019acb8380 SHA512 0f4822e50f9376dc2e8c87b55f6526ab514f5f08f737071f5b15696e71b51416203df6c9219d78989544bbc135cd92be91ef351a377be7ab4052e98c25c0c4f5
 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
 DIST cups-2.3.1-source.tar.gz 8135891 BLAKE2B fab46dfeb8a1846c4d8c8a1c166b465e72928ecc5b52dedd9d6a6328619f6eda822a85da9545c405b7bc7375acd2f2677497b94ab00735979487417537438831 SHA512 e3f3ad9e78c1c723d46cc2276957ac67495483882f639421203d9dad227eacbb1259717a92489e710995fdc89e2d575202e4b43117aff08ff1230dcf06674376
-EBUILD cups-2.2.12.ebuild 9732 BLAKE2B 18a1a09845b92d17f78ab74c95d53412ee501eafe4f6b2f91e31e8684a5d669e1395b20915b9dc13cdd0fa42fa6fe1d62e488eacb84636a80d482005089179ee SHA512 35a7c77f2e5894fd1569d2f3bcd269a48f03ac8da81c4ce067205b2e214032b70b38bff8c627610f8e233b0e2d2468368cee5697e5ecec9daaa0550e108666e0
-EBUILD cups-2.2.13.ebuild 9732 BLAKE2B 18a1a09845b92d17f78ab74c95d53412ee501eafe4f6b2f91e31e8684a5d669e1395b20915b9dc13cdd0fa42fa6fe1d62e488eacb84636a80d482005089179ee SHA512 35a7c77f2e5894fd1569d2f3bcd269a48f03ac8da81c4ce067205b2e214032b70b38bff8c627610f8e233b0e2d2468368cee5697e5ecec9daaa0550e108666e0
-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
+EBUILD cups-2.2.13.ebuild 9729 BLAKE2B 9c0b6e15bbdcff31c35fc709d4369f97bdff7f18d7f3359bf99936244eeb1056333df7e197c9140cc20e59080bf893f49941121950fba44b7313c7cec06acc56 SHA512 abef436477e2b0e34f63dad132981bf9b4313c7467168efb1221b31fbe4cc2d1e133b8e2308663f6ffeed1cf19ef0bee15e2ca33cdf6966f5f43b938f6f8dffd
+EBUILD cups-2.3.1.ebuild 9585 BLAKE2B eeccc3d3fc828c6ee3309ece3ddfe954918f86eb16d967b7c375bf36a49b3c5be91313d56bec685a5e6ac0e92085e5f2befd6eb5f03fc9b5ae5c23b7c918068a SHA512 be02a3f144dd90f98f490351b4a8eac0fc1ea674fce9d02b0e66a6aefdcce718b58dc21ec2094bc07e8370e6e9fda0e03b0fb2df75aa17e43928266417cdbec3
+EBUILD cups-9999.ebuild 9585 BLAKE2B eeccc3d3fc828c6ee3309ece3ddfe954918f86eb16d967b7c375bf36a49b3c5be91313d56bec685a5e6ac0e92085e5f2befd6eb5f03fc9b5ae5c23b7c918068a SHA512 be02a3f144dd90f98f490351b4a8eac0fc1ea674fce9d02b0e66a6aefdcce718b58dc21ec2094bc07e8370e6e9fda0e03b0fb2df75aa17e43928266417cdbec3
 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
deleted file mode 100644
index dce403cc5758..000000000000
--- a/net-print/cups/cups-2.2.12.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2020 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.2.13.ebuild b/net-print/cups/cups-2.2.13.ebuild
index dce403cc5758..efd23a0698bd 100644
--- a/net-print/cups/cups-2.2.13.ebuild
+++ b/net-print/cups/cups-2.2.13.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999 ]]; then
 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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~m68k-mint"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
diff --git a/net-print/cups/cups-2.3.0.ebuild b/net-print/cups/cups-2.3.0.ebuild
deleted file mode 100644
index 46eed6927902..000000000000
--- a/net-print/cups/cups-2.3.0.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# 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-2.3.1.ebuild b/net-print/cups/cups-2.3.1.ebuild
index 46eed6927902..241cb46e4268 100644
--- a/net-print/cups/cups-2.3.1.ebuild
+++ b/net-print/cups/cups-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ 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"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
 	fi
 fi
 
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 46eed6927902..241cb46e4268 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ 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"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
 	fi
 fi
 
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index f66be10241c0..225a6e2cc5de 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,6 +1,4 @@
 AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475aa29f82e2ff81568aa72e2a3c25018c481b9d56bfd321314fb931561bbaed5b0883597c6fb296465ac486f1 SHA512 8a32ce7d22bb97cf1a7c1864353cab4a148eb4d1dc599f355420e0119dfb89abbfb66cbe58c8f35e2f8fc3a62b0c4018e0d48065acd21b17cb250e4722b9e027
-DIST epson-inkjet-printer-escpr-1.7.2-1lsb3.2.tar.gz 4667086 BLAKE2B f01790daca7b80e0d1258a6736f1b6edf0db1d5899941174b75b7ea40dd7e75bfa0504511403a1301018ca20273410d5afc28c3b2768e6e2af93c15c032d9b97 SHA512 ae8d965c3325e89b428c53a4037566f0b786e0109ac521623c6a6ada66717487c82eeb9147de01f6a14a6e0afc6ed60045ff8b9526f91bf2995b3c3cd66c548d
 DIST epson-inkjet-printer-escpr-1.7.7-1lsb3.2.tar.gz 4767015 BLAKE2B a50be3f9975183c64a55225d81cb607ffbb018843aab682b077e7ab236e02b20d0d2aecbdb6fed58daab78d8d2382745f434d7dfec6098c2d8c111d2b4e4fabd SHA512 9663b9ed425fbe5d3f2b6f85f036cdbd230665919e2cc9d62a33ebae85a0068513417209dae97ce55e406124b92c96c455cdc204d3d2335f4215f57b79f9d2a9
-EBUILD epson-inkjet-printer-escpr-1.7.2.ebuild 876 BLAKE2B 80be13cb5310803b8e7bab8dd43b224883d53ed8600030ed6ca48c3947102126f8d090803f2dfa570e1121a6136b3b39a85e739f7af2444b70f598e180af0148 SHA512 32e7896e86b190ee095776a04c7861d94f8f00d0ea8ea1802aa728811586c471f40b5edaf1ffbcbb726911101eb1e8a119d787f76b8a1965eec3c51c2c584c8b
-EBUILD epson-inkjet-printer-escpr-1.7.7.ebuild 869 BLAKE2B d3c40a9d885925a95353d6fcff5a5e2a5dc7946fe8871452cd3075131cc1a1bd637e890574e00ac46c23cdcae04b782bae34475ed4f612699a18ac351bd56316 SHA512 2a4adb46c05baa8ae51552f5ce5f6c961c838a16a95916ddd1a2829d8b83bddc3cdead73c945bfa40947f5bad1381032582320ff2882f4fac0c64caed24b6462
+EBUILD epson-inkjet-printer-escpr-1.7.7.ebuild 868 BLAKE2B 48fd71b3831c386359db04fdfe40ec6b28982a011d536a2281417a4dd9d740bf745dcc24871f8007563e16f3aedeec05c95d8945064a8e9fd635a7b914c34570 SHA512 87937d67f848e1eb580a7316bceed6437d56a20d722a56c05963971c1cd062a2083395b604065fc1d9898a6952877db2064dea76b595d551feeb4c4e4eff8856
 MISC metadata.xml 253 BLAKE2B 9f98272e44d92f62df07adebeb8942eb26113e29ae3021a9d1ef478a1bc2bdd26bd4700cc7d88dab9c5fd78d54958327997e9849c100ac00fbe051915ab3f2e0 SHA512 e8bc4d02500676e2506fbe7f0811be984878560deb05d09122cede2e62e633fb7644fa59b73a20da8f3fceea8f8cb928768726e8b679f32178c0aed9a874ea15
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.2.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.2.ebuild
deleted file mode 100644
index 30f82261182c..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/09/76/14/6479eac30ef2e351bb6672ed63314953b9655d16/epson-inkjet-printer-escpr-1.7.2-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/1.6.5-warnings.patch" )
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild
index 67ec9eb95e45..1e0db2c8f85a 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/10/49/18/f3016be6120a7271a6
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"
diff --git a/net-print/foomatic-db-engine/Manifest b/net-print/foomatic-db-engine/Manifest
index feab6c210a24..e730440c6201 100644
--- a/net-print/foomatic-db-engine/Manifest
+++ b/net-print/foomatic-db-engine/Manifest
@@ -2,5 +2,5 @@ AUX 4.0.12-use-pkgconfig.patch 1010 BLAKE2B d37cb4ad77e191229c0ca7ae64b8f51b7ce2
 AUX 4.0.7-perl-module.patch 392 BLAKE2B 48a1913833c637eaf80f0d9c8366e85750857356a28d346ec37a11c233e1cfed7d79eb5ada6033cfdc2743c6823d8db976f9095ee04694fa176979f2dbad9d62 SHA512 7f26ac25325dffa706bef97915be06707c4953ee7c436a86a79d4edf764bbe4db9e6eeb37b889f6f4214b9b8d5ceb31091398c5ccce7607be941a74b3fe4ebf7
 AUX 4.0.7-respect-ldflag.patch 719 BLAKE2B 534ac6b3b3333bd54c9abe8b7e658faed0759b95e0104d36e381ba178f8138b9b79fa38a35f66ef5c78ca54630d870da0fb1a12f949764e623247d10dcba61c6 SHA512 432c4b61c94d1b774fc909375217587f4d8336603db0b944ec9e98e3022c2b1355928445e2cc7fbbd06a1452927082ed0fb655bc955643cce6290fe8f2d5d6c9
 DIST foomatic-db-engine-4.0.12.tar.gz 360499 BLAKE2B b03ba0a0cddc2d1c59a64ffa33e577f991d36c478e3f7b43f66474c749b7fb546f0ad5b04fee056c69532a6f126b87c95a72e5561443ef79bf3bdfed650d6b07 SHA512 b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f
-EBUILD foomatic-db-engine-4.0.12.ebuild 1164 BLAKE2B d8de19197f013c0c93d1c3cd79210df746ceb0eeab990f7e624c65cb15695725173a057fd160704d1f2584d33d52463d1ae771b2e192cd58f361f3a3f97c9fec SHA512 461fec1d8385c511ee07f4ac174995be1a610f7667a48be5de32e8d6bb7c01faf54c73d63df3891012e7bac6706e5dae4ebc5db4d6ef29a023ea2045acd09bb2
+EBUILD foomatic-db-engine-4.0.12.ebuild 1161 BLAKE2B 184e62667e3c4e87efd323b538bea9363165abcc4a426a9229b361ad8fa8fd1e4711de0dd965e797f29a82163283811117a87004f96b76ebd021eaad33551b65 SHA512 d5742f981ab1a3e7807e0671328d57167a80883eb0c67afade733d19e5d18eb313a8318834100fce2c55bcc5ccadbc4b3179646ab89ab6b22ecaacb153655ac9
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
index 2a6b4d1e9786..0107432dbc51 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND="net-print/cups
diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index ce37c19477ea..01783a8531d7 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -2,7 +2,7 @@ AUX Makefile.in-4.0.20120117.patch 1161 BLAKE2B f935f674597d1edc4d70b2fc600e5a04
 DIST foomatic-db-4.0-20170331.tar.gz 53321292 BLAKE2B 375421205b80cc84d10629454cad053ea0022c8e230c0eab0797f3de79d42e6cc3769ad286095aa7a5bdde0f49d30fb3484e8cbefbae48a32840c0ca96885276 SHA512 33037b087eccfe08fb5b2c0220992f4ad4762c7206325f6bc8073903aafa27a260382cfa8edb4500f0feeea4d0489a3a345fe3017790484fdfb53aa577f691c0
 DIST foomatic-db-4.0-20180126.tar.gz 58697641 BLAKE2B ae063e5d82e70dcd4b7791d0ffc3914c6a7d218c9e1067f6fe99f029c7f4340399e7034da26119e4219096758d029c832797dc10e8076f49f0e24ca11188785c SHA512 84e9c70e797a5328317d0b2725ebb67aa630923516fd8f860740af58ee5337b6302669c822b6aba32fb10ad9670c5894b34356e3cfc0e1496bd051551f40026d
 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-ppds-4.0.20170331.ebuild 833 BLAKE2B 38e6839d61a415095dd4d6bf788ed1c97eea9db109bd302a9b63e3c9e4920305f3c81665bf00763cf08be94274c589b19d08aa6649893b201d8069aab8c1484c SHA512 ae7fea729d0ca1b69231fdf6c17d3a960a9261fa17d2f78138547d0b644bd43d8b8b3a3879d5a0a002a07c6d803b5e5de7b3ef5f773137d4c873bcab7932fd25
-EBUILD foomatic-db-ppds-4.0.20180126.ebuild 853 BLAKE2B 8d3245f5ef09d72f916840a45b295ea05cec1d1aae74d7e611f7f6e6c39b841ad806d9a52eecf1621ce2ce3fa3cded5520445e52457adf93a605f2731897f39a SHA512 9c39237c1d08cf8fd435406003231ac9f21e958c5f33f75bb23f53392007ad44bb16424f323f3053c95183a0652f20c24864b6dbd1e3d6738082b8958e3be0e8
-EBUILD foomatic-db-ppds-4.0.20190226.ebuild 850 BLAKE2B 7b64160725d98ae679bf79c63223d2bf8c8559f79527ac18b19060438fbf58234c8fa9ec6d0d2b71d5a0a36d072310fa985d14484ca0a8c29def073c2f44d365 SHA512 8835238947ec5d479f688507683b47c962ed1f10fdc084ca8b15b9963b0c434eeefc3e1043c2c2d2c9f3679241dbfe90bcb4e9d119590fd60059657caa1eba25
+EBUILD foomatic-db-ppds-4.0.20170331.ebuild 830 BLAKE2B c6afe2e8874c8675955e226433a811ea25ae5f049555ffee44fd9feac474057c8671c62a67d7baa719af9771a0b55e112cf42a81a8dcb51e4bbdee73635c4337 SHA512 a3473bbc4a8926265815b56cdfcb5b25c8aa010f6a294decf6f4bf9b4538cf1177e1500fa38828233444253299b934ea2df3a00458b8a9b8dbf87d109657e4a5
+EBUILD foomatic-db-ppds-4.0.20180126.ebuild 846 BLAKE2B f405520d97618b119085d75e1851480b87acdb1fa86b28e9af5d7ee185f58b4dbf23471fbeda817c8825ca8ca6bbda5f629d2f59be1c76f83aa84f0d60965e54 SHA512 c0fd1ee6953854620536ebf565afffbbbe3438c81d2f6ee27eb23d5047f67ded18e75a67a80e42bd3cab4ef2e977c5d72d3f32f94df4ed836d15bd1cb9e79657
+EBUILD foomatic-db-ppds-4.0.20190226.ebuild 846 BLAKE2B 5f6a8ab72553c8b3f0a92eaa48183e4c4830e27cd5f40d4f76cb59f14b18c0b6d4daf3cf1246c879a6e10873e60308b66f252c39c7e1f05a6ec50b10d7b84064 SHA512 40e97c7c17fd3bf433bb6f06f048e6e6a1bb174986e061f8a94c0248af36dac3b0d55f525c85c875c8ad2e723998b1ce12bc953ab7a1e258bd3eb233387bbed1
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
index 7b8a654ba223..1506c8f42957 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
index 93843a46d849..725401eb0c11 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
index 3bbad3539230..509ab6d4b681 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index 5e4e24af3933..c1b8d8700da0 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,7 +1,7 @@
 DIST foomatic-db-4.0-20170331.tar.xz 5083832 BLAKE2B 3c22869cc50f9e68e04bc9edaf6227764ede1566bf93311f1098d0022174911697a63685488be2c753205e40284ec22c31a64e672fee3851eeec920730b5a344 SHA512 f265a476533a77c27f0eb6414a3b93c6b269effba7bb0d46c9d3965c0e7218c3b081ae5e3f01ebfe7afbec70379543dd2e553b97b338eca43c34c11a4ffb4dcc
 DIST foomatic-db-4.0-20180126.tar.xz 5418608 BLAKE2B e11dbfc7e4cf121ba8b456820438b0418981c414c6a798dee463430dd8ccf65b424e1d597bc21b32929e858d0282b12df81fb419793bd34172b0c414619d2762 SHA512 1879e2601ad88262c99201bff5353ac40516985de72dd894eeeae2589ae2b82dd4dbfc972cb3ff43f209efb92753d4ed0ce584d89cd242fedc011511c45d8a87
 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-4.0.20170331.ebuild 1195 BLAKE2B e57786302b5f7db9e749ce9435342a8ed3906847bc03b4ee0e06566740126ddddb1e4c4c4b3d794f1be8a8d552b3b442686d9a967196de8a5ca44cbc3d6dd5ac SHA512 3c22f2e895d9309dd147032f103b78c3bf3c74ba7e760cc928c8ad772627c386bab92fbf504b38d4cf3cae8aac0fbcc2f1f28fc0fddc0567103c427e99359b7d
-EBUILD foomatic-db-4.0.20180126.ebuild 1215 BLAKE2B 094a32b3ccdf5ccf1a4304cd281656f7e503d88337c0194cf4d4bb58594be07885cf0ae7d7ed9ed168ce7bfec9ba2d79051fd1b6a5c015b8f941d9b1f86af901 SHA512 d23fdebede97f924bc39f4cb68e38f1c0602ed9049374a2cfd2f0abf83fe9e0a84748b30902383a1f528a16ae0884c55127290acaac12f0c99301d3e746743c4
-EBUILD foomatic-db-4.0.20190226.ebuild 1212 BLAKE2B f719061c34a5de8171f5656c5a1c598afaa047c56742162da4765d622256ec70d36ede5143bca333393000bfd8b4f9ccb043857c3e098e7dc036f78d4e951639 SHA512 3562b04899e313ae43c33a55cce639908d88df3be9e7dabc0cdbe3684ed1b8d6fee44c1f88cc1710e6a9a9e6136368b27dacc863a28261783bdcb9dc644b3daf
+EBUILD foomatic-db-4.0.20170331.ebuild 1192 BLAKE2B ee2a97c5de45d3886616a271e787166007431684978747f84c5c0516ad47ec132a80c30df89d1d8ba001942711522a51bb928616f0e74f227b933a57c89b06b1 SHA512 1f624641a063fd6bc4a1e1b5a6781bfef338f01452aaf0b7836e82efe320448e2f467cf9a618b9dbaf9903b16e85bfe4f80811ac147786463e032352c614e75d
+EBUILD foomatic-db-4.0.20180126.ebuild 1208 BLAKE2B 9ea02390f164fb33a2b85b24fb02a9bcc2646074676ae4a90767354452e7c371ac01bab7f836c3bca5b3300df894bdfa9305c50a46d6a718b60c6f2d44df0bf8 SHA512 7a569304fd23ab104393f34bda347cea778d2e7ec2c9565d2b0df04bac1e757c98e9b9ca189c7e4a626b45efb40a54ca6fd223f0ff35e6a06ee36a59a402f257
+EBUILD foomatic-db-4.0.20190226.ebuild 1208 BLAKE2B 9ea02390f164fb33a2b85b24fb02a9bcc2646074676ae4a90767354452e7c371ac01bab7f836c3bca5b3300df894bdfa9305c50a46d6a718b60c6f2d44df0bf8 SHA512 7a569304fd23ab104393f34bda347cea778d2e7ec2c9565d2b0df04bac1e757c98e9b9ca189c7e4a626b45efb40a54ca6fd223f0ff35e6a06ee36a59a402f257
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
index 6f0079adac14..a7945cd28e47 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
index 6f5d5933e67b..dc60de17c674 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
index 41b16804fffb..dc60de17c674 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 678c73ce59d3..09b2a5e2de3b 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,6 +1,4 @@
 AUX gutenprint-5.3.1-cflags.patch 659 BLAKE2B 90beb435d0b9a036f31e25f78afedca178b2b6d7bba3cf294ae45699e139d136bbc996dfca86db65d64a61ef004c343ba55f7e097e7304b1d6392efe0ed9cc31 SHA512 f7bac5fd0cff9c1e5b47c965c0304ffda47478241f715de4ada829a295ec54adf198046699bab866166f974c692ac525207f0541e7ba6959e18d63765128327d
-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.3.1.ebuild 2086 BLAKE2B 05e7befb8217ee66c653029af49eb1600989d945bbb2d3782fe86cb5e3eeb06b6cf486da6060079198e9ab8b4fbf2f0430ae7e83cefd5c6a72a09dabaeb718b8 SHA512 092e6de1393a05ed0a9fc1c8d53b0307e7214e40c91abfd7d5346148ff23e1cebd0d491014103d72b4a48bbf50fcf6347cd6ee4cc649f4faebdfc03a1ad7eea2
 EBUILD gutenprint-5.3.3.ebuild 1913 BLAKE2B 85d129bd65dfda9e1bcd982aeb153b2f96fe726d3e62cc1dc09ebc2d5004e63047f3fb51389afabbfc47bd5e7195ba661e5d162706b985e3e886a40eba5d19f4 SHA512 c0bc210b367f3c3db07100a2fdcdb909d670aeba595c1053b74af60f4e1146ee926a66bf833639395de3052f5ce0eee45eb1091441b7b915082719e39f14ddca
 MISC metadata.xml 339 BLAKE2B 1090eefd725cc9e37f9c8e77daddb80c3791098af5ba2405dd2746426a46722bef0ed8706654100559735d9f29c2be45eec525cadc0653776dda60453abca786 SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6
diff --git a/net-print/gutenprint/gutenprint-5.3.1.ebuild b/net-print/gutenprint/gutenprint-5.3.1.ebuild
deleted file mode 100644
index fcbf7a181fed..000000000000
--- a/net-print/gutenprint/gutenprint-5.3.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 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 )"
-
-# gimp restriction: https://sourceforge.net/p/gimp-print/bugs/725/
-RDEPEND="
-	dev-lang/perl
-	readline? ( sys-libs/readline:0= )
-	cups? ( >=net-print/cups-1.1.14 )
-	gimp? ( <media-gfx/gimp-9999:2 x11-libs/gtk+:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.1-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i "s:m4local:m4extra:" Makefile.am || die
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "s/AM_PROG_CC_STDC/AC_PROG_CC/" \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-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 5aaf4646a1c9..faf9510eb98d 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,5 @@
-DIST hplip-3.18.12-plugin.run 10486821 BLAKE2B e48940b1b5fe94dc216383b63bee7807bce9ad265b7c454c201c0ed22ec1964e6c5adf653c3c230789c042cffaaf50bd604bae6f66f407a85f98248934307158 SHA512 82b90aa8245f787e088a1bebfa7892a7f2b97fd04b3702c46eed27306640e562aeec63b4b5b45c24943abe4672f2627d1821bdcdf58a5c1ac4e1d06c7270535f
-DIST hplip-3.19.11-plugin.run 11517119 BLAKE2B d7eefde4e579abbb019cfbb5bf7541360884b0d18240c87c0b532981ad3542a60dae139a623db0eaee3057d6fb5e805287ad5bddb2ec87df5b85ffd604f748f4 SHA512 9ef568aa297eb58370e7f01e54d83c53fbfb02494a0f4cfa3b9f92fd11bfae7b9f54d60516d5cf0436a882864505aab68f70b462b820e918a6ad4104987c9295
-EBUILD hplip-plugin-3.18.12.ebuild 1635 BLAKE2B 421610d7a88268aced86e4b30a4e6798fcdb07fd1b321b3caf65c1e444d9034b461e606f42fe75879a6f19cddc7b5d6264a02febb24e11d126a073b50c517b9c SHA512 3ec01211d1ce65e56e3b2a904390a7ead68a4fec8681b26ed36d2dae7daf7c78d79fec06684b1fccf675290bfed8214693f429b58c2a395ce682016750337865
-EBUILD hplip-plugin-3.19.11.ebuild 1582 BLAKE2B c154a00fae8a57e1b210714728fac79256f14fc8e850936caa1fd6273199f60087cb8cbaf96ba3d0afaf0109638031f9de010812f585676e6af8cca4e2d6cad6 SHA512 eca251a0e72c19a4bf4809a84de741b9704ee20fb82bf669eaeb4f4e9125ead78b3635002120e96c4fd1fbda2060bc8672a8d81caea048eb240ee7305bea7b51
+DIST hplip-3.19.12-plugin.run 11512079 BLAKE2B 534cbba51b2254f8227611b8f0449e100361fb445400f664e43e30412be8eb554bb35c2fe260d45cd5ad742b083af6d551532a9d14585029b0ff93675fab578a SHA512 ac2022d555f5084d5bf1e4519ddbb29828e9ca385aa6dff818ae9e79b60b4b2745e31ad4146cb01bca3747fae0d61b96e4a823b81179d2e2c55a643831165e4b
+DIST hplip-3.20.2-plugin.run 11517273 BLAKE2B 2e1a4829fad70c575ee86b02b80057cf5e3bd7d6ef2e5d76a532290b699ec908ef57e568938607ce8ee7ff8150aa4096ce6425023ce671150b7fac69310ec82b SHA512 632e9d5a0381b568fb1766df493134b9d8c53c13bd5da1e7e06fdf8369d8f30205378e64fec3372104b44ce6ed6a5e9c1f587914f0ad6454a750d07d384e5d28
+EBUILD hplip-plugin-3.19.12.ebuild 1582 BLAKE2B a32bc580eaf2ee335739306a8f5661bd7bf3a0a49f2bd7fdf0ddab0265418807122d680d385e76a5eae243d2e56029ddb7d74ee9f362ec338290ff226b33e003 SHA512 a423e2ef0f2663ed772cebf37517d5373737c6c68ff387ece0aa17a43a934b4338ba2f2ff395b67ca00ae8f9e7b29f587e86c69cfb461dde6c0e9273358e851b
+EBUILD hplip-plugin-3.20.2.ebuild 1582 BLAKE2B a32bc580eaf2ee335739306a8f5661bd7bf3a0a49f2bd7fdf0ddab0265418807122d680d385e76a5eae243d2e56029ddb7d74ee9f362ec338290ff226b33e003 SHA512 a423e2ef0f2663ed772cebf37517d5373737c6c68ff387ece0aa17a43a934b4338ba2f2ff395b67ca00ae8f9e7b29f587e86c69cfb461dde6c0e9273358e851b
 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.12.ebuild
index b497f4a93fa1..315136510139 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.19.11.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.19.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild b/net-print/hplip-plugin/hplip-plugin-3.20.2.ebuild
index 7714ffa082db..315136510139 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.20.2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit udev unpacker
+inherit unpacker
 
 DESCRIPTION="Proprietary plugins and firmware for HPLIP"
 HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
-#SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
 SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
 LICENSE="hplip-plugin"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
 	~net-print/hplip-${PV}
+	virtual/libusb:0
 	virtual/udev
 "
 DEPEND=""
@@ -38,12 +38,14 @@ QA_PRESTRIPPED="
 # License does not allow us to redistribute the "source" package
 RESTRICT="mirror"
 
-src_unpack() {
-	unpack_makeself "hplip-${PV}-plugin.run"
-}
-
 src_install() {
-	local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
+	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
@@ -59,8 +61,8 @@ src_install() {
 		newexe ${plugin} ${plugin/-${hplip_arch}}
 	done
 
-	mkdir -p "${ED}/var/lib/hp/"
-	cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_
+	insinto /var/lib/hp
+	newins - hplip.state <<-_EOF_
 		[plugin]
 		installed = 1
 		eula = 1
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index cfd3602114f1..a709a98244ba 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,8 +1,8 @@
 DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742b7c56929b23e6c1cc3ba9df4eafb8007273a5a2e7f27af0d2d4a3a97ebb9cfe462b74dcddd7149088980893b2c66113b7c SHA512 3b0e2b4f7d8da257c6fcf12f2e049276d059426f2d1c626324982ce862efa2323cbb191a373c53fea7880e3b6e44ec62e584091676556d97e6a456edea4c44cf
-DIST hplip-3.18.12.tar.gz 24588202 BLAKE2B f2ffa6d0d54e467c03ccf9e74accb62ef69842001a00e8c4e6fd68b40c4daff5896fcdd69d37b5e50be2b837918058a5c9071615ab77c1ce83fffc546ff98c02 SHA512 7197cac325cf40c03f49053a98ee0e8ac6c670d142b2a64df09c0f7afa1d7d3602216c55c825ccbf20a1fbda9c9289173b8708e9f87171a862dae5b6b4ef7635
-DIST hplip-3.19.11.tar.gz 25632761 BLAKE2B d189fe4d4d25e7abfba216213aa8ba55410840e00731842080cc94d30c86a56a5a10de55964e63a7ed25e5206089a16cbcc85be632ed31d9f80f0a5a1447f3ca SHA512 f419de0e18937c93c2727f4d8b4f7bf1fcc24961a6b7a0d043ce8341c65d0c0332cd354c0cd907b85bc6ccc7735d23ba5f2c918dba5bf965540291cfcbe032d5
 DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6bec614ef7490c1ecc0e5e745b81b6c2097948fbd062b5e72e10714cdc8d6f9145aacafc0fedeafde375909cb2cb6 SHA512 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
-EBUILD hplip-3.18.12-r1.ebuild 7820 BLAKE2B a023d2f2e7e7b5aee6eb82c7c0e1615181835201030699e80195eb161b007146eb3a97ca7546836d0e86c72781b42821503b87a17d7d85b2d9c128c2e60f83fc SHA512 b0f54c778e56daa20b79604edb1c3fcb04bf1ee90bc71bcf0cbf4683f8be29782057aae3de7d9c803ab022964e2569aff32c0db3e9cff1a5cc5d353c5fad2ff8
-EBUILD hplip-3.19.11.ebuild 7832 BLAKE2B a6330e829cb0dbbf580ee6b41c2599a0fcb14ff6323a28f3feec3c00d7c0dde8915767c6e29c4738078bbd915b9f1226fb2bda57ad577a02985ac4a849c7b4d7 SHA512 79f50926870307c4825dee5268199bcfda42db0973cf10ea720a0907bf2f8e789710012d196e3e468cda66e941125777693415b0b8f55b12f57dfe67b685a415
+DIST hplip-3.20.2.tar.gz 25675649 BLAKE2B 8e98768736fe4ec667852fccebf2bb178047eedb1d92b995d3107ea4c8ba618caa24204c48069b06333a2797dabdf14e1d7d066f5aca77e2c88a85c7080223e6 SHA512 9343eca569c8367e8207708a76351c0f97472500d07f26b62867b4001d504f24b2d2ecfe431e8019623477e7e5d55623d5d91848b4aba71c3e88c8302ed51b4c
+DIST hplip-3.20.3.tar.gz 25672070 BLAKE2B 4c6209a268898de123b2b557d662acddb3ad90b227c0752ebdd1e2afb3fe3d19fddc819aba999347708dd0c098f2b8fea4580dcfb3d5fc7893e47520cae7c1d5 SHA512 a397eb3896292ac956a1969b76707af62c866e47d88148fa75b68574e4639283f7414a2c77e6854c5d22daea49181d4f1bc2daf11fb3058372ff084d591696f1
 EBUILD hplip-3.19.12-r1.ebuild 7827 BLAKE2B e57c664d4802fed5721dc0d1d8a211ac292e955bf647d8b453fdf42a40214cd4a61918e764c24cc1dacaee05c77e5b3a8ca0fc7822c9c17e7089cf6b8a7a0692 SHA512 7f4cedf809f7b42c70ad46bc7674789becd4ecd24129465aa892885f80998a86d2919c371ecbe733a2654a8604a427739c85fe63edadebce7f53f5d687594739
+EBUILD hplip-3.20.2.ebuild 7832 BLAKE2B a6330e829cb0dbbf580ee6b41c2599a0fcb14ff6323a28f3feec3c00d7c0dde8915767c6e29c4738078bbd915b9f1226fb2bda57ad577a02985ac4a849c7b4d7 SHA512 79f50926870307c4825dee5268199bcfda42db0973cf10ea720a0907bf2f8e789710012d196e3e468cda66e941125777693415b0b8f55b12f57dfe67b685a415
+EBUILD hplip-3.20.3.ebuild 7770 BLAKE2B 25814bff70cdba80fb71932a379f6c139fd5188c9253e603d064f18d554067e6d6e497b5cd4500fbc6353132a8c24ede9302fb102434ee0ed997a52067ced9a3 SHA512 45f73eed34ba3a88e815752061fa20d3e2cd0dc4ab7ca3cc0143b17dfae45feb4855898553e20338a100f882f117cf9002bdbb6eadae807575fd1f5080d6dde5
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.19.11.ebuild b/net-print/hplip/hplip-3.20.2.ebuild
index 49cad9be3506..49cad9be3506 100644
--- a/net-print/hplip/hplip-3.19.11.ebuild
+++ b/net-print/hplip/hplip-3.20.2.ebuild
diff --git a/net-print/hplip/hplip-3.18.12-r1.ebuild b/net-print/hplip/hplip-3.20.3.ebuild
index 35552963b9db..6abdff9d5b0e 100644
--- a/net-print/hplip/hplip-3.18.12-r1.ebuild
+++ b/net-print/hplip/hplip-3.20.3.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+),xml"
 
 # 14 and 15 spit out a lot of warnings about subdirs
 WANT_AUTOMAKE="1.13"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
@@ -117,7 +117,6 @@ src_prepare() {
 	default
 
 	if use !minimal ; then
-		python_export EPYTHON PYTHON
 		python_fix_shebang .
 	fi
 
@@ -264,7 +263,6 @@ src_install() {
 	find "${D}" -name '*.la' -delete || die
 
 	if use !minimal ; then
-		python_export EPYTHON PYTHON
 		python_optimize "${ED}"/usr/share/hplip
 	fi
 
diff --git a/net-print/libgnomecups/Manifest b/net-print/libgnomecups/Manifest
index b57ccbc62950..4e3140fdaa10 100644
--- a/net-print/libgnomecups/Manifest
+++ b/net-print/libgnomecups/Manifest
@@ -7,6 +7,6 @@ AUX libgnomecups-0.2.3-glib.h.patch 1017 BLAKE2B 1b3ffe7417f1fdfa617a214162efcd0
 AUX libgnomecups-0.2.3-lpoptions.patch 408 BLAKE2B 970583a14c8850d1e65feab9459a11f8b72e72d6d6aebabe6fac188158128a2e5c17cc1322e223bdf1757852b1b5b8d6996764bc87d9bb2412c782d1b9f9ffb8 SHA512 6d64b0b14dcce03a36a1c0b257e19c37e93778552f306ee312b019690fc35b64b0f1f5c1dc54c72ee85dad755b1facb607d5ef7914c6af01c4bcb86ad4628c85
 AUX libgnomecups-0.2.3-pkgconfig.patch 404 BLAKE2B 78c0107172cf057975dcc4f4c938c2ae990b022d1afaf87e7b0d8623987148d5d240970311fbea0a8c23734d1130bde4c8a05a094e17c8102bcb26f90a43d714 SHA512 2a3ea4921c01c01a55266deaf36d9ff2b0511592be1e58add93af398b9d0d92b21d8c3fe62446b09a939b46569997381a8e56435797625758a22b7d52914c3f8
 DIST libgnomecups-0.2.3.tar.bz2 357129 BLAKE2B 8a8babf0af7a83232590c5e756c4e1c2ce329dae59b88ee5be84c0286a6ed6d6c39f891b7ab0bb68bfc29539769cdd82032422c44a6131c4da9c9355669b1a57 SHA512 7276dfc92209c8503d8a59ceb192273e41bc13cc5f3515dcc00444deca4b9de6a29d0ec4c89811398e03971fa3f5ccbb85ca477da6c5f2bc26f2fb70dccb6a75
-EBUILD libgnomecups-0.2.3-r3.ebuild 1100 BLAKE2B c52f4c07ff914fbcf2deefe1ab73b5ef43c9aa09b069d89f6a908709877fd242912799923e0517f1eb75aa228ea9cf5d9e8f7b675711e17b2f379eae80a1f30b SHA512 9e50a65fd803a1e1b9c94a3dd54f7f3993799b03b5c2ee9fa72ac109c618a0c27f674646ef0349e966e411a0315ae533e55c22ee6bf99532cd67013ecebbcb52
-EBUILD libgnomecups-0.2.3-r5.ebuild 1645 BLAKE2B fed111377262b2f53edb7d15d7cc4b6510023c847de3020b3f06049efc0b931efb2d281f3af8a93a96c874c2a275808a9132f29527fcc7eb0adab6ac22258403 SHA512 9a0b23709521fc4b4618f70eddfe053f56090b6881985d401673994eaaa4395b3d9977fb45cbab0095ac55f926538a7d8bdce2c06ffd6d6991a58216bfcbcd2f
+EBUILD libgnomecups-0.2.3-r3.ebuild 1098 BLAKE2B e5000f33856cbf38ad2e3d013eaef941ee98c5fee6c71edd2e326c6ca1cc31000d4908c2a252c3753a56ebf3f541ce7d3dd868bd8c4b7e83b2e9ffdb44ec1174 SHA512 a89b9caee65d3abdab0edccdd731a7eec1dc6912f8f78b69c1798ece19240bf13a1014870c864d7f53258473c46a1b5afe5c8bf69b3287f2fdc4ae0ff0d8c557
+EBUILD libgnomecups-0.2.3-r5.ebuild 1642 BLAKE2B 610bc0d3d7e7b8e744c69f76dbf6157ddb70d5a1984caeb898a3c5914291992ed5c9aec18b607fe33fd7c3df244552c4ace5c221cd6f979296d7fda28207459f SHA512 0b7cb8906ad2d0bf463839dc297ca4241e1be8dd21283b3cda5ff8a125646f020b8822c733d3258457cf4933b1702bb07093baddb98148d31b5b0352f306fb10
 MISC metadata.xml 365 BLAKE2B a34fd100f946a0e9b31486a7fbf620e8b63495fbd2a24ac665435526bf980e23715a2b9b1b24b7e114e23c4f86c1a3c144c1d92e034464bb26b051ff39bfd53b SHA512 6696e110749820558c770f257f4f74d8d4a6fb617e9f74b7170e12a6c353a03a4fbfbc1c39f2247657f515079d541752da8f6f993d37464523ae5364f0e7c6e9
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
index d4a38b17a1fb..bf943d4fba6d 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
index 15342a0e5db6..4ede34cd9338 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-print
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)