From 6cb97dd9bf7377c8634ba59cab8d543b5577f819 Mon Sep 17 00:00:00 2001 From: Daniel Pielmeier Date: Fri, 6 Sep 2013 15:49:43 +0000 Subject: Version bump. Package-Manager: portage-2.1.12.2/cvs/Linux x86_64 Manifest-Sign-Key: 0x215AD14D --- net-print/hplip/ChangeLog | 7 +- net-print/hplip/Manifest | 10 +- net-print/hplip/hplip-3.13.8.ebuild | 271 ++++++++++++++++++++++++++++++++++++ 3 files changed, 283 insertions(+), 5 deletions(-) create mode 100644 net-print/hplip/hplip-3.13.8.ebuild (limited to 'net-print') diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index 2dfe7c1f169b..ecb565567cb1 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-print/hplip # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.277 2013/07/24 18:15:48 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.278 2013/09/06 15:49:35 billie Exp $ + +*hplip-3.13.8 (06 Sep 2013) + + 06 Sep 2013; Daniel Pielmeier +hplip-3.13.8.ebuild: + Version bump. *hplip-3.13.7 (24 Jul 2013) diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index eac8cd46d236..68f155824a6a 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -7,15 +7,17 @@ DIST hplip-3.13.6-patches-1.tar.xz 7912 SHA256 3514231b03b889471e59d277d30e6019f DIST hplip-3.13.6.tar.gz 20785825 SHA256 86f4fd0accf25ce6d89aa415b3a987e7db410bf529e68b4138f90b1e9055f6c7 SHA512 bfec389e0c4bd74824e1d8a3fcf6e5ee92090c88741252d64e3be1bc5d7054396c0e58e721a643c969800ff026441080633b94c5063603261f308bb865475adf WHIRLPOOL bed63d9f974a0ac06b0e7d3642d77de68b48f01b7ff600342cb75f9598f5ef9aebc32b8b857e3218cc5ff94df9cadb6aabf61e3f496e9ff96ae0d2434d446810 DIST hplip-3.13.7-patches-1.tar.xz 7628 SHA256 16110fea116df0034bb57e2addd7649629626706364109a3b8e74c5a74ba6800 SHA512 dd3f27c71bc6443ba7fbccace6addc29eeaea964feb80e0541f9ae6c7d3af4c73a4d1573f4cf6a85d7a2e4bb804a4e635abbefebc661ef611b06faabf7c39999 WHIRLPOOL bc590a645431b3cd8f13639a2c1a9e94157268a67ddd5d19b94f5c4c82c3dff1af36f25c19c9c5f052ae1ccd940033942e6ec1cef4824cb2a81e1b1a8207afef DIST hplip-3.13.7.tar.gz 20810611 SHA256 710b99786783d75f0d260e36a795e730d54e54a494d0a35276a4b1c497905b11 SHA512 8fb6dae76b772b378cd652ad321682e73928851ee676f8cee7c1038a1b9633cf7be122e462e6ce63f0b3bf3e08a90361d62168fe08c1c1540d67d006733b7265 WHIRLPOOL 6e6e63c06e99cf1dd8f6b50e86e262004953b1d333b8497a4ae440da74a340af35ed2455e20323d112796cb99690546da9845319bf1b6c3c5b6cfedfe84c4d05 +DIST hplip-3.13.8.tar.gz 20836354 SHA256 57c83139eca691e1337a4a43a9cfe7777cf969c94f85e8718949212f94e39b1d SHA512 a21629dad91dc0c0c1d6d0442b2f142c02d02a775f2f96bcc39881b1e2f5c8612211677033115a0215d2fae21a851742ad47b5e45cc19ac1c639c06730d40e9a WHIRLPOOL fcae8c35b2107cc316d7b60c119be01037495826b12f0f32342c5258a5f8b128e08e6dabcc0e33eec06da8a6c347d1799145be9c8a6da2de44ac6d570934f802 EBUILD hplip-3.12.10a.ebuild 6774 SHA256 0bbe59d0b90af08c9b9ba92c75a80b7864755e222514cf3ec5f02697b4857701 SHA512 7088959016734bf194fbae687f96881ebcbf712a89054fd0e883f51e7fd70a28989cb84d07eabb3613a1c77887b335be241acd3e789395bb078873ac27533987 WHIRLPOOL f8eb2628b67872e55c72b1923c522716a23524b4e8592707a713653e435a3051cd999e033eaae39ecea9dc68c167d349edccc0910797b8693e08db042ef47002 EBUILD hplip-3.13.6.ebuild 8065 SHA256 b2bddd937d76d80295a2632a30d0d90b79a305eea8aaed62ef602687e7902d73 SHA512 12c4a0f844f3d9562b04c6e78caf5665c4b7a581e23c8b379a236d0af6ac43d8cf50ae93f97307afb17d1bd12eda1de59461808388322981e4d517a6141b9f2e WHIRLPOOL 392330fddefc4af5c3b3c47c9cbede60a0e242c504ea2d00deaeda52fad06cb21e7578a7274d26f322b99d11b31f39669c4a8d03bf15022da60f7cbaed1996b7 EBUILD hplip-3.13.7.ebuild 8065 SHA256 f79317c2fe8dbaa2478347863a29acfb6d469341a043138887a102eb0ad13648 SHA512 6f34fe5aee50ce1a1a642d2e455ca1c0a827b683674705c1ce7873acb943c9449d7011b5bea06f291465a4b57671ff2aaf347a14594be5dd9f57ee10639c4ea5 WHIRLPOOL 34f218b3adcad24afd5559323b799855ae970c7464d0c39a2d0fcdcf445766de6c08b52fe3afff62bfe45659a8dcc3b2c757dac38141a467fe1e828d49bee64c -MISC ChangeLog 47599 SHA256 b7a1468789c3e770815ded79c2d34982e7526b720af7d87affa7aa1052dad0b2 SHA512 76650e599dbbd2896363ef0fc13116e094437e4055f7a18d88ee4b57830c0711106e11cf33d268c560a42407ef47a37f081264ca85df03117fcd196edc3346c2 WHIRLPOOL f25c11df3d9e29a6cb57a530c7309dc3de6d5864315e9c3e3f217975225ef97d3f9783aa567fc2358a3c3735da8144edf1e72c6e0694d7adb362672fd342ece9 +EBUILD hplip-3.13.8.ebuild 8065 SHA256 5d44a06dbc1906e6191df258b163960e28313d365a422bd17ea2cef21750fc84 SHA512 468866616343b4801e0a050e07229762b23fc22c6f6f7a987926ed54958b5630b95e842e743c82c0c8ca90b05524d9fa5a2e129a7c9b3158c45cc739e66a52c8 WHIRLPOOL 8d2ec2361933fd8fa24c52b5c4500fff086aa5d71176919d4dcd628e565142f7564f204029d7c2b23aea80c01452b57b8e378b7d2c5e5bbf4ae4deec26c97648 +MISC ChangeLog 47719 SHA256 e4c6a411bec0a3fde6f6449b87c48469cc13f195405efe74892d4e1f26464b60 SHA512 ecb9e68374382ade599252b1caf00357b9295e2397ffcbdac1831d6f34256cfb8175cde2dc3fad5d0d0934923985ff79992ae5a78345c3eaddede3a40cd3d58c WHIRLPOOL 6c7f0da1914ca1540ac09063562471d79512bb57d1d6da6f109878d99e8df9fd29f39ac759bb5027f0f5111fcfd32e46a79adbb154eea0801eaaaa8eefd7ad0a MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlHwGdsACgkQlcuUeyFa0U0lPQCgqqoh/V1QIrAJriMgNsupMBxj -rM0Ani31XsgCXxSwEmooFZkZem3PzBL2 -=x4hw +iEYEAREIAAYFAlIp+ZcACgkQlcuUeyFa0U2KKwCfdysGpLFKikY+IgUqnrxKEfa+ +Q3QAoNLPglA3spuO1gc7zIne7wifsHzH +=mBsu -----END PGP SIGNATURE----- diff --git a/net-print/hplip/hplip-3.13.8.ebuild b/net-print/hplip/hplip-3.13.8.ebuild new file mode 100644 index 000000000000..4a1bfe0c6326 --- /dev/null +++ b/net-print/hplip/hplip-3.13.8.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.13.8.ebuild,v 1.1 2013/09/06 15:49:35 billie Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE="threads,xml" + +inherit eutils fdo-mime linux-info python-single-r1 udev autotools toolchain-funcs + +DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools." +HOMEPAGE="http://hplipopensource.com/hplip-web/index.html" +SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz + http://dev.gentoo.org/~billie/distfiles/${PN}-3.13.7-patches-1.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + +# zeroconf does not work properly with >=cups-1.4. +# Thus support for it is also disabled in hplip. +IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X" + +# TODO: check if net-print/cups, net-analyzer/net-snmp +# are migrated to python-r1 + +COMMON_DEPEND=" + virtual/jpeg + hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) + !minimal? ( + ${PYTHON_DEPS} + >=net-print/cups-1.4.0 + !libusb0? ( virtual/libusb:1 ) + libusb0? ( virtual/libusb:0 ) + scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) + fax? ( >=sys-apps/dbus-1.6.8-r1 ) + snmp? ( + net-analyzer/net-snmp + dev-libs/openssl:0 + ) + )" + +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +RDEPEND="${COMMON_DEPEND} + >=app-text/ghostscript-gpl-8.71-r3 + >=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}] + policykit? ( + sys-auth/polkit + ) + !minimal? ( + >=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}] + kernel_linux? ( virtual/udev !=dev-python/reportlab-2.6[${PYTHON_USEDEP}] + >=virtual/python-imaging-1[${PYTHON_USEDEP}] + X? ( || ( + kde? ( kde-misc/skanlite ) + media-gfx/xsane + media-gfx/sane-frontends + ) ) + ) + fax? ( + >=dev-python/reportlab-2.6[${PYTHON_USEDEP}] + >=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}] + ) + qt4? ( + >=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}] + libnotify? ( + >=dev-python/notify-python-0.1.1-r3[${PYTHON_USEDEP}] + ) + ) + )" + +REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )" + +CONFIG_CHECK="~PARPORT ~PPDEV" +ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)." + +pkg_setup() { + use !minimal && python-single-r1_pkg_setup + + ! use qt4 && ewarn "You need USE=qt4 for the hplip GUI." + + 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() { + if use !minimal ; then + python_export EPYTHON PYTHON + python_fix_shebang . + fi + + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}" + + # 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=$(udev_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 + + # 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 + + eautoreconf +} + +src_configure() { + local myconf drv_build minimal_build + + if use fax || use qt4 ; then + myconf="${myconf} --enable-dbus-build" + else + myconf="${myconf} --disable-dbus-build" + fi + + 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 + + econf \ + --disable-cups11-build \ + --disable-lite-build \ + --disable-foomatic-rip-hplip-install \ + --disable-shadow-build \ + --disable-qt3 \ + --disable-udev_sysfs_rules \ + --disable-udev-acl-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} \ + $(use_enable doc doc-build) \ + $(use_enable fax fax-build) \ + $(use_enable parport pp-build) \ + $(use_enable scanner scan-build) \ + $(use_enable snmp network-build) \ + $(use_enable qt4 gui-build) \ + $(use_enable qt4) \ + $(use_enable policykit) +} + +src_install() { + default + + # Installed by sane-backends + # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023 + rm -f "${D}"/etc/sane.d/dll.conf || die + + rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die + rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die + + # Remove hal fdi files + rm -rf "${D}"/usr/share/hal || die + + find "${D}" -name '*.la' -exec rm -rf {} + || die + + if use !minimal ; then + python_export EPYTHON PYTHON + python_optimize "${D}"/usr/share/hplip + fi +} + +pkg_preinst() { + # remove temporary directory so it is recreated with correct permissions + # this ensures correct permissions when upgrading from vulnerable versions + # remove this after some time + # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=452586 + # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1016507 + if [[ $(stat -c '%A' /var/lib/hp/) =~ w.$ ]] ; then + rm -rf "${ROOT%/}/var/log/hp" + fi +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "For more information on setting up your printer please take" + elog "a look at the hplip section of the gentoo printing guide:" + elog "http://www.gentoo.org/doc/en/printing-howto.xml" + elog + elog "Any user who wants to print must be in the lp group." + fi +} -- cgit v1.2.3-65-gdbad