gentoo resync : 23.09.2020

3 files changed, 199 insertions, 2 deletions

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
+}