From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- net-print/hplip/Manifest | 8 +- net-print/hplip/hplip-3.19.12-r1.ebuild | 1 - net-print/hplip/hplip-3.20.3.ebuild | 1 - net-print/hplip/hplip-3.20.5.ebuild | 1 - net-print/hplip/hplip-3.20.6-r1.ebuild | 280 ++++++++++++++++++++++++++++++++ 5 files changed, 285 insertions(+), 6 deletions(-) create mode 100644 net-print/hplip/hplip-3.20.6-r1.ebuild (limited to 'net-print/hplip') diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index 25814f3bc0c5..b858949f0063 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -3,7 +3,9 @@ DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6b 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.5.tar.gz 25774089 BLAKE2B b1d95e5551ead7818c7fb8529edffea59718944e6838370594f20f8e4917ee23d0beb85f1b68867c332c196ab863f8479ab9b645ce57d9b03dae59fd1cab5f0a SHA512 fce3c7b8a2f3b0d2875bafd2ff65a3312fae867b658cd45eea16d9f3663646b6b0b70b58e6c2b46eb24627cdeefb318b6ca9ccf5a0e9790ff19519518992da07 -EBUILD hplip-3.19.12-r1.ebuild 7827 BLAKE2B e57c664d4802fed5721dc0d1d8a211ac292e955bf647d8b453fdf42a40214cd4a61918e764c24cc1dacaee05c77e5b3a8ca0fc7822c9c17e7089cf6b8a7a0692 SHA512 7f4cedf809f7b42c70ad46bc7674789becd4ecd24129465aa892885f80998a86d2919c371ecbe733a2654a8604a427739c85fe63edadebce7f53f5d687594739 -EBUILD hplip-3.20.3.ebuild 7874 BLAKE2B 8e008ee4ca66c5df5c0ab08a9f63f96cfe815d308d4d331b0dbaf9da71177c32b1b7e7735561f32bb8b32410f2be61deb4208cb0b89d0d9d0ffe33c9d0d44846 SHA512 a2af25057292341b16d1ec9d0fdb8da616240b858029d34909c877d5e83cc7d9cd4c463cb9d54577fdff9af5ef94094db4ce2266779bf22d109df93c489d2487 -EBUILD hplip-3.20.5.ebuild 7877 BLAKE2B f4fed5c04659ef359021b75081a96958f6d86c4182a67aed9ffa71b729c00a3a4278fb8e61fd0201d5edc5ef0dc646a8e0d0cca914ae79d906cf7511345b1fa8 SHA512 690f2f128bd9451e2eb15f5e91a4a34848b8954ad730cfe63daf9b2f61fbc735675bc611fc3fe30eb7c4d6f979b3cee4caed117133da046835c920a1be36ff11 +DIST hplip-3.20.6.tar.gz 25909290 BLAKE2B ac5720c0b0a871459f22d24658eb51b381afcb7cc76831908229e1f0d1cc2feb69122690915f817b835d71b17fe9ecaddd25f506f9e9809f49d8b935fdba962a SHA512 6a5ce55465e3a537ecc0b6e7d198835dbe495e191522e674a507a4993e2061da3ea084a5239a74b2279c065c0775067d5b6a4aeb2a7791825106a299fb55e8f8 +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.5.ebuild 7792 BLAKE2B 6ef0aac91d3527a1581f883655c5ea514f59c127b09ec320f88eb53482371bbefcf01065320c5222ec4ca842b52f0e8183a4b50df0093eb1420bab36244a08d6 SHA512 e3bc41d171e8112c4f6eeda9ba69ad1565e0a8fbd88e66a8a6136b832af043eec5ae7857b72f043c1ba7981b3a8aa1936ab4b213e18be414af19a8c5d037570d +EBUILD hplip-3.20.6-r1.ebuild 7910 BLAKE2B 15b6b52ac69dcd704685beb1e7e43e2f7955b9b630bcc442d2585fb2dec14f341ef9c0c8d3d1be7587a60c1f24eaa2fe59167d487a4200f11b55c51500296912 SHA512 ee5fdbe9b8ca9bccf8007f963400b6ed743d87efade64364bc781349e4fb96eccc32318f0f0c49b13a31d68642f9eb015a03cf4ffb68ffe334b412cb009f83d4 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef diff --git a/net-print/hplip/hplip-3.19.12-r1.ebuild b/net-print/hplip/hplip-3.19.12-r1.ebuild index 11c11535587e..8c95b96d1de0 100644 --- a/net-print/hplip/hplip-3.19.12-r1.ebuild +++ b/net-print/hplip/hplip-3.19.12-r1.ebuild @@ -49,7 +49,6 @@ RDEPEND=" ${COMMON_DEPEND} app-text/ghostscript-gpl !minimal? ( - $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*') $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*') kernel_linux? ( virtual/udev ) $(python_gen_cond_dep ' diff --git a/net-print/hplip/hplip-3.20.3.ebuild b/net-print/hplip/hplip-3.20.3.ebuild index 15730447b86b..61499e2246af 100644 --- a/net-print/hplip/hplip-3.20.3.ebuild +++ b/net-print/hplip/hplip-3.20.3.ebuild @@ -49,7 +49,6 @@ RDEPEND=" ${COMMON_DEPEND} app-text/ghostscript-gpl !minimal? ( - $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*') $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*') kernel_linux? ( virtual/udev ) $(python_gen_cond_dep ' diff --git a/net-print/hplip/hplip-3.20.5.ebuild b/net-print/hplip/hplip-3.20.5.ebuild index 467ad10ba15e..0577e0d45ea6 100644 --- a/net-print/hplip/hplip-3.20.5.ebuild +++ b/net-print/hplip/hplip-3.20.5.ebuild @@ -49,7 +49,6 @@ RDEPEND=" ${COMMON_DEPEND} app-text/ghostscript-gpl !minimal? ( - $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*') $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*') kernel_linux? ( virtual/udev ) $(python_gen_cond_dep ' diff --git a/net-print/hplip/hplip-3.20.6-r1.ebuild b/net-print/hplip/hplip-3.20.6-r1.ebuild new file mode 100644 index 000000000000..6bf31b7b4b6e --- /dev/null +++ b/net-print/hplip/hplip-3.20.6-r1.ebuild @@ -0,0 +1,280 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="threads(+),xml" + +# 14 and 15 spit out a lot of warnings about subdirs +WANT_AUTOMAKE="1.13" + +inherit autotools flag-o-matic 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.20.5-patches-1.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + +IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X" + +COMMON_DEPEND=" + net-print/cups + virtual/jpeg:0 + hpijs? ( net-print/cups-filters[foomatic] ) + !minimal? ( + ${PYTHON_DEPS} + sys-apps/dbus + !libusb0? ( virtual/libusb:1 ) + libusb0? ( virtual/libusb:0 ) + scanner? ( media-gfx/sane-backends ) + snmp? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + net-analyzer/net-snmp + ) + ) +" +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + ${COMMON_DEPEND} +" +RDEPEND=" + ${COMMON_DEPEND} + app-text/ghostscript-gpl + !minimal? ( + $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*') + kernel_linux? ( virtual/udev ) + $(python_gen_cond_dep ' + >=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}] + dev-python/distro[${PYTHON_MULTI_USEDEP}] + fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] ) + qt5? ( + >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}] + libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] ) + ) + scanner? ( + >=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}] + X? ( + || ( + kde? ( kde-misc/skanlite ) + media-gfx/xsane + media-gfx/sane-frontends + ) + ) + ) + ') + ) + policykit? ( sys-auth/polkit ) +" + +REQUIRED_USE="!minimal? ( ${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() { + use !minimal && python-single-r1_pkg_setup + + use scanner && ! use X && ewarn "You need USE=X for the scanner GUI." + + 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 + + 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." + else + use parport && linux-info_pkg_setup + fi +} + +src_prepare() { + default + + if use !minimal ; then + python_fix_shebang . + fi + + # 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 myconf drv_build minimal_build + + append-cppflags "$(python-config --includes)" + + if use libusb0 ; then + myconf="${myconf} --enable-libusb01_build" + else + myconf="${myconf} --disable-libusb01_build" + fi + + 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" + else + if use fax ; then + minimal_build="${minimal_build} --enable-fax-build" + else + minimal_build="${minimal_build} --disable-fax-build" + fi + fi + + # disable class driver for now + econf \ + --disable-cups11-build \ + --disable-lite-build \ + --disable-foomatic-rip-hplip-install \ + --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 \ + ${myconf} \ + ${drv_build} \ + ${minimal_build} \ + --enable-hpps-install \ + --disable-class-driver \ + $(use_enable doc doc-build) \ + $(use_enable !minimal gui-build) \ + $(use_enable !minimal dbus-build) \ + $(use_enable parport pp-build) \ + $(use_enable policykit) \ + $(use_enable qt5) \ + $(use_enable scanner scan-build) \ + $(use_enable snmp network-build) + + # 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 + + if use !minimal ; then + python_optimize "${ED}"/usr/share/hplip + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} -- cgit v1.2.3