gentoo resync : 22.01.2021

26 files changed, 47 insertions, 802 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 3420d220c07c..165b8e31c784 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest
index 2f38b7290d20..016eb02b8313 100644
--- a/net-print/c2esp/Manifest
+++ b/net-print/c2esp/Manifest
@@ -1,4 +1,3 @@
-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
diff --git a/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch
deleted file mode 100644
index 1ea36482687d..000000000000
--- a/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2012-09-06 00:18:06.000000000 +0100
-+++ b/Makefile	2013-08-01 19:56:01.884969274 +0100
-@@ -234,16 +234,16 @@
- 	@echo 
- 
- c2esp: c2esp.o c2espcommon.o $(LIBJBG85)
--	$(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85)
- 
- c2espC: c2espC.o c2espcommon.o 
--	$(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -lz
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2espC.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -lz
- 
- command2esp: command2esp.o c2espcommon.o
--	$(CC) $(CFLAGS) -o $@ command2esp.o  c2espcommon.o $(LIBCUPSDRIVER)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o  c2espcommon.o $(LIBCUPSDRIVER)
- 
- myopldecode: myopldecode.o $(LIBJBG)
--	$(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(LIBJBG) -lz
- 
- #
- # Installation rules
-@@ -403,3 +403,8 @@
- command2esp.o: c2espcommon.h
- c2espcommon.o: c2espcommon.h
- 
-+# Respect CPPFLAGS.
-+.SUFFIXES: .c .o
-+.c.o:
-+	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o '$@' '$<'
-+
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index 831b0bdd971d..f3e81b480c4f 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -1,18 +1,6 @@
-AUX cnijfilter2-5.20-gentoo.patch 1535 BLAKE2B c3861e039d0ecce6f1940c1f998ce23ab2834f18a7394c82070e83d7de4d7860869775d5e017a8e26999f3798090bcffab699916263953afbc52a24f39b3bb23 SHA512 29458eabdfe3f7c66b47ddbd490c741b78a3cb9b375be1769e65d2240e732fc184005de226eed8985f77aa153c00c39463d9fce41ba79a439874ebb031acb70d
-AUX cnijfilter2-5.50-gentoo.patch 276 BLAKE2B 9805afacbdc9e3a9dfcb13b250606058f55c8f33a71018f919ae61e5f252563c701b08faaef8e380491897e3fc89669879be159b52b556886f63bb6f13c20cf4 SHA512 206b808460b4c6f5c8f7fd5e999d6fd501e278a97ea79a4f2bbbdb8e061a3641bac7033cf55d75c0681a99b69aa152ac2cf512e54b2fde3339685a3c2e0af326
 AUX cnijfilter2-5.70-gentoo.patch 1786 BLAKE2B 96c0f8b919dbc896c7b749ef52cc1c6f331921fe55b196782b613389372c5ba382b8a7f1e5f6e326bcfae4652cf4d1c40fcd052f435c721301cf4cdf7433faaa SHA512 9cc2b0a069a8ec045bdedb41e9f6246f6245ae5fb4567a23f03516bbc0d6661d54faa291a976d8a89ee216df31db4515ee04123f9ba7e1cfd629f3191c6ff657
 AUX cnijfilter2-5.80-cflags.patch 475 BLAKE2B 18cee126ff7bc58cce31e22bccbc220b3f3a149dce1d3e68a070739a08715d6093cb41e6db12bc8a3ade0d9e73ea18d9ed1b666c84f8364d263bf585a666c60f SHA512 ca36f72b0a4f5a1e9fa7c57722a55b3eb5f907fd86cdb92ec27cd1f8cd6bdba6f27b50612eb03c774d823a17598fcb475b1ea9fdba10b6de5d0acd575ddee07e
 AUX cnijfilter2-5.80-fno-common.patch 486 BLAKE2B 688d66202fddd0afeb757e7933fbf38af6cb65ee3a805e8af75a0c8c6bbf9e6951d2b5376c0204830c457a77d06d3f942a420496b98aafafe6df42f651b1da41 SHA512 fd5a21de395e93975b2118c06a6957de85157e4cac8b3c473f48f00cbd56e7178b59c03396ece47f21f49414eb7acdff53952469dca5498b875e0c488af80b53
-DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a04dcbe1e3ab5462b59c0cd919316a7c54a36bbeb34cf4205132f0aa3e5a23f89eb260c35c1a3ee14ea85bc36b9e3b67cd7e3f7 SHA512 60be49d34adf9a4d2cd8337cccb36eb8c078e9712bf8043c3552f1d83c3da307badfe34fc3683c99e3234da30f4ba82e0c4a0b48ea5f78f0d66db1408bd7d495
-DIST cnijfilter2-source-5.40-1.tar.gz 817298 BLAKE2B 1088eb19c70ed9133c38b8a6da9fbc26c42d6f077fda01678fb4485c2db21a17567fab8ab5c9565ece7ea13e5fac3f7c5842e984116d6c595e7a1f19092d3461 SHA512 bb4ce18864037fae9735fcb1b2c3198fe39f8abe0caa754e457e3cb0d03767742d82ff4fddf81451215395b23eea8207a880e238558e0ea2ac5c359186ecd859
-DIST cnijfilter2-source-5.50-1.tar.gz 1129057 BLAKE2B 20208b1fa679a4303b5f47ae733224fa1346277d539e62688ecbfaa6a1a9f7b01cb4742c299ec188d59787e4175896dfe8d812f8aa936977f8168d823216b239 SHA512 9a99d0230fb9498d2b17648e58009efa5812fe5c076c11fdc6c2afeec453e355c1e3406053330e965e46be23651df6b887d0edb20eebd564554a7bf31b155186
-DIST cnijfilter2-source-5.70-1.tar.gz 1366033 BLAKE2B 0d03c4c4f4bc00ea91cc46db6554252997242dcc98ee65fe856528848843cdd6d2195e3839d8dad71f1fc722cfbb2e65730020665d9095d0a93900840659477d SHA512 3d9afe4ca6b042015898f4fc08d991a4af2c55010c9d98807a12dade01d2655f74b7e4896abeb933c93faeca954bcfdadfd6e359ee8efe5952623fc635500729
-DIST cnijfilter2-source-5.80-1.tar.gz 1422542 BLAKE2B 046fa72752c5645f307dbee3f2d5f01cd24484859a2d9002135cbcaa9dba0adb3b8d961c7adede8aedd816d4932c526474e7cd252c13e1cef56a427b3b58740d SHA512 060af4834472d21f50f3a431ff6a1bfb36e14348b58eaa777ae471d44062d76b7fd3f247da1818f893285a94ac0335f656e3d026fc613d338dc2ce4d8e242d21
 DIST cnijfilter2-source-5.90-1.tar.gz 1707084 BLAKE2B 3df5786785b12c410f4ae72e1d20fcd7686e0b8de60e7a713392076c2cd9edc1bd3d7f7494712ec6a4f50197fdb79e4cb708fcbe5f3b9e38cb3353e74cc8291a SHA512 d31f5133b6f81114d46cb067779260d5d74b5616e6e1b3924ef9db0db233fbb2b16132f7a003342e2ed14742c3123c644619dc1d5c93bca5d16425a77d45c632
-EBUILD cnijfilter2-5.20.ebuild 1403 BLAKE2B 1daedead655b9573ea422a8374bf04449baed0d9f845fb64852f0a3515694d6a24cb799f83d98074553808b6e3cadeb273a4b54c1a743d079658c5f093f1cadf SHA512 e316d08d3e04b5bdc2b3281c4e2d983b8bb4d4a46b7b32b088fa65c370f613ec3a4a6d48252f620125974212b4c235d42316ef73c7748fed940ab44442d09027
-EBUILD cnijfilter2-5.40.ebuild 1515 BLAKE2B 5c7452ce92474cc403a1051b622e18ff257759bfd80b45c0e928ecf2a68e69a78eefa31ec60f29e1c4c9aa218dbab5141ccb1251a9fd46f171332dbf069975ae SHA512 0e75f8248fe1d14e2bede4e172e662492c7e2483c2dbebe66d1a8ba719df3b3c6da31f83dd2be7c71db98367a62f969a6a0ad1d7cf8ea68eb17bfdc4f6097171
-EBUILD cnijfilter2-5.50.ebuild 1824 BLAKE2B 0bf3b50902e82594459eda12e60e7e7f5e95114c3c075434465c3922ea8cdc11785bb5ed40a9f664e1a98a3d666809a5a9f0aa660dc86edaa8a2598d0b2595d1 SHA512 9582f2fd8a578546000ffbc31d925802079e6131f0b907a0e9a846ff51341b171b5e25c578440808fac5782038bf8c2a63fc4343c588d733a0f4db9ab52187ca
-EBUILD cnijfilter2-5.70.ebuild 1520 BLAKE2B 526de368e3ada4e675ab6bd8b3cfc84fa6314a233be92ca072de738945011a1a76f017c0da1d6516d8879d2abfcd9636f4999860984298d5f3135b81b242c978 SHA512 44f3775f11b07387448703a7102a7d498ece24f5750e141a6838b994e4a9050a19b990514fe9a17a138683349372e40cfb6f178f3ded7cc6e6d6266d6f1e0d45
-EBUILD cnijfilter2-5.80.ebuild 1818 BLAKE2B b9223cea935897b368d04ae76174035e3581990119c946f4ba0fc91cd3c436249f15efc4920749aeed5f0866d7e8c70dee1ec9f138c39fb27e4a1d86ad10fdfd SHA512 7def0d02041859735b01edc76f9b048331313aafbc17b4453bbe1f379b6517c0e10bcfea1fbd99837d76d8b3f922e8934b090ece2a7f66ee807a48b35d74c585
-EBUILD cnijfilter2-5.90.ebuild 1827 BLAKE2B 1e43306fcd74fbff0031cff4fb0272c3660ecdfbce495693d41b65400deeb2c2b83bbb13a3dd791c212c1f86589e46e19381f561712930f3f82ce28bfa193e65 SHA512 6e64ae2d4ae75ad0b723fcd7cc36aa13b1f0f15958c59626806af410e6c517781790012b3e80c75caba77ee4e2e83cac2fa55b0e82fe8acd3edfe66e378f82de
+EBUILD cnijfilter2-5.90.ebuild 1825 BLAKE2B 928db61a0f4fde99e817d99e645f0046567ee2ffde897e2e2cd194c3514927f40a357f5600ac29d91438e8f9d86caee1ac077dd7b8129677f7bd6a9e1bc2878e SHA512 2b130c886c08fe38d7565e3c88c33022c1e23cb4818d25aa4c7b049553d7c73104697686355f3c1f4e7827557b81abcb7221276f53794eb3e7c5fe28a3830547
 MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/net-print/cnijfilter2/cnijfilter2-5.20.ebuild b/net-print/cnijfilter2/cnijfilter2-5.20.ebuild
deleted file mode 100644
index a5ceae2028a2..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-5.20.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${PN}-source-${PV}-1"
-
-DESCRIPTION="IJ Printer Driver"
-HOMEPAGE="https://www.canon.it/"
-SRC_URI="http://gdlp01.c-wss.com/gds/0/0100006900/01/${MY_P}.tar.gz"
-
-LICENSE="Canon-IJ"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/libusb:1
-	dev-libs/libxml2
-	net-print/cups"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	DIRS="cmdtocanonij2 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
-	LIBDIR=com/libs_bin$(usex amd64 64 32)
-	for d in ${DIRS}; do
-		mv "${d}"/configure.{in,ac} || die
-	done
-	echo "AC_INIT([${PN}], [${PV}])" >> configure.ac
-	echo "AM_INIT_AUTOMAKE" >> configure.ac
-	echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac
-	echo "AC_CONFIG_FILES([Makefile])" >> configure.ac
-	echo "AC_OUTPUT()" >> configure.ac
-	echo "SUBDIRS= ${DIRS}" >> Makefile.am
-	sed -i \
-		-e "/^CFLAGS/d" \
-		*/configure.ac || die
-	eautoreconf
-	cd ${LIBDIR}
-	rm libcn*2.so || die
-	ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
-	ln -sf libcnnet2.so.1.2.3 libcnnet2.so || die
-	cd -
-}
-
-src_configure() {
-	LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin"
-}
-
-src_install() {
-	default
-	insinto /usr/share/ppd/cupsfilters
-	doins ppd/*ppd
-	dolib.so ${LIBDIR}/*
-}
diff --git a/net-print/cnijfilter2/cnijfilter2-5.40.ebuild b/net-print/cnijfilter2/cnijfilter2-5.40.ebuild
deleted file mode 100644
index 038cbf38f1bc..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-5.40.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${PN}-source-${PV}-1"
-
-DESCRIPTION="IJ Printer Driver"
-HOMEPAGE="https://www.canon.it/"
-SRC_URI="http://gdlp01.c-wss.com/gds/3/0100008393/01/${MY_P}.tar.gz"
-
-LICENSE="Canon-IJ"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/libusb:1
-	dev-libs/libxml2
-	net-print/cups"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.20-gentoo.patch )
-
-src_prepare() {
-	default
-	DIRS="cmdtocanonij2 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
-	LIBDIR=com/libs_bin$(usex amd64 64 32)
-	for d in ${DIRS}; do
-		mv "${d}"/configure.{in,ac} || die
-	done
-	echo "AC_INIT([${PN}], [${PV}])" >> configure.ac
-	echo "AM_INIT_AUTOMAKE" >> configure.ac
-	echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac
-	echo "AC_CONFIG_FILES([Makefile])" >> configure.ac
-	echo "AC_OUTPUT()" >> configure.ac
-	echo "SUBDIRS= ${DIRS}" >> Makefile.am
-	sed -i \
-		-e "/^CFLAGS/d" \
-		*/configure.ac || die
-	eautoreconf
-	cd ${LIBDIR}
-	rm libcn*.so || die
-	ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
-	ln -sf libcnbpnet20.so.1.0.0 libcnbpnet20.so || die
-	ln -sf libcnbpnet30.so.1.0.0 libcnbpnet30.so || die
-	ln -sf libcnnet2.so.1.2.4 libcnnet2.so || die
-
-	cd -
-}
-
-src_configure() {
-	LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin"
-}
-
-src_install() {
-	default
-	insinto /usr/share/ppd/cupsfilters
-	doins ppd/*ppd
-	dolib.so ${LIBDIR}/*
-}
diff --git a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
deleted file mode 100644
index 99edb10a5be2..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN}-source-${PV}-1"
-
-DESCRIPTION="IJ Printer Driver"
-HOMEPAGE="https://www.canon.it/"
-SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009110/01/${MY_P}.tar.gz"
-
-LICENSE="Canon-IJ"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="virtual/libusb:1
-	dev-libs/libxml2
-	net-print/cups"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED=(
-	"/usr/lib.*/libcnbpnet30.so.1.0.0"
-	"/usr/lib.*/libcnbpcnclapicom2.so.5.0.0"
-	"/usr/lib.*/libcnnet2.so.1.2.4"
-	"/usr/lib.*/libcnbpnet20.so.1.0.0"
-	/usr/bin/cnijlgmon3
-)
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.20-gentoo.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${PN}-5.80-cflags.patch
-)
-
-src_prepare() {
-	default
-	DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
-	LIBDIR=com/libs_bin$(usex amd64 64 32)
-	for d in ${DIRS}; do
-		mv "${d}"/configure.{in,ac} || die
-	done
-	echo "AC_INIT([${PN}], [${PV}])" >> configure.ac
-	echo "AM_INIT_AUTOMAKE" >> configure.ac
-	echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac
-	echo "AC_CONFIG_FILES([Makefile])" >> configure.ac
-	echo "AC_OUTPUT()" >> configure.ac
-	echo "SUBDIRS= ${DIRS}" >> Makefile.am
-	sed -i \
-		-e "/^CFLAGS/d" \
-		cnijbe2/src/Makefile.am \
-		*/configure.ac || die
-	eautoreconf
-	cd ${LIBDIR}
-	rm libcn*.so || die
-	ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
-	ln -sf libcnbpnet20.so.1.0.0 libcnbpnet20.so || die
-	ln -sf libcnbpnet30.so.1.0.0 libcnbpnet30.so || die
-	ln -sf libcnnet2.so.1.2.4 libcnnet2.so || die
-
-	cd -
-}
-
-src_configure() {
-	LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}" econf --enable-progpath="${EPREFIX}/usr/bin"
-}
-
-src_install() {
-	default
-	insinto /usr/share/ppd/cupsfilters
-	doins ppd/*ppd
-	dolib.so ${LIBDIR}/*
-}
diff --git a/net-print/cnijfilter2/cnijfilter2-5.70.ebuild b/net-print/cnijfilter2/cnijfilter2-5.70.ebuild
deleted file mode 100644
index 3b5058bc8153..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-5.70.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN}-source-${PV}-1"
-
-DESCRIPTION="IJ Printer Driver"
-HOMEPAGE="https://www.canon.it/"
-SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009930/01/${MY_P}.tar.gz"
-
-LICENSE="Canon-IJ"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/libusb:1
-	dev-libs/libxml2
-	net-print/cups"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
-	LIBDIR=com/libs_bin$(usex amd64 64 32)
-	for d in ${DIRS}; do
-		mv "${d}"/configure.{in,ac} || die
-	done
-	echo "AC_INIT([${PN}], [${PV}])" >> configure.ac
-	echo "AM_INIT_AUTOMAKE" >> configure.ac
-	echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac
-	echo "AC_CONFIG_FILES([Makefile])" >> configure.ac
-	echo "AC_OUTPUT()" >> configure.ac
-	echo "SUBDIRS= ${DIRS}" >> Makefile.am
-	sed -i \
-		-e "/^CFLAGS/d" \
-		*/configure.ac || die
-	eautoreconf
-	cd ${LIBDIR}
-	rm libcn*.so || die
-	ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
-	ln -sf libcnbpnet20.so.1.0.0 libcnbpnet20.so || die
-	ln -sf libcnbpnet30.so.1.0.0 libcnbpnet30.so || die
-	ln -sf libcnnet2.so.1.2.4 libcnnet2.so || die
-
-	cd -
-}
-
-src_configure() {
-	LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin"
-}
-
-src_install() {
-	default
-	insinto /usr/share/ppd/cupsfilters
-	doins ppd/*ppd
-	dolib.so ${LIBDIR}/*
-}
diff --git a/net-print/cnijfilter2/cnijfilter2-5.80.ebuild b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
deleted file mode 100644
index a631ce9abccc..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN}-source-${PV}-1"
-
-DESCRIPTION="IJ Printer Driver"
-HOMEPAGE="https://www.canon.it/"
-SRC_URI="http://gdlp01.c-wss.com/gds/3/0100010273/01/${MY_P}.tar.gz"
-
-LICENSE="Canon-IJ"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/libusb:1
-	dev-libs/libxml2
-	net-print/cups"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED=(
-	/usr/lib64/libcnbpnet30.so.1.0.0
-	/usr/lib64/libcnbpcnclapicom2.so.5.0.0
-	/usr/lib64/libcnnet2.so.1.2.4
-	/usr/lib64/libcnbpnet20.so.1.0.0
-	/usr/bin/cnijlgmon3
-)
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.70-gentoo.patch
-	"${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
-	default
-	DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
-	LIBDIR=com/libs_bin$(usex amd64 64 32)
-	for d in ${DIRS}; do
-		mv "${d}"/configure.{in,ac} || die
-	done
-	echo "AC_INIT([${PN}], [${PV}])" >> configure.ac
-	echo "AM_INIT_AUTOMAKE" >> configure.ac
-	echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac
-	echo "AC_CONFIG_FILES([Makefile])" >> configure.ac
-	echo "AC_OUTPUT()" >> configure.ac
-	echo "SUBDIRS= ${DIRS}" >> Makefile.am
-	sed -i \
-		-e "/^CFLAGS/d" \
-		*/configure.ac \
-		cnijbe2/src/Makefile.am || die
-	eautoreconf
-	cd ${LIBDIR}
-	rm libcn*.so || die
-	ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
-	ln -sf libcnbpnet20.so.1.0.0 libcnbpnet20.so || die
-	ln -sf libcnbpnet30.so.1.0.0 libcnbpnet30.so || die
-	ln -sf libcnnet2.so.1.2.4 libcnnet2.so || die
-
-	cd -
-}
-
-src_configure() {
-	econf --enable-progpath="${EPREFIX}/usr/bin" LDFLAGS="-L"${S}"/${LIBDIR} ${LDFLAGS}"
-}
-
-src_install() {
-	default
-	insinto /usr/share/ppd/cupsfilters
-	doins ppd/*ppd
-	dolib.so ${LIBDIR}/*
-}
diff --git a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
index 870bdbc7e931..e687d7cce0cd 100644
--- a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~tupone/distfiles/${MY_P}.tar.gz"
 
 LICENSE="Canon-IJ"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="virtual/libusb:1
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
deleted file mode 100644
index be941790b995..000000000000
--- a/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/cmdtocanonij2/filter/Makefile.am.old	2018-01-14 18:14:20.645473030 +0100
-+++ b/cmdtocanonij2/filter/Makefile.am	2018-01-14 18:14:36.078219959 +0100
-@@ -1,4 +1,4 @@
--filterdir=$(libdir)/cups/filter
-+filterdir=$(libexecdir)/cups/filter
- 
- filter_PROGRAMS= cmdtocanonij2
- 
---- a/cnijbe2/src/Makefile.am.old	2018-01-14 19:25:48.823470121 +0100
-+++ b/cnijbe2/src/Makefile.am	2018-01-14 19:25:59.316275741 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--backend_bindir = /usr/lib/cups/backend
-+backend_bindir = $(libexecdir)/cups/backend
- backend_bin_PROGRAMS = cnijbe2
- transform = 
- 
---- a/rastertocanonij/src/Makefile.am.old	2018-01-14 21:31:33.053307218 +0100
-+++ b/rastertocanonij/src/Makefile.am	2018-01-14 21:31:41.106166479 +0100
-@@ -1,4 +1,4 @@
--filterdir=$(libdir)/cups/filter
-+filterdir=$(libexecdir)/cups/filter
- 
- filter_PROGRAMS= rastertocanonij
- 
---- a/tocanonij/src/Makefile.am.old	2018-01-15 22:38:14.236460663 +0100
-+++ b/tocanonij/src/Makefile.am	2018-01-15 22:38:39.184018933 +0100
-@@ -1,7 +1,8 @@
- INCLUDES = \
- 	-I$(top_srcdir)/include/cncl
- 
--bin_PROGRAMS= tocanonij
-+filterdir=$(libexecdir)/cups/filter
-+filter_PROGRAMS= tocanonij
- 
- tocanonij_SOURCES= \
- 	main.c
---- a/tocnpwg/src/Makefile.am.old	2018-01-15 22:42:43.759703863 +0100
-+++ b/tocnpwg/src/Makefile.am	2018-01-15 22:43:10.442232986 +0100
-@@ -2,7 +2,8 @@
- INCLUDES = \
- 	@XML_2_CFLAGS@
- 
--bin_PROGRAMS= tocnpwg
-+filterdir=$(libexecdir)/cups/filter
-+filter_PROGRAMS= tocnpwg
- 
- tocnpwg_SOURCES= \
- 	main.c mkpset.c
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch
deleted file mode 100644
index a7322bbce860..000000000000
--- a/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/cmdtocanonij3/filter/Makefile.am.old	2018-01-14 18:14:20.645473030 +0100
-+++ b/cmdtocanonij3/filter/Makefile.am	2018-01-14 18:14:36.078219959 +0100
-@@ -1,4 +1,4 @@
--filterdir=$(libdir)/cups/filter
-+filterdir=$(libexecdir)/cups/filter
- 
- filter_PROGRAMS= cmdtocanonij3
- 
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
index 0911e69933b7..131c16097b74 100644
--- a/net-print/cups-bjnp/Manifest
+++ b/net-print/cups-bjnp/Manifest
@@ -1,5 +1,3 @@
 DIST cups-bjnp-2.0.3.tar.gz 140764 BLAKE2B 4b8d3c823abd9057be91a246b463fd17a26362c7f11959989749e023d3bdb70a0cba444b86d5f2302f6da13324f7fb6f6c84970933919be67c023e03842b124a SHA512 57db45e85ca016b823563ed6a2aa07a32b9fb733fc01af0aa488bd2fc3cf02388ae1dfb63234ce80d64616dd97209153bb8c047ff549405e7bfdcca0c57fcd5c
-DIST cups-bjnp-2.0.tar.gz 140617 BLAKE2B 7d280346a6f29a3530b605d8e259007c004dc5c53386904db93e5302303a158b8a5a4ed86e8cf72692fb4d64f4b041625b224a1325d5c77e4ecc82cd59bfa0d2 SHA512 60b7c58828c736eab6986896730db7635d3364e94d6d7c4992eb7f49f22ced6a5643153c069d3823d4dc663ee7de8748b8e8ec527e04afc65389c521b791c8d0
-EBUILD cups-bjnp-2.0.3.ebuild 472 BLAKE2B 016451cb79da167f444c057e0227b9e87a325c2b8c4f51c76d9fa0b5bd195e1979b65b6f1a1535033069f948d8550554b4c395922982619aff39e1f8dc41810f SHA512 2035b80356a87d5cc60e5376e87bb8694d9c45a3b180ca7e23e76e51fe86f9b7a72b867db9d471dc5cbf54c3a660cfa1caf7fc41da502637044bbe930cf8704d
-EBUILD cups-bjnp-2.0.ebuild 481 BLAKE2B 75ff24ed8dba8575f614745ad86913156077eb877bbb0a35f58bf307c9429e90064ead3919c2795e675248c65c69673cfb0ca854bd62a47eddb0e66b38918d8a SHA512 4eab0921680a478ad9f4fe8217e5acd41acf787334743c53050076b139d4c6aed4e1d406e5b76d1b87c4d1f840719dc7d7f522ec327ec04bef0404d4388ad269
+EBUILD cups-bjnp-2.0.3.ebuild 470 BLAKE2B a0f78204e4511f51e8b9079ca0f0817f961531e2c69ee35167129ac79ad96c538f6474bfba9982ad0f03906bf245d527fa4b9aee3ee3d0231ce249520eb4a23e SHA512 2e9e4f4d461d6d33d19545651358c9d7b681a70bf1dad2fd60198ada759e83c7b5134c4d4f5928e82fd75a09b3b3eeacc8762c2b3740abee1ee698426eddc19d
 MISC metadata.xml 338 BLAKE2B 672c0b7535be027177912e73ba4978fa3fbc6a7ff597f664ef719d0b11e3d95b6a0fa630385ff371ec2567aa016063c017cf8f38c4a2046214aa3d958b675b96 SHA512 be2e9f37b6456136fedac3ee2bcf004d8bf5ac644dd5154714aba02fa3dbc026b5c8f0e0518e494d9bc5d22902339c97cd8df8955df814306337883a68a87a84
diff --git a/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
index fd3217e0a0f5..613046076382 100644
--- a/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
+++ b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"
diff --git a/net-print/cups-bjnp/cups-bjnp-2.0.ebuild b/net-print/cups-bjnp/cups-bjnp-2.0.ebuild
deleted file mode 100644
index 794ea7b24fb9..000000000000
--- a/net-print/cups-bjnp/cups-bjnp-2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol"
-HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf --disable-Werror
-}
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 476d618e7551..e4782c138fbe 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,14 +1,9 @@
 AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
 AUX cups-filters-1.27.4-make-missing-testfont-non-fatal.patch 510 BLAKE2B 9b48f841b7034b4c56ed6ea7d229696aacc232b9d78c9984dad6db8f6e967e239c77dbb35886230ac968966ee04912add135a5932ca1483674e1bf2c087e81fc SHA512 ce14af0a4d2db1e67471b8986290261ac17709720fe5a52a6a81bda19e4ae7e4ab92a8f1e954b82b792690f9eae8116c59ee3a11594256a36bf8cff32846e97c
-AUX cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch 451 BLAKE2B 0dc63e4c494bb60aa8ac5ae157b5640f903e0852a2454d115456f200888c3d074d43c877e56e01789a0ac38d50a89f44ce20658da14119cd1953e834b33f890c SHA512 306eed342d323cbc99d586ad83aa748af5d1b41896d6000a9df34bd2eac3fe2773f5f979f2befb0441d83509d43438d293ce97125f88300b731624502b5bf774
 AUX cups-filters-1.28.2-make-missing-testfont-non-fatal.patch 477 BLAKE2B 30e8fd049fb4d16439405aa052134d828a5f9e5e3f79c02e6121d3c15c5374c62d370fe88ab4b761e849ab48ecc0bdde97d36c6fd98056d0dc195464c7648a2d SHA512 797e8530f5a44b4e4975399076e4e1c537da968a9ed8272baaf1e457a025bc22478045e780208b1607dbcd4eb31b91ac605781cf6eae47ffcdd748e34d126327
-DIST cups-filters-1.27.4.tar.xz 1493860 BLAKE2B 424c3ba73ec7d6f4683eaedde86d657b1a2da17670c84097f5f3f8ef525cc8cc6d7843a88d35013a5f48bba8a903f7504df9054427b9a63d748ce39de458e71f SHA512 8005e94bb6b06d0a15fa4dfd8455d0bc67418478bf517e205af1c8c0018681a97ae9ea486db07570050ebeeb7f63f75319a8fe012c112c6d16c0941299eaa50e
-DIST cups-filters-1.27.5.tar.xz 1494864 BLAKE2B 457968139f0bc1a5fd4c587dfe4a88d1904eb0ca9ee2aa88c1360785eb53b59e7eb823535ef01a9f81551628514441077562e91487a55a9f0c9e6c9dbdba98b7 SHA512 8bc917b2a168add1062d091d02d99c39d72861c0d0cb1242c34b2bf117c9943e7fdc1fe002de7cde4cb1919fbce41073adc34916c328fc99e66e389b0a4fe103
-DIST cups-filters-1.28.2.tar.xz 1502352 BLAKE2B e0d95a7e1596d4dc05a8e2d32b2ee573cfa1ec304288e476a38c8b51de5ed8e0b6a71e371d2196802b116d63aea1e750e0b3a6c8fae749377de0ab72f92aa86e SHA512 aa5f075927286a8278259025aa5baf95445809a83b88e2d4654e8f0a124012591b045df115294242fae60a283d983d6cdbaafc6a51224af30a7e56b58d831da5
 DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea SHA512 ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c
-EBUILD cups-filters-1.27.4.ebuild 3588 BLAKE2B 1f2b5b53cec7b0e5fd39c271fb5e11c50a72cbfccb725d897ca3a5c6c6cbdca76fe3ce7d5c204660de7c41584fab2a356d45f9c25dbee8227b4eeb4eb83dc0ab SHA512 7a0dac4750dc894973bd1c46f4a81be1aa588ef96f722a0e2478c111b79f95a8700f6e315707c0cbdd4511aabb8069ef8841a9d131e48b7a6393452d22032cc5
-EBUILD cups-filters-1.27.5.ebuild 3600 BLAKE2B 0a77e163516763bf79356e22e36041286f94472e57e934bf18e2c7345959209d066e522e62bf84b38327d226a255b8ddcb6c6fa19c91d975ee1518e402a257a9 SHA512 11434604582bdb144a542a2bf216ff35a06535f7561dea459f1383138d8fa0e06bbb1c0d4ddb0fbf64350badcd9c31df999b9213900488d4f3c52c686fd4c93d
-EBUILD cups-filters-1.28.2.ebuild 3597 BLAKE2B b775cf022cadc1f622bf2be36efd2fb6d893644becb07adc310c46a9b560cbb33f9afb87a888f05cb80724ed55fd6fd7219bc9b5627645e848ea8e9fc1899424 SHA512 fcbf4c45294703ce95f20eb5565c0b8c72ee2133c6db12c29e4e5407cd1104ff210ec6101912ac528ba111b15385dedb7c07ef730ab2d23aa51abcf038a87457
+DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442 SHA512 fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727
 EBUILD cups-filters-1.28.3.ebuild 3588 BLAKE2B 13dd4b84406b23d346e49b578ece8ab0133c26df584bc2ba48154bccacaf1f3c8805056d5fdb60a5aa3ffa53a36c41e6ba6100be2dc5966f3acca8636c33ecc9 SHA512 e1f41da89145c942e974d57f9189baf68f3cb85ce6eea10619c6866f4346a99b1ab19c2f663c96525a8ae81701797f85fdc71faea01adb10aa708fec4dd3eb8d
+EBUILD cups-filters-1.28.7.ebuild 3597 BLAKE2B 400b5eaaccfb491aab1305f7d9d11d0c3c0a5bdd454d148dbe0a1642bec5ec5514055beb8f2c15b5c68322c0b3c57edf0f62c03abf8fc059569fe8fd0a0dd1d5 SHA512 a1db1af2a2eac43a8c8df236e71c73d61a632e0416363760fbf768df7e254853195491a1ff229fff388c9a14248d5bab13ea8e6997a3d4cd4ff8f5ff6d8815ae
 EBUILD cups-filters-9999.ebuild 3526 BLAKE2B c38824b7d039513ce3cdf39881193df39a36f2a3f1884fd88579e4a32600b5ada64024a689aad3b801eaf73322b7ce2509391997d77175a5e92e2509912df936 SHA512 4102b01ea57450437a4e6f594f137c8bf82dade5275e4719b546983a49f1a725bb209a1c88d89b18b9e5dd813395afd8865999c1e3158d77c32b50f675d143c5
 MISC metadata.xml 444 BLAKE2B 43542e8e11bcce56517af18fe24258495e3032a72bec385a513c741bb1b48f9b77d83b2d8ebcd52f83a16b099762e9e85ff4a91e688203cbfc4461b4a68a34fb SHA512 8eafb557741f3d771b445424c4bfeef6e4de60c7aca36c1a1e3541d234d2bcd5e459602bbb7b3b5327403993486d803f8e837ec51dfde64fcdbfa522ad131950
diff --git a/net-print/cups-filters/cups-filters-1.27.4.ebuild b/net-print/cups-filters/cups-filters-1.27.4.ebuild
deleted file mode 100644
index f3809128d29f..000000000000
--- a/net-print/cups-filters/cups-filters-1.27.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	local need_eautoreconf=
-
-	default
-
-	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.27.4-make-missing-testfont-non-fatal.patch
-		need_eautoreconf=yes
-	elif [[ "${PV}" == "9999" ]] ; then
-		need_eautoreconf=yes
-	fi
-
-	[[ -n ${need_eautoreconf} ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.27.5.ebuild b/net-print/cups-filters/cups-filters-1.27.5.ebuild
deleted file mode 100644
index 583024a642b8..000000000000
--- a/net-print/cups-filters/cups-filters-1.27.5.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	local need_eautoreconf=
-
-	default
-
-	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.27.5-make-missing-testfont-non-fatal-r1.patch
-		need_eautoreconf=yes
-	elif [[ "${PV}" == "9999" ]] ; then
-		need_eautoreconf=yes
-	fi
-
-	[[ -n ${need_eautoreconf} ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.28.2.ebuild b/net-print/cups-filters/cups-filters-1.28.7.ebuild
index 0803df22be65..7f74e5b5a9e3 100644
--- a/net-print/cups-filters/cups-filters-1.28.2.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
deleted file mode 100644
index 43aa6bf3b5aa..000000000000
--- a/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -791,7 +791,10 @@ AC_ARG_WITH([test-font-path],
- 
- AS_IF([test -f "$with_test_font_path"],
- 	[AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])],
--	[AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)]
-+	[
-+		AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test failures!)
-+		AC_DEFINE([TESTFONT])
-+	]
- )
- 
- # ================
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 5f5f5907ed48..318426afac99 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -2,9 +2,10 @@ AUX cups-1.4.4-nostrip.patch 487 BLAKE2B efc4b3db44b65a1b0c67c472e467d80b4869693
 AUX cups-2.0.1-xinetd-installation-fix.patch 332 BLAKE2B 5688eeabaea0d2db636012e658f5cbbf6793138653df731c24c89149553994a2db423f85251385628de2f467597af98baa91ab954f63f77b5f7eec037d8db7af SHA512 e4111fb05ac381f5639868464734fbbc9296252bda288fc415274cb0eda37ff57d4d2816e34960a3e30a1c73c3aa6911267a5d2c29f1480d8e44fdb6e95f3836
 AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6eaeb5aea05dcf32a9a554d445ae1b57b8d33386394e1d3f414095d89dc55eb0d4c5678e2985c37451e64101e6426bc2ad26aa50404b51844 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb
 AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c5fd13b10727fa4e40793b7072c88c3856c580e408180819acc1668da06024b30173fd71f725175981305c739aaa40b7ba65 SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf
+AUX cups-2.3.3-no-libtool.patch 912 BLAKE2B 14c19e8a215e2a56af387c6cf904a6a2a11de41a730d4a272a30d37ec98ee031be5e24458ad9a82c221dc76c71a4550055fedd877455752a1b7e925eb684f4cb SHA512 a12be37b290e2e2d875d20d1aec426ce0bfec4980ffa321a4232a3c8ffe5c8c7360c2882915b370236133168b54abfcdb729acdfb5ef2d08f706f981bf7c1214
 AUX cups-2.3.3-user-AR.patch 593 BLAKE2B 4794e162b156075a507707296a045226af5f6342870fb7173017ff530aa052b4467cc64c03cfc80d4e2d3500e584e6c313414ed7237acaeda8a8107c3ed2e65a SHA512 ec570a3a7bd6710f50e8e702755a106158f8a2fd9b7e2efad6e345f12210bbd79e450f60ae0d30ae838f1abf1b4c7fd89d13363d2e4bbacd653177b60f05786c
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
 DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
-EBUILD cups-2.3.3-r1.ebuild 9629 BLAKE2B f83ca00c94024c5408d55cc554b9ad699a367547fb6e4d459516e1067146a85509a83aa88195a6a59840b51bc2e505a8f16098f0d34706e6fd53e383b818da4e SHA512 a2f7adbe4e4157c7d286f0d1e71251bf42b26e2cb3e9fd49e6724fdfecfd4a09fa96038f6fa4e105aae73781baa42930c1134e142120bc0797c89b6fc4c39322
-EBUILD cups-9999.ebuild 9597 BLAKE2B 4a46b5511be9431aa6248f59e6135f1e4b3f186b6abb48592d4e775b30b81c7e857e09e683a5ddbdaf506b2582e232d94caed8473bbf4ea712bde96c25eec08a SHA512 11055964ee76fa4cb3548de994ff0c7394e3076f54fdf5633a29c0cf02fd025e521d90e1dfce7776385dc7c2d21c060bd8ede40842652b0ce90e3605abc7ff92
+EBUILD cups-2.3.3-r2.ebuild 9670 BLAKE2B b9c176cbbd4f2a608a818112dc84be693941e84b454d1620fc430b6afc20799354a5b10df321c1bbb0c018378b5257db7f36fcb2003f2ef947416cd0710bc9c4 SHA512 46901ac1b2d5cb561ed99f2383d70dcfe8faadf674d08dfb54e0195e8f964210ae3533985407fb56153f9fa279b86273f141eb55468bff956de10d47e0380df8
+EBUILD cups-9999.ebuild 9594 BLAKE2B e7f43aeed561ba4eae3938b3739845286d3ff80ddd19140361d39a80992697eaaad2c5d845970a6d9c53124064ad986f3e5fe4d9a7e2f88ca949ebb46dc8719d SHA512 4f9a3bd84f529de97f25c3c400148ad28a17517cbed402aa1f1a1107c9321f9071eef04dd9c6e173d88f64b44e0c9a840b54667a43e214505ee9557de2c0762a
 MISC metadata.xml 527 BLAKE2B 432203e09b4b13065dd0fa3a799e1b707f079b146e4d89583fcde60b1a4d09ac21805573faee9c67fecbcb0fc364c22cda310d2b4ecc92be3f39c985b20fcbd5 SHA512 0f1469c396e9e47504ec44a1e4a8db2c6dbf34e4e8cd36862cee7b58d0402873273cb9b3b24ef9b676566cafa10aed6547f8d4b50233af7257ab1d8d828b483d
diff --git a/net-print/cups/cups-2.3.3-r1.ebuild b/net-print/cups/cups-2.3.3-r2.ebuild
index 1e397ff741c7..a367e9deed5b 100644
--- a/net-print/cups/cups-2.3.3-r1.ebuild
+++ b/net-print/cups/cups-2.3.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -80,6 +80,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
 	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
 	"${FILESDIR}/${PN}-2.3.3-user-AR.patch"
+	"${FILESDIR}/${PN}-2.3.3-no-libtool.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
@@ -252,8 +253,9 @@ multilib_src_install_all() {
 		"${T}"/cupsd || die
 	doinitd "${T}"/cupsd
 
-	# install our pam script
-	pamd_mimic_system cups auth account
+	if use pam; then
+		pamd_mimic_system cups auth account
+	fi
 
 	if use xinetd ; then
 		# correct path
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index dd20b85bf923..7fecb1e8f2ee 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -251,8 +251,9 @@ multilib_src_install_all() {
 		"${T}"/cupsd || die
 	doinitd "${T}"/cupsd
 
-	# install our pam script
-	pamd_mimic_system cups auth account
+	if use pam; then
+		pamd_mimic_system cups auth account
+	fi
 
 	if use xinetd ; then
 		# correct path
diff --git a/net-print/cups/files/cups-2.3.3-no-libtool.patch b/net-print/cups/files/cups-2.3.3-no-libtool.patch
new file mode 100644
index 000000000000..cf8911294183
--- /dev/null
+++ b/net-print/cups/files/cups-2.3.3-no-libtool.patch
@@ -0,0 +1,25 @@
+This is not needed and causes problems with more strict
+implementations of libtool.
+
+With slibtool it fails.
+
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+@@ -142,7 +142,7 @@ install-exec:	$(INSTALLXPC)
+ install-xpc:	ipp
+ 	echo Installing XPC backends in $(SERVERBIN)/apple
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/apple
+-	$(LIBTOOL) $(INSTALL_BIN) ipp $(SERVERBIN)/apple
++	$(INSTALL_BIN) ipp $(SERVERBIN)/apple
+ 	for file in $(IPPALIASES); do \
+ 		$(RM) $(SERVERBIN)/apple/$$file; \
+ 		$(LN) ipp $(SERVERBIN)/apple/$$file; \
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 2c24d1169795..9fe073ac1c3d 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -3,5 +3,5 @@ AUX epson-inkjet-printer-escpr-1.7.7-fnocommon.patch 309 BLAKE2B 70e10c99dcf8b5d
 DIST epson-inkjet-printer-escpr-1.7.7-1lsb3.2.tar.gz 4767015 BLAKE2B a50be3f9975183c64a55225d81cb607ffbb018843aab682b077e7ab236e02b20d0d2aecbdb6fed58daab78d8d2382745f434d7dfec6098c2d8c111d2b4e4fabd SHA512 9663b9ed425fbe5d3f2b6f85f036cdbd230665919e2cc9d62a33ebae85a0068513417209dae97ce55e406124b92c96c455cdc204d3d2335f4215f57b79f9d2a9
 DIST epson-inkjet-printer-escpr-1.7.8-1lsb3.2.tar.gz 4809140 BLAKE2B f26b5ce71aec624777e23bd76c65da938b47b24300d3a025b9541a3c1f3aedeb061b342e078f5103b6f4b5d1aa4a72b71764c13b65b842e9014d482aff758c99 SHA512 2d8c36debba52721febef07d18390e3ece6cd5f3a500304dfd285dc31ae33b3712934e0eca8cdb0afe644c18b505190d8a35cd5a69d11d0079f027fa35032195
 EBUILD epson-inkjet-printer-escpr-1.7.7.ebuild 905 BLAKE2B 695aab74d4662046dfd60bff6bce0b9f821a702d380e4cebd17041e1d38a1ea222a53f0f677b433f9832dd6f4342448b284647e3d87fd0d63a6bd63faf2461b9 SHA512 751842ffc2d98fac16d34584c9f8a2c47da4e3fbc7441911d3fce5acde1a9f7177001321bcaf35ae7a74fa9c90352b5aeee4560c84f0e82125245b223b833955
-EBUILD epson-inkjet-printer-escpr-1.7.8.ebuild 913 BLAKE2B 2b18c1a76ecbbd048d6a9835f86322ece5591c86beb88bb3d64649130bf48638efe6e7ee308e70d22df4eebed4cac2bf51e1dace0cf0c52fdc334b565af1d99e SHA512 19cad1fe9c9f7e93cffa0d5bfe047b3ae39b42b17bd1d592d9ac77eee2a81fbab1a76289200c46a7abbef2b8c49596e9f4eb85dbf1259b0c5bb63ec56a7a0f65
+EBUILD epson-inkjet-printer-escpr-1.7.8.ebuild 912 BLAKE2B 99b606a378b793d109254e2faa1fe6cf54bcf2f02b37c28d67fd0ca87028679e5be870af0d0ff6151013f8312acd440d5fe6392e2238dc8d72f5c650aee77d97 SHA512 7d3060e5274ca7f5c08ebe558222639394ff3f8a8f5a4a3a272bed46c4731e6f6f7a5ab520026bd95e45c7f4325db577a377b72fead10ab5218dfb49a67cdc9a
 MISC metadata.xml 253 BLAKE2B 9f98272e44d92f62df07adebeb8942eb26113e29ae3021a9d1ef478a1bc2bdd26bd4700cc7d88dab9c5fd78d54958327997e9849c100ac00fbe051915ab3f2e0 SHA512 e8bc4d02500676e2506fbe7f0811be984878560deb05d09122cede2e62e633fb7644fa59b73a20da8f3fceea8f8cb928768726e8b679f32178c0aed9a874ea15
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.8.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.8.ebuild
index 4d774448b0af..8e82732e6135 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.8.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/12/04/32/1a455ef8618def6570
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"