gentoo resync : 14.12.2020

18 files changed, 411 insertions, 131 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 61e2b6b18c12..921b586ceee1 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest
index 8806c5863c56..2f38b7290d20 100644
--- a/net-print/c2esp/Manifest
+++ b/net-print/c2esp/Manifest
@@ -1,5 +1,6 @@
-AUX 0001-Fix-various-missing-includes.patch 1107 BLAKE2B 36063d8bf6025e4c7df3151b3b3da868d0850bde7ed28e4c5c7c9ce604709e1acb8473cd54bce7643df710ed51ac1aad56c1a42ca24ebda791cbdfecbfb8bf9b SHA512 90dc8880864ec2aed498ebba2173c07697f8136bc95788f0e3e446fe16519857288c07c0a67c5a319c19837550e0b52e38a788419ffc85ebcbc0434edde2c0de
 AUX c2esp-26-ldflags-cppflags.patch 1152 BLAKE2B dc5463e1574c0f8852cbcb567fd24a0bc7f29a537d3073f4b6835cdf54deed2d3d3595816ae0ba84e4f026edf66daa3dbe4ad66765b47284b9862765656afd2e SHA512 c85abc2a3511ee7cf4ab4045c77ac257d85579354c98403a27209a21915fcd2180053db86fef09151d5e52e98684f46e14bd57bae9f0250597c451286fbe3da4
+AUX c2esp-27-fno-common.patch 1208 BLAKE2B 20158c4ae4e51cb91758c95bd5821f813d0ad7d1ebd7a9da2471037f74dbbffdf4fcd13309ae51e2b47c47abdf5b1a8832c47945a8c43fad004a89baf75e7889 SHA512 91823ceb5ace665769e928e6ead5eec9cc1cccffea9230c7e97d4ca1579b45c02c4cd192f2dd7e8257de8b43bc6176b78343f9992a0cb222722abd173c2d1394
+AUX c2esp-27-missing-includes.patch 1107 BLAKE2B 36063d8bf6025e4c7df3151b3b3da868d0850bde7ed28e4c5c7c9ce604709e1acb8473cd54bce7643df710ed51ac1aad56c1a42ca24ebda791cbdfecbfb8bf9b SHA512 90dc8880864ec2aed498ebba2173c07697f8136bc95788f0e3e446fe16519857288c07c0a67c5a319c19837550e0b52e38a788419ffc85ebcbc0434edde2c0de
 DIST c2esp-27.tar.gz 143551 BLAKE2B 7cc80fd72eed24c24cb153d7395a692849c51249ca40a563f94bedbb82c6d976bce6b44d47dbe21c36ec40f26571178f562b175485f404d356724b4bc3f611bf SHA512 d3ff9dc6de7cf692e4be4f4b316f862d271bff06181f0000daf1ce2fb6921f1b24efe88ec24f7b811d78cb9dca18fcba3f17dd5273ac84ceb9f6bfcecedeecce
-EBUILD c2esp-27.ebuild 699 BLAKE2B 0d0be951c38fd455af0b511ed0f9b4c7949b41747240794700e31288ba1846d9c89717f012ed46f5c2fa4a16cceaee255d9de7be65f5dfa7df7add78dff09606 SHA512 c8062f8f6d66fc63b44361afd0544ee42ffe45b81dcb64e153e2b78ef69594f19527bd2e900c39e05e8d344d7b481a2e40a4d6adf106ea501d2007aed58d8819
+EBUILD c2esp-27.ebuild 722 BLAKE2B 7bbb30c176e826cf170bbcb76af4d829f4489fc5627252800ff04d86323b95c09ec567880fd12d122b64b6c52f78862440d22c4360ce02132b9ad0082ed5bd55 SHA512 9f3a0cebc757ff77fcdd48ad4a5d6b88076dd411dd08bc8dd9d17a5fb2c09ab9ebe2b6fdccdbec61e8e9afaac871fe6dff88513db129b89312d98f959e576f6d
 MISC metadata.xml 354 BLAKE2B 125545bf6e8dbd21bb674f494585d22d2e293738a9409613fa91eb7d888f4d6c10028aaf3b55beab10e5f94e4cbaee34eb9fb3d8f24c9f64056b6085edf6319c SHA512 d392c1b2ed7e557c5f9ce293e4cb668e0c229ece25dfdb098f569c0cbf9f797d706a0f55a066a8c5649bbc2184866a92d169f32c1f2eaa97c6f073e6d77c57a7
diff --git a/net-print/c2esp/c2esp-27.ebuild b/net-print/c2esp/c2esp-27.ebuild
index 69e58fbb92f9..f7fe2a2c6a37 100644
--- a/net-print/c2esp/c2esp-27.ebuild
+++ b/net-print/c2esp/c2esp-27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,7 @@ EAPI=7
 DESCRIPTION="A CUPS filter for Kodak ESP printers"
 HOMEPAGE="https://sourceforge.net/projects/cupsdriverkodak"
 SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -17,7 +18,8 @@ DEPEND=">=media-libs/jbigkit-2.0-r1:=
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/0001-Fix-various-missing-includes.patch
+	"${FILESDIR}"/${P}-missing-includes.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_configure() {
diff --git a/net-print/c2esp/files/c2esp-27-fno-common.patch b/net-print/c2esp/files/c2esp-27-fno-common.patch
new file mode 100644
index 000000000000..8e4dc81519e2
--- /dev/null
+++ b/net-print/c2esp/files/c2esp-27-fno-common.patch
@@ -0,0 +1,32 @@
+Taken from: https://sources.debian.org/patches/c2esp/27-8/0002-Add-extern-stanzas-to-variable-definitions-in-header.patch/
+Author: Didier Raboud <odyx@debian.org>
+
+--- a/src/c2espcommon.c
++++ b/src/c2espcommon.c
+@@ -42,11 +42,11 @@
+  * Globals...
+  */
+ char		CallerName[50];  	/* String that identifies the calling program */
+-int		DoBack;			/* Enables the back channel comms */ 
++extern int	DoBack;			/* Enables the back channel comms */
+ char 		BackBuf[32000]; //for the back channel replies from the printer
+ int 		BackBufLen=sizeof(BackBuf)-1;
+ FILE 		*LogFile = NULL; //file descriptor for log file
+-time_t		StartTime;
++extern time_t	StartTime;
+ int		BlackPercent, ColourPercent;
+ 
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile)
+--- a/src/c2espcommon.h
++++ b/src/c2espcommon.h
+@@ -35,8 +35,8 @@
+ /*
+  * Globals...
+ */
+-char 		BackBuf[32000]; //for the back channel replies from the printer
+-int		ColourPercent, BlackPercent; //to store the detected marker levels
++extern char BackBuf[32000]; //for the back channel replies from the printer
++extern int ColourPercent, BlackPercent; //to store the detected marker levels
+ 
+ 
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile);
diff --git a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch b/net-print/c2esp/files/c2esp-27-missing-includes.patch
index bde86e666688..bde86e666688 100644
--- a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch
+++ b/net-print/c2esp/files/c2esp-27-missing-includes.patch
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 29488c4ef0fe..d5ff2d7fc299 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -3,5 +3,5 @@ AUX gutenprint-5.3.3-epson.patch 5637 BLAKE2B 7cb05d40e23ca30bd59b0863318d22c911
 AUX gutenprint-5.3.3-selphy-typo.patch 1077 BLAKE2B c8ad7ebb032ac8320b11d88df6cba79dffe68c910f293116d2f04333d53b17fef7baaba5a0d453c6c087ee9f0a6d1150484280c10ac6ae3a9f6d54905d7884ee SHA512 0376b689b3c6d7d630937f56f19efb0d8d9e7a9726af39794106205aeaca00621ec10a56a28fcc25dadf106e66c7956245ee53709cb1cd39f120716dbc6927d1
 DIST gutenprint-5.3.3.tar.xz 5050624 BLAKE2B dbcf74169d0756d991bbdad7338a6e6f995f8eeedc2610677b327abee6aecc787d1cc35949f73c1d93ad274de7d467542b72a5fe0abf58fbc4ec6f21667cbad7 SHA512 d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6
 EBUILD gutenprint-5.3.3-r1.ebuild 1909 BLAKE2B b115e345785d59373c3cfc98c84c1fee3828cc6bc540c6e84b2941b0d35281c0d6e0174705fabf36cfaeac909d1598a2c8f0e784584f2dae707a1f7e19da4d5b SHA512 59cce5fa9265a04fdcf93856efbdc9193fc2611cc792c56782999e0609c99f218ef4081d516b37611c13cb53895e064aa21f7c21b3951e0bf0f0696210b41470
-EBUILD gutenprint-5.3.3-r2.ebuild 2024 BLAKE2B 830c4e05906a48e1fe389cc7c27214e61eb954e183f3296bd92d6345c7909d023fa221827625fbeba72310e2b02e6cce6ae8916aedc877019e2a5d40e496d6a1 SHA512 13401bc23d77b3c0c8569785c68aebfc41646c0c470683d3a6e9046f1417a09d35b0f06fcc8fd32ec6310cb93b712deb2749f753e9a0899967c8fe5bbf8ee330
+EBUILD gutenprint-5.3.3-r2.ebuild 2019 BLAKE2B 4ca9da7c2a32091c55e2a5717e4c94f62d9d917bf0f59135368c3283d74ac37d5fc01422fe97edd176707fdc1868c3572c3bf958c75ad24beb4c29c567e7c02d SHA512 59910331aefc47d34fc2be130a731646f22a1d6f24f73b1ea1793995bc65c681da1173eaaa28be528232b9a2f48cda53d70bf93aa45d7f145c8106c68db6402c
 MISC metadata.xml 339 BLAKE2B 1090eefd725cc9e37f9c8e77daddb80c3791098af5ba2405dd2746426a46722bef0ed8706654100559735d9f29c2be45eec525cadc0653776dda60453abca786 SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6
diff --git a/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
index 2c2cceda92e9..40f1fbe5655d 100644
--- a/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
+++ b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 IUSE="cups gimp gtk nls readline ppds static-libs"
 REQUIRED_USE="gimp? ( gtk )"
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 428f4e44ec07..8f123fce5ba6 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,7 +1,9 @@
 DIST hplip-3.19.12-plugin.run 11512079 BLAKE2B 534cbba51b2254f8227611b8f0449e100361fb445400f664e43e30412be8eb554bb35c2fe260d45cd5ad742b083af6d551532a9d14585029b0ff93675fab578a SHA512 ac2022d555f5084d5bf1e4519ddbb29828e9ca385aa6dff818ae9e79b60b4b2745e31ad4146cb01bca3747fae0d61b96e4a823b81179d2e2c55a643831165e4b
+DIST hplip-3.20.11-plugin.run 11514293 BLAKE2B b3b7698a45e5e68a25ec1216e736484d26546b657f4a519a153acf0280847667e7ca81afc988f722668746281857d51d9e1703857514ffe5b57dea85f2bae4d3 SHA512 9075c1ac8e8f6e12d33b81b633025259f54352ea00271eec07ee898fd9a164445519608fc9ea61a7157845a4a03f87c28f486c7994f0d7db81d11d3fe51f1876
 DIST hplip-3.20.6-plugin.run 11514108 BLAKE2B 83e2d26fb397c5c5df1fc4371bfc2798cea049965499b6f1ad5daa05b44b74f51ba9deb933b564dfa47a8d0ef79d4921c3a96b9531730317742e1c5651d7b012 SHA512 6f9e5c92e302f4068abbe9134cf7f8081fcbe98568c9b75d6a668843b76c83afd0f4fbb3d90d3ac775c719ab8e2dca5beedd887ef6d072bd8ee0eb48d42521ed
 DIST hplip-3.20.9-plugin.run 11515336 BLAKE2B 27686828374675412ae82a0a5be121c87dbd9ed3adb8d5f30e2f946e315140a5641fdbc60d7f952323060de7fb7bce77b21f19e0d07aa0c5c36e898732030b8b SHA512 bbb5c5768c0f1e88f960f9decff65d70942bc40d8f0443fa2e1c0507895e2e6ba7bc8e0fbec5a74b335787ac45bd3c34cf6bc4d5e544ce7c2ef0965e074a440a
 EBUILD hplip-plugin-3.19.12.ebuild 1301 BLAKE2B f4cd61c24495b61e9928e1b80cee878d647037af127d9b890ddb9301666b69c17efd15103ceab6983a0c18c24e240185ea0d967e6efdff917c3e250ef4094a45 SHA512 2b0c474f02f34078b603c47d02724f198416569befabc6d8ec6abd25b4002ba93a6d600e5aa07dff0092c9fbbd26f8330f04ac31661cbc721c566fab503cfcc9
+EBUILD hplip-plugin-3.20.11.ebuild 1450 BLAKE2B ab91d2d615018b9d377e6397a122f3fa92cbf42ea00441cedd6e7eaa57873cd6137ff558395106f78006c066f18c28856dd171f5ccf0f86fdf1574ba5c848d2f SHA512 694394be4f54bb8e5f7a2ee2a0991fcbe3588dfc1798e3b84168c53087746a17982bd496401dfbe3016f598cf3c275734de5980fc34c23dcaf6cd7165b4ae559
 EBUILD hplip-plugin-3.20.6-r1.ebuild 1450 BLAKE2B ab91d2d615018b9d377e6397a122f3fa92cbf42ea00441cedd6e7eaa57873cd6137ff558395106f78006c066f18c28856dd171f5ccf0f86fdf1574ba5c848d2f SHA512 694394be4f54bb8e5f7a2ee2a0991fcbe3588dfc1798e3b84168c53087746a17982bd496401dfbe3016f598cf3c275734de5980fc34c23dcaf6cd7165b4ae559
 EBUILD hplip-plugin-3.20.9.ebuild 1450 BLAKE2B ab91d2d615018b9d377e6397a122f3fa92cbf42ea00441cedd6e7eaa57873cd6137ff558395106f78006c066f18c28856dd171f5ccf0f86fdf1574ba5c848d2f SHA512 694394be4f54bb8e5f7a2ee2a0991fcbe3588dfc1798e3b84168c53087746a17982bd496401dfbe3016f598cf3c275734de5980fc34c23dcaf6cd7165b4ae559
 MISC metadata.xml 522 BLAKE2B 47eae04f2b9633c1707c451a53dbdd8d72491903525e04f82e6017cd4e1ce9a4ce71a488dd0afcc84401fa061d51bad545a8b8a3f50d378d5f19c33f2b43ec2d SHA512 8f1a5e7c4b50aa472433dc6e49cb4715731f146f29774ad4304d9e24f1ffbe2a4756bef024d01982d8c978208e5c47e5987a48fc2ad6dd3962fa3cfb68d01a31
diff --git a/net-print/hplip-plugin/hplip-plugin-3.20.11.ebuild b/net-print/hplip-plugin/hplip-plugin-3.20.11.ebuild
new file mode 100644
index 000000000000..fa8335f3ab18
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.20.11.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
+SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="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"  ;;
+		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 9ee43fbe88fb..8177f1d61532 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,11 +1,14 @@
 DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742b7c56929b23e6c1cc3ba9df4eafb8007273a5a2e7f27af0d2d4a3a97ebb9cfe462b74dcddd7149088980893b2c66113b7c SHA512 3b0e2b4f7d8da257c6fcf12f2e049276d059426f2d1c626324982ce862efa2323cbb191a373c53fea7880e3b6e44ec62e584091676556d97e6a456edea4c44cf
 DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6bec614ef7490c1ecc0e5e745b81b6c2097948fbd062b5e72e10714cdc8d6f9145aacafc0fedeafde375909cb2cb6 SHA512 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
+DIST hplip-3.20.11-patches-1.tar.xz 17876 BLAKE2B 39514399b4b43c668c38f7fe570fc53f50547598fc86ddf383b237a6992e9c24e3aab524bee0c7055003e766f8fea67cbe7c86ab4c23911d31ade0ad4766b181 SHA512 eabc26feca22e2d6dbafb9f40df5d61fde1fd08ac0cfb17751b0e179ecd6cc3ce6c4434746293aa372d9cca0bdc9b5d6bc96af9e199aeab5b3621e2c584fedc1
+DIST hplip-3.20.11.tar.gz 26301441 BLAKE2B 14667f33cc50b2887c8434ada7327a82e16b9acbcdc75d3a50c0261ec9aef3fada9be81e6c0cbdfb4d29914630799c6406893644386db99c0ce86245cca38cc2 SHA512 f583fb4140a29c5e21956c3e51fe3620baa65d33b40447af419d7fc61473a1148a1873216a84e89be785b155ee8e9aebd5e3eb19d2ded82b8415b1a35de1b55d
 DIST hplip-3.20.5-patches-1.tar.xz 12716 BLAKE2B 982480185b2decb9f4e857336b474dab585d64aa44a9f0da70ba568e20488f451507aae3bd1427aef4274d36db93dd9bcb1d906f7b393939dfc43c81a1f9a9db SHA512 ae46a6f490253a1112838b08d56199c6257d33911569619483d925798b54a8bc9fe57afd1e86dedb9482d89d42f44bec81db215f37cbcd8fb5982596c80c1117
 DIST hplip-3.20.6-patches-2.tar.xz 14308 BLAKE2B b9982387364344e90d87769f4f5da2eae06ca9a21685d8d17aa8a0ac446285f806f8fdbc9c0aa3a7fdf6a2daee6440955974c2c34053d3e160931e327a2681da SHA512 e611be1eba5bc0d9c53b0563b5c42e2a06e73031431a40db9c360dc28106736eafa645be7fca86bbcfddf54efe6885369548cea508d51d03125f1807c18a62e3
 DIST hplip-3.20.6.tar.gz 25908476 BLAKE2B cd70d00081ff41d36b566d6f6f546b2cddabb46427afafcd2d04ea7769ce5114feff74612e58ffa83dde4e817ffa2804dbf41411187d9cd15ed7b888b87658ad SHA512 ccd82112afb5ee73f5d027819ab89ba8f52ec36a4b061d314565f95d288be24e045050c3368332eeae50c0fb170f8cb015fdd8dde4b32a08e3758f0f0f4e8e96
 DIST hplip-3.20.9-patches-2.tar.xz 18040 BLAKE2B f218703f5e6f319306b6cd178eb9f91981eed0d0c06b14c6846ad8a79b1d92b66176856f7b8bb272d0fa20194d4150fecf066c11fff5996f32b6fd71e1d6237d SHA512 5aa16f9c4e829774ea9266f30f6cd9d78556ea4ed36abc57cb11975c097c8bfdc44f139f5b1236af79859355ef715ec27d47f187d330541b29361e779d972fff
 DIST hplip-3.20.9.tar.gz 26141198 BLAKE2B 3aa353343ee79ae04dbe94cb9e135469586a50c2052a21ffcff6907be40522a1605f1174b0b8891dea25abb83a3b836350e1e6c9d12ab2798aa826f1d3ce4069 SHA512 d2981cf51f6d893a576c51808710ac9815aa6ac5fdc617d95cc372518731a48b0aca09af721c1792e1531df6cf8fc0ebf5ebd7e9c96950602a830ceed3d441ae
 EBUILD hplip-3.19.12-r1.ebuild 7744 BLAKE2B e19803ef105c70237b7c88d7d45f756a219195f3f0d01ad7040676226f0acba81bb9dc94de2d8ea20081e420155297414a87a303e779bca2d03d5ed82685d1dd SHA512 b15681bbf4f396df4abd145d02a7ddca006cff7619a852b5cbdbcd5fd89d6cf34534aadf5e33114f47a8ab1443453b03f6dac71c71a80ba6740418bd699280b0
+EBUILD hplip-3.20.11.ebuild 8366 BLAKE2B 96dccc122bf601652dbea92ec13b48425f44a4d020ccb49d117a83bdaa9fa4c56a69296216dc4f045676016f7b90ec7c9fea7f8f479d07fc1946d2b4ab86aedb SHA512 a075b9bd4e0ce160480996dc6fead5304884662206cbcbb274699670df85634d88696a4a6bd75cc8b53cc20f347c5cf70ca295a5596a7b1848ccac73d3f35eef
 EBUILD hplip-3.20.6-r1.ebuild 7913 BLAKE2B 0d991ff1f5d52716cbfa089c0eb4c0c18340168eec8742b588769f9cee575ece1ad38351db7066a1bddc3fdada1bffdfc6dac42580298811db6dbca128af52eb SHA512 2b7d729e4cb51d1e278eeabf57d18a379bb4545407e468290dc30a7bc7963be84bd54607b75c58b899176d3490066738fe7811e9b5fa0dcb64ecfac4f05de71f
 EBUILD hplip-3.20.6-r3.ebuild 7860 BLAKE2B f214152b4af58e6ae3ec5921705669fba5b450717038e1a11a07fbb4681d95fe84ebb6ce172505e6e31cb5cfea559253c4a913d0481ed15ed181f7c4780407bc SHA512 d9db5ce52c87b9c13187a7a6cf9c3b119ce579f0b5e35525bbdd516c0c0909cb89e5aa7462c41c09bf4c5092de6fa21d76547ce7a0bfcb5c9a4abadd490b8843
 EBUILD hplip-3.20.9-r3.ebuild 7929 BLAKE2B ca7fad7a4eef708d5ac46691dcf39ea2d81037058e748ede78e0086c2998c73e8b2684c26bcd2a6e63e23490c7ac687d0d538ea1a32059bdb377cb63dedb961c SHA512 f2c93711956ca9acd38ab6f3575d3d9090366fe481b2a57a1743a65789b4a04dbd20b404c520cf7bbe7ec66a5bd77b0a58d6c12e9699d679287a13f02a3f1a47
diff --git a/net-print/hplip/hplip-3.20.11.ebuild b/net-print/hplip/hplip-3.20.11.ebuild
new file mode 100644
index 000000000000..b56b77c24785
--- /dev/null
+++ b/net-print/hplip/hplip-3.20.11.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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.20.11-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~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
+	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? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp:=
+			$(python_gen_cond_dep 'net-dns/avahi[dbus,${PYTHON_MULTI_USEDEP}]')
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
+		kernel_linux? ( virtual/udev )
+		$(python_gen_cond_dep '
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
+			dev-python/distro[${PYTHON_MULTI_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+			qt5? (
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+			)
+			scanner? (
+				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_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-foomatic-rip-hplip-install \
+		--disable-cups11-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/poster/Manifest b/net-print/poster/Manifest
index b75ee647bff9..da4f6e681dad 100644
--- a/net-print/poster/Manifest
+++ b/net-print/poster/Manifest
@@ -2,7 +2,5 @@ AUX poster-20060221-fix_cutmarks.patch 454 BLAKE2B a7494550de7a41bfbf87ff4b9a3fd
 AUX poster-20060221-fix_duplicate_DocumentMedia.patch 513 BLAKE2B 36cd30563d847a1e7946f14cff999a69d29f8cc37eea27ba003917643f5ef8b3cc507c76093ce972df98a2026c585f481c96cd9bdf2b2b01c09802abe2f4ef94 SHA512 b13c4cf46075922a6933be7b6adbf6c4f58d63c79208c9b63f04c3d21de47416019fd4257a3c8b36237a271b499fa61e06aaa80283203e61cc980c82004d8e43
 AUX poster-20060221-fix_gs_crash.patch 1370 BLAKE2B 7921cee78c95dad3660bc7e9c793a0fd4f6266eaf3f36caf85b30ed3fce701dd397db8a426974a186ea8e3fa958d849a34129478bcb42b08631579a976d2f7dc SHA512 3b2cf207c6ada9cf23a014f768b45a957b348b9ac9c2a151e951131cd845691dc91c40c8f77083066ffd2d97c21fe57f21f64b869c67458e0dcf29f6408e64ee
 DIST poster-20060221.tar.bz2 33770 BLAKE2B 96fc7202b737a6752d26428d5f5b301d84743ced74d8f1f971d61ddb24c32261ac708fe89aae8ee6a42c13a80ef1409086c3fab4cf6f83cb9c4df6e3ee0c1c6c SHA512 530d846ace93a182a4c232d7e30df47af653f354c8138f52d385b62b677ac51e6ca777c93ff5b3d4e983d8c16f3efa43d122f48826c80a08be0232331232c471
-EBUILD poster-20060221-r2.ebuild 640 BLAKE2B daa3bc104538e811227c1e39b1166120288042f9fcf331c1b2a4920bb0e1eae59cbcccf6df17a5a192080f1d7777662225c401e1d905808a4bee657f024f4bc1 SHA512 dc54b74bf6ed49fc66a0318d5954e4650f77240401ab4d86fb27de7b37861af691db96bfb9b5fc50ccc2d64aa64283107914999f501d626bcfa6971624454a86
-EBUILD poster-20060221-r3.ebuild 679 BLAKE2B 57aa2b68a8d1abd86eaec0f39068c15001584d5250edf91b5a634cca0d1f63fa7c9f54b48d530cc01d77fb03fe789ff8e554dbe4640403d666939fdda3465364 SHA512 fa39b4c45ed68d0325108c22d7ce4e338c27ed8b91b0374cfb322f3e18964e404b952e2b7cbb7bbc8c6b53c16db8b66f0ae3ee098437b98791c2af0538a20aac
-EBUILD poster-20060221.ebuild 532 BLAKE2B e694ac16a44265b8e4d08ee561d9f80e7cd2236d72976efec3cde9a70c0da788ab2156c7cedf701842213d458ae44330fa66ceaa07108748cdb5c47658d0a180 SHA512 786e62f1735ce5ed2900ed30cd290d1d2012a0c8ca90c95239144e6fb385235f95214dd361e31a61ab6585ee1020c56ebbff06ffd822d98437f29fb645bb5daf
+EBUILD poster-20060221-r3.ebuild 677 BLAKE2B f52bd90ef4b4c4363fa9e1c6a767d74655c866590cd15caad6aea022942a8b5a7e3c685dcb279a2579e6fd71d4c0d7430057fd9998049ce4d90c9b02a7654f7a SHA512 88c18f723ff4843b4e7839aa30502bb469b29eba514b7358ca31650d3f1b7e9c4841f7dbf2e94448f6e77e937e660caf0975c338d7d590943ab9f580af478ec2
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/poster/poster-20060221-r2.ebuild b/net-print/poster/poster-20060221-r2.ebuild
deleted file mode 100644
index 294fbc285b51..000000000000
--- a/net-print/poster/poster-20060221-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Small utility for making a poster from an EPS file or a one-page PS document"
-SRC_URI="mirror://kde/printing/${P}.tar.bz2"
-HOMEPAGE="https://printing.kde.org/downloads"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix_gs_crash.patch"
-	"${FILESDIR}/${P}-fix_duplicate_DocumentMedia.patch"
-)
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -lm -o ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README ChangeLog
-}
diff --git a/net-print/poster/poster-20060221-r3.ebuild b/net-print/poster/poster-20060221-r3.ebuild
index b912c89acd95..f278b477bd42 100644
--- a/net-print/poster/poster-20060221-r3.ebuild
+++ b/net-print/poster/poster-20060221-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://printing.kde.org/downloads"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/net-print/poster/poster-20060221.ebuild b/net-print/poster/poster-20060221.ebuild
deleted file mode 100644
index 34c1a6bc4d55..000000000000
--- a/net-print/poster/poster-20060221.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="small utility for making a poster from an EPS file or a one-page PS document"
-SRC_URI="mirror://kde/printing/${P}.tar.bz2"
-HOMEPAGE="https://printing.kde.org/downloads"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -lm -o ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README ChangeLog
-}
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index 0fb52817243c..38e554d3cbfd 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -1,6 +1,5 @@
 AUX splix-2.0.0_p20130826-algo0x11_le.patch 1231 BLAKE2B 8fe043f615bae54bf24635817696d2c38bf5250c77a4f52061b3cd7a82cc6c46a705ceed9ae4d46e47d5e8af64f8932a83acc718dabc614f6b03156274a34119 SHA512 9c96805deedc819cf4e663de63d35c4016b36a04ab56f5d3cee503e64dcd7a25d6ede2cd2ae3facf51d4e673476295a551e5659e9b91de6c30d1c21dc294be4a
 DIST samsung-cms-20120312.tar.xz 3354884 BLAKE2B ebff80c7e4ddebb87c46b0d282c64037d7584170ed224931e5b17fc93a76b162bd1b33ed00c59371464dcaef345cf6c33d428aa42c7b67c82958a23384ed0bac SHA512 448f111493540dc93b88d59fa50857bdca2aa9eb772e53c1d227402235d878ad599683d74bc4d815b4789527b5e7ebe207bb0c8fa9194eaf61ca95b78a1444db
 DIST splix-2.0.0_p20130826.tar.bz2 127278 BLAKE2B 6a8eb6b15e5208dd4173d50bf2b41d0e0f136057fbb46f36fb68ab1302c0c8a6b735311bc03f15e7afce0de802b3fa62df04ad5cd016532216b67a74e39835c3 SHA512 dda07e24b4321e6c1e3d4fbdd03fcc2b5931465db36ed9d8676a62313c4c64b7cbd58bf41996ddd1ab02086438f225439db0506aca7f0269f6c84e80eff72cb0
-EBUILD splix-2.0.0_p20130826-r1.ebuild 2187 BLAKE2B c2ffaa6080752032849d34eba2d0d8db0195cbcd4ccd6fd1e04d73056cc9f90bb59b0940dd90e3d99b11fe371db1f3c24740070a94c370d4bb50db36c342346a SHA512 99e8c29f6d0e5390386395d36374cfeeac39914a49c4ec511a68e8b3e2a54cc2947010a1a45fc8984e3b4d9ee6aeba19ce9895bc8f30f88ec2f10591031dff47
-EBUILD splix-2.0.0_p20130826.ebuild 2222 BLAKE2B 5954d062804e255f70a3cb11e2cbd79c2cecc1ca85565bcaee31a4925fb13cae61369ea4d20f03748ddb206109287112afd2dbd3da211f1199d297568c9a388b SHA512 2e124078fdde449972d150db2416d177841ec4088b0749a0406ef661f9d56959ea93ec28dfa0903c98f35866a34e72af31f8a764675864c485995e6d85aee327
+EBUILD splix-2.0.0_p20130826-r1.ebuild 2185 BLAKE2B 397a6da1a164cffa6e57b5db4938e80cad4ae2eb5e43c195c9a847dc9831e3859996135fcae4efaaaa689a7a0780273aaae8e55edf21ca3d6e438d5cb19277af SHA512 ff981508fd1641eca3344318846dbe55caca28f7a640c91a11c3b5da4c236ba3262ebfa40fa4782654bac026341bee2492f18d8e979e8da00b0059d5d0858127
 MISC metadata.xml 448 BLAKE2B 90ff61ffb785842747851b72263a3be4dc4fe3327450458d670bf2e4f0eea69a1ad3fc65ced40b0cea04542cc72cedeb071796b677af69d9dee7f9408a60fcdd SHA512 0ff863e6a4c76cfd3d027903a438b455a647c840250cd5d317600ea7c1df2b941f9cc61b096dade6f64c7b7ad0b3a1e28e9d3fd5d8c930f15b642e9c2fecdb9d
diff --git a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
index f8278234dc38..fd915aa6e56c 100644
--- a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
+++ b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+jbig"
 
 DEPEND=">=app-text/ghostscript-gpl-9.02
diff --git a/net-print/splix/splix-2.0.0_p20130826.ebuild b/net-print/splix/splix-2.0.0_p20130826.ebuild
deleted file mode 100644
index 3ca2d9b6afb6..000000000000
--- a/net-print/splix/splix-2.0.0_p20130826.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
-HOMEPAGE="http://splix.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
-	https://dev.gentoo.org/~voyageur/distfiles/samsung-cms-20120312.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+jbig"
-
-DEPEND=">=app-text/ghostscript-gpl-9.02
-	>=net-print/cups-1.4.0
-	jbig? ( media-libs/jbigkit )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Move to correct place
-	mv *.ppd ppd/ || die "ppd files move failed"
-	# Honor LDFLAGS
-	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
-		|| die "module.mk sed failed"
-	# Correct link comand
-	sed -e "s/g++/$\{LINKER\}/" -i rules.mk \
-		|| die "rules.mk sed failed"
-}
-
-src_compile() {
-	local options="MODE=optimized"
-	use jbig || options="${options} DISABLE_JBIG=1"
-	emake ${options} PSTORASTER=gstoraster CXX="$(tc-getCXX)" \
-		OPTIM_CFLAGS="${CFLAGS}" OPTIM_CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	gzip "${ED}"/$(cups-config --datadir)/model/*/*.ppd || die "ppd gzip failed"
-
-	emake DESTDIR="${D}" CMSDIR="${WORKDIR}"/cms MANUFACTURER=samsung installcms
-	# Add symlinks for xerox and dell models (installed in samsung)
-	dosym $(cups-config --datadir)/profiles/samsung $(cups-config --datadir)/profiles/xerox
-	dosym $(cups-config --datadir)/profiles/samsung $(cups-config --datadir)/profiles/dell
-}
-
-pkg_postinst() {
-	ewarn "You *MUST* make sure that the PPD files that CUPS is using"
-	ewarn "for actually installed printers are updated if you upgraded"
-	ewarn "from a previous version of splix!"
-	ewarn "Otherwise you will be unable to print (your printer might"
-	ewarn "spit out blank pages etc.)."
-	ewarn "To do that, simply delete the corresponding PPD file in"
-	ewarn "/etc/cups/ppd/, click on 'Modify Printer' belonging to the"
-	ewarn "corresponding printer in the CUPS webinterface (usually"
-	ewarn "reachable via http://localhost:631/) and choose the correct"
-	ewarn "printer make and model, for example:"
-	ewarn "'Samsung' -> 'Samsung ML-1610, 1.0 (en)'"
-}