gentoo resync : 05.12.2021

21 files changed, 421 insertions, 227 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index e32eca69aa84..49b6d84ca69a 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 f8726c5ae01f..bb97461bed88 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -6,7 +6,7 @@ DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebf
 DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442 SHA512 fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727
 DIST cups-filters-1.28.8.tar.xz 1502456 BLAKE2B 21dad6dc9a1d2f967f3938f2fc5e35eebadb67da8b526a9ea61599272bd3f87e8efff376661adc02b62b539798cbe46e0f7c5c25ba262da0561b53bbb3d08d5d SHA512 77b39ce2a30ad44d50aa58964b389fa5dd75b2b4307ccb25996050fd176e1e794ad0a66ddd4de76e95a671683c3bf448a4f471272c97a752f25ff6234f7d8511
 DIST cups-filters-1.28.9.tar.xz 1502888 BLAKE2B ddfed7c0815673d8a372af96cd879fb159a10d5cdaf07839a0157b94c43cead9d32c62a204513274f2a90b48a09e07d20049b93370b24604f14efe0e782116af SHA512 fbdf01b0a3acd70e3bf036ca4944a8b85ab4ab95d945458e924692008a8a37bb0b1fb097c4d4b3cf6f5ad68ae06e8358659cdfc24974ee629be37b54f5c3dca1
-EBUILD cups-filters-1.28.10-r1.ebuild 3604 BLAKE2B f3505a0fd30acf9272a6c9518cd8fc8a18c365e54e7c62971dbe97eb9f352e1433c231c563f0ac122885b86f3632d1f6a5040232274a066d3846532a8287d0cf SHA512 bb6c54cb9997229884a835324820ebeebfd6efec6c090c2db3c6cc27123e61f4c8dfb09f690d8ad9939bdf855989178b1c39c1416f2e43fb6c8d8db547469bc0
+EBUILD cups-filters-1.28.10-r1.ebuild 3597 BLAKE2B 91787aa87a66f36b92c7abb6a8a48790e7c881474be25a908e4757cd071a933de74fc6b43d2904cdc39b0598bbfe6fae8374457890684b310d0c6d56e9cab2bc SHA512 ab3b3a5f4daab8007efce8fcde13ddc96f44b1eb0167020e3352db004f47bd68c48e94f0edb9c49b5b191267496ba74bde4e046e404b8886ee38562c6391393b
 EBUILD cups-filters-1.28.10.ebuild 3606 BLAKE2B 6078cdea39bbe969f74dbcc7df085d1253008f0a11643d984653a2a0a43de048f3096560313f3240c3f01c02fb457177ff2ffe927eeccf45335cc713e429928b SHA512 18fd7f914a278379a393cc209da189e535e4d625e00d6047a2a7bac30dded7a14a5bedf17021dbb47d0110944823a2ca890f4c6f004c46d2cb75296e79f5d159
 EBUILD cups-filters-1.28.3.ebuild 3589 BLAKE2B cea462810ff0d46a9f9a56e71b101425f389fba43bd70fc0130b59ca9665996c26af9b0b8ca73f762360a00cb24e067ea3ffd1898f433e940d717a18695bbda5 SHA512 0f6530019fca4fa788394716135643869c2d3aa3b2425a5b3dde6a250b44fb348b3f398a8de367e48805d8a6a604bc7ecf12e9cb34e9ce289f33da942ebdfcc4
 EBUILD cups-filters-1.28.7.ebuild 3589 BLAKE2B cea462810ff0d46a9f9a56e71b101425f389fba43bd70fc0130b59ca9665996c26af9b0b8ca73f762360a00cb24e067ea3ffd1898f433e940d717a18695bbda5 SHA512 0f6530019fca4fa788394716135643869c2d3aa3b2425a5b3dde6a250b44fb348b3f398a8de367e48805d8a6a604bc7ecf12e9cb34e9ce289f33da942ebdfcc4
diff --git a/net-print/cups-filters/cups-filters-1.28.10-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.10-r1.ebuild
index dafc22ff2b77..8168e01e3a50 100644
--- a/net-print/cups-filters/cups-filters-1.28.10-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.10-r1.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 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 0a619b361e66..6f160c5e9cdf 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -14,6 +14,6 @@ DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270
 DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117
 EBUILD cups-2.3.3-r4.ebuild 9701 BLAKE2B 4203eb7e427486594802694bc83124de8cdc2d1f116638b22669d4b38aa6132234b15d7551ba50eb0952933887128ce070b2ceb4c2ffd8dde5a7e1e7951079e5 SHA512 09c6f214213c13ceb7d2edaf979a378d2c2ac54040db3a1bcd44580b6dca3480ab75a575bc8338d9c0f167fcc8274cb16208c23419cffab5d5019cf0c9888b12
 EBUILD cups-2.3.3_p2-r2.ebuild 9071 BLAKE2B 3942fb09f2010856b51a83f344fedefa0a2fd8a63e1e7613ba36f24aaca362c96ec9454f9acbf14b7dfd440616dc33514ec7e063884b801c8e491bf2f06a2a81 SHA512 8c08852a1729176b2ad826be11fde8f7e5b3bf2d1f887300d8881d4ee73e08f4baa05c891e42726e9c35cbbb920ce2c17495c7af26877c4c46b7c98da38de330
-EBUILD cups-2.3.3_p2-r3.ebuild 9697 BLAKE2B 992d12f982c9604130a107984bf509840baf9f3c88aa0a738801c1e687be3d059b0bcf94a0400fe15dbf14506a95534cc2f42a91e5babd0bd6ca26ad1038cb53 SHA512 9504124177d26eee6713c73cead5304279239b5a5684424fbccd7d8b15447c2671a2c759c4759eb503f096c9f833b083c4ca32f2f95eba751698f46dd8792e01
+EBUILD cups-2.3.3_p2-r3.ebuild 9689 BLAKE2B 8473befac51099d4fe0c735cb5f5a35607394cf8ee026a6304ee6cfda4eb64b60f947c7324c0d6c086b4574c547a88218e3e626e1cedf122af7a14e4f3d88a1e SHA512 3e3c2f53dc3882df7f399a7bdd90ae6e3d444241a3ce4682d493a84fbaae6732e6b3bfb625d382a151e246767b90dd9776c7f2cd050fcaf8cbd9008d585f1ca2
 EBUILD cups-9999.ebuild 9005 BLAKE2B 2321c7ddf922a49e643962932888d7b99f1565328487a1f1cd3b631ee392d056aa7a509962c34d2373687edcd703bfbaadf8836efca698329b9ac526c4846f39 SHA512 2bf49d626434b7c1562386c71ac0d96f2f2f34eb57fa3f02d8dcfc3abfdfcf4f483850fd7e9342542c56a45a542c0ddd91a733648c6dc74db4e0dfd65ae861c8
 MISC metadata.xml 528 BLAKE2B 5dedc19570fc6fa2c8ddf6578b30ec8fb1820fb5deb8e2b62cb0897b1f4805086b59cab33bc5e5a8992f4ce2995fba42ab441a77ccf8889b5c4b05da18fdd966 SHA512 c12285daaf0d3a141e7caead57525e8130fcf6859479ae275ed214a508934b15b4697a0cb3f0f5fb90c2931a1727b6919116f1651af6f5dd7eff2eaef7b41803
diff --git a/net-print/cups/cups-2.3.3_p2-r3.ebuild b/net-print/cups/cups-2.3.3_p2-r3.ebuild
index 2cf405ade5c8..0a5b7bfb2b59 100644
--- a/net-print/cups/cups-2.3.3_p2-r3.ebuild
+++ b/net-print/cups/cups-2.3.3_p2-r3.ebuild
@@ -19,7 +19,7 @@ else
 #	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
 	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	fi
 fi
 
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index cfff9ab751ab..50ec2cb8f27f 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,7 +1,9 @@
 DIST hplip-3.20.11-plugin.run 11514293 BLAKE2B b3b7698a45e5e68a25ec1216e736484d26546b657f4a519a153acf0280847667e7ca81afc988f722668746281857d51d9e1703857514ffe5b57dea85f2bae4d3 SHA512 9075c1ac8e8f6e12d33b81b633025259f54352ea00271eec07ee898fd9a164445519608fc9ea61a7157845a4a03f87c28f486c7994f0d7db81d11d3fe51f1876
+DIST hplip-3.21.10-plugin.run 11514107 BLAKE2B a5e0d9d76e4575e8b99cf32749590d1b5209bfd9b33827f3d6f918a4574fb7452c68c816933fe6142b9acd8e336fd57a5a4ef6cf126e767ce37a05872db666ef SHA512 ee5c36b42e3f8e59607bf4e5a2b0e2b594f19aa7302125fff5dd5fdf392cc7cd142d6c44cbd35a53e1f160ee8293a25419caec2de7e09ecc926551723c793b67
 DIST hplip-3.21.6-plugin.run 11514013 BLAKE2B 3ce0aea3642579838fc683a26a2ef16ce3477b3b664487764895504d1f488fa1246ece0ee19889403e6f22f18ebbe16a7ccd689ae6bbc48197179365dbeb672d SHA512 aa5620687a4b3ac1ff4c8278ac8d51bb38cedf6ea79782bd7c11e71beb0fe75672761874f271ff33e73a394f2a3aa04e1976455688b0f850b57ad7bc1eea3af8
 DIST hplip-3.21.8-plugin.run 11513942 BLAKE2B cbc5614b28a2032ade7fe9906ba5e93c773129121c5b6be950d8d04fd3edeaa97224cee6db4db72fbee6312151d4340b54c04753d03fea36a1772c961a3a0eba SHA512 5042e210d9c084e73a971d605a2eee5e96f2309101859fca09efbd09d60b6ae4959e54cdb334589f36a7aea16fb9eb23eb02bf2b330fab2e4c5a710cb0ec55e1
 EBUILD hplip-plugin-3.20.11.ebuild 1447 BLAKE2B 4833b0498319b3d1aa1bfcda87335d708efde09be0831cfc07bd9e0dc08bcfe5f3a98aad6f0828ca461dfaf271e920d8a0e33ce6abd33e6ecd72a8b561166e3c SHA512 cd1989698ea448e5e1b630d93bb164c856fa055783a3f00b7bac5a33b0c6597d3261260c8d267f7a43c15b0b89893c7245ba078014851be5345380615dcdda53
+EBUILD hplip-plugin-3.21.10.ebuild 1482 BLAKE2B 8e0c160738053c605c2473891f4f146c18e630aa1789d009cf21daf6246e59f14d1d537294ae073878be753759ce1d6293ecf1ef604cae12e2899de3475e3d21 SHA512 ffd6cf68e9afc89cf45c616ac3f9d2ada6118e89f4bd172d08e896e9baec3d23a28cc6bffde9f000fabc18e89565c73159131a953e9480b864a60cf4103baf63
 EBUILD hplip-plugin-3.21.6.ebuild 1482 BLAKE2B 8c66152fa1c69e7de4262d46420427333cafd100287bd26a990fccb04c7044f8a12a289b0ebdc1a52c90ba155b70d5abaec239718366f9e5ca40673c04966d94 SHA512 75669d62756cba3607135ef952b4f2d00a7437db61de5e3d47553a8b4e744843a052e495d73cab02fca84cd7fcf0ec55549b525b56b18d701a54de8b1ebc63bb
 EBUILD hplip-plugin-3.21.8.ebuild 1482 BLAKE2B 8e0c160738053c605c2473891f4f146c18e630aa1789d009cf21daf6246e59f14d1d537294ae073878be753759ce1d6293ecf1ef604cae12e2899de3475e3d21 SHA512 ffd6cf68e9afc89cf45c616ac3f9d2ada6118e89f4bd172d08e896e9baec3d23a28cc6bffde9f000fabc18e89565c73159131a953e9480b864a60cf4103baf63
 MISC metadata.xml 523 BLAKE2B 396a3e3f19f1929ac628fd3301f7de077e34d80b88f0f65dd4035a55b8ff16be6a89dc94b47085dafc7a8a2def19353aa52996a12e51e94154a61ba1329f8c91 SHA512 9d5abebbd6fdac76142c70aa911c4ac55eb5388fd39e010d72e8e6253f51a7924eda2a675cd8ce3475fea76b307805644cf8f7140b265e66b4fcd65a8546fd96
diff --git a/net-print/hplip-plugin/hplip-plugin-3.21.10.ebuild b/net-print/hplip-plugin/hplip-plugin-3.21.10.ebuild
new file mode 100644
index 000000000000..66a474795496
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.21.10.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
+SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="orblite"
+
+RDEPEND="
+	~net-print/hplip-${PV}
+	virtual/udev
+	orblite? (
+		media-gfx/sane-backends
+		>=sys-libs/glibc-2.26
+		virtual/libusb:0
+	)
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PREBUILT="${HPLIP_HOME}/*.so"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_install() {
+	local hplip_arch
+	case "${ARCH}" in
+		amd64) hplip_arch="x86_64" ;;
+		arm)   hplip_arch="arm32"  ;;
+		arm64) hplip_arch="arm64"  ;;
+		x86)   hplip_arch="x86_32" ;;
+		*)     die "Unsupported architecture." ;;
+	esac
+
+	insinto "${HPLIP_HOME}"/data/firmware
+	doins *.fw.gz
+
+	for plugin in *-${hplip_arch}.so; do
+		local plugin_type=prnt
+		case "${plugin}" in
+			bb_orblite-*)
+				use orblite || continue
+				plugin_type=scan ;;
+			bb_*)
+				plugin_type=scan ;;
+			fax_*)
+				plugin_type=fax ;;
+		esac
+
+		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+		newexe ${plugin} ${plugin/-${hplip_arch}}
+	done
+
+	insinto /var/lib/hp
+	newins - hplip.state <<-_EOF_
+		[plugin]
+		installed = 1
+		eula = 1
+		version = ${PV}
+	_EOF_
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 36852b2bbc86..d50f36448744 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,9 +1,12 @@
 DIST hplip-3.20.11-patches-2.tar.xz 18140 BLAKE2B a0271d0c6fcfaa53c68ab00c4c6cfc121e4eef0368b7eff04677ccbd8b897897352fe44a111693d0d45ee1b40bc3c783984f23a35faedfa2fa0da52018aade3c SHA512 8d00d48e295572df19b6edf0efce005f6bae6e051cce5d618575f5e226e2c32896111ddc1a193d4aacfadbe9d7f525761b0ea2564277f4c263b3df5bc86c1f40
 DIST hplip-3.20.11.tar.gz 26301441 BLAKE2B 14667f33cc50b2887c8434ada7327a82e16b9acbcdc75d3a50c0261ec9aef3fada9be81e6c0cbdfb4d29914630799c6406893644386db99c0ce86245cca38cc2 SHA512 f583fb4140a29c5e21956c3e51fe3620baa65d33b40447af419d7fc61473a1148a1873216a84e89be785b155ee8e9aebd5e3eb19d2ded82b8415b1a35de1b55d
+DIST hplip-3.21.10-patches-1.tar.xz 17700 BLAKE2B a5d60802a3a9b76b18c0cc4d880b649c2ffceb38b9a0b1857e86eac6a4e840272ce8764db6544b273071e361bb29ae6863df64a3b39bcede2a37ea55c1957fe8 SHA512 d8cda2abadc9b0184bf6669e648fa060a9f0f78e9fcaa3998424b968d01c8a1e1e7ebf371c2614b3d1fbf9052c35368bd65ae265946367a72785ff88f753df8b
+DIST hplip-3.21.10.tar.gz 27309040 BLAKE2B 542304f4dd5f07b683982ad1218ed47dd06227511025eef6e285e9a3073a3472f7a9eaa5666ade59cc681cb3f4c4a7e1f4eb4d94a8518c322bc0a6c81b0eff94 SHA512 e9b49b7bfc3fa38ea83b357af01cfbc59bf238ad7add49c8e4cb281fbc87facfe6fed9e8428bb926f75fb22ff8e980d620ac102694ae0c8271ce0c4f1ab8b7ed
 DIST hplip-3.21.4-patches-1.tar.xz 17812 BLAKE2B d38584eb04e5e8d886cd4c8ecd05c31f3a32db185c87eed8a6593f3f2d1368a284bbef36f9d78b2689862165cd132597a3d616aaf5411e875f97de45c57e197e SHA512 fd7438353af8b05e100b5ef16fedcc6bf9257d49fe7d5a12a1a2b3b26965c2ebcd613788e7f585f7c0bd3a97e83381e36f3915eabd16a1e8c4ac50c1129804e8
 DIST hplip-3.21.6.tar.gz 27026295 BLAKE2B 12588ee31bfad45842bd09f8aa0e653bbdb3c80358150b15d391bb55077e52870a5fb047ae0d4c98d687409b5d244da4ee08ce56a7946ef67088de1493a0455b SHA512 08d0a93089669aa04b158aac8aa339da0278824ff2d9ecfcd967ed21ae5c4a1092910e103696e01dd230b8367471528687a4d4623759a561962116758a0b093c
 DIST hplip-3.21.8.tar.gz 27085456 BLAKE2B a3d5dc664c9e87a0a02a4bd5854c6e207a2d661aef70e3ac1cff023bacdd56a004d90caa9897eb9887a16362f73b93b30d8f52e592813e2239448fb22d549b9e SHA512 13802359a2a4510243fa81a27c3047f1fc54c25d53597011a2d5a6933121ae5aa1b020790d7d1a8a0970d5cef18e7e57b60afcbbe079dcf6219e2e64ed6675d4
 EBUILD hplip-3.20.11-r2.ebuild 8231 BLAKE2B 3e060f6b134cfb101500db89a889c092f3eecd8803d8d475212d0c91fb7be52759dac472cfe82dd59eff85f4d579b48d7c03d68fb5ded3f90495334294578dde SHA512 a0fe5d63efd08036fcb45b23dc943b529b07d214f3b8bde4b4c91e34d28ae33f8032cb314108922f74955d6e0a4ed88a29c7d6672e18cd90aef6bce03750d13d
+EBUILD hplip-3.21.10.ebuild 8197 BLAKE2B 422b38df83b6d7484fe52c91f7c36e39b554e16d45c78f99d120676fa3dac7e16a08bc17701e34ce5664fb1b1d0490c886bb0bb59edf5437375f3620f957c22b SHA512 0e6a2c250048a400b677596a2d9168d4dfcd8caa2aaa003a8a2455fde57e6eed6ebfdf2cdfc8e73ed889444bf1b4a3b24b02060f90790db7bcbc18f018896942
 EBUILD hplip-3.21.6.ebuild 8271 BLAKE2B 827899a109fb800b38206152ab83c49a3b0ad0838f66107295e36f5d701ef8be68bd9d14f037c02fb8f6fbc26e796d09b7687dceb89bead68d7958e905b0cff9 SHA512 4efa223ea600ecade69fe7d33ad376e071e6e476073f63bdc41946ce51fbe8b69e074d8f3b4eba4356bb9ef860c1d5ae5c73f51fac868459b470fbb321ce3dd1
 EBUILD hplip-3.21.8.ebuild 8271 BLAKE2B 827899a109fb800b38206152ab83c49a3b0ad0838f66107295e36f5d701ef8be68bd9d14f037c02fb8f6fbc26e796d09b7687dceb89bead68d7958e905b0cff9 SHA512 4efa223ea600ecade69fe7d33ad376e071e6e476073f63bdc41946ce51fbe8b69e074d8f3b4eba4356bb9ef860c1d5ae5c73f51fac868459b470fbb321ce3dd1
 MISC metadata.xml 1911 BLAKE2B ccddda1b977dda5c8bb3c9e9d9d152ca57406a1b530ee92ccccc7a8a4b194b0749426e3012329fb982ce4c445c05d1fa74a3b3e0619b355ca0de429d9727bfc7 SHA512 290530d8260586d9cc07b63b7599c10a6c7b8304ffd72c22e9b9c2f7db9b6a28a72d0f53a8a84c2715cd9fd25228e0b64c005d97267f1d390114b5a46b88e4f1
diff --git a/net-print/hplip/hplip-3.21.10.ebuild b/net-print/hplip/hplip-3.21.10.ebuild
new file mode 100644
index 000000000000..de81fef8dce1
--- /dev/null
+++ b/net-print/hplip/hplip-3.21.10.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+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.21.10-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	sys-apps/dbus
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!libusb0? ( virtual/libusb:1 )
+	libusb0? ( virtual/libusb:0 )
+	${PYTHON_DEPS}
+	!minimal? (
+		scanner? (
+			media-gfx/sane-backends
+		)
+		snmp? (
+			dev-libs/openssl:0=
+			net-analyzer/net-snmp:=
+			net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}]
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		kernel_linux? ( virtual/udev )
+		$(python_gen_cond_dep '
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+			dev-python/distro[${PYTHON_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+			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="${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
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	use parport && linux-info_pkg_setup
+
+	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."
+		ewarn "This also disables fax, network, scanner and gui support!"
+	fi
+
+	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
+}
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# 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 drv_build minimal_build
+
+	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
+		minimal_build="${minimal_build} --disable-fax-build"
+		minimal_build="${minimal_build} --disable-network-build"
+		minimal_build="${minimal_build} --disable-scan-build"
+		minimal_build="${minimal_build} --disable-gui-build"
+	else
+		if use fax ; then
+			minimal_build="${minimal_build} --enable-fax-build"
+		else
+			minimal_build="${minimal_build} --disable-fax-build"
+		fi
+		if use snmp ; then
+			minimal_build="${minimal_build} --enable-network-build"
+		else
+			minimal_build="${minimal_build} --disable-network-build"
+		fi
+		if use scanner ; then
+			minimal_build="${minimal_build} --enable-scan-build"
+		else
+			minimal_build="${minimal_build} --disable-scan-build"
+		fi
+		if use qt5 ; then
+			minimal_build="${minimal_build} --enable-qt5"
+			minimal_build="${minimal_build} --enable-gui-build"
+		else
+			minimal_build="${minimal_build} --disable-gui-build"
+			minimal_build="${minimal_build} --disable-qt5"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-class-driver \
+		--disable-cups11-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-imageProcessor-build \
+		--disable-lite-build \
+		--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 \
+		--enable-hpps-install \
+		--enable-dbus-build \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable libusb0 libusb01_build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit)
+
+	# 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
+
+	python_optimize "${ED}"/usr/share/hplip
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-print/lexmark-upd-ppd/Manifest b/net-print/lexmark-upd-ppd/Manifest
new file mode 100644
index 000000000000..a8fb27c4b3ed
--- /dev/null
+++ b/net-print/lexmark-upd-ppd/Manifest
@@ -0,0 +1,3 @@
+DIST lexmark-upd-ppd-1.0.0.20210304.tar.Z 1023065 BLAKE2B 5731f76651b108f77c1cf20462b7375a3ed4fd71a8ef358e0941614dbaec3f1337d5d16d3d2c00f69ecea364e9ddc97d0f9c6c6dc32c0d7fff3f4e8e12c6918c SHA512 5b14f2db399152490cb6ad149ce3c4e5fc4bf90464af124cea0a4b2f23a03241e31fe0ca99bf3c4ec5c47523edeb3759cb5ec097066c94fe070bd1c73e254306
+EBUILD lexmark-upd-ppd-1.0.0.20210304.ebuild 1190 BLAKE2B 11bc6e39a65af93ff1aad667de766dabd998703f0362c28b3cbbee32e94f7e5d200333f2ee5bde0aa5a5fb0959bb80e29b08bf26b207ffd769857b0736271bcf SHA512 fb5907ba3e5e9f728a6e2f6719db009e034cfd1ba73cdb921b568f5d0b1a7607859d534fce29cbabd7ad9a5bfeba859ee63e79e3975557b2b5d88cd5856de4bb
+MISC metadata.xml 245 BLAKE2B c146502191378e07b2d7d4d97bcb6daa8eb65f6c0b0d947b8214c19e5302fefc9921d9f8d13516c8bf31d9f642782d098a5d8aa67f45ed4fb33f65c25b1ef8ed SHA512 e901bb8274c666979c1a357a6681d5a0a0f73d5e1d6a4e87eb2f23b16e2ba28592b7d5bd9e2a3e37cf5aec66c159707deaf68619d0cda5e51e1ca98b73253c3a
diff --git a/net-print/lexmark-upd-ppd/lexmark-upd-ppd-1.0.0.20210304.ebuild b/net-print/lexmark-upd-ppd/lexmark-upd-ppd-1.0.0.20210304.ebuild
new file mode 100644
index 000000000000..cd7b80b6f7a7
--- /dev/null
+++ b/net-print/lexmark-upd-ppd/lexmark-upd-ppd-1.0.0.20210304.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Lexmark universal printer driver PPDs"
+HOMEPAGE="https://www.lexmark.com/en_us/support/universal-print-driver.html"
+SRC_URI="https://downloads.lexmark.com/downloads/drivers/Lexmark-UPD-PPD-Files.tar.Z -> ${P}.tar.Z"
+RESTRICT="mirror"
+
+LICENSE="Lexmark-EU2-0111"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="
+	>=net-print/cups-1.4
+	net-dns/avahi
+"
+BDEPEND=""
+
+# TODO: add IUSE for foomatic and install those files too
+
+S="${WORKDIR}"/ppd_files
+
+QA_FLAGS_IGNORED="usr/libexec/cups/filter/LexCommandFileFilterG2"
+
+src_prepare() {
+	default
+	sed -i 's:/usr/lib/cups/filter/:/usr/libexec/cups/filter/:g' GlobalPPD_1.4/Lexmark_UPD_Series.ppd || die "Unable to patch hard coded PPD paths"
+}
+
+src_install() {
+	local filterdir
+	if use amd64; then filterdir="lib64";
+	elif use x86; then filterdir="lib";
+	else die "No filter for architecture"; fi
+
+	insinto /usr/share/cups/model
+	exeinto /usr/libexec/cups/filter
+
+	doins "${S}"/GlobalPPD_1.4/Lexmark_UPD_Series.ppd
+	doexe "${S}"/GlobalPPD_1.4/$filterdir/LexCommandFileFilterG2
+	doexe "${S}"/GlobalPPD_1.4/LexFaxPnHFilter
+}
diff --git a/net-print/lm1100/metadata.xml b/net-print/lexmark-upd-ppd/metadata.xml
index 85e4ed814fa2..78a9d6b02d0f 100644
--- a/net-print/lm1100/metadata.xml
+++ b/net-print/lexmark-upd-ppd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+<name>Jason A. Donenfeld</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
index 1915f08f53c9..283bde125d38 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -2,5 +2,5 @@ AUX libinklevel-0.9.2-autoconf-2.70.patch 1911 BLAKE2B a5fa846bf17c252be5f58fe2c
 DIST libinklevel-0.9.2.tar.gz 367928 BLAKE2B f74af31529246668a0bc00c17b2ec1432532eb484b7efb230873e251c26b349ff26f4eb51f7f610198416964c090f60232f10e40f5170783cbe806cbcf849155 SHA512 127acaef2d2c09981b4da80e4d86a869c66f0f2f9733e139800bc944c159ddca42829499a97ecbb712b74c950bb28a4e22382c9c2a42d374bc5593f8802b6c59
 DIST libinklevel-0.9.3.tar.gz 385622 BLAKE2B c44726239d09719b634046dd40e168b6d0aefe86e675ac6669e7ffcefffbe30f9116fd2b778d7b6c9ae06d7781126202b6dcdddc50359e8905c9dab3893a6cb7 SHA512 bc45661fb861fb8fc6e209ceb4023e7eed2e474e05de76a9185e698aac7bc14d302bd254a1d95bdda104bce066d85ca27bb69d6620e17eca41b95bb279a6ad47
 EBUILD libinklevel-0.9.2.ebuild 889 BLAKE2B bb459cafb3504903003fec7cca8c6b0c63a794419ec5a1307977ce81c1105c09eff8add253f43daacfd0d7e903cb6c57b2680c3bde0fdbe71630f56a75b5f828 SHA512 c3386c22e2c7d555d8b7817e30e4f89843524d3868b6fdf7e0fb8d3ed9ac8fb78a9c83f20af491a095d39251f3e3310f0f351922bf3abc9e758611330d8b19ee
-EBUILD libinklevel-0.9.3.ebuild 797 BLAKE2B 27c98475dc87f26d4fae56caa94c888f595cb2cc226798f3d6ff776408da8224846d4615f1f982a68bb9ef595192d507fcdfe3fe9fc839a9c4f27775621ae4ed SHA512 a55da790acad91c21ee89ee120996ca45ae97dc524a7bf1cd89aae2ba7e0da105fe0346f756042dc1da9133881b174e75c56d773739c7b5496bf2b81f053ced4
+EBUILD libinklevel-0.9.3.ebuild 795 BLAKE2B 9db48e736ee62da4b7ca93ba41517df3a1ee883a8acbe8e43f1032e9bd0ecbd5bcfc9d97df3f52f813cc356fc0c4503c6be6982544be1a4c09cb432a43a0ffde SHA512 75269ec0dd16ee074db2148e98b8effbfd26dae4ef9a7e245599a908ac537a743f1335136194cb0c5a72779aa358cd8358d47a5ff4fa2d5eb93386a8f99c53a8
 MISC metadata.xml 341 BLAKE2B 0704370a2a25c5d5bb5bcf775b75235cb01bd402d51d3335c0ca46b345e6729a2139f51e9cb1a57ab586c140d279a029be79cf5234c60bab9c28218c014b23ff SHA512 10b7818239b88f229321028831803666ac6c51df61a412201ed82d88a7d1862d54b49b1c99267132bb46a14565dc0bab599161277318423f9242d22feae26d6d
diff --git a/net-print/libinklevel/libinklevel-0.9.3.ebuild b/net-print/libinklevel/libinklevel-0.9.3.ebuild
index 384eec93be7e..b1645bd19cf0 100644
--- a/net-print/libinklevel/libinklevel-0.9.3.ebuild
+++ b/net-print/libinklevel/libinklevel-0.9.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
 
 DEPEND=">=sys-libs/libieee1284-0.2.11
diff --git a/net-print/lm1100/Manifest b/net-print/lm1100/Manifest
deleted file mode 100644
index 45ed0e8bcf72..000000000000
--- a/net-print/lm1100/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX lm1100-1.0.2a-class.patch 709 BLAKE2B f5b13b58f0913bd2841850f81c7266cfe4c67826d1e4cd1748e234217b509eadb4a334c34dc6c6b014ddfea710a5b477be2efccc9f73a3b5a189d26345db5a8c SHA512 1e738e9f6ccf16d9e8afa07c488003b599282578452e793331c2aa9a7c96ba6c4e24044dde503051606d56efef3df8e540b62ccb78687d3b8188e0ecb1b16d58
-AUX lm1100-1.0.2a-fix-compile-gcc-3.4.patch 866 BLAKE2B b063536b76b97e9ecee1725fff60dd979bf6c0ce883aa5ff74e0f89181cf02c310252c51687e39b7eab239c05f29fe209fe50ac54def42d5bd9c542aa260edf3 SHA512 56cfcdcf866bc2a3ea148ffafb574a811bc3ff2920c7b9155f54d6ea5c00b66383ef083cca5e12391c74ed189e59e0b959582ccc88aecb4b3dbe9c3596639467
-AUX lm1100-1.0.2a-fix-compile-gcc-4.1.patch 2453 BLAKE2B 1f4587e01949c686635bb1e66482a4bf505306491900ba48e6ed5b695360f6739100408096b848266538e0975697b52d8433c0f551c8c2e84c3b204824f825c9 SHA512 960f3fabf74c2ed65a5086d9bffc94c96f73a39b112c9f3c4f9e50ed3b8a0830589ef335c2b6a47cb5980269e29ecff21d2c4226af5c764318dac16ea95d2090
-AUX lm1100-1.0.2a-makefile.patch 1021 BLAKE2B f08deff4c4acfa705aa332ee8d44d50d04bd2e8ed6c99a341874a91114824b3ef6ec00615396777323d0d0e87df66d2dd8691cd1d095baa0343525814f830c39 SHA512 10b1b0bdda41793168c107f7e8ae388c5721fcfb0719d2abc80d2a90545d0a9fe91f0b8f5e27e322ce980281d5311c4635eb3147e32e13308d8d300336126067
-AUX lm1100maint-firmware.patch 638 BLAKE2B a6fadd4bf04bcc2ef4fcd11dc19dca1cf4452f081829c22a58a2fa56a7d049973e61f7fc8bb438df06855aa9a4a4698a1b222f7c4393bda4206300db75b714a3 SHA512 7605373b4777a5b880944d38b318144d8dab18f337080bbba3e6e164ab0c8285a648fc57659fe1efa77053db9af748f96c3c4bf98d114ec70306cf65a027409f
-DIST lm1100.1.0.2a.tar.gz 64316 BLAKE2B b47fef489b16568e2e2b0097bd79f90b1c7acb80b7fd28d00fc74c5072f83b1c2f2d6bb75534e0c678d4ad9312d222e311bd9593206acad8eaa3a5166fbbebcf SHA512 3dda80602af99d93a570e066ca2a121afd93b28b5d28b6f49b52c2c90e288de7b87cefdd5e00bf4edd73439fb6088433fabe884b841befd24183f27a12fcbcb1
-DIST lm1100maint.tar.gz 708 BLAKE2B 69b29e477a5491f88bafe92eb94a3742fe8b6074116544cd0689a98273b9bd4eb3ee5e5b74acc4e68cff3eef1d9c177b6d041db64712dad2e6fb189f56e9c1cb SHA512 fe81351705c36dd30e01d402461820ed583d2a8222af8dd81f4dff35c6629592e09fb6dbc0740b9ba0f555de65aeae41c0cb953fbedd0c8620db29b37d797b02
-EBUILD lm1100-1.0.2a-r1.ebuild 1113 BLAKE2B 7ea8f1b342fb353b205c27f61ea53129176eaff492de331bb4ba88836a5df9b9da0ab00e86dbcbf491558fc110f5e5af95111bd5a27d3de8e13dfc330a11df59 SHA512 725d1e0ef3815c77664a013ba19b65c7268379b95da332582ac001fd5bd30843f4097543fbd40825dcc60dc60565c7313ab828b2da888bf4cae6ac7b3d9672c0
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-print/lm1100/files/lm1100-1.0.2a-class.patch b/net-print/lm1100/files/lm1100-1.0.2a-class.patch
deleted file mode 100644
index b771e1bf1449..000000000000
--- a/net-print/lm1100/files/lm1100-1.0.2a-class.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur lm1100.1.0.2a~/PaintLine300c.h lm1100.1.0.2a/PaintLine300c.h
---- lm1100.1.0.2a~/PaintLine300c.h	2006-06-22 15:14:36.000000000 +0200
-+++ lm1100.1.0.2a/PaintLine300c.h	2006-06-22 15:14:55.000000000 +0200
-@@ -32,7 +32,7 @@
- 	int size;
- 	int x,y;
- 
--	friend LexmarkProtocol300c;
-+	friend class LexmarkProtocol300c;
- 
-  public:
- 	void pad(int pad_amount);
-diff -ur lm1100.1.0.2a~/PaintLineBW.h lm1100.1.0.2a/PaintLineBW.h
---- lm1100.1.0.2a~/PaintLineBW.h	2006-06-22 15:14:36.000000000 +0200
-+++ lm1100.1.0.2a/PaintLineBW.h	2006-06-22 15:14:55.000000000 +0200
-@@ -33,7 +33,7 @@
- 	int size;
- 	int x,y;
- 
--	friend LexmarkProtocolBW;
-+	friend class LexmarkProtocolBW;
- 	
-  public:
- 	void pad(int pad_amount);
diff --git a/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch b/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch
deleted file mode 100644
index 60e1b5c2e7a3..000000000000
--- a/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- LexmarkProtocol300c.cc.orig	2000-11-21 09:06:22.000000000 +0100
-+++ LexmarkProtocol300c.cc	2004-06-16 13:28:04.397060286 +0200
-@@ -69,7 +69,7 @@
- Jet **LexmarkProtocol300c::createJets(int *numJets, Map *imageMap)
- {
- 	*numJets = 6;
--	class Jet **jets = new (Jet *)[6];
-+	class Jet **jets = new Jet*[6];
- 	jets[0] = new Jet(0,9,0,imageMap,LEFT_JET,0,8);
- 	jets[1] = new Jet(1,0,0,imageMap,RIGHT_JET,0,8);
- 	jets[2] = new Jet(2,-9,20,imageMap,LEFT_JET,1,8);
---- LexmarkProtocolBW.cc.orig	2000-11-21 09:06:22.000000000 +0100
-+++ LexmarkProtocolBW.cc	2004-06-16 13:32:51.291509280 +0200
-@@ -68,7 +68,7 @@
- Jet **LexmarkProtocolBW::createJets(int *numJets, Map *imageMap)
- {
- 	*numJets = 2;
--	class Jet **jets = new (Jet *)[2];
-+	class Jet **jets = new Jet*[2];
- 	jets[0] = new Jet(0,9,0,imageMap,LEFT_JET,0,28);
- 	jets[1] = new Jet(0,0,0,imageMap,RIGHT_JET,0,28);
- 
diff --git a/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch b/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch
deleted file mode 100644
index bc797a09a44b..000000000000
--- a/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ru lm1100.1.0.2a~/Jet.h lm1100.1.0.2a/Jet.h
---- lm1100.1.0.2a~/Jet.h	2006-12-02 18:48:16.000000000 +0100
-+++ lm1100.1.0.2a/Jet.h	2006-12-02 18:49:54.000000000 +0100
-@@ -45,7 +45,7 @@
- 	Coord imageStart;  // start of image from edge of paper
- 
- 	bool insideImage(int x, int y);
--	bool Jet::needsPainting(int ix, int iy, int bit);
-+	bool needsPainting(int ix, int iy, int bit);
- 	
-  public:
- 	/* Range of paper jet covers when head is at 0,0 */
-@@ -54,7 +54,7 @@
- 	/* Range of paper jet needs to cover to get the entire image */
- 	void getImageRange(Rect *dest);
- 	Coord *getPreferredImageStart(Coord *start);
--	int Jet::getPreferredEnd();
-+	int getPreferredEnd();
- 	bool finished();
- 	void setImageStart(Coord *imageStart);
- 	void paint(int startX, int endX, int y, class LexmarkProtocol *protocol);
-diff -ru lm1100.1.0.2a~/LinkedList.h lm1100.1.0.2a/LinkedList.h
---- lm1100.1.0.2a~/LinkedList.h	2006-12-02 18:48:16.000000000 +0100
-+++ lm1100.1.0.2a/LinkedList.h	2006-12-02 18:49:54.000000000 +0100
-@@ -26,8 +26,8 @@
- 	void *object;
- 	LinkedList *next;
- 
--	LinkedList::LinkedList();
--	LinkedList::LinkedList(void * object);
-+	LinkedList();
-+	LinkedList(void * object);
- };
- 
- #endif
-diff -ru lm1100.1.0.2a~/Map.h lm1100.1.0.2a/Map.h
---- lm1100.1.0.2a~/Map.h	2006-12-02 18:48:16.000000000 +0100
-+++ lm1100.1.0.2a/Map.h	2006-12-02 18:49:54.000000000 +0100
-@@ -41,7 +41,7 @@
- 	int height; /* height of map in cells */
- 
- 	Map(int width, int height, int cellSize);
--	Map::~Map();
-+	~Map();
- 
- 	void cacheLines(int start, int len);
- 	void addAlgorithm(MapAlgorithm *algorithm);
-diff -ru lm1100.1.0.2a~/PPMRaw.h lm1100.1.0.2a/PPMRaw.h
---- lm1100.1.0.2a~/PPMRaw.h	2006-12-02 18:48:16.000000000 +0100
-+++ lm1100.1.0.2a/PPMRaw.h	2006-12-02 18:49:54.000000000 +0100
-@@ -32,7 +32,7 @@
- 
-  public:
- 	PPMRaw(Reader *reader,bool readMagic);
--	static void PPMRaw::readHeader(int *width, int *height, int *maxval, Reader *reader, bool readMagic);
-+	static void readHeader(int *width, int *height, int *maxval, Reader *reader, bool readMagic);
- 	
- 	virtual void getRGB(RGB *rgb, int x, int y);
- 
-diff -ru lm1100.1.0.2a~/Rect.h lm1100.1.0.2a/Rect.h
---- lm1100.1.0.2a~/Rect.h	2006-12-02 18:48:16.000000000 +0100
-+++ lm1100.1.0.2a/Rect.h	2006-12-02 18:49:54.000000000 +0100
-@@ -23,8 +23,8 @@
- class Rect
- {
-  public:
--	Rect::Rect();
--	Rect::Rect(int x, int y, int width, int height);
-+	Rect();
-+	Rect(int x, int y, int width, int height);
- 	
- 	int x,y,width,height;
- 
diff --git a/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch b/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch
deleted file mode 100644
index b1f0a2ac4913..000000000000
--- a/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- lm1100.1.0.2a~/Makefile	2001-02-26 01:40:16.000000000 +0100
-+++ lm1100.1.0.2a/Makefile	2006-10-23 19:01:57.000000000 +0200
-@@ -7,17 +7,19 @@
- VERSION=lm1100.1.0.2a
- TARFILES = $(FILES:%=$(VERSION)/%)
- 
--CC = g++ -O2
-+CXX?=g++
-+CXXFLAGS?= -O2
-+#CC = g++ -O2
- #CC = g++ -g
- 
- lm1100: $(OBJS)
--	$(CC) -o lm1100 $(OBJS) $(LIBS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o lm1100 $(OBJS) $(LIBS)
- 
- bufcat: SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o
--	$(CC) -o bufcat SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o -lpthread
-+	$(CXX) $(CXXFLAGS) -o bufcat SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o -lpthread
- 
- leak: $(OBJS)
--	$(CC) -o lm1100 $(OBJS) $(LIBS) /usr/local/LeakTracer/LeakTracer.o
-+	$(CXX) $(CXXFLAGS) -o lm1100 $(OBJS) $(LIBS) /usr/local/LeakTracer/LeakTracer.o
- 
- tarball: $(FILES)
- 	rm $(VERSION);ln -s . $(VERSION);tar -cf - $(TARFILES) | gzip > $(VERSION).tar.gz
-@@ -27,7 +29,7 @@
- 	rm *.o
- 
- %.o:	%.cc
--	$(CC) $(DEFINES) -c $<
-+	$(CXX) $(CXXFLAGS) $(DEFINES) -c $<
- 
- TAGS: $(SRCS)
- 	etag $(SRCS)
diff --git a/net-print/lm1100/files/lm1100maint-firmware.patch b/net-print/lm1100/files/lm1100maint-firmware.patch
deleted file mode 100644
index 5c3f4c92ea86..000000000000
--- a/net-print/lm1100/files/lm1100maint-firmware.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur lm1100maint~/lm1100back lm1100maint/lm1100back
---- lm1100maint~/lm1100back	2006-06-26 19:48:51.000000000 +0200
-+++ lm1100maint/lm1100back	2006-06-26 19:50:41.000000000 +0200
-@@ -1,2 +1,2 @@
- #!/bin/sh
--dd if=/usr/share/lm1100maint/lexmarkback of=/dev/lp0
-+dd if=/usr/share/lm1100/lexmarkback of=/dev/lp0
-diff -ur lm1100maint~/lm1100change lm1100maint/lm1100change
---- lm1100maint~/lm1100change	2006-06-26 19:48:51.000000000 +0200
-+++ lm1100maint/lm1100change	2006-06-26 19:50:55.000000000 +0200
-@@ -1,2 +1,2 @@
- #!/bin/sh
--dd if=/usr/share/lm1100maint/lexmarkchange of=/dev/lp0
-+dd if=/usr/share/lm1100/lexmarkchange of=/dev/lp0
diff --git a/net-print/lm1100/lm1100-1.0.2a-r1.ebuild b/net-print/lm1100/lm1100-1.0.2a-r1.ebuild
deleted file mode 100644
index 1521dc21c771..000000000000
--- a/net-print/lm1100/lm1100-1.0.2a-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs
-
-DESCRIPTION="The Tim Engler's Lexmark 1100 driver"
-HOMEPAGE="http://www.linuxprinting.org/show_driver.cgi?driver=lm1100"
-MY_P=${P/lm1100-/lm1100.}
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	mirror://gentoo/${PN}maint.tar.gz"
-#http://www.linuxprinting.org/download/printing/${PN}/${PN}maint.tar.gz
-#http://www.linuxprinting.org/download/printing/${PN}/${MY_P}.tar.gz
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-compile-gcc-3.4.patch"\
-		"${FILESDIR}/${P}-fix-compile-gcc-4.1.patch"\
-		"${FILESDIR}/${P}-class.patch"\
-		"${FILESDIR}/${P}-makefile.patch"
-	cd "${WORKDIR}/${PN}maint" || die
-	epatch "${FILESDIR}/${PN}maint-firmware.patch"
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	dobin lm1100
-	dodoc README RELEASE.txt
-
-	cd "${WORKDIR}/${PN}maint" || die
-	dobin lm1100back lm1100change
-	insinto "/usr/share/${PN}"
-	doins lexmarkback lexmarkchange
-	newdoc README README.maint
-}