From 9ec9cbf23e468492eab5e3a31836c699e8c5c534 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 4 Aug 2022 14:05:21 +0100 Subject: gentoo auto-resync : 04:08:2022 - 14:05:20 --- net-print/Manifest.gz | Bin 6090 -> 6084 bytes net-print/hplip-plugin/Manifest | 4 +- net-print/hplip-plugin/hplip-plugin-3.22.2.ebuild | 71 ------ net-print/hplip-plugin/hplip-plugin-3.22.6.ebuild | 71 ++++++ net-print/hplip/Manifest | 2 - net-print/hplip/hplip-3.22.2.ebuild | 285 ---------------------- 6 files changed, 73 insertions(+), 360 deletions(-) delete mode 100644 net-print/hplip-plugin/hplip-plugin-3.22.2.ebuild create mode 100644 net-print/hplip-plugin/hplip-plugin-3.22.6.ebuild delete mode 100644 net-print/hplip/hplip-3.22.2.ebuild (limited to 'net-print') diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz index dccde0dbacae..6c67f19af0d7 100644 Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest index eccac40e758f..212d391cc73f 100644 --- a/net-print/hplip-plugin/Manifest +++ b/net-print/hplip-plugin/Manifest @@ -1,5 +1,5 @@ -DIST hplip-3.22.2-plugin.run 11487296 BLAKE2B 2c953e85b3ef299066aaf158121f4a3db68b00f2e2df3cb35acc78a54a466e8a3e204592fbfa2128acb87c0f9b258178cd29faf4e93600ee4b10fe81b93f213b SHA512 5efa533863bec3e7e5fc354411216e6e4232c2bbc15a062ff829296e1357c523333df8221a341b10c940022708299a33449020e633a9873205b568959327cb24 DIST hplip-3.22.4-plugin.run 11487215 BLAKE2B dc9b0977c35bff29c81f3854e7104301c3bd96cf77833a056a09dd2b2465e8f47c53c941ff4d1235f62eae9a3af93fe95129111d7abf5e82032959de1167920e SHA512 be53ad8d2f910d772535775037b912f332122a6aa141fa2f92415dd9a259efca34011939e648fc7a46e8123ee409396b28236947e37539153c55f80c6d7f8cd1 -EBUILD hplip-plugin-3.22.2.ebuild 1484 BLAKE2B 00d10feb206b7c70c6523e5c8757a4a1d4846d20be7d1b34e0d4ceda452d686404abee5a01d76b6cf9ba5510ecdb79e87807a4635c19cdce79ab9a3999e5faec SHA512 e6947d194de5aee27f8253d104ddc0d1ba82d83f54fee6106b4f5937c2d05e26fa78306dee8cfd208c84add673f953bd73462c8e64413ffc32979456eeba9260 +DIST hplip-3.22.6-plugin.run 11493966 BLAKE2B 9346625c665c25c5c065462269fba4764ef6728a5a351fc0ca81d5fbd3af41185d18cbee88bc9ae0c40909ed1dd412c5f53486676daf0459b79a612c7d65c257 SHA512 6eafe71f88a012bc95ecdf5bf70756e08074208964183b057f299167030b9d228c934c08955c400333b88b46d7d55ed25eb0792a8ed24b4df97a61dddca64585 EBUILD hplip-plugin-3.22.4.ebuild 1484 BLAKE2B 00d10feb206b7c70c6523e5c8757a4a1d4846d20be7d1b34e0d4ceda452d686404abee5a01d76b6cf9ba5510ecdb79e87807a4635c19cdce79ab9a3999e5faec SHA512 e6947d194de5aee27f8253d104ddc0d1ba82d83f54fee6106b4f5937c2d05e26fa78306dee8cfd208c84add673f953bd73462c8e64413ffc32979456eeba9260 +EBUILD hplip-plugin-3.22.6.ebuild 1487 BLAKE2B e80cf0d84b6a8bd542f60eb43a7ba99908913a25d9158c10d3c25e829d47bb74edbb4342bcd57891cfa6293c9fd8c95c186fab6e9afa5cec1b8a6d8bff32608f SHA512 3666cfece271f4e9f04f1b7bb5f34580f42867c070b08c3282cbe80df34a2885640e6b150afc977c3c3498e3b083c4ed96a5995ce46f66eb3d39493196c9e4fd MISC metadata.xml 523 BLAKE2B 396a3e3f19f1929ac628fd3301f7de077e34d80b88f0f65dd4035a55b8ff16be6a89dc94b47085dafc7a8a2def19353aa52996a12e51e94154a61ba1329f8c91 SHA512 9d5abebbd6fdac76142c70aa911c4ac55eb5388fd39e010d72e8e6253f51a7924eda2a675cd8ce3475fea76b307805644cf8f7140b265e66b4fcd65a8546fd96 diff --git a/net-print/hplip-plugin/hplip-plugin-3.22.2.ebuild b/net-print/hplip-plugin/hplip-plugin-3.22.2.ebuild deleted file mode 100644 index 5f684cc91dfd..000000000000 --- a/net-print/hplip-plugin/hplip-plugin-3.22.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit unpacker - -DESCRIPTION="Proprietary plugins and firmware for HPLIP" -HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins" -SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run" -S="${WORKDIR}" - -LICENSE="hplip-plugin" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 x86" -IUSE="orblite" -# License does not allow us to redistribute the "source" package -RESTRICT="mirror" - -RDEPEND=" - ~net-print/hplip-${PV} - virtual/udev - orblite? ( - media-gfx/sane-backends - >=sys-libs/glibc-2.26 - virtual/libusb:0 - ) -" - -HPLIP_HOME=/usr/share/hplip - -# Binary prebuilt package -QA_PREBUILT="${HPLIP_HOME}/*.so" - -src_install() { - local hplip_arch plugin - case "${ARCH}" in - amd64) hplip_arch="x86_64" ;; - arm) hplip_arch="arm32" ;; - arm64) hplip_arch="arm64" ;; - x86) hplip_arch="x86_32" ;; - *) die "Unsupported architecture." ;; - esac - - insinto "${HPLIP_HOME}"/data/firmware - doins *.fw.gz - - for plugin in *-${hplip_arch}.so; do - local plugin_type=prnt - case "${plugin}" in - bb_orblite-*) - use orblite || continue - plugin_type=scan ;; - bb_*) - plugin_type=scan ;; - fax_*) - plugin_type=fax ;; - esac - - exeinto "${HPLIP_HOME}"/${plugin_type}/plugins - newexe ${plugin} ${plugin/-${hplip_arch}} - done - - insinto /var/lib/hp - newins - hplip.state <<-_EOF_ - [plugin] - installed = 1 - eula = 1 - version = ${PV} - _EOF_ -} diff --git a/net-print/hplip-plugin/hplip-plugin-3.22.6.ebuild b/net-print/hplip-plugin/hplip-plugin-3.22.6.ebuild new file mode 100644 index 000000000000..54c789992915 --- /dev/null +++ b/net-print/hplip-plugin/hplip-plugin-3.22.6.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit unpacker + +DESCRIPTION="Proprietary plugins and firmware for HPLIP" +HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins" +SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run" +S="${WORKDIR}" + +LICENSE="hplip-plugin" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="orblite" +# License does not allow us to redistribute the "source" package +RESTRICT="mirror" + +RDEPEND=" + ~net-print/hplip-${PV} + virtual/udev + orblite? ( + media-gfx/sane-backends + >=sys-libs/glibc-2.26 + virtual/libusb:0 + ) +" + +HPLIP_HOME=/usr/share/hplip + +# Binary prebuilt package +QA_PREBUILT="${HPLIP_HOME}/*.so" + +src_install() { + local hplip_arch plugin + case "${ARCH}" in + amd64) hplip_arch="x86_64" ;; + arm) hplip_arch="arm32" ;; + arm64) hplip_arch="arm64" ;; + x86) hplip_arch="x86_32" ;; + *) die "Unsupported architecture." ;; + esac + + insinto "${HPLIP_HOME}"/data/firmware + doins *.fw.gz + + for plugin in *-${hplip_arch}.so; do + local plugin_type=prnt + case "${plugin}" in + bb_orblite-*) + use orblite || continue + plugin_type=scan ;; + bb_*) + plugin_type=scan ;; + fax_*) + plugin_type=fax ;; + esac + + exeinto "${HPLIP_HOME}"/${plugin_type}/plugins + newexe ${plugin} ${plugin/-${hplip_arch}} + done + + insinto /var/lib/hp + newins - hplip.state <<-_EOF_ + [plugin] + installed = 1 + eula = 1 + version = ${PV} + _EOF_ +} diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index 9e2b2331fb17..4daec0608c2a 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -1,8 +1,6 @@ DIST hplip-3.22.2-patches-1.tar.xz 17564 BLAKE2B df4d3c71679000febe68730fd88c81a82283874200d86934318b602fc1fb51f6d90a42effb5fbfef38a98ef6a150f9dc139ca3edeb519d9ac11f98ba7ef7ec63 SHA512 df3716b59bbdd87696900f111d3a0c7d27a474826d343503af43bb625f0796696ffdd24383564f5ff3e600f7ae8f5092700ffc9d130b6d5f812750c8856f6ef8 -DIST hplip-3.22.2.tar.gz 27341972 BLAKE2B d262307430b5a4ca05f2a58cdadc212e93b73141906c0852a2b9b2ced33b942dbec6d9f2fc1f79773d3d37a9d71f37b5fe457ba574d7bf826cd3afeb80d4f05d SHA512 9cde954a11bae2e2ad6120d8fe103ab52409c906dde4c1e82fa7a9e5e265e0a71e0578e3117a8b4508e2c7c87f05052d32b14b39b89e3e59baf7a4055ac5579f DIST hplip-3.22.4.tar.gz 27479009 BLAKE2B 6446cecad6a9dea4685874da4879b604ad5c68842783741e8ee87b5cf957a8cc69269ced0a4fa40077abcc35fd0cd8f0103f90e02f1a1244a28617dfd0cd4036 SHA512 8c71a7c87b8e6203dbd9c7d86fc3b926474046c69f00fae1e0f87e057f17ff17184b3c4f8b8d4c14495208b21990cbc1acb08c36d96c96749ab1707922c31923 DIST hplip-3.22.6.tar.gz 29331408 BLAKE2B 7f2bc09ab2d7950d8e84b4c23d35fd5370ddc51d1d61c674fad0ce1667f8ecf9c25e0b57c155b688d932db583d3c6af528da86348ebe64ce8da9c8d051b2be34 SHA512 cb25c07c767d3d8921468429ef154401a4df9d2fdf87ead3ab18f0d06e1bd3de610843b8131641a1af8d920c7e15e290a0923405bf609cdc0a3fba9df93ddb5e -EBUILD hplip-3.22.2.ebuild 8193 BLAKE2B 72513998f3040c34f57befd449d793b1a5cd5eed25e1f0cc2f5ef15053bd466f6230492b178d2c31f72198592d522f8334ecc32ed20a0370acff2d3aa63fee22 SHA512 e666a9fb7b0753e82115895db6e8e8879ad02cb80aca5a75ec33c53c0ccdb125d6ac55132a1877a28253791dfcd89cfad81f92caf50407ebe733d402fa25a12f EBUILD hplip-3.22.4.ebuild 8237 BLAKE2B 9fe403c90078f1fb4bec6644861e5b4d8278a662b7f3923e22b3b6abe77189f6a51380f5875762f28c71cdccf995c2d2f0660d27e161de0b9649373426b317de SHA512 9eef32be05229020ca9aabf95799286a104494f8aee04c9e9b8948b545ce334994c5283b9431603f659219e0e07738d6d7a6e7e4c54becf7089276575f6e6f1c EBUILD hplip-3.22.6.ebuild 8243 BLAKE2B b299798f5c0f98e424369ed95e5f881c32605d02dbca80ec61cd5e537f525b40d0c33eed8edb79c4242c5d2cd4a1c71bcac5bf525f378406e8f7e48272f3cef0 SHA512 10ed86939db20e3b442045df463753d4cb1b55e4652979494fa0675dbdf8cd6fd6b4311133b2ca81d8b932bd2f16f868ec949143e0a0b15e972c9b7ac262bce6 MISC metadata.xml 1849 BLAKE2B 381cc0d0fe08d072487850a5f5ac6e264cb4ee5db8722b6f83ad9d4e6e78948a7768e80ea2a8a2313bdca1029b59a02d8c3ca309d9438d5e4d63585f7a6b2a83 SHA512 0f5f42b561099e943d99dc5e50cfd42577582b31590c0cd98f276e5acc364fb31f4a48cf91b33e923d24daa77b7b3a6bc54a0c24d9ebff9e3ec82c957a5671e3 diff --git a/net-print/hplip/hplip-3.22.2.ebuild b/net-print/hplip/hplip-3.22.2.ebuild deleted file mode 100644 index 6bbc21cf9e0e..000000000000 --- a/net-print/hplip/hplip-3.22.2.ebuild +++ /dev/null @@ -1,285 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="threads(+),xml" - -inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev - -DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools" -HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing" -SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz - https://dev.gentoo.org/~billie/distfiles/${PN}-3.22.2-patches-1.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 x86" - -IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X" - -COMMON_DEPEND=" - net-print/cups - sys-apps/dbus - virtual/jpeg:0 - hpijs? ( net-print/cups-filters[foomatic] ) - !libusb0? ( virtual/libusb:1 ) - libusb0? ( virtual/libusb:0 ) - ${PYTHON_DEPS} - !minimal? ( - scanner? ( - media-gfx/sane-backends - ) - snmp? ( - dev-libs/openssl:0= - net-analyzer/net-snmp:= - net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}] - ) - ) -" -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - ${COMMON_DEPEND} -" -RDEPEND=" - ${COMMON_DEPEND} - app-text/ghostscript-gpl - !minimal? ( - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*') - kernel_linux? ( virtual/udev ) - $(python_gen_cond_dep ' - >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - fax? ( dev-python/reportlab[${PYTHON_USEDEP}] ) - qt5? ( - >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] - libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] ) - ) - scanner? ( - >=dev-python/reportlab-3.2[${PYTHON_USEDEP}] - >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}] - X? ( - || ( - kde? ( kde-misc/skanlite ) - media-gfx/xsane - media-gfx/sane-frontends - ) - ) - ) - ') - ) - policykit? ( sys-auth/polkit ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -PATCHES=( - "${WORKDIR}/patches" -) - -CONFIG_CHECK="~PARPORT ~PPDEV" -ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)." - -#DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -For more information on setting up your printer please take -a look at the hplip section of the gentoo printing guide: -https://wiki.gentoo.org/wiki/Printing -" - -pkg_setup() { - python-single-r1_pkg_setup - - use scanner && ! use X && ewarn "You need USE=X for the scanner GUI." - - use parport && linux-info_pkg_setup - - if use minimal ; then - ewarn "Installing driver portions only, make sure you know what you are doing." - ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver" - ewarn "is installed. If both USE flags are set hpijs overrides hpcups." - ewarn "This also disables fax, network, scanner and gui support!" - fi - - if ! use hpcups && ! use hpijs ; then - ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver," - ewarn "which is probably not what you want." - ewarn "You will almost certainly not be able to print." - fi -} - -src_prepare() { - default - - python_fix_shebang . - - # Make desktop files follow the specification - # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324 - sed -i -e '/^Categories=/s/Application;//' \ - -e '/^Encoding=.*/d' hplip.desktop.in || die - sed -i -e '/^Categories=/s/Application;//' \ - -e '/^Version=.*/d' \ - -e '/^Comment=.*/d' hplip-systray.desktop.in || die - - # Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847, - # https://bugs.launchpad.net/hplip/+bug/500086 - local udevdir=$(get_udevdir) - sed -i -e "s|/etc/udev|${udevdir}|g" \ - $(find . -type f -exec grep -l /etc/udev {} +) || die - - # Force recognition of Gentoo distro by hp-check - sed -i \ - -e "s:file('/etc/issue', 'r').read():'Gentoo':" \ - installer/core_install.py || die - - eautoreconf -} - -src_configure() { - local drv_build minimal_build - - if use hpcups ; then - drv_build="$(use_enable hpcups hpcups-install)" - if use static-ppds ; then - drv_build="${drv_build} --enable-cups-ppd-install" - drv_build="${drv_build} --disable-cups-drv-install" - else - drv_build="${drv_build} --enable-cups-drv-install" - drv_build="${drv_build} --disable-cups-ppd-install" - fi - else - drv_build="--disable-hpcups-install" - drv_build="${drv_build} --disable-cups-drv-install" - drv_build="${drv_build} --disable-cups-ppd-install" - fi - - if use hpijs ; then - drv_build="${drv_build} $(use_enable hpijs hpijs-install)" - if use static-ppds ; then - drv_build="${drv_build} --enable-foomatic-ppd-install" - drv_build="${drv_build} --disable-foomatic-drv-install" - else - drv_build="${drv_build} --enable-foomatic-drv-install" - drv_build="${drv_build} --disable-foomatic-ppd-install" - fi - else - drv_build="${drv_build} --disable-hpijs-install" - drv_build="${drv_build} --disable-foomatic-drv-install" - drv_build="${drv_build} --disable-foomatic-ppd-install" - fi - - if use minimal ; then - if use hpijs ; then - minimal_build="--enable-hpijs-only-build" - else - minimal_build="--disable-hpijs-only-build" - fi - if use hpcups ; then - minimal_build="${minimal_build} --enable-hpcups-only-build" - else - minimal_build="${minimal_build} --disable-hpcups-only-build" - fi - minimal_build="${minimal_build} --disable-fax-build" - minimal_build="${minimal_build} --disable-network-build" - minimal_build="${minimal_build} --disable-scan-build" - minimal_build="${minimal_build} --disable-gui-build" - else - if use fax ; then - minimal_build="${minimal_build} --enable-fax-build" - else - minimal_build="${minimal_build} --disable-fax-build" - fi - if use snmp ; then - minimal_build="${minimal_build} --enable-network-build" - else - minimal_build="${minimal_build} --disable-network-build" - fi - if use scanner ; then - minimal_build="${minimal_build} --enable-scan-build" - else - minimal_build="${minimal_build} --disable-scan-build" - fi - if use qt5 ; then - minimal_build="${minimal_build} --enable-qt5" - minimal_build="${minimal_build} --enable-gui-build" - else - minimal_build="${minimal_build} --disable-gui-build" - minimal_build="${minimal_build} --disable-qt5" - fi - fi - - # disable class driver for now - econf \ - --disable-class-driver \ - --disable-cups11-build \ - --disable-foomatic-rip-hplip-install \ - --disable-imageProcessor-build \ - --disable-lite-build \ - --disable-shadow-build \ - --disable-qt3 \ - --disable-qt4 \ - --disable-udev_sysfs_rules \ - --with-cupsbackenddir=$(cups-config --serverbin)/backend \ - --with-cupsfilterdir=$(cups-config --serverbin)/filter \ - --with-docdir=/usr/share/doc/${PF} \ - --with-htmldir=/usr/share/doc/${PF}/html \ - --enable-hpps-install \ - --enable-dbus-build \ - ${drv_build} \ - ${minimal_build} \ - $(use_enable doc doc-build) \ - $(use_enable libusb0 libusb01_build) \ - $(use_enable parport pp-build) \ - $(use_enable policykit) - - # hpijs ppds are created at configure time but are not installed (3.17.11) - - # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip - # The hpcups driver does not use foomatic-rip - #local i - #for i in ppd/hpijs/*.ppd.gz ; do - # rm -f ${i}.temp || die - # gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ - # gzip > ${i}.temp || die - # mv ${i}.temp ${i} || die - #done -} - -src_install() { - # Disable parallel install - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018 - emake -j1 DESTDIR="${D}" install - einstalldocs - # default - - # Installed by sane-backends - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023 - rm -f "${ED}"/etc/sane.d/dll.conf || die - - # Remove desktop and autostart files - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770 - use qt5 || { - rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg - } - - rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die - rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die - - # Remove hal fdi files - rm -rf "${ED}"/usr/share/hal || die - - find "${D}" -name '*.la' -delete || die - - python_optimize "${ED}"/usr/share/hplip - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} -- cgit v1.2.3