From d316e965ad4953bf5f0983b11a2e3b5263828ff4 Mon Sep 17 00:00:00 2001 From: Laszlo Valko Date: Wed, 30 May 2018 17:09:21 +0200 Subject: [PATCH] Fixed Canon printer. --- net-print/cndrvcups-sfp/Manifest | 2 +- .../cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild | 5 - .../cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild~ | 148 ------------------ 3 files changed, 1 insertion(+), 154 deletions(-) delete mode 100644 net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild~ diff --git a/net-print/cndrvcups-sfp/Manifest b/net-print/cndrvcups-sfp/Manifest index 0bc6e72..18e6d49 100644 --- a/net-print/cndrvcups-sfp/Manifest +++ b/net-print/cndrvcups-sfp/Manifest @@ -1,4 +1,4 @@ AUX remove-StatusMonitor.patch 249 BLAKE2B b36889d01f1232987add0e495c147cbd8b9c3515f38935cfc3ce5047a9773cd2673c5348a58169d32592add4b36f7f10f577037482e78c35683a77b66d4ea8ba SHA512 ed6cc24512173635ec7737ff12bbd6f2e5715e38ba72312d31ea22e1419dc7ef9270f7f6f26c28f0587fd9217de126e02a4a31377010d70a00d60b2e0e94b80d DIST linux-UFRIILT-drv-v140_uken.tar.gz 106958045 BLAKE2B 605663beea4737a3d7503340d66106a959167fc60ee8f0bfea514ee320c73ce5488290b2a105d72d0f8257d131656c5cd92f7f025297cb2526a2cf28e1066d3f SHA512 3d25db05dd17a85c299bb1fdab776225be5370e6f1f634496a8b4f7dfd59b7a545bccfeb436656387343238e96d624556448047659968fe8094148937ba04e84 -EBUILD cndrvcups-sfp-1.40.ebuild 4531 BLAKE2B 7b82df8cdd89f085d40fd0461e03b863c2f27e1f5d4616eb73a906847dd4da2e391951975b0d6c9577073e555bf953d1cf017e421939341e17343dc4bff3e009 SHA512 e3e8f67d0cddf5000f16595275a95aeac505a51c265f60397d9ea28ed192037b67f5fca2f5e44ed36f97666cd0defd1e155edb39ae1c0e2de7178256e39bafa6 +EBUILD cndrvcups-sfp-1.40.ebuild 4357 BLAKE2B da0d8ab22d62b2a4adef03a24388cbd3a36af832432fcaa94af6f204a699314e6d4d129a91f02ee9d55d9814684964d589a25385d0755e47d6d0328d8a55d33b SHA512 dad46dd1a89c3bc20665af5cd1d05df2bbe3856e174a9280d5b02fa47122634a600f723784f1a99749327597f75fcfc6fadd3c73f4c72975605f2abdc2a7c82a MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623 diff --git a/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild b/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild index 99aac0d..7ed5ed8 100644 --- a/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild +++ b/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild @@ -147,9 +147,4 @@ src_install() { dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}" dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}" done - - # c3pldrv dlopens the absolute path /usr/lib/libcnncapcm.so :( - if [[ "$(get_libdir)" != lib ]]; then - dosym "../$(get_libdir)/libcnncapcm.so" /usr/lib/libcnncapcm.so - fi } diff --git a/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild~ b/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild~ deleted file mode 100644 index d0c255d..0000000 --- a/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild~ +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools versionator - -MY_PV="$(delete_all_version_separators)" -SOURCES_NAME="linux-UFRIILT-drv-v${MY_PV}-uken" - -DESCRIPTION="Canon UFR II LT Printer Driver for Linux" -HOMEPAGE="https://www.canon.co.uk/support/consumer_products/products/printers/laser/i-sensys_lbp7110cw.aspx?type=drivers&language=&os=Linux%20(64-bit)" -SRC_URI="http://gdlp01.c-wss.com/gds/0/0100005950/08/${SOURCES_NAME/-uken/_uken}.tar.gz" -LICENSE="Canon-UFR-II" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="" - -RDEPEND=" - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] - >=gnome-base/libglade-2.4:2.0 - >=net-print/cups-1.1.17 - ~net-print/cndrvcups-common-sfp-${PV} - >=x11-libs/gtk+-2.4:2 - virtual/jpeg:62[abi_x86_32(-)] -" -DEPEND="${DEPEND}" - -S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}" - -MAKEOPTS+=" -j1" - -PATCHES=( - "${FILESDIR}"/remove-StatusMonitor.patch -) - -pkg_setup() { - # Don't raise a fuss over pre-built binaries - QA_PREBUILT=" - /usr/bin/pksmncap - /usr/bin/commandfilefilter - /usr/bin/cnpkmodulencap - /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libncapfilter.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcnncapcm.so.1.0 - /usr/$(get_abi_LIBDIR x86)/libcaio_usb_cdc.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libccpd_util.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcanon_common.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcanonncap.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libCUPS_Communicator.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libCommIsolation.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcomm_ncapcaio.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcomm_stdout.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcomm_usbmlport.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcomm_usbsock.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcomm_websrv.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libinfo.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libinfo_analyze.so.1.0.0 - " - QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaio_usb_cdc.so.1.0.0" -} - -src_unpack() { - unpack ${A} - cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die - unpack ./${P}-1.tar.gz -} - -change_dir() { - for i in ppd pstoncapcpca cngplp cngplp/files cpca ; do - cd "${i}" || die - "${@}" - cd "${S}" || die - done -} - -src_prepare() { - default - sed -i -e \ - "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config --serverbin`/filter:" \ - pstoncapcpca/filter/Makefile.am || die - - export "LIBS=-lgmodule-2.0" - change_dir eautoreconf -} - -src_configure() { - change_dir econf -} - -src_install() { - default - einstalldocs - - find "${D}" -name '*.la' -delete || die - - cd "${S}/data" || die - insinto /usr/share/caepcm - doins * - - cd "${S}/libs" || die - insinto /usr/share/ncapfilter - doins ThLB* - - ABI=x86 - dobin cnpkmodulencap - dolib.so libcnncapcm.so.1.0 - dosym libcnncapcm.so.1.0 "/usr/$(get_libdir)/libcnncapcm.so.1" - dosym libcnncapcm.so.1.0 "/usr/$(get_libdir)/libcnncapcm.so" - for lib in libcnncapcm*.so.?.? libncapfilter.so.?.?.? libcanonncap.so.?.?.?; do - dolib.so "${lib}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}" - done - - use x86 && libsource=libs - use amd64 && libsource=libs64 - cd "${S}/${libsource}" || die - insinto /usr/lib/Canon/CUPS_SFP/Bins - dobin commandfilefilter - insinto /usr/lib/Canon/CUPS_SFP/Utilities - dobin pksmncap - insinto /usr/lib/Canon/CUPS_SFP/Bidi - for lib in libcomm_*.so.?.?.? libccpd_util.so.?.?.? libcaio_usb_cdc.so.?.?.?; do - dolib.so "${lib}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}" - done - insinto /usr/lib/Canon/CUPS_SFP/Libs - for lib in libCUPS_Communicator.so.?.?.? libCommIsolation.so.?.?.? libcanon_common.so.?.?.? libinfo*.so.?.?.?; do - dolib.so "${lib}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}" - done - - cd "${S}/libs" || die - insinto /usr/lib/Canon/CUPS_SFP/Libs - for lib in libEno*.so.?.?.?; do - dolib.so "${lib}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}" - done - - # c3pldrv dlopens the absolute path /usr/lib/libcnncapcm.so :( - if [[ "$(get_libdir)" != lib ]]; then - dosym "../$(get_libdir)/libcnncapcm.so" /usr/lib/libcnncapcm.so - fi -}