gentoo resync : 08.01.2021

9 files changed, 106 insertions, 6 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 1a0a9864ccbe..3420d220c07c 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 496346e557dc..362f437e7a40 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -2,5 +2,5 @@ AUX cndrvcups-common-lb-3.70-fno-common.patch 2543 BLAKE2B 01af53fa5f40f9abe9aba
 DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97 SHA512 d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc
 EBUILD cndrvcups-common-lb-3.60-r1.ebuild 2922 BLAKE2B f002fb0784954843a02d04f216bcaa2901c728d337831e96c9dd6a4ba1b1060dca91407704d943bdd510313cb00d31afab83ce295850912e5241581721ca2719 SHA512 8765fba45ca858827f7b0cb7ca655a31376ef22a7694d1ffb0416b7807e80b2383523d850dcd825e6b6b1aac48de14a6957b5422f3089ad190a1ff573feac35f
-EBUILD cndrvcups-common-lb-3.70.ebuild 3236 BLAKE2B 7a99961d7fcc0548a1e664d7dd1a90343942f8ea5babeb2966ae302f45b031d35d52723b2770be87ff87ed175c7c392b23fd39708022e99eea5107b520d04421 SHA512 d7cbd7dfe11c11e92646761009ff7915eed5691c6d92444ed518abf5a7f5a5c83d5190edf14c328b17ff46dfea9d8754bb8337f6889abfce6b3fa25acffe1a47
+EBUILD cndrvcups-common-lb-3.70.ebuild 3234 BLAKE2B 06e5bcd884bb3de171e2cc4ba3328ae794249417bea107d517d1aa3de0cbc15c02e681c76e51f65c9ec4402de05876ee62743699ee744a26b23f54403327d4bf SHA512 e9b3a5b5d4b769db45a3c0361ed75e9af5bccb8fa3819f37e445c055259578ffd9eb5b733e575db1c1bff46db57c4dbae809a2bbc0d92fc6cd5ac8ee24705519
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index 41880207f325..a838dd0d7670 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.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
@@ -15,7 +15,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/08/${SOURCES_NAME}-05.tar.gz"
 # GPL-2 License inside LICENSE-EN.txt files
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6:2
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 01c43d7bcde0..449628292d14 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,5 +1,5 @@
 DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97 SHA512 d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc
 EBUILD cndrvcups-lb-3.60-r2.ebuild 2645 BLAKE2B d691db4a3275fde32c17916fa4d7df7c9986d77968c60330a4cba3b0e1b36617665ff22d722c45814ef88db11d67942f1e9797277abceca6b554cba4ae2481a9 SHA512 ff473b4b6f4bd5ad685184ddddd269bf8b2ab5d4071ee064eae50e9c091fa110e324c255b05f44a944a1a96f4b818fa59536d30ca5bab75972aee94b13b1ab3d
-EBUILD cndrvcups-lb-3.70.ebuild 2791 BLAKE2B ab2dffe2b9fea99f7041bff5cc2ed74878b9208e76041887b2def108e97b5786fec555e5df5c70c9f3f91da2c20dd8ae66e98e67dc21c419f8f7bdb9886dca4b SHA512 a88c4ae9f310ce783d39b8c30d3f2a333d2b01979651c0974b92bbadc04773dd8e982e7c8434dc3e3d9deb83389d317679b89ddc636f0a3410c855915b7ca839
+EBUILD cndrvcups-lb-3.70.ebuild 2789 BLAKE2B f0f9f2a308e2c6be0ecaa8aee25fc3fb3bcbb64cfbc24936f7eae36130b4931581b1eb4806fb9c139a4b03458e781bf895679cc8664eee87363e01b87ae229b5 SHA512 7e8a3dc0abd17ea86c5680d9900513cf57ed470e13977b1a313a16cde1212ec1a96c45e82c076c0ade7b733eefe3a549f15e5e0ef8d19a2b3fc4675c4b2784c2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
index b7afeb8bf4c2..79bcf17c8404 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/08/${SOURCES_NAME}-05.tar.gz"
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index 9212cc9e0617..831b0bdd971d 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -8,9 +8,11 @@ DIST cnijfilter2-source-5.40-1.tar.gz 817298 BLAKE2B 1088eb19c70ed9133c38b8a6da9
 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
 MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
new file mode 100644
index 000000000000..870bdbc7e931
--- /dev/null
+++ b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 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="https://dev.gentoo.org/~tupone/distfiles/${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}"/${PN}-5.80-cflags.patch
+	"${FILESDIR}"/${PN}-5.80-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/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
index f2943a047d91..0911e69933b7 100644
--- a/net-print/cups-bjnp/Manifest
+++ b/net-print/cups-bjnp/Manifest
@@ -1,3 +1,5 @@
+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
 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
new file mode 100644
index 000000000000..fd3217e0a0f5
--- /dev/null
+++ b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-Werror
+}