From 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 May 2018 15:22:17 +0100 Subject: gentoo resync : 25.05.2018 --- net-print/Manifest.gz | Bin 6922 -> 6921 bytes net-print/hplip-plugin/Manifest | 4 +- net-print/hplip-plugin/hplip-plugin-3.18.3.ebuild | 69 ------ net-print/hplip-plugin/hplip-plugin-3.18.4.ebuild | 69 ++++++ net-print/hplip/Manifest | 4 +- net-print/hplip/hplip-3.18.3-r1.ebuild | 268 ---------------------- net-print/hplip/hplip-3.18.5.ebuild | 268 ++++++++++++++++++++++ net-print/mtink/Manifest | 1 - net-print/mtink/files/mtink-1.0.16-options.patch | 39 ---- 9 files changed, 341 insertions(+), 381 deletions(-) delete mode 100644 net-print/hplip-plugin/hplip-plugin-3.18.3.ebuild create mode 100644 net-print/hplip-plugin/hplip-plugin-3.18.4.ebuild delete mode 100644 net-print/hplip/hplip-3.18.3-r1.ebuild create mode 100644 net-print/hplip/hplip-3.18.5.ebuild delete mode 100644 net-print/mtink/files/mtink-1.0.16-options.patch (limited to 'net-print') diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz index 3f30a7537877..5166941a98e4 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 868e7c368054..7743cf27effc 100644 --- a/net-print/hplip-plugin/Manifest +++ b/net-print/hplip-plugin/Manifest @@ -1,5 +1,5 @@ DIST hplip-3.17.10-plugin.run 2062947 BLAKE2B 86f15193a751794eb64acfbaf1b42151c34336603d4d592cc84a375ccca4e7be4177d3dda76fc153ac0a6898eff24174df43256450cd81ae8ad4d4f6abd69ade SHA512 98eef413b122527c4a7860b621baf11c04ec9d7f4e43ce4f36e7822a633c64b3d98cbc86cd7d305c74d9a49a4159ebd7280d652e1ba430cad4cc70f66d23ee07 -DIST hplip-3.18.3-plugin.run 2065610 BLAKE2B 820f390c7c5f66943b12545ebe33742909b41f3f2d9389a811f4aed983e88dec22d44288692a9de5014f9093173b726c3e792124327e4bd774cbc66070e113c4 SHA512 d1bf83476aa56748f9e808f6ae9dd66b761c7674fdc0c960636102e7f263347fe8553a14e9ddbe6dfacc52fddbe4e47b5a9c1c01f07010444e656751272d73f2 +DIST hplip-3.18.4-plugin.run 2065541 BLAKE2B 0e7af5eaf3059c4e77b5213e2fcb240da898f1bb68162fedf4b36e0f47cb1fa060f908a617f7ca1d10aadf6fa59f9617fdf91374c709c3439a59ca27560f186c SHA512 8e8aaa9703b12806ebcaa10ec764489baa02ce48a3f73f82a6ae964c6ed01882e1ae315b4ccd923e96792217765d6f8ac9c01e9b6ea41af86b13ba6100229fb9 EBUILD hplip-plugin-3.17.10.ebuild 1545 BLAKE2B 31f321fa6f038a90c5f2487b9d6242d7fea58fe9cf6af69ac8dc2eabd3788d09e57ab325737ca71ea5e7b26a686c83bb39448d3bba71f47500c16f2aae855d6c SHA512 e9c19899a37e95c2a61cf432e0c2557dbe8a8ff302da5f39475f97c89d362ab0da51a28818f457633c7d1b2a782703349d798d0e9526f2ef31346f39ed77a6cf -EBUILD hplip-plugin-3.18.3.ebuild 1545 BLAKE2B caad3c84d51702bf101bdb240e4e10bca75923dd5ba2d94fa8ac034495aa088fca40f1ad39e102e17c3227ab918792cff4349d128c08b89cf362951d853d4d7c SHA512 167d560a9cc88ca1fed36fae85fad9ceec7186e61d6f2504e07afd82bb6afedab040bb93241f352e425e1fd67f982fd81bacb86a922c534ad34600e6bfcc7d1f +EBUILD hplip-plugin-3.18.4.ebuild 1553 BLAKE2B 79d9f5f3892dd3f1f08a5c6111bd336fd5b95d1457c52cf46c8349950e83fc26daead599d039acc5aee24bec931a311e8a1af7d97061cf2b5b564b90194fd67a SHA512 bf2563690e81384e8c521e08234966af3332324e4cb892bb320fdc8017ecf3182b9496d2e2fe09f767054f80511b27bbfef2af3094f7afd7ad36500dfb2a3b52 MISC metadata.xml 334 BLAKE2B 8f1a0784c57af6204db98f443bdb09df2a6432674d711a5ecf577c20e29f04a030549ea19c6e04f51cd9a36e60a6da94bebafbfcc10d52da87109e59c32d42ee SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c diff --git a/net-print/hplip-plugin/hplip-plugin-3.18.3.ebuild b/net-print/hplip-plugin/hplip-plugin-3.18.3.ebuild deleted file mode 100644 index b96c3ec3601d..000000000000 --- a/net-print/hplip-plugin/hplip-plugin-3.18.3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit udev unpacker - -DESCRIPTION="Proprietary plugins and firmware for HPLIP" -HOMEPAGE="http://hplipopensource.com/hplip-web/index.html" -SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run" - -LICENSE="hplip-plugin" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - ~net-print/hplip-${PV} - virtual/udev -" -DEPEND="" - -S=${WORKDIR} - -HPLIP_HOME=/usr/share/hplip - -# Binary prebuilt package -QA_PRESTRIPPED=" - /usr/share/hplip/fax/plugins/fax_marvell.so - /usr/share/hplip/prnt/plugins/hbpl1.so - /usr/share/hplip/prnt/plugins/lj.so - /usr/share/hplip/scan/plugins/bb_escl.so - /usr/share/hplip/scan/plugins/bb_marvell.so - /usr/share/hplip/scan/plugins/bb_soapht.so - /usr/share/hplip/scan/plugins/bb_soap.so -" - -# License does not allow us to redistribute the "source" package -RESTRICT="mirror" - -src_unpack() { - unpack_makeself "hplip-${PV}-plugin.run" -} - -src_install() { - local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32') - - insinto "${HPLIP_HOME}"/data/firmware - doins *.fw.gz - - for plugin in *-${hplip_arch}.so; do - local plugin_type=prnt - case "${plugin}" in - fax_*) plugin_type=fax ;; - bb_*) plugin_type=scan ;; - esac - - exeinto "${HPLIP_HOME}"/${plugin_type}/plugins - newexe ${plugin} ${plugin/-${hplip_arch}} - done - - mkdir -p "${ED}/var/lib/hp/" - cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_ - [plugin] - installed = 1 - eula = 1 - version = ${PV} - _EOF_ -} diff --git a/net-print/hplip-plugin/hplip-plugin-3.18.4.ebuild b/net-print/hplip-plugin/hplip-plugin-3.18.4.ebuild new file mode 100644 index 000000000000..906e4c9f061b --- /dev/null +++ b/net-print/hplip-plugin/hplip-plugin-3.18.4.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit udev unpacker + +DESCRIPTION="Proprietary plugins and firmware for HPLIP" +HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing" +SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run" + +LICENSE="hplip-plugin" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + ~net-print/hplip-${PV} + virtual/udev +" +DEPEND="" + +S=${WORKDIR} + +HPLIP_HOME=/usr/share/hplip + +# Binary prebuilt package +QA_PRESTRIPPED=" + /usr/share/hplip/fax/plugins/fax_marvell.so + /usr/share/hplip/prnt/plugins/hbpl1.so + /usr/share/hplip/prnt/plugins/lj.so + /usr/share/hplip/scan/plugins/bb_escl.so + /usr/share/hplip/scan/plugins/bb_marvell.so + /usr/share/hplip/scan/plugins/bb_soapht.so + /usr/share/hplip/scan/plugins/bb_soap.so +" + +# License does not allow us to redistribute the "source" package +RESTRICT="mirror" + +src_unpack() { + unpack_makeself "hplip-${PV}-plugin.run" +} + +src_install() { + local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32') + + insinto "${HPLIP_HOME}"/data/firmware + doins *.fw.gz + + for plugin in *-${hplip_arch}.so; do + local plugin_type=prnt + case "${plugin}" in + fax_*) plugin_type=fax ;; + bb_*) plugin_type=scan ;; + esac + + exeinto "${HPLIP_HOME}"/${plugin_type}/plugins + newexe ${plugin} ${plugin/-${hplip_arch}} + done + + mkdir -p "${ED}/var/lib/hp/" + cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_ + [plugin] + installed = 1 + eula = 1 + version = ${PV} + _EOF_ +} diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index 1805b6e64e1f..2511020d4e1d 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -1,9 +1,9 @@ DIST hplip-3.17.10.tar.gz 23878364 BLAKE2B 0165bcb00159572a16277624db0de4b2ca8421d5cf42418bf406548dd68a7d5087142a74a0e6ca332936b006f6ffeaa4d9202c5332fd1f971923bb142adb244f SHA512 0c1c78730d269ec41f95bbde887a490aebb4c9c3dcb9784052a1c3b537c12093cbc426e1f79266c63dd5e7adecdda0735b9bf964ddc1307b2c6603f3fa0462a8 DIST hplip-3.17.9-patches-1.tar.xz 8484 BLAKE2B 3a1f25d0554af5597266eb5ed3ff9f594560671784a89ade6246e9287661bf17fa16c555391c3f685e59aec8c548560911065a9c4188906c2f00c755f503fe49 SHA512 125f9cfd1c3cad662ce33954b8ab9ab1898368b449c4ad78dfe99f29de8025183773272b9865cd22b976a30c502e38254ce0ac59d685299dff7f9314927d546a DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed -DIST hplip-3.18.3.tar.gz 22178733 BLAKE2B 2d5c30d884cd04314ef3727e88abd1a2621e39916c0fa9a558e72ed2d040a5d11847cd82237da33efccd41b23eeb0fad69c84b36fbb736af3def4aa60f00ba71 SHA512 cb51e357cc9def3c087231b01752941b469e5fc4508ec83c6f5875352694249ef72339f2f20c4a6831c49ace7c1f6b902cc11a961c0e1f43ce098b2bf800728f DIST hplip-3.18.4.tar.gz 22185532 BLAKE2B dceb0213b67a4842db9d30b45d1eb9796ceb5065d0495901af89f359016cc2febb47fd80610d13f2aada69ef8701a56bc6c52065bc68b200f488fcfd739a0d7c SHA512 dfe0e21606498112d57fd76763bcc9457a130896bd86508736422c1d82a8be5b5e4b4277b07e2efd2c777cedb9f573ac9fe8198afcf425386c7d8ac0cd62d086 +DIST hplip-3.18.5.tar.gz 22437406 BLAKE2B d32c38209b8a60c6ca7fe89512409d4d32bf095097cdc499a1afeb985c9add2da5e99b12b307f1cf0c4513071f2d4b62291d7624fe982579e8781ace5f533f6a SHA512 2c99bb446af604a2f011f9dd5ddf4bf5019b7cd36a0ecb1cbe6dce0c0358b8472a695ad85d09e52c3e63de8a69e2a3e7081c61ec36f44aae2770b5fef0f67516 EBUILD hplip-3.17.10.ebuild 7417 BLAKE2B 6a79d111d6b6c19a2b18b3d0995ba56828ed64f47fc9ce2098916303dd4c239f51dec295852a9a850dd93eb5e80f7421f35165585caecebd710e1175ff3deeb9 SHA512 855943629bf3dd0fdd85013e71b00fe40ea7414403cc3b761f93f63f7c4a7f2deab8f3d464c724ea1f585317ded9d855b99411d54872d96005241981aa6fc54a -EBUILD hplip-3.18.3-r1.ebuild 7814 BLAKE2B 83aa08ceb21bebb3c9cf535412bf1a593e9c8a74df51650da0416aa0b167bf9f0e2e7a4ff5869b983eb2281211b142d6e3b5e8123f4f3c23b3e8d2047c54be78 SHA512 9cc2d3f80e12b16061cd439a08e5373860b1ca7e934e8c6a72f0b595dab52751ebf6bd6849a287a8c2632031e99b92281ec211bb88850bb58ea47e7bb11cd5b0 EBUILD hplip-3.18.4.ebuild 7814 BLAKE2B 83aa08ceb21bebb3c9cf535412bf1a593e9c8a74df51650da0416aa0b167bf9f0e2e7a4ff5869b983eb2281211b142d6e3b5e8123f4f3c23b3e8d2047c54be78 SHA512 9cc2d3f80e12b16061cd439a08e5373860b1ca7e934e8c6a72f0b595dab52751ebf6bd6849a287a8c2632031e99b92281ec211bb88850bb58ea47e7bb11cd5b0 +EBUILD hplip-3.18.5.ebuild 7822 BLAKE2B d2d2f630089de97c290d9573657f581daa6867b26a012a1952c438c6dc121bf69a97fab22321ccee25d9734217870a2a108f4c970bba1581159bfb37e4a48766 SHA512 0f0c743f6c749b9f1b6de5fe284c95cf1a6e97ef9533ae62df615224ce562994e09e8c3a41b04771217b77a16c84a6c0af67725016a07b07757b9b48b7d6b319 MISC metadata.xml 1767 BLAKE2B 67ab6b778637b42f5849699aa506c48844ea510a6528c2e62e54164a1d4502def06f0461bb79e9ea525b09026b502039719dfb42d9168738822e4fd588989196 SHA512 eab26de132a410104ad260bf09962702fdc0c554261511264d4d95375a7afa07fa5b902115e4a500d5371e54f483c6f655f6d0c1fbc387e46f10e98d20b842b3 diff --git a/net-print/hplip/hplip-3.18.3-r1.ebuild b/net-print/hplip/hplip-3.18.3-r1.ebuild deleted file mode 100644 index c1bd7d6cc228..000000000000 --- a/net-print/hplip/hplip-3.18.3-r1.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE="threads,xml" - -# 14 and 15 spit out a lot of warnings about subdirs -WANT_AUTOMAKE="1.13" - -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="http://hplipopensource.com/hplip-web/index.html" -SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz - https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.3-patches-2.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" - -IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X" - -# dependency on dev-python/notify-python dropped due to python 3 incompatibility -# possible replacement notify2 (https://pypi.org/project/notify2/0.3) not in tree - -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 - ) - ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - app-text/ghostscript-gpl - !minimal? ( - >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*') - fax? ( dev-python/reportlab[${PYTHON_USEDEP}] ) - kernel_linux? ( virtual/udev ) - qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${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="!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 - -Any user who wants to print must be in the lp group. -" - -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_export EPYTHON PYTHON - 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 - - 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 - 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 fax fax-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_export EPYTHON PYTHON - python_optimize "${ED%/}"/usr/share/hplip - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-print/hplip/hplip-3.18.5.ebuild b/net-print/hplip/hplip-3.18.5.ebuild new file mode 100644 index 000000000000..00309e5ab471 --- /dev/null +++ b/net-print/hplip/hplip-3.18.5.ebuild @@ -0,0 +1,268 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_REQ_USE="threads,xml" + +# 14 and 15 spit out a lot of warnings about subdirs +WANT_AUTOMAKE="1.13" + +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.18.3-patches-2.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + +IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X" + +# dependency on dev-python/notify-python dropped due to python 3 incompatibility +# possible replacement notify2 (https://pypi.org/project/notify2/0.3) not in tree + +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 + ) + ) +" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig +" +RDEPEND="${COMMON_DEPEND} + app-text/ghostscript-gpl + !minimal? ( + >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*') + $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*') + fax? ( dev-python/reportlab[${PYTHON_USEDEP}] ) + kernel_linux? ( virtual/udev ) + qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${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="!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 + +Any user who wants to print must be in the lp group. +" + +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_export EPYTHON PYTHON + 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 + + 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 + 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 fax fax-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_export EPYTHON PYTHON + python_optimize "${ED%/}"/usr/share/hplip + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-print/mtink/Manifest b/net-print/mtink/Manifest index e730a6c3f0e5..91fbb17ef4c1 100644 --- a/net-print/mtink/Manifest +++ b/net-print/mtink/Manifest @@ -1,5 +1,4 @@ AUX mtink-1.0.16-flags.patch 10583 BLAKE2B aeddc279ca436ccbefd182f4f1a27e2ac2e0a9f171fe90cd4c44a424ea6d6a9f4c9d200238d320e0b0e47252793e0fe30ffa7249bad53c59d080991dc7689c11 SHA512 a4a6767139e1bf0d0ab8efaf82a1cb7abfa084505a3ef6ecfe6ef43aa9fa813ebd8e81aeae5be0582ff1fb9938e8c3f72611c2b7a898c9290d6b98508a93201f -AUX mtink-1.0.16-options.patch 1424 BLAKE2B 0b0636dcd9ee08a1a12461485f6b498e921d6de2feb520f4113cf18db21427833365d034fc0c7fcb44fcf928125d118f3731210fcd876d1cf24dd9ca91274d15 SHA512 11fa05f2cb6e512a18a0d43a838197fa96f22fac74fd7565387351132c0a879fd9f90076fb88cc876d3ac81920b14dd9e6ab80c1325a89e8fa631cd6ce1279aa AUX mtink-1.0.16-overflow.patch 421 BLAKE2B 6588f9d2025e866a3fda2eb518e19c4cabf5540eec503759a902d67f80b4bc148880042d2510d18b758d134abc63c64fe6f4afaa475734fbc2279e77b5b61a8b SHA512 801e7fa935b965398f2d2cb9b5384d5868485b09879636fb385c5d84be80a725b51a3fde8c94253749bc35e1dece4f879d1a292b4b557d592a26a3f7fc731159 AUX mtinkd.confd 383 BLAKE2B f407d4f3302d027f8bc2208554100ef427e9fa0735d488b75447b87a3fd0588978ff25425b384da33edfd38c02e0e66cb3e8433a9a7ef97d0e03042616bec8e5 SHA512 83bdc7aa3947c0f4f2161288fe634d355205a9e097cac6e82c2bc7f55afd6ae8bbee15c1871089ddf1c718b587a0f6929ad4be0590c601b7e3428c0ef79ed331 AUX mtinkd.rc 332 BLAKE2B ba7902b7d2e2aa00530ba1466d78eb9f91311ea164c242e2980cf5139624e9fbd607d26e824925acfa4fa7c8a6f29c76435c05b5ad143268119aa5d1677f4e7d SHA512 764cf45bf56f2fa50b3b927422e2374e1142ac1b29022b0f44cd462618587fa568200b08f56d802d3754698928a6f65a39d05d3cfde51c32b57db3b85fbca034 diff --git a/net-print/mtink/files/mtink-1.0.16-options.patch b/net-print/mtink/files/mtink-1.0.16-options.patch deleted file mode 100644 index c173a4c762c1..000000000000 --- a/net-print/mtink/files/mtink-1.0.16-options.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ruN mtink-1.0.16.orig/Makefile.ORG mtink-1.0.16/Makefile.ORG ---- mtink-1.0.16.orig/Makefile.ORG 2007-08-28 12:52:30.000000000 +0200 -+++ mtink-1.0.16/Makefile.ORG 2011-06-05 21:29:23.000000000 +0200 -@@ -4,7 +4,7 @@ - setUid=1 - gimpVersion= - --DBG = -s -O -+DBG = - - # comment this out for Solaris - -@@ -235,7 +235,7 @@ - - ttink: $(TTYOBJ) $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h $(SRCDIR)/version.h Makefile - @echo Link ttink -- @$(CC) -o ttink $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0 -+ @$(CC) -o ttink $(LDFLAGS) $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0 - - ############# PLUG-IN ####################### - gimp-mtink: $(SRCDIR)/gimp-mtink.c Makefile -@@ -257,7 +257,7 @@ - - mtinkd: $(SVR_OBJ) Makefile - @echo Link mtinkd -- @$(CC) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) -+ @$(CC) -o mtinkd $(LDFLAGS) $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) - - ########### Chooser ############## - -@@ -269,7 +269,7 @@ - - $(DETDIR)/askPrinter: $(DETDIR)/askPrinter.c - @echo Compile and link askPrinter.c -- @$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR) -+ @$(CC) -o $(DETDIR)/askPrinter $(LDFLAGS) $(DETDIR)/askPrinter.c -I. -I$(DETDIR) - - ########### utilities ###################### - -- cgit v1.2.3