Version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 30d75aa96e01b8c46a4f3ca2e84182a1553fa36c..9f77e4e34f722fb278e37238b32e4a79ee0b6be7 100644 (file)
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.323 2015/04/04 09:39:03 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.324 2015/04/19 15:29:03 billie Exp $
+
+*hplip-3.15.4 (19 Apr 2015)
+
+  19 Apr 2015; Daniel Pielmeier <billie@gentoo.org> +hplip-3.15.4.ebuild:
+  Version bump.
 
   04 Apr 2015; Daniel Pielmeier <billie@gentoo.org> -hplip-3.14.1.ebuild:
   Remove old. This time the correct version.

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 92c7ff3b24875fe3dd08b52f43df4596f9a68202..963b16b64f3c80e20a4ad2c87d7f2b0be67b0dad 100644 (file)
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 DIST hplip-3.14.10-patches-1.tar.xz 8140 SHA256 33116a5e2c104495d60f0b15e923b2ae5eaaf269cd5ee8e988b035eb20aa23ab SHA512 a8deb03979c55b660ef299505afc328fc930786ea9d473109a9fafd83d72528a9c3700faf4742f2e05829824fc97c3656538e1a607e2191e617f3944f0482e9a WHIRLPOOL bbf5d62f29c0fb0162f34b7815fc190459c619fdaf4f96e33d085f9b7228fa5431b6d668322256995a0a1d16aa1cccb75171000bbb2334ad3b51fec47f2653c0
 DIST hplip-3.14.10.tar.gz 21773429 SHA256 11b3cd8311dea6b22a4c80be1e5d021e84d15a5f3e7e22cbd43798e5c1a89598 SHA512 ed184c8d0d3d8d5aad454831013d7c5e0b1685b088ee8099b6efc1b152f8b159a2349f23f0c5c77a7a5f1a48165b0e22f2ff83ced1beb14633bd278d4ef4d6dc WHIRLPOOL 8e1985cfd370849db96765f792655da36e22b6cecb660dd4707b0ff33dd53c8b66b2ec73a9596c7e60036edc1843c195bbbde64f37c5a1c319752bf0ebc08eb6
 DIST hplip-3.15.2.tar.gz 21793148 SHA256 5f02eca743d85240db07ed2fc6551e1dce0dedc85ad4a0e90417e4d5b630f67c SHA512 d06352080593e7d376c9d540b10911e55f7458d35f64daef4d12b921d58e080ee984a0391ad61c6c26147ecdfbb304b96e234ef27ed960e838f91f59d3a335a2 WHIRLPOOL 6b736279a73e67a53a67afc560b1d4c543a561698396092b44072954345904f3303c29f393ed932dfea05a510abdb6cda8006051705e02f517b80991cf7a9514
+DIST hplip-3.15.4.tar.gz 21926172 SHA256 a3872f17690f2bfafbe025cea524b933260c81349b91083c465600705d8c3e68 SHA512 8d0d7f40d353c4cb9cc2a24944467502ba5c4850969c194db66a824b9d435099e9a49f35c29f74b724988322528632b41cada494692d4729ad631b6918ce8296 WHIRLPOOL da39ec7318926cb9169cdcf5ffc48bd0b0582fdd943f49ad7dfa139a8d6bdfbfaf3a050a7a101790db782e5889706f128dde33806c011d680507df3122570cb4
 EBUILD hplip-3.14.10.ebuild 7907 SHA256 4ba6773b226c5e10d1a2f4f06bff5e97f3ce5a769f1d338a9d0b9f6ea065a5b2 SHA512 184c0d639a0dcdeb92bba599057580c7ebfd12190ad0b716bf529871e8502d3eb3eba3e935a3af2900455ef0138fc1fc866a57727a681f6caf778e69030befaa WHIRLPOOL 065456a42ac8be192426ef6c6e400e1cb93373365e9a74ad9bc1ea9fef3496ffd4d558be86041cad9cccec38f78529084c7f2a17827fa88e37e15fdb4bfcbad8
 EBUILD hplip-3.15.2.ebuild 7708 SHA256 97874a97a04f2d713ed39db302106b4a6cbf4231b40491a59eef3b884e251c86 SHA512 51baf3af5179df0044365fbf3b5f926301d72b74ef8e174163830fb94b5898e3b866fbd4dd6ddbf422d2349fadfea16d6aafdfa63e68d9e59edf4984b304ab8a WHIRLPOOL 9dc9856bf59275479a2daa1bca28924e39629def51787f3d382d30b2bd3f7719ec9e7188f2dc569ec802737e87e3debe8965caf71c4020bc622e1a35aca12c7a
-MISC ChangeLog 54099 SHA256 b2b751252965e9b9b8624cfd8fb973a514578b7ce46cb4c87cbf533ac51cc0a8 SHA512 5dfe5d0047e8fe3ea97911764c50d2f986bf5b8a31185e275e85ead7bddcb4b148fca39ba801cb32f2d5c3066b835fd074905e6ff5515ab3729ced5917f9d715 WHIRLPOOL df21e2ed37bfceb67d318138b2189a3d955c6f33d257e762dc7468e59fa79bee8cea037085ea3f4e0bb641dc89fd3ff2481943bf4cfa4413498f3caeaf88f859
+EBUILD hplip-3.15.4.ebuild 7708 SHA256 a9cad9757ec5a74fad4424dfddb0f1476274ec739a8ef5630ecfba839c6bafb9 SHA512 8c66c7b0fa28fb850acb855a9a38fccfa180590ebb77954cb718bf4ac2a8b94a6cea4803aa0b4442a7373fe37e7968b64bd60744a7844ede193fdc7ff46025a9 WHIRLPOOL 4728ab87e06e72a0f712067deba03881636b89ef3e5a4c5eb0fe47d8f01cdb7e9afd48a335d7bdb015ea9e328957da0ae8b1654dddf451b0051852ed0b907f5b
+MISC ChangeLog 54219 SHA256 6fe8f93251ace6a30324fe12164c439f672dd280f1da66d9f853a28ad1be75c4 SHA512 4d086301c1582976cfceecd9e30f0dfcc39c067d633124c2544f988ddc7fa292d9680c408ca3cae65cb53be6d3463f4d0acc1a838359a436f9182dcd72cb500d WHIRLPOOL acf3b25b3f2eaf5c61e20ea04762268185a556a0771e7d4f11325244cdba88629b22b7b146d7da91815f4032363513ad661838c405b3d71ea075c22b00d7df47
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUfsTcACgkQlcuUeyFa0U39wACgjtNQ/UYkwrm+yyiiWtNvbBiS
-lTgAoIlxZVJ1EalIjxZmbkfUh/A1Sxrk
-=Qj6d
+iEYEAREIAAYFAlUzycMACgkQlcuUeyFa0U14ewCgk+ox9cKRbrGvCA9hrbELXXfZ
+NjMAoPr2B209eUm5pCSz6Piz4vOo2nZv
+=ZB7C
 -----END PGP SIGNATURE-----

diff --git a/net-print/hplip/hplip-3.15.4.ebuild b/net-print/hplip/hplip-3.15.4.ebuild
new file mode 100644 (file)
index 0000000..7f08813
--- /dev/null
+++ b/net-print/hplip/hplip-3.15.4.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.15.4.ebuild,v 1.1 2015/04/19 15:29:03 billie Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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.14.10-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
+
+COMMON_DEPEND="
+       virtual/jpeg:0
+       hpijs? (
+               || ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=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
+       policykit? (
+               sys-auth/polkit
+       )
+       !minimal? (
+               >=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+               >=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}]
+               kernel_linux? ( virtual/udev )
+               scanner? (
+                       >=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=$(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 \
+               --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
+
+       prune_libtool_files --all
+
+       if use !minimal ; then
+               python_export EPYTHON PYTHON
+               python_optimize "${D}"/usr/share/hplip
+       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 "https://wiki.gentoo.org/wiki/Printing"
+               elog
+               elog "Any user who wants to print must be in the lp group."
+               elog
+               elog "Please note: Printers requiring a binary plugin are currently"
+               elog "not supported. All bugs regarding the plugin are most likely"
+               elog "closed. A bug about including the plugin package to gentoo is"
+               elog "available here: https://bugs.gentoo.org/352439"
+       fi
+}