diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
commit | be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch) | |
tree | f82923fbca262493e83dd1382e561a2fae24cc46 /net-print/hplip | |
parent | 7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff) | |
parent | 6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff) |
Merge branch 'edge' into next
Diffstat (limited to 'net-print/hplip')
-rw-r--r-- | net-print/hplip/Manifest | 2 | ||||
-rw-r--r-- | net-print/hplip/hplip-3.20.3.ebuild | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index a709a98244ba..04ad9aa65d8e 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -4,5 +4,5 @@ DIST hplip-3.20.2.tar.gz 25675649 BLAKE2B 8e98768736fe4ec667852fccebf2bb178047ee DIST hplip-3.20.3.tar.gz 25672070 BLAKE2B 4c6209a268898de123b2b557d662acddb3ad90b227c0752ebdd1e2afb3fe3d19fddc819aba999347708dd0c098f2b8fea4580dcfb3d5fc7893e47520cae7c1d5 SHA512 a397eb3896292ac956a1969b76707af62c866e47d88148fa75b68574e4639283f7414a2c77e6854c5d22daea49181d4f1bc2daf11fb3058372ff084d591696f1 EBUILD hplip-3.19.12-r1.ebuild 7827 BLAKE2B e57c664d4802fed5721dc0d1d8a211ac292e955bf647d8b453fdf42a40214cd4a61918e764c24cc1dacaee05c77e5b3a8ca0fc7822c9c17e7089cf6b8a7a0692 SHA512 7f4cedf809f7b42c70ad46bc7674789becd4ecd24129465aa892885f80998a86d2919c371ecbe733a2654a8604a427739c85fe63edadebce7f53f5d687594739 EBUILD hplip-3.20.2.ebuild 7832 BLAKE2B a6330e829cb0dbbf580ee6b41c2599a0fcb14ff6323a28f3feec3c00d7c0dde8915767c6e29c4738078bbd915b9f1226fb2bda57ad577a02985ac4a849c7b4d7 SHA512 79f50926870307c4825dee5268199bcfda42db0973cf10ea720a0907bf2f8e789710012d196e3e468cda66e941125777693415b0b8f55b12f57dfe67b685a415 -EBUILD hplip-3.20.3.ebuild 7770 BLAKE2B 25814bff70cdba80fb71932a379f6c139fd5188c9253e603d064f18d554067e6d6e497b5cd4500fbc6353132a8c24ede9302fb102434ee0ed997a52067ced9a3 SHA512 45f73eed34ba3a88e815752061fa20d3e2cd0dc4ab7ca3cc0143b17dfae45feb4855898553e20338a100f882f117cf9002bdbb6eadae807575fd1f5080d6dde5 +EBUILD hplip-3.20.3.ebuild 7873 BLAKE2B 5d44edb2e7b6b4716a6d57ebbf41d7b129ed34d57be4fe4bbbb909170c833c61ab7edb65b42bc73465f63432516d762c231efe1a462029ed89339c14f8531eb2 SHA512 c93ab876029bf2065c5ad607902cf99dddd1d2c1bc8caca43856409fdfe2b7933c137cef1ad68fde0cfa5135d76ea399df5f5bb18b57861bef1903c17ece5af9 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef diff --git a/net-print/hplip/hplip-3.20.3.ebuild b/net-print/hplip/hplip-3.20.3.ebuild index 6abdff9d5b0e..d24a1c95865e 100644 --- a/net-print/hplip/hplip-3.20.3.ebuild +++ b/net-print/hplip/hplip-3.20.3.ebuild @@ -3,13 +3,13 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,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 linux-info python-single-r1 readme.gentoo-r1 udev +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" @@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86" IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X" @@ -54,6 +54,7 @@ RDEPEND=" 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}] @@ -147,6 +148,8 @@ src_prepare() { src_configure() { local myconf drv_build minimal_build + append-cppflags "$(python-config --includes)" + if use libusb0 ; then myconf="${myconf} --enable-libusb01_build" else |