gentoo resync : 18.11.2018

15 files changed, 401 insertions, 53 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index ddcb38b7017e..0891fe7134bf 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 9eeda254f297..8bf33e51012c 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,6 +1,6 @@
-DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 BLAKE2B fafdddedd1b09f33742ae55dfb41994ad3ac6ef5a8c9dc7e7b2a87ec8f5596f1079aead966a89f366c7548cc730328dc594b04747e7946560f83d6df2716d73f SHA512 05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494
 DIST linux-UFRII-drv-v350-uken.tar.gz 116120579 BLAKE2B fa5f521f4eec375fa0d9efb7b47ff6dd88f47c36fa5750818f7e367058b8ccafce99b9f8f9d9195e1e5e0e2f1b77a7c0cc1524786f111b065204d0472601202b SHA512 2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3
-EBUILD cndrvcups-common-lb-3.40.ebuild 2875 BLAKE2B d0590d4149db16ebfd62447e094d5acd32b25a1b5d2b3414fbbcbcba2e2987fa2c4feacea8fb054805470e8f8c4b2f98867d77665bc3e2649877a5ec435c2495 SHA512 e2a95ded32ff1f4be31bdc92a5909e9e1131cc1cd3ec8fd3dedca7969e7bb0a43584a4f158859e01127129b0c9efe4929c4c607c532f78c40c880e7934e2492c
-EBUILD cndrvcups-common-lb-3.50-r1.ebuild 2964 BLAKE2B da67fc87539c5afe8bcdda8ce4a9ebf733b106422509848e7dca2a9428ee8fb6d6c46703bcec52d4a1e63bea4091fa60782c2eae0f3e3cca14e1848afa6c49e8 SHA512 733a995b1f75d462c4c9d5e3020f6930ffa62160bd3d310e3fd897a7565177049e48719db1e15e76569953c630bef40248c053c3b9832432eb66c1f1fc28c215
+DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
+EBUILD cndrvcups-common-lb-3.50-r1.ebuild 2959 BLAKE2B 6d4dbeb5f84e62c36a50587950c642b7ff4647a54a26f7fd7eb9b8651241c7bdd532c589f2e4ac202ed4197abd428c02bf532fdb888b6c757773970e0124768f SHA512 9a1e84267d2174842e8c4f96ffc7038acffac1209cb9bd45c7df6bee745174973cd12e23f3811308b097f79d516cfa73a92db48ea7169815ae88f791b09cc46b
 EBUILD cndrvcups-common-lb-3.50.ebuild 2908 BLAKE2B d94d0bb052e2bec96dd89a31cf492ea4fb87cda1c18e3ceac871c5c4476a4a1da0ba64a8fff320fc44a9051e4efc058e24852e152a554fc398409f4c58595afc SHA512 54d04efc82ccbb790615f5c57b907e4303290884146b83cf445d53e4f8d89efde2cc94c78b0cb1aac7126bf8237c8d451dafc923f77668e491b5d555e0391700
+EBUILD cndrvcups-common-lb-3.60.ebuild 2899 BLAKE2B b893f04e1583dd32fe3937cd99eb4b9933cb09535349154ae0483a40c52e55fba5b9d364e828d72205651a4a9bedb1a2dc402bc26a515c989269cb4d460c1429 SHA512 76dc20f7e6bbfc473513487ee3af670a0c41a6e5b5713c2084048d0e2a4dbb0251d5f9375cf8ff3be995abc826e44a6e0ab8fed0f6778681a5a34b8ce2dda2a7
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
index 2a20a651679e..251dd60eae82 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009240/01/${SOURCES_NAME}.tar.gz"
 # GPL-2 License inside LICENSE-EN.txt files
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60.ebuild
index f8318f3d2fea..ce75e664a60a 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools versionator
+EAPI=7
+inherit autotools
 
-MY_PV="$(delete_all_version_separators)"
+MY_PV="$(ver_rs 1- '')"
 SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
 
 DESCRIPTION="Common files for Canon drivers"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX"
-SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/04/${SOURCES_NAME}.tar.gz"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx"
+SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009240/02/${SOURCES_NAME}.tar.gz"
 
 # GPL-2 License inside LICENSE-EN.txt files
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	dev-libs/libxml2
-	gnome-base/libglade
-	net-print/cups
-	x11-libs/gtk+:2
+	>=dev-libs/libxml2-2.6:2
+	>=gnome-base/libglade-2.4:2.0
+	>=net-print/cups-1.1.17
+	>=x11-libs/gtk+-2.4:2
 "
 DEPEND="${DEPEND}"
 
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.80}"
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.00}"
 
 pkg_setup() {
 	# Don't raise a fuss over pre-built binaries
@@ -48,7 +48,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-	unpack ./${P/-lb-${PV}/-3.80}-1.tar.gz
+	unpack ./${P/-lb-${PV}/-4.00}-1.tar.gz
 }
 
 change_dir() {
@@ -107,8 +107,9 @@ src_install() {
 		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
 	done
 
-	# c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(
-	if [[ "$(get_libdir)" != lib ]]; then
-		dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
-	fi
+	# c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(, bug #????
+	# # Skipped for now due to bug #642138
+#	if [[ "$(get_libdir)" != lib ]]; then
+#		dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
+#	fi
 }
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index cf8af18a4f19..a7108cd61074 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,6 +1,6 @@
-DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 BLAKE2B fafdddedd1b09f33742ae55dfb41994ad3ac6ef5a8c9dc7e7b2a87ec8f5596f1079aead966a89f366c7548cc730328dc594b04747e7946560f83d6df2716d73f SHA512 05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494
 DIST linux-UFRII-drv-v350-uken.tar.gz 116120579 BLAKE2B fa5f521f4eec375fa0d9efb7b47ff6dd88f47c36fa5750818f7e367058b8ccafce99b9f8f9d9195e1e5e0e2f1b77a7c0cc1524786f111b065204d0472601202b SHA512 2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3
-EBUILD cndrvcups-lb-3.40.ebuild 2575 BLAKE2B 4d5708541461c764cf69dbc331116f7707adbd6c8a20b08e2b4dce6427f0374d873a8d5eb90dd807da6977a75c399c2178b641092cb26e78639adc6583ee483a SHA512 1e7b061e8e1c3c65e8c359f3b064ee728c54129b4e1af6028f61aca3c8ca4828c1a2a0bafcf2db4a76891c2c9b9819988f7f933fd1f843816a115af4ee6234d5
-EBUILD cndrvcups-lb-3.50-r1.ebuild 2666 BLAKE2B f3e6584508820d7ef2fc2c5beb687f13fbd6f019bca5342ac2d06c9fcfa32ee6b713bc0e7b70a4cdb43e4cd634e016f9dba06d15c11486070559b3dba498075a SHA512 cc52d37cf782c6c13d204b13cc6fa84a4a318b06c799b8d55ca797f32631b696362ddd721cbab47ecc1a857f59543c621efb6c6e291c5dbd434a00bc28cd3ce7
+DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
+EBUILD cndrvcups-lb-3.50-r1.ebuild 2661 BLAKE2B 8d6efa1d90606289ca418beda23d0aeac3b7bed4ba39d5a5525d29bffda50ba826e798d9843fbf46ca952e26fa3f8149dfe8af1fb2a32f82bf05433caba951b2 SHA512 cc53d15407dd84597531b094b9365bd28d85eb4b52cabcd61bdb825b325a59b9261ad915f44ea1df279c7fe4d38846418a63da54864dff17ab05abb5f62a38d5
 EBUILD cndrvcups-lb-3.50.ebuild 2612 BLAKE2B d96957081bcec6c14310fba0edb5e0106692548c9ada3e31432b9dbfd9a9602d2989a00dbbd7430d402ddfb2b69e371ecb6fa13a9b9883763280c2540ea315ff SHA512 428241bbc275f2ffdc4f82e43b75d9c065fad2531eac51e5037173431b6781cccbff1aae04aa384e162a611aa71e972cd93348db1197bc5e687dda93cda6a564
+EBUILD cndrvcups-lb-3.60.ebuild 2597 BLAKE2B 4a952bf9007e40454a86f7fcff984a564815ae932d65e7883b9e41f94176c86e3f766af059ca73ed5ea18e1314185e8f2df66c5c35107996d226f8154b318173 SHA512 a3e0ca1e78e0f4e4d889bcd13cdc4d8b0e971e4a02770d750e8ae391d9f685b41a3ca90fcf0ebb3a1e8f590afcc9eaab5521a9d81d2d69f54c26aca80ac2e236
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
index b7fe520c91f3..b0fc31e973c6 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009240/01/${SOURCES_NAME}.tar.gz"
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild
index 5547321c0517..bb09609625f5 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools ltprune versionator
+EAPI=7
+inherit autotools
 
-MY_PV="$(delete_all_version_separators)"
+MY_PV="$(ver_rs 1- '')"
 SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
 
 DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX"
-SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/04/${SOURCES_NAME}.tar.gz"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx"
+SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009240/02/${SOURCES_NAME}.tar.gz"
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	gnome-base/libglade
-	net-print/cups
-	~net-print/cndrvcups-common-lb-${PV}
-	x11-libs/gtk+:2
 	>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+	>=gnome-base/libglade-2.4:2.0
+	>=net-print/cups-1.1.17
+	~net-print/cndrvcups-common-lb-${PV}
+	>=x11-libs/gtk+-2.4:2
 	virtual/jpeg:62[abi_x86_32(-)]
 "
 DEPEND="${DEPEND}"
 
 S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+
 MAKEOPTS+=" -j1"
 
 pkg_setup() {
@@ -51,7 +52,7 @@ src_unpack() {
 }
 
 change_dir() {
-	for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
+	for i in pstoufr2cpca cngplp cngplp/files cpca ; do
 		cd "${i}" || die
 		"${@}"
 		cd "${S}" || die
@@ -74,10 +75,9 @@ src_configure() {
 
 src_install() {
 	default
-
 	einstalldocs
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 
 	cd "${S}/data" || die
 	insinto /usr/share/caepcm
@@ -101,8 +101,9 @@ src_install() {
 		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
 	done
 
-	# c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so :(
-	if [[ "$(get_libdir)" != lib ]]; then
-		dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
-	fi
+	# c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so :(, bug #????
+	# Skipped for now due to bug #642138
+#	if [[ "$(get_libdir)" != lib ]]; then
+#		dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
+#	fi
 }
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 9cf9f5b8ed36..25db345fa076 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -8,5 +8,5 @@ EBUILD cups-filters-1.17.9.ebuild 3495 BLAKE2B 0354831007a19a9a5fc00152e52fec2d9
 EBUILD cups-filters-1.20.4.ebuild 3558 BLAKE2B 3063fe64d43deea9c064553fb9da520a8c8d59fc113b1d26ce7e4a53d1b3a9d840b6cd0ad36bc22fac39ccc69ff85bbc7ece6aef98d6f5216c789bade6a8664f SHA512 d465bdd8dca34d128de311af00fe7b4787a854598c6ed976dc51527bfea7a3b433c3b2008afa42066c912c9c99194c66258351fbed8808f0991e149348ab64b7
 EBUILD cups-filters-1.21.2.ebuild 3502 BLAKE2B 17085b5c41c8e20f5c829a0a0ee3a19f646e056d5884be0d49bb1e53ca2b563b4d2d55aaba633d0aae9cb1d3f8a02495b2b539cfb7b5293ebfb05ee2c6544488 SHA512 1f49982ee5ce6d0a6c572d01abb3afb7744d8cab6b26284365c1716eb93f78926eec580bb0be5fc3951fa6aaf2abc96c7f9692a2c6da1a1ed9d5eb1cbece6ef6
 EBUILD cups-filters-1.21.3.ebuild 3499 BLAKE2B 3d905b568e5a6b0e35eedf4bf36d6e0cd8a4674ff5c9231f7060025042ce2bca9e57d7ae0e3eb17aa0a3ed3fdfdbf05867007374cb36bde15c2fdac3f7c6d4be SHA512 c05043f224c2b15b380057296fb263c5152677507b0a3ca5ddc87cdd68ac04083b996776328ea334a58cc458e4dbf08a0be3ea36b5f64798a86bd8d21a5827b4
-EBUILD cups-filters-9999.ebuild 3502 BLAKE2B 17085b5c41c8e20f5c829a0a0ee3a19f646e056d5884be0d49bb1e53ca2b563b4d2d55aaba633d0aae9cb1d3f8a02495b2b539cfb7b5293ebfb05ee2c6544488 SHA512 1f49982ee5ce6d0a6c572d01abb3afb7744d8cab6b26284365c1716eb93f78926eec580bb0be5fc3951fa6aaf2abc96c7f9692a2c6da1a1ed9d5eb1cbece6ef6
+EBUILD cups-filters-9999.ebuild 3593 BLAKE2B c5774a25045123e7ccc395470fc6df78bb8348f9738652c849bcab4b3287e11df23d171f54e6d53da1cb8a4e3838281a48ff63caa35732a824a00da9933075b0 SHA512 e7a2ecd21d0b1d225cb76365388bd67db61c38ff27065af1b2072f4f5f9b4fe49c5a7cc1801e8b03f5c3529f1d5ad2a896636827dc85558b28aaecf4bad2bda6
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 79068417916a..2a2223f47e1e 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-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,10 @@ 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 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 ~amd64-fbsd ~m68k-mint"
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 4973abcda33c..970d560bcc34 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -9,9 +9,11 @@ AUX cups-2.3_rc1-no_pam.patch 4704 BLAKE2B 99d9726f43ebc6ebb7fcaa608b99f435dccde
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
 DIST cups-2.2.7-source.tar.gz 10330296 BLAKE2B 015a64758ee8d2559f4259ff36bf702b93dc695a44e2170d4ecf71b80d5691b4d947decf0a84ff9433b43c6d47dc350a8769d1e230ceda276c13add67e5e8a20 SHA512 780a6a484f38967ff678456ec7b532aa8445a9562663e4e4f6f7a24aac6ec9e8eae36459ee3c025dff053d59ad1d9ecfb823e8a832bae9d384db3d1a10d8860e
 DIST cups-2.2.8-source.tar.gz 10374921 BLAKE2B 3fc4d5cae3848cbb7fb1263b377210254dfa08d70a1218c7f20d5a277d0536791e071c50bac282ab2049e1cffddfe91438216ceb37ec279d7cb0ec7b57a315da SHA512 6ed44c5e6f1c46c85b06691713ce476330c93834243720ad2c04fa983e20cde9f6ebfc2eb2ba8bb3700f11320471b99856d6402d3641038da690f89c49fbd261
+DIST cups-2.2.9-source.tar.gz 10402885 BLAKE2B 6736a2f5efa6ee8eadeea6620b5750e16e3be2e1c46d6f5821146d21078d10cda8e993b111ae326863db93d0c36e55c26d1c91140f8a518759111bafc9c93996 SHA512 423d2a215a115d5f78ce73118e8a2e566662e5d7f8acbffea39e1bfefb2f48f94841c8b85d731b0786b682dc579df8dfb5508570225b5205a182fbb2cd6dd2a5
 DIST cups-2.3b5-source.tar.gz 10176856 BLAKE2B beda07a64ef463371e4e1f25b397caa9487f7acdc982fcfa7edee736a41f6a6875747c772e4c59e2d2746c8c508a0cc87f8608227592f5e1d9c8c48d956ab97c SHA512 48d45f090637bf32bdcc83106272efb8462ff609f74fbe4e82add7f851dcb9173126a1df186848c087d02e8c1441f31a70859faf2714b6ddb1f3738ef8dba60d
 EBUILD cups-2.2.7.ebuild 9948 BLAKE2B 93f232963bb18833570171402bf98eb67a5dc4ab0a05fd224ce82dc71d12ec2698ea0d5e8ce5dd6030005d3392b053261bf22eee9943618146ba7bb3da8811fa SHA512 6bd4ff2b0c17db27ff65a93a5f3ecb61c2bc5c1e4a48621dbe14ba76dd7fb1fbdc9a4eb10a1f08aa9af57cf3afa0114217bbe84df9f5aca24b9cc47cb5625afd
 EBUILD cups-2.2.8-r1.ebuild 9948 BLAKE2B 7216a26222ee20e1839aa062a933755bf091c943a7e39f30d24d265ea3fcd5214291a02e8d531eb3b5b6c441e54e2cee4920c12b7b0d2ff97e76e2b09ba0b991 SHA512 f456adba3ce3b06e630999aa93cf77b47909e89391da6e1683aee5fcd7fc85797efef543ee6549ea9d1160b8178d745b688f220666b05384212aeb7619080de9
+EBUILD cups-2.2.9.ebuild 9894 BLAKE2B 4e70310a747b178a61bcaaaeb11422297876090c465bb3a94f18173a5dc82192fe4daf6b26fa891eb54203d7f8671f18942f43f8d25420551bde5ac7453f10e1 SHA512 7d2491a410d4904db8e4b3ac37b8caf9a01378c7ca0bc77d3f11d4c9c105dac14fe09c7165248de200aed4c784e8774155ca06eaa6bb47ff5b4c8bfe201f25a0
 EBUILD cups-2.3_beta5-r1.ebuild 9724 BLAKE2B eb56666649dc74027e9212796ffbd854eac81c59006d64085e9ea56933c9567c6b6ba59209c32c759182f9368b0e6602da545afa297acb6985503340cb2ae39f SHA512 3c081372d84e805425ad67c117965a84b6ee921ffcd651877858c9a5f17cb7b118eda83d28706e41e8f908f86806eaf122cb4fb34a6ebe9008fb5502c57b2fde
 EBUILD cups-9999.ebuild 9673 BLAKE2B a4b10549bb1e045347580400611de0dc637d23dbab783ff6a6524bfab05a44ea5dc1d9f7f14349028f0843a20ea04ff98fe563c610ad6f5fff00d90110e83029 SHA512 b5024f8e94d6f8e251f54a5c988b512d622ac454a49f84893a900ad63e65dcb565007f95a93b52301e1c0a16ba8cfca06f78edc476fa5c631222fcfed0153bf8
 MISC metadata.xml 677 BLAKE2B ca19e7bd0d56a0a78771a30efcbd867cd0ab1eba7aaf3add8d384721ac70ed8809bc8a171df43887d772f81dcfd54f31bc13267a9a3a88da44b51322aff87c15 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717
diff --git a/net-print/cups/cups-2.2.9.ebuild b/net-print/cups/cups-2.2.9.ebuild
new file mode 100644
index 000000000000..b5fcaa92de95
--- /dev/null
+++ b/net-print/cups/cups-2.2.9.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eapi7-ver gnome2-utils flag-o-matic linux-info xdg-utils multilib 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 ~amd64-fbsd ~x86-fbsd ~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? ( virtual/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}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	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
+	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
+	use zeroconf && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" 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 || die "fperms failed"
+	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() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	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)
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 01740cfc8608..df5e9ed9ff3f 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,8 +1,9 @@
+DIST hplip-3.18.10-patches-1.tar.xz 12344 BLAKE2B e557798ae4b9b23c85cf7084233bb403f1f5ec03e36ee91bcf44c4be4f810db7119d997857c1e1ac27ab2e39e62fd148b85e93bdf2379fe62218fb86c9fc21cf SHA512 99a185ec87c8a75f302764a3f1e19dda601779bf002e08552a6fc8bb7a270e4348817c90b42ab7ae7d9e7a270dff1aa1596ca8051cbd831435ffc980b7fd3999
+DIST hplip-3.18.10.tar.gz 24572132 BLAKE2B a0bfd40c61f3d08c5ef30fbe88bcc78a73081f806cec1c3456f44cc80156cb2470f9b9d97cd9bd43674e6c0ff6756033fe9427c6e67a7a626ad3f00741a39ae5 SHA512 8e744608f1da0e24afbeea814973363d95bbff15a7430c8471d5a53c4a9e772b141e5cd7e69ea03826d1b2e4544e9aabaedc148f2b6577339ef9b2a6d4431c96
 DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed
-DIST hplip-3.18.6-patches-1.tar.xz 10612 BLAKE2B 5fade89a54b5db9002ada0b1819b41cc177d1a709bdb74a32359927ddac35445275bbbbbdec4bcf64a8413fba94bde66c5f4eda2a8a460cc13afc187c59aa388 SHA512 ee1e4848ec7060aed688fb46263f87838a3116666a4d0161dd414ef6b4231c23a11090679d2525c65c2686838436735427a40de0ad80bca4cd5c48eff5207c59
 DIST hplip-3.18.6-patches-2.tar.xz 10632 BLAKE2B 7f0732e082bf44bfd5818a86f35f95a61c5ec6d0218a2be448746a950081d6fb551aea8183763de20154ab40f77f430941d14fa537e367f59d05fc9f0f182f7c SHA512 94be17d18075ea702a1fedec7ae9cc8ac55dfe5d0b2f8f4004412ae3bb84140aac11bb7f45d0ef8f06cbd560daa37859f14aedce87dc39b8368dbd07c7b85733
 DIST hplip-3.18.6.tar.gz 22590564 BLAKE2B edbc80120bb332de9848e528095839b8f3496404ae83482a17bb8bd196c30dd8d3fca4d3dbb60c048bfbeeddd4384b4d7844798dad993eaf52d5418a9391b4ad SHA512 deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f
-EBUILD hplip-3.18.6-r1.ebuild 7732 BLAKE2B 3aede7f2852e97e929d09163db6dcc25133debd868cba05d5623b8c3b4e530ff5dcd37e4ee84c2a5f47d45ca6ccc6291b6be7424f5e3199dbe397dce235a570d SHA512 b540c9f7f95706f42df678469efe32d9ad6e28181fd115d75baa095da05f1835ab7d8862cb76048685c12e1dab5628dded2fc66b7bc3c6857207e3e521a4b903
+EBUILD hplip-3.18.10.ebuild 7733 BLAKE2B a6f9db14610255b99834c58ce94c328f7fbcca4488ea51505f375c0304112ee468fab19ee1323ace169a68acde6da3a83712e571f2ef8eed4de5715d01a8ab04 SHA512 b1e8d9db2e3f798de9e51dcd371225e5b8c8efa4bfe1b116e395c2748ad74d26bd9c38ff10eef4cd1de6e0194b9d4c5a7d67b374b0c751f0cf28be4c8e7d8818
 EBUILD hplip-3.18.6-r2.ebuild 7732 BLAKE2B 19746e3f88431c49a7e6cdcc69f321120e6bb6f2a52985b43aee4d3f4098c19173d3c3509a5b87cff19a900629c9ff8e49f4cb8418a2b2c85dc69d8d7c5b4af0 SHA512 5acd5ca51222b736adeb8fbd5628d27855ecbba8a228327d9f1b46266317df01ff125a234074b68041eaded9c036d3079ac6128094f96f586d147bbe7c74419a
 EBUILD hplip-3.18.6.ebuild 7817 BLAKE2B 0a3ae6abfb6db06d51c13fae58cd90f17246bac765ba7e69d5632163ac8b2e521f5be379e2b6cf179b821fe1c3b4f215c710bce4c44a3628d611e3c8490023fa SHA512 f5793ed25258974257e4b8e6099b6d43ef52a18f37cac925e8af607e6f27f01e165549e490ed5c86f6f2d3655d1283dc1bc6c47dfce773f72d40faabce61928e
 MISC metadata.xml 1829 BLAKE2B 614757c5958bb24f223c75a252beb06014bfe7f47cfe58feb88be89918394224b7075e0d444d7bb898f9f478c2ae5cf572df3f905ff110ec1153cf1849cc8e46 SHA512 c6aae86cd5a200b7d42336f0884b87dc0b74d2b2216b8002929a56a53f42ec02447684eb8d0411e30ef707e01d930aac446866796c781f95a3463f84901666f6
diff --git a/net-print/hplip/hplip-3.18.6-r1.ebuild b/net-print/hplip/hplip-3.18.10.ebuild
index 687d6294c019..d71dd7018534 100644
--- a/net-print/hplip/hplip-3.18.6-r1.ebuild
+++ b/net-print/hplip/hplip-3.18.10.ebuild
@@ -14,7 +14,7 @@ inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
 DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
 HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.6-patches-1.tar.xz"
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.10-patches-1.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-print/lprng/Manifest b/net-print/lprng/Manifest
index b75bf98aab2f..3975ee79cc96 100644
--- a/net-print/lprng/Manifest
+++ b/net-print/lprng/Manifest
@@ -5,4 +5,4 @@ AUX lprng-init 944 BLAKE2B b1155af74d517a510460e266ddf0d45889e12591a9cab00dac4f5
 AUX printcap 551 BLAKE2B 78f243f651c88dad445b048f3678e43ccd655be5b6e34eeacc025621f9a667ea4241b2876da3c71aaf278a4868588b6901a96f6971a3ec666acccfa3895e46a7 SHA512 f2536090359cca27c78c6f2bda89fef61dba9a0cf402364a685491c91c6ee1d7e4d693349b45a9ed576dbffcc64de0f09cb111e7cb89c844ccf68bcaa016bce9
 DIST LPRng-3.8.35.tgz 12512453 BLAKE2B 82c23aa092ef5d9d946bc363c406aeaa9ef9cd566cb7ce353d0e7734ceab5fdd6129e6e1f9617d5e56481d93b3e30331a7dd128c5daff3e3609c67a022394d65 SHA512 ddebf23087b6c98c89369af26a2e46194c01243490ae47b025afde8ffcf0b1c05b9689702296c1a8aa38c2c38934df094d8cc7e922ab1ac27f51ce19f3676771
 EBUILD lprng-3.8.35-r3.ebuild 1959 BLAKE2B 02e5eca0a375aceaffb4d8fdfc8ee9a62ae63c736694fca8b019448d39c62e7aea377a5ea3c23ceccfb9866369c05a1feb406fcda46eca385b5495fcccf72d0d SHA512 4957e6bcfeadaf008e8693651d7d5cea607d197e6f9ff38be89184130ac8062d18627494287927e6a447e363ca59b6d964dc915abc425035a368d4cbb1268aee
-MISC metadata.xml 366 BLAKE2B cf7a0d75bb1c71439382f16ff03bbf76ad8eaf864de8dc02d03121fe0e9ebb347d14c6dc9c3385aff9487383f7be07532c5fb9f6513710f821b1bea986157f93 SHA512 6117e79cf777aa49a3212eea42384e1cfb8b54c3a759d8c98a89f516da2b4a503a01a0a4e785b1d030b2299bc6bf640e29cf7dfff0197605a75bf538e3dd1dd5
+MISC metadata.xml 471 BLAKE2B e3d3c9cf1ce8f26cb586d2862851a9fe445c4d8f92e45ec4448a05ddaaea909cd2d0d33af5dac8088a4e03cb2d450a43ec0784870e456e3392df7b59a45a9681 SHA512 dae5dc08fb3a7042a0d7d77da3e2aa29fc20d9bab269c7da55249a46407e8cf73946ae5e7c44cab8499bbf92c5bda8feedc85bc0ed621aec3102e3dfc74c869d
diff --git a/net-print/lprng/metadata.xml b/net-print/lprng/metadata.xml
index 568181659c37..4aaa7226a2d6 100644
--- a/net-print/lprng/metadata.xml
+++ b/net-print/lprng/metadata.xml
@@ -9,4 +9,8 @@
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
+	<use>
+		<flag name='foomaticdb'>Add support for the foomatic printing
+			driver database</flag>
+	</use>
 </pkgmetadata>