gentoo resync : 23.09.2020

8 files changed, 208 insertions, 10 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 9fe2522010c8..8bb0133248bd 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index 8384872e6b91..34ac4f2168d8 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,3 +1,5 @@
 DIST linux-UFRII-drv-v510-uken-19.tar.gz 106848526 BLAKE2B afc6b158db038c4b5bacbd4965e8576a7dc4c6e4dcb8362823b69630372d60f8ecb82e1a7e9123fb251bbf8e459fb5fc314447e46dd1ad95058b912ac610fe56 SHA512 64f6af6fbd437076ca786b5904bf00145f49a19c3eb559fcc85316360e82aa90ab90c5763ff4f4c83d34608c4941a3fae78f93debb01f9c63f93fcc7615ae044
-EBUILD cnrdrvcups-lb-5.10-r1.ebuild 5859 BLAKE2B c412351e6b53e1b494262565e9f029a8191a528a177145c8308d4adb407cc4a875e8b04f7c6f12bd9d10f992a5e812d2c185858af3379cc80880a2bd606d85ea SHA512 08f16df8d5caba2515d5587ef80c55aef40569759e9d42889a05aec1285d0c9960b87e099b5c4888f3ffe6afb51139aacc155179c5d730e1994212fdd0023b19
+DIST linux-UFRII-drv-v520-uken-05.tar.gz 107101656 BLAKE2B 4ea92eaaab76babca7fc94771c39b12804b9016ae7baeeaafc18e1979a83ffdcb2090a9cc8a5390314be129ca273c3571f95c83c9e4a29254aca18325687acb2 SHA512 31652894e8ad07e81ae044c5172ced73569a1b78f06f48bcafcd9cabcb19406f0645bfdf741cf3a60746859e671c443d14e5c0c04bffd540ac10406df7266b45
+EBUILD cnrdrvcups-lb-5.10-r1.ebuild 6048 BLAKE2B cd5c18eaaa539283e9ac6b3cf9a36e49a2f9b678063780e5c853cca4909db763d99763dde00110861c4e05a2a4ff01b4daf610f360c4d460113b39ec7490412b SHA512 ed4c1204f00077b32580490012a35cebe35a41727e42be295b6f08c897f071a5e6ec1528166bcab558bdedaded0a4e1f79705b8261785bbbb40492baab2d991d
+EBUILD cnrdrvcups-lb-5.20.ebuild 6038 BLAKE2B 34d72ac0453bd5df6b92489b277fe1d107675b787a255933ae503ea25c548d9f1530a37103416c189279dfe06b0f4562b03ae401562db89217cae98e85de6fae SHA512 6dd4e263aca45265ffc1eb43fb71c4c5fb7aeb1d8825fbdb6e4520a0a08e603cac727ea1100a944298edf51ef771d1c2413140e9c361f541756dd565b569b006
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
index 892991608452..6d4bbe74b3f6 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop flag-o-matic
+inherit autotools desktop flag-o-matic toolchain-funcs
 
 MY_DOWNLOAD_ID="8/0100007658/14"
 MY_PV="${PV//\./}"
@@ -100,6 +100,9 @@ src_prepare() {
 		die "Failed to modify cnsetuputil2.desktop file."
 
 	append-cflags -fcommon
+
+	# For some reason, @AR@ is defined everywhere else correctly, but not here.
+	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
 }
 
 src_configure() {
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
new file mode 100644
index 000000000000..647cf5ade517
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic toolchain-funcs
+
+CANON_REL="05"
+MY_PV="${PV//\./}"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
+SRC_URI="https://dev.gentoo.org/~juippis/distfiles/linux-UFRII-drv-v${MY_PV}-uken-${CANON_REL}.tar.gz"
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/jbigkit
+	net-print/cups
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+	!net-print/cndrvcups-common-lb
+	!net-print/cndrvcups-lb"
+
+HTML_DOCS=(
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.2xUK.html
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
+)
+
+S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
+
+pkg_setup() {
+	QA_PREBUILT="/usr/bin/cnsetuputil2
+		/usr/bin/cnrsdrvufr2
+		/usr/bin/cnpkmoduleufr2r
+		/usr/bin/cnpkbidir
+		/usr/bin/cnpdfdrv
+		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
+		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
+		/usr/$(get_libdir)/libcnlbcmr.so.1.0
+		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
+		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
+		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
+		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
+		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
+
+	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
+	unpack ./${P}-1.tar.gz
+}
+
+common_op() {
+	local i
+	for i in backend buftool cngplp cnjbig rasterfilter; do
+		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+driver_op() {
+	local i
+	for i in cngplp cngplp/files cpca pdftocpca; do
+		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+src_prepare() {
+	default
+
+	common_op mv configure.in configure.ac || die "failed to move configure.in"
+	driver_op mv configure.in configure.ac || die "failed to move configure.in"
+
+	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+
+	# This should work with autoreconf
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+
+	# Other components already depend on compiled product
+	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
+
+	common_op eautoreconf
+	driver_op eautoreconf
+
+	# Fix a QA issue with .desktop file,
+	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
+		die "Failed to modify cnsetuputil2.desktop file."
+
+	append-cflags -fcommon
+
+	# For some reason, @AR@ is defined everywhere else correctly, but not here.
+	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
+}
+
+src_configure() {
+	common_op econf
+	driver_op econf
+}
+
+src_compile() {
+	common_op emake
+	driver_op emake
+}
+
+src_install() {
+	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+
+	insinto /usr/share/cups
+	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
+
+	if use amd64; then
+		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
+	elif use x86; then
+		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
+	else
+		die "I don't know what directory to switch into!"
+	fi
+
+	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
+		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
+		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
+		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
+
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
+
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
+
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
+
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
+
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
+
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
+
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
+
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
+
+	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
+
+	insinto /usr/share/cnpkbidir
+	doins ./cnpkbidir_info*
+
+	insinto /usr/share/ufr2filterr
+	doins ./ThLB*
+
+	cd "${S}" || die "Failed to switch back into ${S} during installation."
+
+	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
+	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
+	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
+
+	insinto /usr/share/caepcm/ufr2
+	doins -r "${S}"/lib/data/ufr2/
+
+	insinto /usr/share/cups/model
+	doins ${P}/ppd/*.ppd
+
+	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
+	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
+
+	einstalldocs
+	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
+	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/net-print/cups-windows/Manifest b/net-print/cups-windows/Manifest
index 24eb3ec38385..aabb10b743ac 100644
--- a/net-print/cups-windows/Manifest
+++ b/net-print/cups-windows/Manifest
@@ -1,3 +1,3 @@
 DIST cups-windows-6.0-source.tar.bz2 38284 BLAKE2B 67722a99dc906ac9c39ba9a93b7fbbb24a44b7400de6209ac5d0ddedc4f891b48ad0284d6cfa8336400697af6eaa006e79349931cefe55cf72b428546c6ff43e SHA512 03bd66d210ee191d25139d9e462543a01d30e8a0dc797a9ee62673e84cfa9d057cc6d327792c74941a17e5021a7ffe52c40bcb52a3f3f4186f59f04796c809df
-EBUILD cups-windows-6.0-r1.ebuild 570 BLAKE2B d422d728f72654abf87482946aec1f56a7b092cbe1cf4c519c421d8d37fae7ad8d37aae7b89ebd8849bc7d29ba93eceffc4c1bd403d90a8199c26b4055f88f23 SHA512 fb0c447f039ff03b2ab7560a98929ec04938e7594515583faa5c72de7f3f980e6aad5bed2b8052fe014224884a5ff8b1851d7d30584fc05c274f044c8c7f24e4
+EBUILD cups-windows-6.0-r1.ebuild 560 BLAKE2B d7ab236e8da10e63205c235e9301f0cd131264f1303e72c4387e24ca50f67033b976a5e36fd6456b9bad9ee85da122bf6c7712c6f567307a89c3d40ac7011d69 SHA512 eeda480fe507d358f1a38b10f6865b4da3f95e87148bec22bc8d07b64b2091897539cf04a82c4fd6b5c6799e9c4eee0dcacf279e527bcb827f5edc990a6d6238
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/cups-windows/cups-windows-6.0-r1.ebuild b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
index de0af8c17543..1fc2f1b0969c 100644
--- a/net-print/cups-windows/cups-windows-6.0-r1.ebuild
+++ b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="CUPS PostScript Driver for Windows"
 HOMEPAGE="https://www.cups.org/"
@@ -10,14 +10,15 @@ SRC_URI="mirror://gentoo/${P}-source.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
 
 RDEPEND=">=net-print/cups-1.2"
 DEPEND="${RDEPEND}"
 
 src_install() {
-	emake install BUILDROOT="${D}"
+	emake BUILDROOT="${D}" install
 	dodoc README.txt
+
 	einfo "Copying missing cups6.ppd file"
-	cp "${S}/i386/cups6.ppd" "${ED}/usr/share/cups/drivers/"
+	insinto /usr/share/cups/drivers
+	doins i386/cups6.ppd
 }
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index a34438e37f88..c1095fd392a3 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,8 +2,8 @@ DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742
 DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6bec614ef7490c1ecc0e5e745b81b6c2097948fbd062b5e72e10714cdc8d6f9145aacafc0fedeafde375909cb2cb6 SHA512 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
 DIST hplip-3.20.3.tar.gz 25672070 BLAKE2B 4c6209a268898de123b2b557d662acddb3ad90b227c0752ebdd1e2afb3fe3d19fddc819aba999347708dd0c098f2b8fea4580dcfb3d5fc7893e47520cae7c1d5 SHA512 a397eb3896292ac956a1969b76707af62c866e47d88148fa75b68574e4639283f7414a2c77e6854c5d22daea49181d4f1bc2daf11fb3058372ff084d591696f1
 DIST hplip-3.20.5-patches-1.tar.xz 12716 BLAKE2B 982480185b2decb9f4e857336b474dab585d64aa44a9f0da70ba568e20488f451507aae3bd1427aef4274d36db93dd9bcb1d906f7b393939dfc43c81a1f9a9db SHA512 ae46a6f490253a1112838b08d56199c6257d33911569619483d925798b54a8bc9fe57afd1e86dedb9482d89d42f44bec81db215f37cbcd8fb5982596c80c1117
-DIST hplip-3.20.6.tar.gz 25909290 BLAKE2B ac5720c0b0a871459f22d24658eb51b381afcb7cc76831908229e1f0d1cc2feb69122690915f817b835d71b17fe9ecaddd25f506f9e9809f49d8b935fdba962a SHA512 6a5ce55465e3a537ecc0b6e7d198835dbe495e191522e674a507a4993e2061da3ea084a5239a74b2279c065c0775067d5b6a4aeb2a7791825106a299fb55e8f8
+DIST hplip-3.20.6.tar.gz 25908476 BLAKE2B cd70d00081ff41d36b566d6f6f546b2cddabb46427afafcd2d04ea7769ce5114feff74612e58ffa83dde4e817ffa2804dbf41411187d9cd15ed7b888b87658ad SHA512 ccd82112afb5ee73f5d027819ab89ba8f52ec36a4b061d314565f95d288be24e045050c3368332eeae50c0fb170f8cb015fdd8dde4b32a08e3758f0f0f4e8e96
 EBUILD hplip-3.19.12-r1.ebuild 7742 BLAKE2B a65c85f9249fb730e4f2db724ba1f8d12a946e219d1cdea42f8b270b880fbfc2113da667c40b295738318524663c0173df23818a8f5e233a21e4a2be48f7ef75 SHA512 14264395f135c78942287e5bd68577d66918511b59ab5c93410ca50c7597e10e0d8eaa43b6b2ee757a9323405fd8d6c3f507356b8defdf1c8fe1d8195db1b49e
 EBUILD hplip-3.20.3.ebuild 7789 BLAKE2B 9c983e4d2aa56aae1d76967b62f0c626c0dd58595c14fd4bd9b2b823f2fb1b24b5bd02837dc28cfa8fd3134d8fe2b41f695ffb991a7192b51b294b45249856ca SHA512 9b5fa8a34fbfb02317b46a45f69297c210bc258e65f47c1761a1aa51df466693132c50cd22acff401097a6c314127043f9de1b5822279084760eca70a1db2447
-EBUILD hplip-3.20.6-r1.ebuild 7912 BLAKE2B d909702875e816024e6424377fe8370597f46b18c9fbb6c1fa4d9581aa5434cdee54d52496c117184b09d7b7a50512ffa0fc67df720dbe31d664fe9ed541a41a SHA512 a32823b64506bffb8b6c5aaacaf72cf4c8d85577c6fabbfbb696fe0804a8d3e947623c926e814ed20f72d0778bd1aa0dcf894fe873478e8b7342d93a4b2d923d
+EBUILD hplip-3.20.6-r1.ebuild 7911 BLAKE2B ddd301232b4c8936b8cbe1402dee7fdeb8a84b9297268683ba7b6c52569c06d5fe2b373f4b02260ecf201d55a1fb8c07223fa488ba7a018705f390d98053e5ea SHA512 9097991841cd0a6d3c0bed9fd48cc2c227894f7dcad51925aba4545bfbb262a4b4fc43fe391177f9d5486d889dfafaa149375d6206f01a58113023e8fdbda991
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.20.6-r1.ebuild b/net-print/hplip/hplip-3.20.6-r1.ebuild
index c3059784f18b..22e2618ba317 100644
--- a/net-print/hplip/hplip-3.20.6-r1.ebuild
+++ b/net-print/hplip/hplip-3.20.6-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+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"