diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
tree | 326613a08f25851c388715e205576a2e7d25dc4f /net-print | |
parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) |
gentoo resync : 18.08.2019
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/Manifest.gz | bin | 6588 -> 6582 bytes | |||
-rw-r--r-- | net-print/cups-filters/Manifest | 4 | ||||
-rw-r--r-- | net-print/cups-filters/cups-filters-1.25.2.ebuild | 134 | ||||
-rw-r--r-- | net-print/cups-filters/cups-filters-9999.ebuild | 2 | ||||
-rw-r--r-- | net-print/cups/Manifest | 4 | ||||
-rw-r--r-- | net-print/cups/cups-2.2.12.ebuild | 339 | ||||
-rw-r--r-- | net-print/cups/cups-9999.ebuild | 18 | ||||
-rw-r--r-- | net-print/hplip-plugin/Manifest | 8 | ||||
-rw-r--r-- | net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild | 2 | ||||
-rw-r--r-- | net-print/hplip-plugin/hplip-plugin-3.18.6.ebuild | 69 | ||||
-rw-r--r-- | net-print/hplip-plugin/hplip-plugin-3.19.6.ebuild (renamed from net-print/hplip-plugin/hplip-plugin-3.19.5.ebuild) | 24 | ||||
-rw-r--r-- | net-print/hplip/Manifest | 7 | ||||
-rw-r--r-- | net-print/hplip/hplip-3.18.12.ebuild | 2 | ||||
-rw-r--r-- | net-print/hplip/hplip-3.18.6.ebuild | 268 | ||||
-rw-r--r-- | net-print/hplip/hplip-3.19.5.ebuild | 274 |
15 files changed, 511 insertions, 644 deletions
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz Binary files differindex d3b312ccf7b6..ba13de4155be 100644 --- a/net-print/Manifest.gz +++ b/net-print/Manifest.gz diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 89e65546c9be..83b2b426b46c 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -4,10 +4,12 @@ DIST cups-filters-1.22.6.tar.xz 1477584 BLAKE2B 7d833c3e97c510eabcc906bbd01d4d1e DIST cups-filters-1.23.0.tar.xz 1477900 BLAKE2B 00a67ace059c9c280dbd4019fbfec61ef1e46bc2b5c9e36019e860c32a8b4277abefb9cf290e7d8629450c7022099157910703bda2366a0700e3e973fd44a110 SHA512 466dc14155750f8868f29fe416c061813b661892aba7bf91446e1145da5c7eb23abf9935a19d2309bfcb521c44eab9d4404db7965c95b9578e10cccd26bbba8f DIST cups-filters-1.25.0.tar.xz 1447496 BLAKE2B 297f16a5580787ccf1494ae99a90ed5912156e255394e3d3e921d8e29db9f94b0ed8409b641bec5231dfc0c802b773415beaf4103424cc2cb46d25d9f3804d8e SHA512 f1be31721fd8f6192868e7954d94038ff1382bb0194bb64014da3dd695cbbd2cd5d65373d809e1b541071374b7eabb44c68c6be29575251490d76a0a5336a5c5 DIST cups-filters-1.25.1.tar.xz 1447208 BLAKE2B ccc9e02309b7a29ac79f91b1de92e11d78ee108777af0e07127f15ba64c6fece79482bf00011e2f82f50eb2bdea42f4a94f4d591402b35757b62876b04119fe5 SHA512 474045497237387dd16bde73253d9e4e9e0ca2f33f3f7ff70245b4c0f8b1dc71abe141f8ab6b467d941dd7153e11369951bc778ef677d6ea17101cd91886625c +DIST cups-filters-1.25.2.tar.xz 1449984 BLAKE2B a6f595ac2c1ef55302aa9063d88d77ff518d1b32cd74449a28e039caa119f894577ed79c312b96181b12ae5153859685ba3f95e250f87c9f2ab002279153fd15 SHA512 e616a3a356ea7ad7d61e50242c1c0fd899911a8a293e721a89b425fb6a5d6d98388bbd4c02df407d9b66219b99f7c41a457b1436af6b9d8e979f0fd4e392ef3e EBUILD cups-filters-1.21.6.ebuild 3488 BLAKE2B da4a24389073b98e8d081290baf781dca00fd9c78512f17c74c8e1962a2e54cbfcac5ae28fd4f2a7ad9c4d9e15b8588a88ddcabfbd33e333839e26d138bd9fc3 SHA512 48d0ab3b1f0361006e79426bff2ad563950ad90833f49aad9934c8cfc607c89fc8ab9ef74c18d832113ba35a76d0a46d5135b739619550790a751a20edf0cca0 EBUILD cups-filters-1.22.6.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177 EBUILD cups-filters-1.23.0.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177 EBUILD cups-filters-1.25.0.ebuild 3384 BLAKE2B 91f79e3470ff93e629fe4d0058951c69439b09da27a7fed891ba71b0453922f7ce7160a5e76b2d523474a99a100807a72ca597987fccae3332115ffa770288db SHA512 0feb327adc4272a479baec21ede0df9d125b1255a4fe6093a7255aa714133f3a7d2141d51eb1c4f89e0f39e779016a9627988e0c29f3f8f3c7ce1c2ecaf150bf EBUILD cups-filters-1.25.1.ebuild 3384 BLAKE2B 91f79e3470ff93e629fe4d0058951c69439b09da27a7fed891ba71b0453922f7ce7160a5e76b2d523474a99a100807a72ca597987fccae3332115ffa770288db SHA512 0feb327adc4272a479baec21ede0df9d125b1255a4fe6093a7255aa714133f3a7d2141d51eb1c4f89e0f39e779016a9627988e0c29f3f8f3c7ce1c2ecaf150bf -EBUILD cups-filters-9999.ebuild 3384 BLAKE2B 91f79e3470ff93e629fe4d0058951c69439b09da27a7fed891ba71b0453922f7ce7160a5e76b2d523474a99a100807a72ca597987fccae3332115ffa770288db SHA512 0feb327adc4272a479baec21ede0df9d125b1255a4fe6093a7255aa714133f3a7d2141d51eb1c4f89e0f39e779016a9627988e0c29f3f8f3c7ce1c2ecaf150bf +EBUILD cups-filters-1.25.2.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9 +EBUILD cups-filters-9999.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a diff --git a/net-print/cups-filters/cups-filters-1.25.2.ebuild b/net-print/cups-filters/cups-filters-1.25.2.ebuild new file mode 100644 index 000000000000..cdc922f82de3 --- /dev/null +++ b/net-print/cups-filters/cups-filters-1.25.2.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GENTOO_DEPEND_ON_PERL=no + +inherit perl-module systemd flag-o-matic + +if [[ "${PV}" == "9999" ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git" +else + SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint" +fi +DESCRIPTION="Cups filters" +HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" + +LICENSE="MIT GPL-2" +SLOT="0" +IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf" + +RDEPEND=" + >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] + >=app-text/qpdf-8.3.0:= + dev-libs/glib:2 + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:2 + >=net-print/cups-1.7.3 + !<=net-print/cups-1.5.9999 + sys-devel/bc + sys-libs/zlib + dbus? ( sys-apps/dbus ) + foomatic? ( !net-print/foomatic-filters ) + jpeg? ( virtual/jpeg:0 ) + ldap? ( net-nds/openldap ) + pdf? ( app-text/mupdf ) + perl? ( dev-lang/perl:= ) + png? ( media-libs/libpng:0= ) + postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) + tiff? ( media-libs/tiff:0 ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${RDEPEND} + dev-util/gdbus-codegen + test? ( media-fonts/dejavu ) +" + +src_prepare() { + default + [[ "${PV}" == "9999" ]] && eautoreconf + + # Bug #626800 + append-cxxflags -std=c++11 +} + +src_configure() { + local myeconfargs=( + --enable-imagefilters + --localstatedir="${EPREFIX}"/var + --with-browseremoteprotocols=DNSSD,CUPS + --with-cups-rundir="${EPREFIX}"/run/cups + --with-fontdir="fonts/conf.avail" + --with-pdftops=pdftops + --with-rcdir=no + --without-php + $(use_enable dbus) + $(use_enable foomatic) + $(use_enable ipp_autosetup auto-setup-driverless) + $(use_enable ldap) + $(use_enable pclm) + $(use_enable pdf mutool) + $(use_enable postscript ghostscript) + $(use_enable static-libs static) + $(use_enable zeroconf avahi) + $(use_with jpeg) + $(use_with png) + $(use_with tiff) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use perl; then + pushd "${S}/scripting/perl" > /dev/null + perl-module_src_configure + perl-module_src_compile + popd > /dev/null + fi +} + +src_install() { + default + + if use perl; then + pushd "${S}/scripting/perl" > /dev/null + perl-module_src_install + perl_delete_localpod + popd > /dev/null + fi + + if use postscript; then + # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831 + dosym gstoraster /usr/libexec/cups/filter/pstoraster + dosym gstopxl /usr/libexec/cups/filter/pstopxl + fi + + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die + + cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die + + if ! use zeroconf ; then + sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die + sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die + fi + + doinitd "${T}"/cups-browsed + systemd_dounit "${S}/utils/cups-browsed.service" +} + +src_test() { + emake check +} + +pkg_postinst() { + if ! use foomatic ; then + ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely." + ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained." + fi +} diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild index 707a8fe57462..cdc922f82de3 100644 --- a/net-print/cups-filters/cups-filters-9999.ebuild +++ b/net-print/cups-filters/cups-filters-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 88cd4fbcd63f..7ec9727b1d51 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -6,8 +6,10 @@ AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c AUX cups-2.3_rc1-no_pam.patch 4704 BLAKE2B 99d9726f43ebc6ebb7fcaa608b99f435dccdeaa53f8fd6b47b4735c084dec8852ab5b34d06f07293299f13a4d975cf9b5bfc44950910c58c409fdcb71dfec6ea SHA512 f5f0f850a954a970aa5129d518f7b84e1e5fbb57c4bf16d42eb09eac01ebb5280514a580938433525514d5cd57acfcb363aa972d783d7b6b23e8f30e01d5e1b1 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3 DIST cups-2.2.11-source.tar.gz 10405908 BLAKE2B 9b7ee4da9502e42fd1b4a2c57ab709b3127ee8aeb8481a52f37da19fe5578f406260f1551e3fcedcd3a828fbed69267e68fcfd7bfabadf65afce4c3af19b4a1f SHA512 21a6916041b50044d336871f10d1192635458a3d318f19a18ad21d27027dd3839400601019e758424c218225a34aba148ba3a57f0ce3fe14c4df03bd1fde3403 +DIST cups-2.2.12-source.tar.gz 10409313 BLAKE2B 126ea81f7108b3b62f5e062ed522898dd48d4e5b4077c834e8fe89012445dd0a903bafa62f593551ed5f1c92cce4fbd22f56834e0615ed65ca4a6ae84dc2ca1c SHA512 b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6 DIST cups-2.3rc1-source.tar.gz 7926640 BLAKE2B c39bee2c4697eb540cfa02ee2ce0fa8a79d7efd0a7e65db19fada8473997841e5c341c209eba8eb242e57bb21b0dbded1ca340654874b9400318ed2d9332b890 SHA512 d2411c1da576bd7d561c5465fba0824af86d7b52792482d90876847d0869a5a092de12efc761fd403c74be072c6d6eb5bf407525f187051683dba694e5f7febd EBUILD cups-2.2.11.ebuild 9743 BLAKE2B f3b1cd58c0774eb64fde8762dfe13834b38a6c70ace22655ec6103b3dcc277ee6562d7d16592f14e138f6fa3f08b166bb9eb7dea26b75ae464a0fa136ad9c1b6 SHA512 870e5c4f06e96b098a069019aa38ec76364f86677cda52d43e84c0e81cd990cddf1d852920ec9fa0de06efb09239726cec15898e9d07ec97826256d134c81229 +EBUILD cups-2.2.12.ebuild 9786 BLAKE2B 18f65da7d2ee4fea4beeead57add0a296a22dd2d66fa13260647672de892467d87136ab3c0f7473ce72e52049f284c0df1fc4d5fa27c25854a73186da824a3cd SHA512 c9ac430f63a3913de538c3098b56af492ce9709c8e34e6d4885a5a0b5e36816976ffbc7d31c62f2a03df4c1a5afa87cfed28d5577c5f8c0eacd6118f1fa69e28 EBUILD cups-2.3_rc1.ebuild 9531 BLAKE2B c92b415be48dfe3209bbf8affb451374a1e76f6bcb75d4a74c32beaa7a6feb79a86a49546054655cf4b32bd208b157957719a7611beb1d4ecc18ee308d9da879 SHA512 70302e04dfc1acfa6b9f8ed6db5c974b63e2210cd94b870d45acfd58bb61beb80cb336a3a39f5fd4293625a527020a8754f546e2129ff27c118028a1734f19ab -EBUILD cups-9999.ebuild 9530 BLAKE2B 7a5c24b50dd094380001641f0a062ffe4aecb6c71abd16c24b211bdb788f47023700c641d9c2d968fbf0ec0c4b85ea0134c517dcc941388bb83db92c2b9a22dd SHA512 01bd020f44a4ff22fb769939ec89f409cb6803fd3ab40d9fa48faaa1da917b829d2dcfcc025a168deaed5b1454cc4f3c3c4d3712d674b916591e6c78aa55511e +EBUILD cups-9999.ebuild 9633 BLAKE2B 2b62636ffa95594e5b3985c3649120fc5deaea937035225ed5f70a4a3f3ceecf21b7eb1ab90a8568c6de0711c169131117de03f8c9ceac32a4493c9eec4494cb SHA512 26221b3b0b98c65dbda3820ccd7a5b88318bacca52d79af37d7cdc35efa441de6696f7082206f716a29001853960ca3f4e6a8ce8e6ef031e4b6025068dea57e1 MISC metadata.xml 677 BLAKE2B ca19e7bd0d56a0a78771a30efcbd867cd0ab1eba7aaf3add8d384721ac70ed8809bc8a171df43887d772f81dcfd54f31bc13267a9a3a88da44b51322aff87c15 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717 diff --git a/net-print/cups/cups-2.2.12.ebuild b/net-print/cups/cups-2.2.12.ebuild new file mode 100644 index 000000000000..ac6565a2d4c1 --- /dev/null +++ b/net-print/cups/cups-2.2.12.ebuild @@ -0,0 +1,339 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools flag-o-matic linux-info xdg multilib-minimal pam python-single-r1 user java-pkg-opt-2 systemd toolchain-funcs + +MY_P="${P/_rc/rc}" +MY_P="${MY_P/_beta/b}" +MY_PV="${PV/_rc/rc}" +MY_PV="${MY_PV/_beta/b}" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/apple/cups.git" + if [[ ${PV} != 9999 ]]; then + EGIT_BRANCH=branch-${PV/.9999} + fi +else + #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" +fi + +DESCRIPTION="The Common Unix Printing System" +HOMEPAGE="https://www.cups.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" + +CDEPEND=" + app-text/libpaper + sys-libs/zlib + acl? ( + kernel_linux? ( + sys-apps/acl + sys-apps/attr + ) + ) + dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jre-1.6:* ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + !lprng-compat? ( !net-print/lprng ) + pam? ( virtual/pam ) + python? ( ${PYTHON_DEPS} ) + ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) + systemd? ( sys-apps/systemd ) + usb? ( virtual/libusb:1 ) + X? ( x11-misc/xdg-utils ) + xinetd? ( sys-apps/xinetd ) + zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) +" + +DEPEND="${CDEPEND}" +BDEPEND=" + acct-group/lp + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" + +RDEPEND="${CDEPEND} + acct-group/lp + selinux? ( sec-policy/selinux-cups ) +" + +PDEPEND=">=net-print/cups-filters-1.0.43" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + usb? ( threads ) +" + +# upstream includes an interactive test which is a nono for gentoo +RESTRICT="test" + +# systemd-socket.patch from Fedora +PATCHES=( + "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch" + "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" + "${FILESDIR}/${PN}-1.4.4-nostrip.patch" + "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" + "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/cups-config +) + +pkg_setup() { + #enewgroup lp -> acct-group/lp + enewuser lp -1 -1 -1 lp + enewgroup lpadmin 106 + + use python && python-single-r1_pkg_setup + + if use kernel_linux; then + linux-info_pkg_setup + if ! linux_config_exists; then + ewarn "Can't check the linux kernel configuration." + ewarn "You might have some incompatible options enabled." + else + # recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122) + if use usb; then + if linux_chkconfig_present USB_PRINTER; then + elog "Your USB printers will be managed via libusb. In case you run into problems, " + elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" + elog "usblp kernel module." + elog "Alternatively, just disable the usb useflag for cups (your printer will still work)." + fi + else + #here we should warn user that he should enable it so he can print + if ! linux_chkconfig_present USB_PRINTER; then + ewarn "If you plan to use USB printers you should enable the USB_PRINTER" + ewarn "support in your kernel." + ewarn "Please enable it:" + ewarn " CONFIG_USB_PRINTER=y" + ewarn "in /usr/src/linux/.config or" + ewarn " Device Drivers --->" + ewarn " USB support --->" + ewarn " [*] USB Printer support" + ewarn "Alternatively, enable the usb useflag for cups and use the libusb code." + fi + fi + fi + fi +} + +src_prepare() { + default + + # Remove ".SILENT" rule for verbose output (bug 524338). + sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed" + + # Fix install-sh, posix sh does not have 'function'. + sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" + + AT_M4DIR=config-scripts eaclocal + eautoconf + + # custom Makefiles + multilib_copy_sources +} + +multilib_src_configure() { + export DSOFLAGS="${LDFLAGS}" + + einfo LINGUAS=\"${LINGUAS}\" + + # explicitly specify compiler wrt bug 524340 + # + # need to override KRB5CONFIG for proper flags + # https://github.com/apple/cups/issues/4423 + local myeconfargs=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config + --libdir="${EPREFIX}"/usr/$(get_libdir) + --localstatedir="${EPREFIX}"/var + --with-exe-file-perm=755 + --with-rundir="${EPREFIX}"/run/cups + --with-cups-user=lp + --with-cups-group=lp + --with-docdir="${EPREFIX}"/usr/share/cups/html + --with-languages="${LINGUAS}" + --with-system-groups=lpadmin + --with-xinetd="${EPREFIX}"/etc/xinetd.d + $(multilib_native_use_enable acl) + $(use_enable dbus) + $(use_enable debug) + $(use_enable debug debug-guards) + $(use_enable debug debug-printfs) + $(multilib_native_use_with java) + $(use_enable kerberos gssapi) + $(multilib_native_use_enable pam) + $(multilib_native_use_with python python "${PYTHON}") + $(use_enable static-libs static) + $(use_enable threads) + $(use_enable ssl gnutls) + $(use_enable systemd) + $(multilib_native_use_enable usb libusb) + $(use_enable zeroconf avahi) + --disable-dnssd + --without-perl + --without-php + $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) + ) + + if tc-is-static-only; then + myeconfargs+=( + --disable-shared + ) + fi + + econf "${myeconfargs[@]}" + + # install in /usr/libexec always, instead of using /usr/lib/cups, as that + # makes more sense when facing multilib support. + sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die + sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die + sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die + + # additional path corrections needed for prefix, see bug 597728 + sed \ + -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \ + -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \ + -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \ + -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \ + -i Makedefs || die +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + emake libs + fi +} + +multilib_src_test() { + multilib_is_native_abi && default +} + +multilib_src_install() { + if multilib_is_native_abi; then + emake BUILDROOT="${D}" install + else + emake BUILDROOT="${D}" install-libs install-headers + dobin cups-config + fi +} + +multilib_src_install_all() { + dodoc {CHANGES,CREDITS,README}.md + + # move the default config file to docs + dodoc "${ED}"/etc/cups/cupsd.conf.default + rm -f "${ED}"/etc/cups/cupsd.conf.default + + # clean out cups init scripts + rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} + + # install our init script + local neededservices=( + $(usex zeroconf avahi-daemon '') + $(usex dbus dbus '') + ) + [[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}" + cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die + sed -i \ + -e "s/@neededservices@/${neededservices}/" \ + "${T}"/cupsd || die + doinitd "${T}"/cupsd + + # install our pam script + pamd_mimic_system cups auth account + + if use xinetd ; then + # correct path + sed -i \ + -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ + "${ED}"/etc/xinetd.d/cups-lpd || die + # it is safer to disable this by default, bug #137130 + grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ + { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } + # write permission for file owner (root), bug #296221 + fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + else + # always configure with --with-xinetd= and clean up later, + # bug #525604 + rm -rf "${ED}"/etc/xinetd.d + fi + + keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ + /var/log/cups /var/spool/cups/tmp + + keepdir /etc/cups/{interfaces,ppd,ssl} + + if ! use X ; then + rm -r "${ED}"/usr/share/applications || die + fi + + # create /etc/cups/client.conf, bug #196967 and #266678 + echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf + + # the following file is now provided by cups-filters: + rm -r "${ED}"/usr/share/cups/banners || die + + # the following are created by the init script + rm -r "${ED}"/var/cache/cups || die + rm -r "${ED}"/run || die + + # for the special case of running lprng and cups together, bug 467226 + if use lprng-compat ; then + rm -fv "${ED}"/usr/bin/{lp*,cancel} + rm -fv "${ED}"/usr/sbin/lp* + rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*} + rm -fv "${ED}"/usr/share/man/man8/lp* + ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." + ewarn "Unless you plan to install an exotic server setup, you most likely" + ewarn "do not want this. Disable the useflag then and all will be fine." + fi +} + +pkg_preinst() { + xdg_pkg_preinst +} + +pkg_postinst() { + # Update desktop file database and gtk icon cache (bug 370059) + xdg_pkg_postinst + + local v + + for v in ${REPLACING_VERSIONS}; do + if ! ver_test ${v} -ge 2.2.2-r2 ; then + echo + ewarn "The cupsd init script switched to using pidfiles. Shutting down" + ewarn "cupsd will fail the next time. To fix this, please run once as root" + ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" + echo + break + fi + done + + for v in ${REPLACING_VERSIONS}; do + echo + elog "For information about installing a printer and general cups setup" + elog "take a look at: https://wiki.gentoo.org/wiki/Printing" + echo + break + done +} + +pkg_postrm() { + # Update desktop file database and gtk icon cache (bug 370059) + xdg_pkg_postrm +} diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 1a22a0b0ae79..b2da32a36b26 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -55,10 +55,12 @@ CDEPEND=" DEPEND="${CDEPEND}" BDEPEND=" + acct-group/lp >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " RDEPEND="${CDEPEND} + acct-group/lp selinux? ( sec-policy/selinux-cups ) " @@ -73,7 +75,6 @@ RESTRICT="test" # systemd-socket.patch from Fedora PATCHES=( - "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch" "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" "${FILESDIR}/${PN}-1.4.4-nostrip.patch" "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" @@ -87,7 +88,7 @@ MULTILIB_CHOST_TOOLS=( S="${WORKDIR}/${MY_P}" pkg_setup() { - enewgroup lp + #enewgroup lp -> acct-group/lp enewuser lp -1 -1 -1 lp enewgroup lpadmin 106 @@ -132,6 +133,10 @@ src_prepare() { # Fix install-sh, posix sh does not have 'function'. sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" + # Do not add -Werror even for live ebuilds + sed '/WARNING_OPTIONS/s@-Werror@@' \ + -i config-scripts/cups-compiler.m4 || die + AT_M4DIR=config-scripts eaclocal eautoconf @@ -234,10 +239,11 @@ multilib_src_install_all() { rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} # install our init script - local neededservices - use zeroconf && neededservices+=" avahi-daemon" - use dbus && neededservices+=" dbus" - [[ -n ${neededservices} ]] && neededservices="need${neededservices}" + local neededservices=( + $(usex zeroconf avahi-daemon '') + $(usex dbus dbus '') + ) + [[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}" cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die sed -i \ -e "s/@neededservices@/${neededservices}/" \ diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest index f9bb8557a888..6cae7d0603e4 100644 --- a/net-print/hplip-plugin/Manifest +++ b/net-print/hplip-plugin/Manifest @@ -1,7 +1,5 @@ DIST hplip-3.18.12-plugin.run 10486821 BLAKE2B e48940b1b5fe94dc216383b63bee7807bce9ad265b7c454c201c0ed22ec1964e6c5adf653c3c230789c042cffaaf50bd604bae6f66f407a85f98248934307158 SHA512 82b90aa8245f787e088a1bebfa7892a7f2b97fd04b3702c46eed27306640e562aeec63b4b5b45c24943abe4672f2627d1821bdcdf58a5c1ac4e1d06c7270535f -DIST hplip-3.18.6-plugin.run 2065663 BLAKE2B 501a37dd504250225ddad9712259e0e1b564aa034e433f24d277c5609fa95580417da1a0ae040a4624ff48806a3b34ec56ff31aed843e9f0f0b68b304d2ebd9e SHA512 7b5eb2f43dd014df25ccd9e72dd7efc069db47921f2de650b2ff993dbee60056063edeee6593be7d35019212daf623fff9696b13508a808db92128f5c81bde76 -DIST hplip-3.19.5-plugin.run 11516444 BLAKE2B c43aaa4dd3c4a8acf91b2746733e5237ef0ff39c3e6180530e0fcd34d5319e603c23806a3b010d70399772abc5564095fe2696c823d80eedf892b87acd170d23 SHA512 8c933f175bf0b91a8f30d6b362f8a487a964dd3304c859d78c9505357088047fdcacb99230f8696071269d5950f681adc0e4051617f1051be254fd6bed704cb9 -EBUILD hplip-plugin-3.18.12.ebuild 1635 BLAKE2B ae1570a85138b53a21ee01c9b6c2eed85b4f22f4040666289d2bf52bdc5df0ef063574e767109fec86d3f24765149774918e9aa39247df5d0b2af56b25dfffcc SHA512 e039e8f25c210638d6098e06e51861b5c35400554fba867abd533f2aa89584abc6c62546bdad04b5fb4ce6dc61bc9d33ef9b7a0ae9d3ed3a7b3b42c45c2888d2 -EBUILD hplip-plugin-3.18.6.ebuild 1551 BLAKE2B d034eacc21cb423a79ccd668d322d40f23aed57392d75aa75b10f3f90f634d96510e5e87c485b04bca566cfdc7bb59056f75a13493e90e92ad4ea13ffe4198f8 SHA512 6ed4f208ec25a1805ed377749d9232ed59f890eaedcdbc1f58fa6c2b41eb77ea52d8dad9f7beec5ad8b156eac22384956faddf458562febf7e20ed1b88bff356 -EBUILD hplip-plugin-3.19.5.ebuild 1635 BLAKE2B 421610d7a88268aced86e4b30a4e6798fcdb07fd1b321b3caf65c1e444d9034b461e606f42fe75879a6f19cddc7b5d6264a02febb24e11d126a073b50c517b9c SHA512 3ec01211d1ce65e56e3b2a904390a7ead68a4fec8681b26ed36d2dae7daf7c78d79fec06684b1fccf675290bfed8214693f429b58c2a395ce682016750337865 +DIST hplip-3.19.6-plugin.run 11517158 BLAKE2B c44707e29b104b45c110729c70ebeba1f392ad753eb98d8677657f735e547cdecfab357b348a30545274b51c18249ddb9102df49aa73d726a8e9145a302a8a0c SHA512 3636d655ba289331572f0762a5de2e0bf2f3108ac3f7ca9cb8bbec126942be954fe9c07c882bd8272e30ac46d67231d86a3c4249a6fe31e2d3e8d5e568bbbd8b +EBUILD hplip-plugin-3.18.12.ebuild 1635 BLAKE2B 421610d7a88268aced86e4b30a4e6798fcdb07fd1b321b3caf65c1e444d9034b461e606f42fe75879a6f19cddc7b5d6264a02febb24e11d126a073b50c517b9c SHA512 3ec01211d1ce65e56e3b2a904390a7ead68a4fec8681b26ed36d2dae7daf7c78d79fec06684b1fccf675290bfed8214693f429b58c2a395ce682016750337865 +EBUILD hplip-plugin-3.19.6.ebuild 1582 BLAKE2B c154a00fae8a57e1b210714728fac79256f14fc8e850936caa1fd6273199f60087cb8cbaf96ba3d0afaf0109638031f9de010812f585676e6af8cca4e2d6cad6 SHA512 eca251a0e72c19a4bf4809a84de741b9704ee20fb82bf669eaeb4f4e9125ead78b3635002120e96c4fd1fbda2060bc8672a8d81caea048eb240ee7305bea7b51 MISC metadata.xml 334 BLAKE2B 8f1a0784c57af6204db98f443bdb09df2a6432674d711a5ecf577c20e29f04a030549ea19c6e04f51cd9a36e60a6da94bebafbfcc10d52da87109e59c32d42ee SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c diff --git a/net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild b/net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild index d598946893c6..7714ffa082db 100644 --- a/net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild +++ b/net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/net-print/hplip-plugin/hplip-plugin-3.18.6.ebuild b/net-print/hplip-plugin/hplip-plugin-3.18.6.ebuild deleted file mode 100644 index afbacbc8fbc3..000000000000 --- a/net-print/hplip-plugin/hplip-plugin-3.18.6.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="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-plugin/hplip-plugin-3.19.5.ebuild b/net-print/hplip-plugin/hplip-plugin-3.19.6.ebuild index 7714ffa082db..b497f4a93fa1 100644 --- a/net-print/hplip-plugin/hplip-plugin-3.19.5.ebuild +++ b/net-print/hplip-plugin/hplip-plugin-3.19.6.ebuild @@ -1,21 +1,21 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit udev unpacker +inherit unpacker DESCRIPTION="Proprietary plugins and firmware for HPLIP" HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins" -#SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run" SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run" LICENSE="hplip-plugin" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="" RDEPEND=" ~net-print/hplip-${PV} + virtual/libusb:0 virtual/udev " DEPEND="" @@ -38,12 +38,14 @@ QA_PRESTRIPPED=" # 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') + local hplip_arch + case "${ARCH}" in + amd64) hplip_arch="x86_64" ;; + arm) hplip_arch="arm32" ;; + x86) hplip_arch="x86_32" ;; + *) die "Unsupported architecture." ;; + esac insinto "${HPLIP_HOME}"/data/firmware doins *.fw.gz @@ -59,8 +61,8 @@ src_install() { newexe ${plugin} ${plugin/-${hplip_arch}} done - mkdir -p "${ED}/var/lib/hp/" - cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_ + insinto /var/lib/hp + newins - hplip.state <<-_EOF_ [plugin] installed = 1 eula = 1 diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index 8050d29445c9..f6ef1a73aab5 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -1,11 +1,6 @@ DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742b7c56929b23e6c1cc3ba9df4eafb8007273a5a2e7f27af0d2d4a3a97ebb9cfe462b74dcddd7149088980893b2c66113b7c SHA512 3b0e2b4f7d8da257c6fcf12f2e049276d059426f2d1c626324982ce862efa2323cbb191a373c53fea7880e3b6e44ec62e584091676556d97e6a456edea4c44cf DIST hplip-3.18.12.tar.gz 24588202 BLAKE2B f2ffa6d0d54e467c03ccf9e74accb62ef69842001a00e8c4e6fd68b40c4daff5896fcdd69d37b5e50be2b837918058a5c9071615ab77c1ce83fffc546ff98c02 SHA512 7197cac325cf40c03f49053a98ee0e8ac6c670d142b2a64df09c0f7afa1d7d3602216c55c825ccbf20a1fbda9c9289173b8708e9f87171a862dae5b6b4ef7635 -DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed -DIST hplip-3.18.6.tar.gz 22590564 BLAKE2B edbc80120bb332de9848e528095839b8f3496404ae83482a17bb8bd196c30dd8d3fca4d3dbb60c048bfbeeddd4384b4d7844798dad993eaf52d5418a9391b4ad SHA512 deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f -DIST hplip-3.19.5.tar.gz 25263343 BLAKE2B 7a7d2afeadd99dcd9a4a251ef6243f5e33d892b9c2a9f801b92f3d443eed0dad9928010164f2d2778f22dfb92643dc79c06ef25eaddfbf56a7c26a9fd68a2313 SHA512 bee7d64cea10020844b08b78a754ab9fa51aa699b365f2ccd98f18a9286a660e3c32ae1b5a173397c75fe2acafe801f3e6d7eabedcd95f2f064b89afe7726494 DIST hplip-3.19.6.tar.gz 25436373 BLAKE2B 9ce8fe6aec475ea6c2c5b25555d311ac498ef34e12e9f7c41900ae88d1ce30939470f8f9a1c29fffceb1f69dd205be25ce6aa381fe9ee3a2f01e86dcbd927c63 SHA512 c99448ad0cef9fc626a0a03147a0d582513cb838ecfbfe29f07c65bbf701dee5c7d02222469b118ccc4e8c230c7a4b4685a72a1e67595ee01150b0472692d654 -EBUILD hplip-3.18.12.ebuild 7741 BLAKE2B 751b37522049c4a2f8f6bec7d7b264fdb823adf3e9db612c3782ad19dcc8a551dc2df7811ab97bc9acbd5995063af9b40aff0c3deac422a9a274be26ecc22932 SHA512 577a06b65a059d039951ed49c4b995d5f1d5f0a61e0fa16f33e34a6b55380676c9defe0dc801419163f7195c655c1d6ea2f1709ebccf17bc5f74c40077a40bcb -EBUILD hplip-3.18.6.ebuild 7810 BLAKE2B 9e5c8e58b368f45f4bb986f72329d952ebdef1dc899252585a73726c79958e768f271a0d756ffd91839184f3d839ced35bebb080b38014a605f0e7af558f9aa5 SHA512 4db0fbae5a50f352cc4a18ee94eaf97de4e327a375c66057a4a873ed57580f9d38957932aed61827e137cf0de51ffbedad71a03a13504f6f89ea427bada03c25 -EBUILD hplip-3.19.5.ebuild 7743 BLAKE2B afd1f59ad7c15e2801d2cdaaac099061606ca22e1a229c391c46c7ec35220b894512d75e611671f16657db5d8cecf8d8fabb195277cfe898b713d9eaa8c9f904 SHA512 d283fc0e5784e9f9d3e298ab186d97692bf071bc2c12c5bec53ebe0c26094252f036858186e395f0a9e1c346407c53d21c3ca5c49e231884293e1039346ec62f +EBUILD hplip-3.18.12.ebuild 7738 BLAKE2B 3a7f56fbf029ad197d8c3f5b20883cf387da98368564a0c76bc349440f9aee55a87c1a0ee71c07b8b6e5cab377432f2e13252aaea6d03c0252a1ad3b68490f43 SHA512 2904fd13f3b168a2c4dd8807a9f665e75cdbd9d2de36acc7bbbe49864764012e37ad1f47b1fc402d397c3e4bcd18d6946484aba1b4708e3f39396b5c4ffb47e1 EBUILD hplip-3.19.6.ebuild 7743 BLAKE2B afd1f59ad7c15e2801d2cdaaac099061606ca22e1a229c391c46c7ec35220b894512d75e611671f16657db5d8cecf8d8fabb195277cfe898b713d9eaa8c9f904 SHA512 d283fc0e5784e9f9d3e298ab186d97692bf071bc2c12c5bec53ebe0c26094252f036858186e395f0a9e1c346407c53d21c3ca5c49e231884293e1039346ec62f MISC metadata.xml 1829 BLAKE2B 614757c5958bb24f223c75a252beb06014bfe7f47cfe58feb88be89918394224b7075e0d444d7bb898f9f478c2ae5cf572df3f905ff110ec1153cf1849cc8e46 SHA512 c6aae86cd5a200b7d42336f0884b87dc0b74d2b2216b8002929a56a53f42ec02447684eb8d0411e30ef707e01d930aac446866796c781f95a3463f84901666f6 diff --git a/net-print/hplip/hplip-3.18.12.ebuild b/net-print/hplip/hplip-3.18.12.ebuild index fcde7fb67991..41b1749876ff 100644 --- a/net-print/hplip/hplip-3.18.12.ebuild +++ b/net-print/hplip/hplip-3.18.12.ebuild @@ -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 ppc ppc64 x86" IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X" diff --git a/net-print/hplip/hplip-3.18.6.ebuild b/net-print/hplip/hplip-3.18.6.ebuild deleted file mode 100644 index 740e00e32dec..000000000000 --- a/net-print/hplip/hplip-3.18.6.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,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/hplip/hplip-3.19.5.ebuild b/net-print/hplip/hplip-3.19.5.ebuild deleted file mode 100644 index 0c753a8bdef0..000000000000 --- a/net-print/hplip/hplip-3.19.5.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,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.12-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? ( - >=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}] - 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="!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 -} |