gentoo resync : 28.04.2019

24 files changed, 356 insertions, 528 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index be67c33ca81d..bddaec188950 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 77e5424e09ce..6d3db3c0bc7b 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,9 +1,9 @@
 AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
 DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a
-DIST cups-filters-1.22.2.tar.xz 1476812 BLAKE2B fa64a0cf3a0c62053914a603366cf6982ce703b44c40dcd1c4410e180f22cd929cc4f1fee4e00945fa9e73dfbc5bae8b664527c32060be42050882a861412ae0 SHA512 da9873f01baf9436c00009348ea8033df1c9e44c97839e16841241510fbb1f3d93fc57ee593d1286bdfeab0a89c15b0f7d74c932bd48f3a623c7c10d200bbd6a
 DIST cups-filters-1.22.3.tar.xz 1476460 BLAKE2B 3db5a5b2f048a4e3929f7e4080c5d50b5b68bc6456df4d9360395edcb4954701da960d63dd8e885bcd8b7d93bb31c3b0d6511f69893b3e4e8df445b6fa1f13b8 SHA512 8f91f7261babf2e4633590e1f69f3c85162596bba9a709d301f774eb65f83e7c025493cabbbc5d91beca32f5122e2d4e1efa9947e2d95b9a622913a79940a534
+DIST cups-filters-1.22.5.tar.xz 1476792 BLAKE2B 77efec3c6c8287b22ab96185e609e8da30ebd20d9c944ba0a3057bd1469e12d30cf6775988500e4f410410160d8766df1d6432e81116cbf926e7c75f49cddb5d SHA512 ed33e6d6f090c00f0f0d1d012d3b394bfaa1f81feeb5b0b7ead1dffa2399f0165ce916a99c3bf28aca7f279bffba5b6575feff700130cabfcd46eb4c904d5c59
 EBUILD cups-filters-1.21.6.ebuild 3489 BLAKE2B 737c9c89d4db817c4d54caac560e942880b766f36ff175948c27b39656883862a9ec8b1b6a40c88a072069f2cb085ae706743e4a92b2669b7f550b25ef1b35b2 SHA512 0e6c5c5cd959e0d730b0c29ca7365673c575a09e3fc89eee507906c79f42345ac50d7a4e01230f1717e6c7fd3fd0205d68bb0afd63a7b02c50ef166083c77add
-EBUILD cups-filters-1.22.2.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
 EBUILD cups-filters-1.22.3.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
+EBUILD cups-filters-1.22.5.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
 EBUILD cups-filters-9999.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.22.2.ebuild b/net-print/cups-filters/cups-filters-1.22.5.ebuild
index 9549f96b1d5a..9549f96b1d5a 100644
--- a/net-print/cups-filters/cups-filters-1.22.2.ebuild
+++ b/net-print/cups-filters/cups-filters-1.22.5.ebuild
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 01e72d284e34..4eb0493a616d 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,7 +1,9 @@
 DIST hplip-3.18.12-plugin.run 10486821 BLAKE2B e48940b1b5fe94dc216383b63bee7807bce9ad265b7c454c201c0ed22ec1964e6c5adf653c3c230789c042cffaaf50bd604bae6f66f407a85f98248934307158 SHA512 82b90aa8245f787e088a1bebfa7892a7f2b97fd04b3702c46eed27306640e562aeec63b4b5b45c24943abe4672f2627d1821bdcdf58a5c1ac4e1d06c7270535f
 DIST hplip-3.18.6-plugin.run 2065663 BLAKE2B 501a37dd504250225ddad9712259e0e1b564aa034e433f24d277c5609fa95580417da1a0ae040a4624ff48806a3b34ec56ff31aed843e9f0f0b68b304d2ebd9e SHA512 7b5eb2f43dd014df25ccd9e72dd7efc069db47921f2de650b2ff993dbee60056063edeee6593be7d35019212daf623fff9696b13508a808db92128f5c81bde76
 DIST hplip-3.19.1-plugin.run 11502855 BLAKE2B 715f8927d08e6328a5049b2336b693cfd604703451f558237d45a4955745377a8142ddd56dffeca81e3878425861463b4c1cbfe88dc92a9f024f4681d46712af SHA512 0464728ccaf48755132969a7cfedefeb66b87c9e234249ca4801e5e99a1e34e45e07c9f3486b527a65c320a4cab801f48b5f0f4dce98c40c844dd1ef092d299c
+DIST hplip-3.19.3-plugin.run 11516959 BLAKE2B 858b5973b6bdceddfed25227ffd0e4f7871f1fe01bd080c88a0f28a72e6c7cf8d0aa35c7c55139a5844f80d2dfa3f9862f61cf9564df8dcd65370ee85882c729 SHA512 c0305926bc610f665cef0c114b64db7861da9a6159dff46a3b600ae440f8b225c7b6f774a6549808aa5f11df78970a799bce763922b52aaf0473210e198d382d
 EBUILD hplip-plugin-3.18.12.ebuild 1635 BLAKE2B ae1570a85138b53a21ee01c9b6c2eed85b4f22f4040666289d2bf52bdc5df0ef063574e767109fec86d3f24765149774918e9aa39247df5d0b2af56b25dfffcc SHA512 e039e8f25c210638d6098e06e51861b5c35400554fba867abd533f2aa89584abc6c62546bdad04b5fb4ce6dc61bc9d33ef9b7a0ae9d3ed3a7b3b42c45c2888d2
 EBUILD hplip-plugin-3.18.6.ebuild 1551 BLAKE2B d034eacc21cb423a79ccd668d322d40f23aed57392d75aa75b10f3f90f634d96510e5e87c485b04bca566cfdc7bb59056f75a13493e90e92ad4ea13ffe4198f8 SHA512 6ed4f208ec25a1805ed377749d9232ed59f890eaedcdbc1f58fa6c2b41eb77ea52d8dad9f7beec5ad8b156eac22384956faddf458562febf7e20ed1b88bff356
 EBUILD hplip-plugin-3.19.1.ebuild 1635 BLAKE2B 421610d7a88268aced86e4b30a4e6798fcdb07fd1b321b3caf65c1e444d9034b461e606f42fe75879a6f19cddc7b5d6264a02febb24e11d126a073b50c517b9c SHA512 3ec01211d1ce65e56e3b2a904390a7ead68a4fec8681b26ed36d2dae7daf7c78d79fec06684b1fccf675290bfed8214693f429b58c2a395ce682016750337865
+EBUILD hplip-plugin-3.19.3.ebuild 1635 BLAKE2B 421610d7a88268aced86e4b30a4e6798fcdb07fd1b321b3caf65c1e444d9034b461e606f42fe75879a6f19cddc7b5d6264a02febb24e11d126a073b50c517b9c SHA512 3ec01211d1ce65e56e3b2a904390a7ead68a4fec8681b26ed36d2dae7daf7c78d79fec06684b1fccf675290bfed8214693f429b58c2a395ce682016750337865
 MISC metadata.xml 334 BLAKE2B 8f1a0784c57af6204db98f443bdb09df2a6432674d711a5ecf577c20e29f04a030549ea19c6e04f51cd9a36e60a6da94bebafbfcc10d52da87109e59c32d42ee SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c
diff --git a/net-print/hplip-plugin/hplip-plugin-3.19.3.ebuild b/net-print/hplip-plugin/hplip-plugin-3.19.3.ebuild
new file mode 100644
index 000000000000..7714ffa082db
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.19.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit udev 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"
+IUSE=""
+
+RDEPEND="
+	~net-print/hplip-${PV}
+	virtual/udev
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PRESTRIPPED="
+	/usr/share/hplip/fax/plugins/fax_marvell.so
+	/usr/share/hplip/prnt/plugins/hbpl1.so
+	/usr/share/hplip/prnt/plugins/lj.so
+	/usr/share/hplip/scan/plugins/bb_escl.so
+	/usr/share/hplip/scan/plugins/bb_marvell.so
+	/usr/share/hplip/scan/plugins/bb_soapht.so
+	/usr/share/hplip/scan/plugins/bb_soap.so
+"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_unpack() {
+	unpack_makeself "hplip-${PV}-plugin.run"
+}
+
+src_install() {
+	local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
+
+	insinto "${HPLIP_HOME}"/data/firmware
+	doins *.fw.gz
+
+	for plugin in *-${hplip_arch}.so; do
+		local plugin_type=prnt
+		case "${plugin}" in
+			fax_*) plugin_type=fax ;;
+			bb_*)  plugin_type=scan ;;
+		esac
+
+		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+		newexe ${plugin} ${plugin/-${hplip_arch}}
+	done
+
+	mkdir -p "${ED}/var/lib/hp/"
+	cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_
+		[plugin]
+		installed = 1
+		eula = 1
+		version = ${PV}
+	_EOF_
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index f9851021f72d..cb4690ef392f 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,7 +3,9 @@ DIST hplip-3.18.12.tar.gz 24588202 BLAKE2B f2ffa6d0d54e467c03ccf9e74accb62ef6984
 DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed
 DIST hplip-3.18.6.tar.gz 22590564 BLAKE2B edbc80120bb332de9848e528095839b8f3496404ae83482a17bb8bd196c30dd8d3fca4d3dbb60c048bfbeeddd4384b4d7844798dad993eaf52d5418a9391b4ad SHA512 deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f
 DIST hplip-3.19.1.tar.gz 24530780 BLAKE2B edebde522dd3b531da1a1c27728e868217cbbd0c173210adc56e3fdf5335fafbde2f86b45febff4087b781ce2db7d3f55181a20a706e8a089470ac977f75b992 SHA512 b1d663a3538a19ab2c195bc627c765b9dded047b0431f6fc2096a8a31b4efb5cf52c88ad9665a2d78893ba66c1c47ccf79c161965f308a27eeeb11b156b446c8
-EBUILD hplip-3.18.12.ebuild 7743 BLAKE2B 7607004f9b1eef2fe789bec5983f357c973b962f3cb809de62d5b20511c7441af0becf071c94e23cf57a6c58667b8257e110bd57af0031661285895d61a762a5 SHA512 b8aa6e71888a4b9ebf23da29746480aed5a63a72d85e69248716948c0c14dbb2ef5149f2596b94e7d4b73341e849e4e84aeda96f60c3a6d3ce8a1df92d44aa54
-EBUILD hplip-3.18.6.ebuild 7817 BLAKE2B 0a3ae6abfb6db06d51c13fae58cd90f17246bac765ba7e69d5632163ac8b2e521f5be379e2b6cf179b821fe1c3b4f215c710bce4c44a3628d611e3c8490023fa SHA512 f5793ed25258974257e4b8e6099b6d43ef52a18f37cac925e8af607e6f27f01e165549e490ed5c86f6f2d3655d1283dc1bc6c47dfce773f72d40faabce61928e
-EBUILD hplip-3.19.1.ebuild 7745 BLAKE2B 1709afd7e8e3bbb8797fc136213b983af343a18a526ee2d958a595d6320ce4242f3f5055fe383f69632d03865518adb5dbd2c79d4a62630d3caf4b54ce34e39e SHA512 7db25b64afcfe344928f062b18d28b6074aa009c02333869d18d92933e0b148b17f4bb98691247850a3b04b0cec08a3ef0d420cf0b0547574af502ac2a39b6c2
+DIST hplip-3.19.3.tar.gz 25068895 BLAKE2B 380fc54c814e38a113d8cfb5d4199bad4f53fbf04535a512e37932d34285e221cf013f688eeeba1cb025ea5230b15cddc9ad0bf5f492170c768662057cbe486e SHA512 6191974d6c9a35e58a9b0d2ff1077b3a9479e44ccb76a551f3e29ca56d420bfe0778fa6b7a4e51b18f2e55cae9ad1f5216f716e22b651122ec0fe9e730fcd29a
+EBUILD hplip-3.18.12.ebuild 7741 BLAKE2B 751b37522049c4a2f8f6bec7d7b264fdb823adf3e9db612c3782ad19dcc8a551dc2df7811ab97bc9acbd5995063af9b40aff0c3deac422a9a274be26ecc22932 SHA512 577a06b65a059d039951ed49c4b995d5f1d5f0a61e0fa16f33e34a6b55380676c9defe0dc801419163f7195c655c1d6ea2f1709ebccf17bc5f74c40077a40bcb
+EBUILD hplip-3.18.6.ebuild 7810 BLAKE2B 9e5c8e58b368f45f4bb986f72329d952ebdef1dc899252585a73726c79958e768f271a0d756ffd91839184f3d839ced35bebb080b38014a605f0e7af558f9aa5 SHA512 4db0fbae5a50f352cc4a18ee94eaf97de4e327a375c66057a4a873ed57580f9d38957932aed61827e137cf0de51ffbedad71a03a13504f6f89ea427bada03c25
+EBUILD hplip-3.19.1.ebuild 7743 BLAKE2B afd1f59ad7c15e2801d2cdaaac099061606ca22e1a229c391c46c7ec35220b894512d75e611671f16657db5d8cecf8d8fabb195277cfe898b713d9eaa8c9f904 SHA512 d283fc0e5784e9f9d3e298ab186d97692bf071bc2c12c5bec53ebe0c26094252f036858186e395f0a9e1c346407c53d21c3ca5c49e231884293e1039346ec62f
+EBUILD hplip-3.19.3.ebuild 7743 BLAKE2B afd1f59ad7c15e2801d2cdaaac099061606ca22e1a229c391c46c7ec35220b894512d75e611671f16657db5d8cecf8d8fabb195277cfe898b713d9eaa8c9f904 SHA512 d283fc0e5784e9f9d3e298ab186d97692bf071bc2c12c5bec53ebe0c26094252f036858186e395f0a9e1c346407c53d21c3ca5c49e231884293e1039346ec62f
 MISC metadata.xml 1829 BLAKE2B 614757c5958bb24f223c75a252beb06014bfe7f47cfe58feb88be89918394224b7075e0d444d7bb898f9f478c2ae5cf572df3f905ff110ec1153cf1849cc8e46 SHA512 c6aae86cd5a200b7d42336f0884b87dc0b74d2b2216b8002929a56a53f42ec02447684eb8d0411e30ef707e01d930aac446866796c781f95a3463f84901666f6
diff --git a/net-print/hplip/hplip-3.18.12.ebuild b/net-print/hplip/hplip-3.18.12.ebuild
index 7793d25b3f8f..fcde7fb67991 100644
--- a/net-print/hplip/hplip-3.18.12.ebuild
+++ b/net-print/hplip/hplip-3.18.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="threads,xml"
 
 # 14 and 15 spit out a lot of warnings about subdirs
diff --git a/net-print/hplip/hplip-3.18.6.ebuild b/net-print/hplip/hplip-3.18.6.ebuild
index 473bb9802709..740e00e32dec 100644
--- a/net-print/hplip/hplip-3.18.6.ebuild
+++ b/net-print/hplip/hplip-3.18.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="threads,xml"
 
 # 14 and 15 spit out a lot of warnings about subdirs
diff --git a/net-print/hplip/hplip-3.19.1.ebuild b/net-print/hplip/hplip-3.19.1.ebuild
index a55937076467..0c753a8bdef0 100644
--- a/net-print/hplip/hplip-3.19.1.ebuild
+++ b/net-print/hplip/hplip-3.19.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="threads,xml"
 
 # 14 and 15 spit out a lot of warnings about subdirs
diff --git a/net-print/hplip/hplip-3.19.3.ebuild b/net-print/hplip/hplip-3.19.3.ebuild
new file mode 100644
index 000000000000..0c753a8bdef0
--- /dev/null
+++ b/net-print/hplip/hplip-3.19.3.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+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.12-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+		kernel_linux? ( virtual/udev )
+		qt5? (
+			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
+		)
+		scanner? (
+			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+			X? (
+				|| (
+					kde? ( kde-misc/skanlite )
+					media-gfx/xsane
+					media-gfx/sane-frontends
+				)
+			)
+		)
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		--enable-hpps-install \
+		--disable-class-driver \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-print/lprng/Manifest b/net-print/lprng/Manifest
deleted file mode 100644
index 3975ee79cc96..000000000000
--- a/net-print/lprng/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX lprng-3.8.27-certs.diff 1120 BLAKE2B d2070b747cbadaf574bc96fb1e37b8f5d0e7ead866327703832d20951a2a2eb89798982d9f917a59d31d54643cef9aa05025810d3babca24057e449b5dfdc12f SHA512 14d88ff3a78632f5f3ef69fd64a20adc745ca1169b3b7dc57d0374f279946b1be5c60e29370e1513222ebd1055d5840e8e3e843166e958be70119b42cbdfb4de
-AUX lprng-3.8.28-krb.diff 428 BLAKE2B efb2e40260306ab3e1f57aca2edd10cdb253d729f68b89069b046af3bfc30f50107b9993b0c47d167f0e35a43d84d555c49963490bcfe5da07daf4c0f5980e79 SHA512 70d7ea3d86d361d402063099e77aeb3d5dfc6e68823e2d00cfa1d3551d6a463a11ec736195d803faccf52dd82cc1965f4164d33536c794aab46b28bfd8f64788
-AUX lprng-3.8.28-make.diff 364 BLAKE2B eab9593ae6ff3dd7300fb094e3275e17ef131d6528d7760c572ac1c695221d042a9ff4553ecfca5bb6de5978e086ccf4027e6e06d9b2bcf6da0edda45e7a68d6 SHA512 bddbcb12596daf86b9d4fdf270a57549626522081d46ae89eafa4eb4aee173a701732093646fb0f448653a94715e90eea379a7716839ec5769dea5e16c9b12f0
-AUX lprng-init 944 BLAKE2B b1155af74d517a510460e266ddf0d45889e12591a9cab00dac4f51b893cb611979946976cdf477a36796069e6fcac3c298861e741c85ad01c80e4c540cdef462 SHA512 10fbee633d27a8692f90af7f506e5144c3cbf614e9ecec6b910a590466a8c9aaf65d5778425504ac238e245d1c24e85953bb26b2a5df957f393683d2a9783cd5
-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 471 BLAKE2B e3d3c9cf1ce8f26cb586d2862851a9fe445c4d8f92e45ec4448a05ddaaea909cd2d0d33af5dac8088a4e03cb2d450a43ec0784870e456e3392df7b59a45a9681 SHA512 dae5dc08fb3a7042a0d7d77da3e2aa29fc20d9bab269c7da55249a46407e8cf73946ae5e7c44cab8499bbf92c5bda8feedc85bc0ed621aec3102e3dfc74c869d
diff --git a/net-print/lprng/files/lprng-3.8.27-certs.diff b/net-print/lprng/files/lprng-3.8.27-certs.diff
deleted file mode 100644
index 13b9051aea0c..000000000000
--- a/net-print/lprng/files/lprng-3.8.27-certs.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- LPRng-3.8.27/src/lprng_certs.orig	2004-12-20 00:29:21.000000000 +0100
-+++ LPRng-3.8.27/src/lprng_certs.sh	2004-12-20 00:33:49.000000000 +0100
-@@ -320,7 +320,9 @@
- # set default values
- 
- 
--CFG=/tmp/$$.sslcfg
-+TMPDIR=`mktemp -d -t lprng.XXXXXX` || { echo "$0: Cannot create temporary directory!" >&2 ; exit 1; }
-+trap "/bin/rm -rf ${TMPDIR}" 0 1 2 3 13 15
-+CFG=$TMPDIR/sslcfg
- 
- OPENSSL=/usr/bin/openssl
- CA_KEY=//etc/lprng/ssl.ca/ca.key
-@@ -508,14 +510,14 @@
- 	shift
- 	if [ "$1" = "" ] ; then usage; fi;
- 	if [ ! -f "$1" ] ; then useage; fi;
--	sed -n -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/p' $1 >/tmp/$$.key
--	sed -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/d' $1 >/tmp/$$.crt
--	STEP="" encrypt /tmp/$$.key
-+	sed -n -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/p' $1 >$TMPDIR/key
-+	sed -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/d' $1 >$TMPDIR/crt
-+	STEP="" encrypt $TMPDIR/key 
- 	status=$?
- 	echo STATUS $status
- 	if [ $status = 0 ] ; then
- 		mv $1 $1.orig
--		cat /tmp/$$.crt /tmp/$$.key >$1
-+		cat $TMPDIR/crt $TMPDIR/key >$1
- 	fi
-     ;;
- 
-@@ -845,5 +847,4 @@
-     exit 1
-     ;;
- esac
--rm -f ${CFG}
- exit $RET
diff --git a/net-print/lprng/files/lprng-3.8.28-krb.diff b/net-print/lprng/files/lprng-3.8.28-krb.diff
deleted file mode 100644
index 76381e560d06..000000000000
--- a/net-print/lprng/files/lprng-3.8.28-krb.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- LPRng-3.8.28/src/common/krb5_auth.c.org	2004-09-24 22:19:57.000000000 +0200
-+++ LPRng-3.8.28/src/common/krb5_auth.c	2006-10-13 09:19:44.000000000 +0200
-@@ -922,7 +922,7 @@
- 		nstored = 0;
- 	}
- 	
--	if ((cc = Read_fd_len_timeout(transfer_timeout, fd, len_buf, 4)) != 4) {
-+	if ((cc = Read_fd_len_timeout(transfer_timeout, fd, (char*)len_buf, 4)) != 4) {
- 		/* XXX can't read enough, pipe must have closed */
- 		return(0);
- 	}
diff --git a/net-print/lprng/files/lprng-3.8.28-make.diff b/net-print/lprng/files/lprng-3.8.28-make.diff
deleted file mode 100644
index 66c742dd994f..000000000000
--- a/net-print/lprng/files/lprng-3.8.28-make.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- LPRng-3.8.28/Makefile.in.orig	2004-09-24 22:19:52.000000000 +0200
-+++ LPRng-3.8.28/Makefile.in	2006-06-27 09:26:13.000000000 +0200
-@@ -42,7 +42,7 @@
- LPD_CONF_PATH=\"@LPD_CONF_PATH@\"
- PRINTCAP_PATH=\"@PRINTCAP_PATH@\"
- LPD_PATH=\"@LPD_DIR@/lpd\"
--SHELL="@SHELL@"
-+SHELL=@SHELL@
- LOCKFILE=\"@LOCKFILE@\"
- CONFIG_SUBDIR="@CONFIG_SUBDIR@"
- PSHOWALL="@PSHOWALL@"
diff --git a/net-print/lprng/files/lprng-init b/net-print/lprng/files/lprng-init
deleted file mode 100644
index 115c8adf3ed7..000000000000
--- a/net-print/lprng/files/lprng-init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /etc/lprng/lpd.conf ] ; then
-		eerror "You need an /etc/lprng/lpd.conf file first"
-		eerror "There is a sample in  /usr/share/doc/LPRng"
-		return 1
-	fi
-	if [ ! -e /etc/lprng/printcap ] ; then
-		eerror "You need an /etc/lprng/printcap file first"
-		eerror "There is a sample in  /usr/share/doc/LPRng"
-		return 1
-	fi
-	if [ ! -e /etc/lprng/lpd.perms ] ; then
-		eerror "You need an /etc/lprng/lpd.perms file first"
-		eerror "There is  a sample in  /usr/share/doc/LPRng"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting lpd"
-	start-stop-daemon --start --pidfile "/var/run/lpd.515" --quiet --exec /usr/sbin/lpd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping lpd"
-	start-stop-daemon --stop --pidfile "/var/run/lpd.515" --quiet --exec /usr/sbin/lpd
-	eend $?
-}
diff --git a/net-print/lprng/files/printcap b/net-print/lprng/files/printcap
deleted file mode 100644
index c851e8e2e826..000000000000
--- a/net-print/lprng/files/printcap
+++ /dev/null
@@ -1,23 +0,0 @@
-# /etc/printcap: printer capability database.
-#
-# You can use the filter entries df, tf, cf, gf etc. for your
-# own filters. See the printcap(5) manpage for more details.
-
-lp|Generic dot-matrix printer entry
-        :lp=/dev/lp1
-        :sd=/var/spool/lpd/lp
-        :af=/var/log/lp-acct
-        :lf=/var/log/lp-errs
-        :pl#66
-        :pw#80
-        :pc#150
-        :mx#0
-        :sh
-
-# rlp|Remote printer entry
-#         :lp=
-#         :rm=remotehost
-#         :rp=remoteprinter
-#         :sd=/var/spool/lpd/remote
-#         :mx#0
-#         :sh
diff --git a/net-print/lprng/lprng-3.8.35-r3.ebuild b/net-print/lprng/lprng-3.8.35-r3.ebuild
deleted file mode 100644
index 7867f643f4c9..000000000000
--- a/net-print/lprng/lprng-3.8.35-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_PN=LPRng
-DESCRIPTION="Extended implementation of the Berkeley LPR print spooler"
-HOMEPAGE="http://www.lprng.com/"
-SRC_URI="ftp://ftp.lprng.com/pub/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tgz"
-
-LICENSE="|| ( GPL-2 Artistic )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="foomaticdb kerberos nls ssl"
-
-RDEPEND="sys-process/procps
-	ssl? ( dev-libs/openssl )
-	foomaticdb? ( net-print/cups-filters[foomatic]
-		net-print/foomatic-db )
-	!>=net-print/cups-1.6.2-r4[-lprng-compat]
-	!<net-print/cups-1.6.2-r4"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	kerberos? ( app-crypt/mit-krb5 )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.8.27-certs.diff
-	epatch "${FILESDIR}"/${PN}-3.8.28-make.diff
-	epatch "${FILESDIR}"/${PN}-3.8.28-krb.diff
-}
-
-src_configure() {
-	# wont compile with -O3, needs -O2
-	replace-flags -O[3-9] -O2
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable kerberos) \
-		$(use_enable ssl) \
-		--disable-setuid \
-		--disable-werror \
-		--with-userid=lp \
-		--with-groupid=lp \
-		--with-lpd_conf_path=/etc/lprng/lpd.conf \
-		--with-lpd_perms_path=/etc/lprng/lpd.perms \
-		--libexecdir=/usr/libexec/lprng \
-		--sysconfdir=/etc/lprng \
-		--disable-strip
-}
-
-src_compile() {
-	# bash is necessary due to bashisms in libtool
-	emake -j1 SHELL=/bin/bash
-}
-
-src_install() {
-	dodir /var/spool/lpd
-	diropts -m 700 -o lp -g lp
-	dodir /var/spool/lpd/lp
-
-	emake install \
-		DESTDIR="${D}" \
-		POSTINSTALL="NO" \
-		gnulocaledir="${D}"/usr/share/locale
-
-	dodoc CHANGES README VERSION "${FILESDIR}"/printcap lpd.conf lpd.perms
-
-	insinto /etc/lprng
-	doins "${FILESDIR}"/printcap lpd.conf lpd.perms
-	dosym /etc/lprng/printcap /etc/printcap
-	newinitd "${FILESDIR}"/lprng-init lprng
-}
-
-pkg_postinst() {
-	einfo "If printing does not work, try 'checkpc'/'checkpc -f'"
-}
diff --git a/net-print/lprng/metadata.xml b/net-print/lprng/metadata.xml
deleted file mode 100644
index 4aaa7226a2d6..000000000000
--- a/net-print/lprng/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-<maintainer type="project">
-		<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>
diff --git a/net-print/magicfilter/Manifest b/net-print/magicfilter/Manifest
deleted file mode 100644
index eaa84d5cf9a6..000000000000
--- a/net-print/magicfilter/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX magicfilter-2.3d-glibc-2.10.patch 2152 BLAKE2B 9c151faccec8f02a7e68e635fa7cd24a1f47779dbd9072134d410cbbded0f93321ab2296ceb7be20340cfc0c83857d447f9253056e0a5701c3170e9c17fc0c0b SHA512 b51305590320ddf9da8aaf51f0e794920fcc45348e7ca0fbb9015c49ff5a88e1749ae514ca45e437cf61f9579b905f19cda0169b433c5f4fe57dab861469fba4
-AUX magicfilter-2.3h-configure.patch 1596 BLAKE2B 0ac41d4ee927258fe90a02c3fb8be719bf68b3a2150508489945601ffa2d21f74ddd15db6b373eb2bf2aa8f3ed3be8616f53250b68891516958cea90a18cf0a9 SHA512 4b36282da58cb741f713ac7c29a472cd081f5e91873f684bc48cf5b76ce92ce460fdbae238e430bc9316a25a1bd5826ffa99c3a3f2fa3023047474071075ece1
-AUX magicfilter-2.3h-makefile.patch 3152 BLAKE2B e5cb8cb6cb55054442cfab58f4572c4d46ed8a826e2bc4add1f18f2f21507e6723e0ab2f85c0337c2a393cbd887d8e861ce7029094bfa9e2c5a71fbb941e2ede SHA512 f0a11df975df9e8f41e4b4eb35fe14cf3d4b1c0fe169c3540137e1dc29af3c0b0799fea4e46c66f2649f6378f664ab9264684336ff56f383f6b03b2146f8b9f2
-DIST magicfilter-2.3.h.tar.gz 161929 BLAKE2B 4333c66962c2b9325635a997b438e9267a3ed1d439bdada9505f2288dbc68f960e8b93c47357929122f55a1f76d6d60a3ef9e4a919c85c0036d41cdf1ce833ed SHA512 7808cfe4944eb5a5a4ad457e3ce9b42556fb09b60223763d0808e5b7c502aafbfe4ff66ebbf73830839eda76d0fa1e840ac9013f61bdce9aa2265c11e8b103dc
-EBUILD magicfilter-2.3h.ebuild 982 BLAKE2B 3bead5c65b809bdb460b7e77c8d4c5df263fb7c4bd285fd9be8a53d3d031ce0bce74f4bcf13568e32f26c29fca24fc39c6c233b3b15a49560db07994d16da528 SHA512 1fcc911efe3bd7663f89d7ffc543c6d52a6611f254bb10b9d5f022f137f1f799981292ef1494481e4d168f3849cd81516075600e9d12625b8df9212a7c28964a
-MISC metadata.xml 381 BLAKE2B f262dbb1bd364971cb9df15b7a6d405d88961353ad0a4f5ee7ba62d5c6f6580fc7524cf1e1df4b56216ec1d81b309dcb10d3531d4a91a9e87fdf714d33284745 SHA512 799b4e1f59fdbb05f865472a76bff92f43d39d698990b52f1bc29305d17452edda75e73678e9bd41d41448f57b4de4ea12d152ef8881d18a7ad5ca8cb02e9952
diff --git a/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch b/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch
deleted file mode 100644
index eea064501cad..000000000000
--- a/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- fe.c
-+++ fe.c
-@@ -128,7 +128,7 @@
- 
-     /* read rules
-      */
--    while ( (r = getline(f)) != 0) {
-+    while ( (r = get_line(f)) != 0) {
- 	rulecount++;
- 	if (tail) {
- 	    tail->next = r;
---- getline.c
-+++ getline.c
-@@ -27,7 +27,7 @@
-  *  THE POSSIBILITY OF SUCH DAMAGE.
-  */
- /*
-- * getline() picks up a magicfilter rule line and passes it back to magicfilter
-+ * get_line() picks up a magicfilter rule line and passes it back to magicfilter
-  *
-  * rules are:
-  *
-@@ -172,10 +172,10 @@
- 
- 
- /*
-- * getline() gets a rule off the input stream
-+ * get_line() gets a rule off the input stream
-  */
- struct rule *
--getline(FILE *input)
-+get_line(FILE *input)
- {
-     static char *bfr = 0;	/* a buffer for reading lines into */
-     static int buflen = 0;	/* size of that buffer */
-@@ -189,13 +189,13 @@
- 	/* initialize the line buffer the first time in
- 	 */
- 	if ( (bfr = malloc(buflen=80)) == 0) {
--	    perror("getline::malloc");
-+	    perror("get_line::malloc");
- 	    exit(1);
- 	}
-     }
- 
-     if ( (r = calloc(1, sizeof *r)) == 0) {
--	perror("getline::calloc");
-+	perror("get_line::calloc");
- 	exit(1);
-     }
- 
-@@ -240,7 +240,7 @@
-     }
- 
-     if ( (r->pattern = strdup(q)) == 0) {
--	perror("getline::strdup");
-+	perror("get_line::strdup");
- 	exit(1);
-     }
- 
-@@ -289,7 +289,7 @@
- 
-     if (hint)
- 	if ( (r->hint = strdup(hint)) == 0) {
--	    perror("getline::strdup");
-+	    perror("get_line::strdup");
- 	    exit(1);
- 	}
- 
-@@ -302,11 +302,11 @@
-     while ( (q = getarg(&p)) != 0) {
- 	r->argv = realloc(r->argv, (3 + r->argc) * sizeof r->argv[0]);
- 	if (r->argv == 0) {
--	    perror("getline::realloc");
-+	    perror("get_line::realloc");
- 	    exit(1);
- 	}
- 	if ( (r->argv[r->argc++] = strdup(q)) == 0) {
--	    perror("getline::strdup");
-+	    perror("get_line::strdup");
- 	    exit(1);
- 	}
-     }
-@@ -330,4 +330,4 @@
-     }
-     ++ruleno;
-     return r;
--} /* getline */
-+} /* get_line */
---- rule.h
-+++ rule.h
-@@ -55,7 +55,7 @@
-     struct rule *next;		/* next rule in the chain */
- } ;
- 
--extern struct rule *getline(FILE *);
-+extern struct rule *get_line(FILE *);
- extern struct rule *rules;
- char * action_p(enum rule_action);
- 
diff --git a/net-print/magicfilter/files/magicfilter-2.3h-configure.patch b/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
deleted file mode 100644
index 0d89b4d04eb5..000000000000
--- a/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- configure.sh
-+++ configure.sh
-@@ -423,44 +423,12 @@ EOF
-     TLOGN " ($AC_CC)"
-     if [ $status -eq 0 ]; then
- 	TLOG " ok"
--
--	# check that the CFLAGS and LDFLAGS aren't bogus
--
--	unset AC_CFLAGS AC_LDFLAGS
--
--	if [ "$CFLAGS" ]; then
--	    test "$CFLAGS" && echo "validating CFLAGS=${CFLAGS}"
--	    if $AC_CC $CFLAGS -o /tmp/ngc$$.o /tmp/ngc$$.c ; then
--		AC_CFLAGS=${CFLAGS:-"-g"}
--		test "$CFLAGS" && echo "CFLAGS=\"${CFLAGS}\" are okay"
--	    elif [ "$CFLAGS" ]; then
--		echo "ignoring bogus CFLAGS=\"${CFLAGS}\""
--	    fi
--	else
--	    AC_CFLAGS=-g
--	fi
--	if [ "$LDFLAGS" ]; then
--	    test "$LDFLAGS" && echo "validating LDFLAGS=${LDFLAGS}"
--	    if $AC_CC $LDFLAGS -o /tmp/ngc$$ /tmp/ngc$$.o; then
--		AC_LDFLAGS=${LDFLAGS:-"-g"}
--		test "$LDFLAGS" && TLOG "LDFLAGS=\"${LDFLAGS}\" are okay"
--	    elif [ "$LDFLAGS" ]; then
--		TLOG "ignoring bogus LDFLAGS=\"${LDFLAGS}\""
--	    fi
--	else
--	    AC_LDFLAGS=${CFLAGS:-"-g"}
--	fi
--	AC_SUB 'CFLAGS' "$AC_CFLAGS"
--	AC_SUB 'LDFLAGS' "$AC_LDFLAGS"
--    else
--	AC_SUB 'CFLAGS' ''
--	AC_SUB 'LDFLAGS' ''
--	AC_FAIL " does not compile code properly"
-     fi
- 
--    AC_SUB 'CC' "$AC_CC"
-+    AC_SUB 'CFLAGS' "$CFLAGS"
-+    AC_SUB 'LDFLAGS' "$LDFLAGS"
- 
--    rm -f /tmp/ngc$$ /tmp/ngc$$.c /tmp/ngc$$.o
-+    AC_SUB 'CC' "$AC_CC"
- 
-     return $status
- }
-@@ -896,7 +864,7 @@ AC_PROG_INSTALL () {
-     fi
- 
-     AC_SUB 'INSTALL' "$PROG_INSTALL"
--    AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -s -m 755"
-+    AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -m 755"
-     AC_SUB 'INSTALL_DATA' "$PROG_INSTALL -m 444"
- 
-     # finally build a little directory installer
diff --git a/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch b/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch
deleted file mode 100644
index 59c2cc15af91..000000000000
--- a/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -17,7 +17,7 @@ libmagic @LIBMAGIC@:
- 	@MAKE_MAGIC@ all
- 
- textonly: contrib/textonly.c
--	$(CC) $(CFLAGS) -o textonly $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o textonly $<
- 
- mpp: magic.m4 mkmpp
- 	@srcdir@/mkmpp magic.m4
-@@ -43,47 +43,46 @@ magic.c: magic.m4 mkmagic config.h
- cfmagic: file/magic
- 	@MAKE_MAGIC@ magic
- 
--commoninstall: textonly @CFMAGIC@
--	@INSTALL_DIR@ $(prefix)/@exedir@
--	@INSTALL_DIR@ $(prefix)/@mandir@/man8
--	@INSTALL_DIR@ $(prefix)/@mandir@/man5
--	@INSTALL_DIR@ $(prefix)/@filterdir@
--	@INSTALL_MAGIC@ -m 444 file/magic $(prefix)/@MAGIC@
--	@INSTALL_PROGRAM@ -m 511 textonly $(prefix)/@filterdir@
-+commoninstall: textonly
-+	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@exedir@
-+	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@mandir@/man8
-+	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@mandir@/man5
-+	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@filterdir@
-+	@INSTALL_PROGRAM@ textonly $(DESTDIR)$(prefix)/@filterdir@
- 
- install:  @DO_WHAT@
- 
- install-bin-t: traditional commoninstall
--	@INSTALL_PROGRAM@ -m 511 traditional $(prefix)/@exedir@/magicfilter-t
-+	@INSTALL_PROGRAM@ traditional $(DESTDIR)$(prefix)/@exedir@/magicfilter-t
- 
- install-bin: magicfilter commoninstall
--	@INSTALL_PROGRAM@ -m 511 magicfilter $(prefix)/@exedir@
-+	@INSTALL_PROGRAM@ magicfilter $(DESTDIR)$(prefix)/@exedir@
- 
- install-data-t: traditional commoninstall
- 	@srcdir@/mkmpp
- 	for x in @srcdir@/filters/*.def;do \
--	    ./mpp @exedir@/magicfilter-t $$x > $(prefix)/@filterdir@/`basename $$x .def`-filter; \
--	    chmod +x $(prefix)/@filterdir@/`basename $$x .def`-filter; \
-+	    ./mpp @exedir@/magicfilter-t $$x > $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`-filter; \
-+	    chmod +x $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`-filter; \
- 	done
- 	@rm -f mpp
- 
- install-data: magicfilter commoninstall
- 	for x in @srcdir@/filters/*.def;do \
--	    sed -e 's,@MAGIC''FILTER@,@exedir@/magicfilter,' < $$x > $(prefix)/@filterdir@/`basename $$x .def`; \
--	    chmod +x $(prefix)/@filterdir@/`basename $$x .def`; \
-+	    sed -e 's,@MAGIC''FILTER@,@exedir@/magicfilter,' < $$x > $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`; \
-+	    chmod +x $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`; \
- 	done
- 
- install-man: VERSION commoninstall
- 	@SED@ -n -e 's/&PROGRAM&/magicfilter/g' -e 's/^MAN //p' -e @LPD_OPTS@ < magicfilter.8templ > $$$$; \
--	@INSTALL_DATA@ -m 444 $$$$ $(prefix)/@mandir@/man8/magicfilter.8; \
-+	@INSTALL_DATA@ $$$$ $(DESTDIR)$(prefix)/@mandir@/man8/magicfilter.8; \
- 	rm -f $$$$
--	@INSTALL_DATA@ -m 444 magicfilter.5 $(prefix)/@mandir@/man5
-+	@INSTALL_DATA@ magicfilter.5 $(DESTDIR)$(prefix)/@mandir@/man5
- 
- install-man-t: VERSION commoninstall
- 	@SED@ -n -e 's/&PROGRAM&/magicfilter-t/g' -e 's/^MAN //p' -e 's/^TRAD//p' -e @LPD_OPTS@ < magicfilter.8templ > $$$$; \
--	@INSTALL_DATA@ -m 444 $$$$ $(prefix)/@mandir@/man8/magicfilter-t.8; \
-+	@INSTALL_DATA@ $$$$ $(DESTDIR)$(prefix)/@mandir@/man8/magicfilter-t.8; \
- 	rm -f $$$$
--	@INSTALL_DATA@ -m 444 magicfilter-t.5 $(prefix)/@mandir@/man5
-+	@INSTALL_DATA@ magicfilter-t.5 $(DESTDIR)$(prefix)/@mandir@/man5
- 
- install-traditional: install-man-t install-bin-t install-data-t
- 
diff --git a/net-print/magicfilter/magicfilter-2.3h.ebuild b/net-print/magicfilter/magicfilter-2.3h.ebuild
deleted file mode 100644
index 91663b6db45f..000000000000
--- a/net-print/magicfilter/magicfilter-2.3h.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-2.3.h
-
-DESCRIPTION="Customizable, extensible automatic printer filter"
-HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/magicfilter/"
-SRC_URI="http://www.pell.portland.or.us/~orc/Code/magicfilter/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lprng-failsafe"
-
-DEPEND="app-text/ghostscript-gpl"
-RDEPEND="${DEPEND}
-	lprng-failsafe? ( net-print/lprng )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.3d-glibc-2.10.patch \
-		"${FILESDIR}"/${PN}-2.3h-configure.patch \
-		"${FILESDIR}"/${PN}-2.3h-makefile.patch
-}
-
-src_configure() {
-	local myconf
-	use lprng-failsafe && myconf="--with-lprng"
-
-	tc-export CC
-	export AC_CPP_PROG="$(tc-getCPP)"
-
-	./configure.sh \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--filterdir=/usr/share/magicfilter/filters \
-		${myconf} || die
-}
diff --git a/net-print/magicfilter/metadata.xml b/net-print/magicfilter/metadata.xml
deleted file mode 100644
index 3f641021f132..000000000000
--- a/net-print/magicfilter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>printing@gentoo.org</email>
-    <name>Gentoo Printing Project</name>
-  </maintainer>
-  <use>
-    <flag name="lprng-failsafe">Refuse options for compability with certain LPRng versions.</flag>
-  </use>
-</pkgmetadata>