gentoo resync : 22.01.2021

9 files changed, 2 insertions, 415 deletions

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
-