From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B044E15808B for ; Sat, 5 Mar 2022 17:26:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9727E07C9; Sat, 5 Mar 2022 17:26:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCC4EE07C9 for ; Sat, 5 Mar 2022 17:26:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EAEB342FBA for ; Sat, 5 Mar 2022 17:26:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE8DAD0 for ; Sat, 5 Mar 2022 17:26:11 +0000 (UTC) From: "Daniel Pielmeier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Daniel Pielmeier" Message-ID: <1646501157.e251c19157b0deff0175110446eb6e13eab8395d.billie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/hplip/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/hplip/Manifest net-print/hplip/hplip-3.22.2.ebuild X-VCS-Directories: net-print/hplip/ X-VCS-Committer: billie X-VCS-Committer-Name: Daniel Pielmeier X-VCS-Revision: e251c19157b0deff0175110446eb6e13eab8395d X-VCS-Branch: master Date: Sat, 5 Mar 2022 17:26:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 276ef143-2a30-46a9-a970-1d4844d1bd32 X-Archives-Hash: c210a87687006804b42f124f2b57f702 commit: e251c19157b0deff0175110446eb6e13eab8395d Author: Daniel Pielmeier gentoo org> AuthorDate: Sat Mar 5 17:25:57 2022 +0000 Commit: Daniel Pielmeier gentoo org> CommitDate: Sat Mar 5 17:25:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e251c191 net-print/hplip: Version bump. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Daniel Pielmeier gentoo.org> net-print/hplip/Manifest | 2 + net-print/hplip/hplip-3.22.2.ebuild | 285 ++++++++++++++++++++++++++++++++++++ 2 files changed, 287 insertions(+) diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index d404b752fa44..31da5544ec2c 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -3,3 +3,5 @@ DIST hplip-3.20.11.tar.gz 26301441 BLAKE2B 14667f33cc50b2887c8434ada7327a82e16b9 DIST hplip-3.21.10-patches-1.tar.xz 17700 BLAKE2B a5d60802a3a9b76b18c0cc4d880b649c2ffceb38b9a0b1857e86eac6a4e840272ce8764db6544b273071e361bb29ae6863df64a3b39bcede2a37ea55c1957fe8 SHA512 d8cda2abadc9b0184bf6669e648fa060a9f0f78e9fcaa3998424b968d01c8a1e1e7ebf371c2614b3d1fbf9052c35368bd65ae265946367a72785ff88f753df8b DIST hplip-3.21.10.tar.gz 27309040 BLAKE2B 542304f4dd5f07b683982ad1218ed47dd06227511025eef6e285e9a3073a3472f7a9eaa5666ade59cc681cb3f4c4a7e1f4eb4d94a8518c322bc0a6c81b0eff94 SHA512 e9b49b7bfc3fa38ea83b357af01cfbc59bf238ad7add49c8e4cb281fbc87facfe6fed9e8428bb926f75fb22ff8e980d620ac102694ae0c8271ce0c4f1ab8b7ed DIST hplip-3.21.12.tar.gz 27314194 BLAKE2B 8ab204f9f655d5792aaeb729b416a994c7661a540602f755c58887d2b5694e85fab3fc9c800620de128979b43724d16603447e875c40e2530bb5566599535311 SHA512 b101a6958dbfa2b717b85bf38b05d682b9fe68ed3d08e2f6039485ac428867de66381e869c1d4ab2bd22e13a751704ca19915dd90661561c8dd68883a72ace2d +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 diff --git a/net-print/hplip/hplip-3.22.2.ebuild b/net-print/hplip/hplip-3.22.2.ebuild new file mode 100644 index 000000000000..eb73f61d2d52 --- /dev/null +++ b/net-print/hplip/hplip-3.22.2.ebuild @@ -0,0 +1,285 @@ +# 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 +}