summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-09-24 19:55:40 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-09-24 19:55:40 +0000
commit4d919543466247af53baea573cd8024eba92563b (patch)
tree770937193f35d9bccc8b4ec7b5a5dfb78d6a19bf /net-print/hplip
parentUse system libraries instead of the bundled ones (diff)
downloadgentoo-2-4d919543466247af53baea573cd8024eba92563b.tar.gz
gentoo-2-4d919543466247af53baea573cd8024eba92563b.tar.bz2
gentoo-2-4d919543466247af53baea573cd8024eba92563b.zip
Version bump, thanks to Oldrich Jedlicka in bug #275682. Fix bug #285840, thanks to Fabio Erculiani. Remove older versions, also closes bug #270354.
(Portage version: 2.2_rc41/cvs/Linux x86_64)
Diffstat (limited to 'net-print/hplip')
-rw-r--r--net-print/hplip/ChangeLog10
-rw-r--r--net-print/hplip/hplip-2.8.7.ebuild176
-rw-r--r--net-print/hplip/hplip-3.9.2.ebuild197
-rw-r--r--net-print/hplip/hplip-3.9.4b-r1.ebuild8
-rw-r--r--net-print/hplip/hplip-3.9.8.ebuild (renamed from net-print/hplip/hplip-3.9.4b.ebuild)83
-rw-r--r--net-print/hplip/metadata.xml3
6 files changed, 72 insertions, 405 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index c5968aa22c25..052c67a29d33 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-print/hplip
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.124 2009/09/13 10:28:40 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.125 2009/09/24 19:55:40 flameeyes Exp $
+
+*hplip-3.9.8 (24 Sep 2009)
+
+ 24 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> -hplip-2.8.7.ebuild,
+ -hplip-3.9.2.ebuild, -hplip-3.9.4b.ebuild, hplip-3.9.4b-r1.ebuild,
+ +hplip-3.9.8.ebuild, metadata.xml:
+ Version bump, thanks to Oldrich Jedlicka in bug #275682. Fix bug #285840,
+ thanks to Fabio Erculiani. Remove older versions, also closes bug #270354.
13 Sep 2009; Timo Gurr <tgurr@gentoo.org> hplip-2.8.6b.ebuild,
hplip-2.8.7.ebuild, hplip-3.9.2.ebuild, hplip-3.9.4b.ebuild,
diff --git a/net-print/hplip/hplip-2.8.7.ebuild b/net-print/hplip/hplip-2.8.7.ebuild
deleted file mode 100644
index 2e234c3b9b4d..000000000000
--- a/net-print/hplip/hplip-2.8.7.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.7.ebuild,v 1.5 2009/09/13 10:28:40 tgurr Exp $
-
-EAPI="1"
-
-inherit eutils linux-info python
-
-DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
-HOMEPAGE="http://hplip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="cupsddk dbus doc fax gtk minimal parport ppds qt3 qt4 scanner snmp"
-
-# Note : libusb-compat untested (calchan 20090516)
-
-DEPEND="!net-print/hpijs
- !net-print/hpoj
- virtual/ghostscript
- >=media-libs/jpeg-6b
- >=net-print/foomatic-filters-3.0.20080507
- !minimal? (
- >=net-print/cups-1.2
- dev-libs/libusb:0
- cupsddk? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
- dbus? ( >=sys-apps/dbus-1.0.0 )
- scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
- snmp? (
- net-analyzer/net-snmp
- dev-libs/openssl
- )
- )"
-
-RDEPEND="${DEPEND}
- !minimal? (
- !<sys-fs/udev-114
- scanner? (
- dev-python/imaging
- gtk? ( >=media-gfx/xsane-0.89 )
- !gtk? ( >=media-gfx/sane-frontends-1.0.9 )
- )
- qt4? ( !qt3? (
- dev-python/PyQt4
- dbus? ( >=dev-python/dbus-python-0.80 )
- fax? ( dev-python/reportlab )
- ) )
- qt3? (
- >=dev-python/PyQt-3.14
- dev-python/ctypes
- dbus? ( >=dev-python/dbus-python-0.80 )
- fax? ( dev-python/reportlab )
- )
- )"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
-
-pkg_setup() {
- ! use qt3 && ! use qt4 && ewarn "You need USE=qt3 (recommended) or USE=qt4 for the hplip GUI."
-
- use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
-
- if ! use ppds && ! use cupsddk; then
- ewarn "Installing neither static (USE=-ppds) nor dynamic (USE=-cupsddk) PPD files,"
- ewarn "which is probably not what you want. You will almost certainly not be able to "
- ewarn "print (recommended: USE=\"cupsddk -ppds\")."
- fi
-
- if use minimal ; then
- ewarn "Installing hpijs driver only, make sure you know what you are doing."
- else
- use parport && linux-info_pkg_setup
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
- sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
- -e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
- base/utils.py || die "Patching base/utils.py failed"
-
- # bug 98428
- sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Patching hpssd.py failed"
-
- # Force recognition of Gentoo distro by hp-check
- sed -i \
- -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
- installer/core_install.py || die "sed core_install.py"
-
- # Replace udev rules, see bug #197726.
- rm data/rules/55-hpmud.rules
- cp "${FILESDIR}"/70-hpmud.rules data/rules
- sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html || die "sed failed"
-
- # Use system foomatic-rip instead of foomatic-rip-hplip
- sed -i -e 's/foomatic-rip-hplip/foomatic-rip/' ppd/*.ppd || die "sed failed"
-
- # Qt4 is still undocumented by upstream, so use with caution
- local QT_VER
- use qt4 && QT_VER="4"
- use qt3 && QT_VER="3"
- sed -i \
- -e "s/%s --force-startup/%s --force-startup --qt${QT_VER}/" \
- -e "s/'--force-startup'/'--force-startup', '--qt${QT_VER}'/" \
- base/device.py || die "sed failed"
- sed -i \
- -e "s/Exec=hp-systray/Exec=hp-systray --qt${QT_VER}/" \
- hplip-systray.desktop.in || die "sed failed"
-}
-
-src_compile() {
- if use qt3 || use qt4 ; then
- local GUI_BUILD="--enable-gui-build"
- else
- local GUI_BUILD="--disable-gui-build"
- fi
-
- econf \
- --disable-dependency-tracking \
- --disable-cups11-build \
- --with-cupsbackenddir=$(cups-config --serverbin)/backend \
- --with-cupsfilterdir=$(cups-config --serverbin)/filter \
- --disable-foomatic-rip-hplip-install \
- ${GUI_BUILD} \
- $(use_enable doc doc-build) \
- $(use_enable cupsddk foomatic-drv-install) \
- $(use_enable dbus dbus-build) \
- $(use_enable fax fax-build) \
- $(use_enable minimal hpijs-only-build) \
- $(use_enable parport pp-build) \
- $(use_enable ppds foomatic-ppd-install) \
- $(use_enable scanner scan-build) \
- $(use_enable snmp network-build) \
- || die "econf failed"
- emake || die "Compilation failed"
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install || die "emake install failed"
- rm -f "${D}"/etc/sane.d/dll.conf
-
- # bug 106035
- use qt3 || use qt4 || rm -Rf "${D}"/usr/share/applications
-
- use minimal && rm -rf "${D}"/usr/lib
-}
-
-pkg_preinst() {
- # avoid collisions with cups-1.2 compat symlinks
- if [ -e "${ROOT}"/usr/lib/cups/backend/hp ] && [ -e "${ROOT}"/usr/libexec/cups/backend/hp ]; then
- rm -f "${ROOT}"/usr/libexec/cups/backend/hp{,fax};
- fi
-}
-
-pkg_postinst() {
- python_mod_optimize /usr/share/${PN}
-
- elog "You should run hp-setup as root if you are installing hplip for the first time, and may also"
- elog "need to run it if you are upgrading from an earlier version."
- elog
- elog "If your device is connected using USB, users will need to be in the lp group to access it."
- elog
- elog "This release doesn't use an init script anymore, so you should probably do a"
- elog "'rc-update del hplip' if you are updating from an old version."
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/share/${PN}
-}
diff --git a/net-print/hplip/hplip-3.9.2.ebuild b/net-print/hplip/hplip-3.9.2.ebuild
deleted file mode 100644
index 871415342db3..000000000000
--- a/net-print/hplip/hplip-3.9.2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.2.ebuild,v 1.6 2009/09/13 10:28:40 tgurr Exp $
-
-EAPI="2"
-
-inherit eutils fdo-mime linux-info python
-
-DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
-HOMEPAGE="http://hplip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="cupsddk dbus doc fax gtk minimal parport ppds qt3 qt4 scanner snmp"
-
-# Note : libusb-compat untested (calchan 20090516)
-
-DEPEND="!net-print/hpijs
- !net-print/hpoj
- virtual/ghostscript
- media-libs/jpeg
- >=net-print/foomatic-filters-3.0.20080507[cups]
- !minimal? (
- net-print/cups
- virtual/libusb:0
- cupsddk? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
- dbus? ( sys-apps/dbus )
- scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
- snmp? (
- net-analyzer/net-snmp
- dev-libs/openssl
- )
- )"
-
-RDEPEND="${DEPEND}
- !minimal? (
- !<sys-fs/udev-114
- scanner? (
- dev-python/imaging
- gtk? ( media-gfx/xsane )
- !gtk? ( media-gfx/sane-frontends )
- )
- qt4? ( !qt3? (
- dev-python/PyQt4
- dbus? ( dev-python/dbus-python )
- fax? ( dev-python/reportlab )
- ) )
- qt3? (
- dev-python/PyQt
- dbus? ( dev-python/dbus-python )
- fax? ( dev-python/reportlab )
- )
- )"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
-
-pkg_setup() {
- ! use qt3 && ! use qt4 && ewarn "You need USE=qt3 or USE=qt4 for the hplip GUI."
-
- use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
-
- if ! use ppds && ! use cupsddk; then
- ewarn "Installing neither static (USE=-ppds) nor dynamic (USE=-cupsddk) PPD files,"
- ewarn "which is probably not what you want. You will almost certainly not be able to "
- ewarn "print (recommended: USE=\"cupsddk -ppds\")."
- fi
-
- if use minimal ; then
- ewarn "Installing hpijs driver only, make sure you know what you are doing."
- else
- use parport && linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-high_cpu_utilization_logout.patch
- sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
- sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
- -e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
- base/utils.py || die "Patching base/utils.py failed"
-
- # bug 98428
- sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Patching hpssd.py failed"
-
- # Force recognition of Gentoo distro by hp-check
- sed -i \
- -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
- installer/core_install.py || die "sed core_install.py"
-
- # Replace udev rules, see bug #197726.
- rm data/rules/55-hpmud.rules
- cp "${FILESDIR}"/70-hpmud.rules data/rules
- sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html || die "sed failed"
-
- sed -i \
- -e s:/usr/lib/cups/driver:$(cups-config --serverbin)/driver:g \
- installer/core_install.py || die "sed core_install.py"
-
- # Use system foomatic-rip instead of foomatic-rip-hplip
- local i
- for i in ppd/*.ppd.gz
- do
- rm -f ${i}.temp
- gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die "*.ppd.gz sed failed"
- mv ${i}.temp ${i}
- done
-
- # Qt4 is still undocumented by upstream, so use with caution
- local qt_ver
- use qt3 && qt_ver="3"
- use qt4 && qt_ver="4"
- if use qt3 || use qt4 ; then
- sed -i \
- -e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
- -e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \
- base/device.py || die "sed failed"
- sed -i \
- -e "s/Exec=hp-systray/Exec=hp-systray --qt${qt_ver}/" \
- hplip-systray.desktop.in || die "sed failed"
- fi
-}
-
-src_configure() {
- if use qt3 || use qt4 ; then
- local gui_build="--enable-gui-build"
- else
- local gui_build="--disable-gui-build"
- fi
- use qt4 && gui_build="${gui_build} --enable-qt4 --disable-qt3"
-
- econf \
- --disable-dependency-tracking \
- --disable-cups11-build \
- --with-cupsbackenddir=$(cups-config --serverbin)/backend \
- --with-cupsfilterdir=$(cups-config --serverbin)/filter \
- --disable-foomatic-rip-hplip-install \
- ${gui_build} \
- $(use_enable doc doc-build) \
- $(use_enable cupsddk foomatic-drv-install) \
- $(use_enable dbus dbus-build) \
- $(use_enable fax fax-build) \
- $(use_enable minimal hpijs-only-build) \
- $(use_enable parport pp-build) \
- $(use_enable ppds foomatic-ppd-install) \
- $(use_enable scanner scan-build) \
- $(use_enable snmp network-build)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- rm -f "${D}"/etc/sane.d/dll.conf
-
- use minimal && rm -rf "${D}"/usr/lib
-
- # bug 106035/259763
- if ! use qt3 && ! use qt4; then
- rm -Rf "${D}"/usr/share/applications "${D}"/etc/xdg
- fi
-
- # kde3 autostart hack
- if [[ -d /usr/kde/3.5/share/autostart ]] && use !minimal ; then
- insinto /usr/kde/3.5/share/autostart
- doins hplip-systray.desktop
- fi
-
- # Do not install unzipped ppd files
- rm -f "${D}"/usr/share/ppd/HP/*.ppd
-}
-
-pkg_preinst() {
- # avoid collisions with cups-1.2 compat symlinks
- if [ -e "${ROOT}"/usr/lib/cups/backend/hp ] && [ -e "${ROOT}"/usr/libexec/cups/backend/hp ]; then
- rm -f "${ROOT}"/usr/libexec/cups/backend/hp{,fax};
- fi
-}
-
-pkg_postinst() {
- python_mod_optimize /usr/share/${PN}
- fdo-mime_desktop_database_update
-
- elog "You should run hp-setup as root if you are installing hplip for the first time, and may also"
- elog "need to run it if you are upgrading from an earlier version."
- elog
- elog "If your device is connected using USB, users will need to be in the lp group to access it."
- elog
- elog "This release doesn't use an init script anymore, so you should probably do a"
- elog "'rc-update del hplip' if you are updating from an old version."
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/share/${PN}
- fdo-mime_desktop_database_update
-}
diff --git a/net-print/hplip/hplip-3.9.4b-r1.ebuild b/net-print/hplip/hplip-3.9.4b-r1.ebuild
index 0a0b90d691d9..fbfc3faa6038 100644
--- a/net-print/hplip/hplip-3.9.4b-r1.ebuild
+++ b/net-print/hplip/hplip-3.9.4b-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.4b-r1.ebuild,v 1.4 2009/09/13 10:28:40 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.4b-r1.ebuild,v 1.5 2009/09/24 19:55:40 flameeyes Exp $
EAPI="2"
@@ -38,7 +38,6 @@ DEPEND="!net-print/hpijs
net-analyzer/net-snmp
dev-libs/openssl
)
- policykit? ( sys-auth/policykit )
)"
RDEPEND="${DEPEND}
@@ -59,6 +58,11 @@ RDEPEND="${DEPEND}
qt4? (
dev-python/PyQt4[X]
)
+ policykit? (
+ sys-auth/policykit
+ dev-python/pygobject
+ dev-python/dbus-python
+ )
)"
CONFIG_CHECK="~PARPORT ~PPDEV"
diff --git a/net-print/hplip/hplip-3.9.4b.ebuild b/net-print/hplip/hplip-3.9.8.ebuild
index 79fcbc0ce9ad..aae54aef258f 100644
--- a/net-print/hplip/hplip-3.9.4b.ebuild
+++ b/net-print/hplip/hplip-3.9.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.4b.ebuild,v 1.7 2009/09/13 10:28:40 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8.ebuild,v 1.1 2009/09/24 19:55:40 flameeyes Exp $
EAPI="2"
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="cupsddk dbus doc fax gtk minimal parport policykit ppds qt3 qt4 scanner snmp"
+IUSE="+cups cupsddk dbus doc fax gtk minimal parport policykit ppds qt3 qt4 scanner snmp"
# Note : libusb-compat untested (calchan 20090516)
@@ -23,27 +23,26 @@ DEPEND="!net-print/hpijs
>=dev-lang/python-2.4.4[threads]
virtual/ghostscript
media-libs/jpeg
- >=net-print/foomatic-filters-3.0.20080507[cups]
!minimal? (
net-print/cups
virtual/libusb:0
- cupsddk? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
- dbus? (
- sys-apps/dbus
- dev-python/dbus-python
- dev-python/pygobject
+ cupsddk? (
+ foomatic? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+ || ( >=net-print/cups-1.4.0 net-print/cupsddk )
+ )
+ ppds? (
+ foomatic? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
)
scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
snmp? (
net-analyzer/net-snmp
dev-libs/openssl
)
- policykit? ( sys-auth/policykit )
)"
RDEPEND="${DEPEND}
!minimal? (
- !<sys-fs/udev-114
+ kernel_linux? ( >=sys-fs/udev-114 )
scanner? (
dev-python/imaging
dev-python/reportlab
@@ -53,11 +52,21 @@ RDEPEND="${DEPEND}
fax? (
dev-python/reportlab
)
- qt4? ( !qt3? (
- dev-python/PyQt4[X]
- ) )
- qt3? (
+ qt3? ( !qt4? (
dev-python/PyQt
+ ) )
+ qt4? (
+ dev-python/PyQt4[X]
+ )
+ dbus? (
+ sys-apps/dbus
+ dev-python/dbus-python
+ dev-python/pygobject
+ )
+ policykit? (
+ sys-auth/policykit
+ dev-python/pygobject
+ dev-python/dbus-python
)
)"
@@ -69,10 +78,10 @@ pkg_setup() {
use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
- if ! use ppds && ! use cupsddk; then
+ if ! use ppds && ! use cupsddk && ! use cups; then
ewarn "Installing neither static (USE=-ppds) nor dynamic (USE=-cupsddk) PPD files,"
- ewarn "which is probably not what you want. You will almost certainly not be able to "
- ewarn "print (recommended: USE=\"cupsddk -ppds\")."
+ ewarn "nor hpcups driver (USE=-cups) which is probably not what you want."
+ ewarn "You will almost certainly not be able to print (recommended: USE=\"cups -cupsddk -ppds\")."
fi
if use minimal ; then
@@ -95,17 +104,14 @@ src_prepare() {
-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
installer/core_install.py || die "sed core_install.py"
- # Replace udev rules, see bug #197726.
- rm data/rules/55-hpmud.rules
- cp "${FILESDIR}"/70-hpmud.rules data/rules
- sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html || die "sed failed"
-
# SYSFS deprecated - https://bugs.launchpad.net/hplip/+bug/346390
sed -i -e "s/SYSFS/ATTRS/g" -e "s/sysfs/attrs/g" data/rules/56-hpmud_support.rules || die "sed failed"
- # plugins check
- mv data/rules/56-hpmud_support.rules data/rules/71-hpmud_support.rules
- sed -i -e "s/56-hpmud_support.rules/71-hpmud_support.rules/g" Makefile.* */*.html || die "sed failed"
+ # Replace udev rules, see bug #197726.
+ mv data/rules/40-hplip.rules data/rules/70-hplip.rules || die
+ sed -i \
+ -e "s/40-hplip.rules/70-hplip.rules/g" \
+ Makefile.am */*.html || die "sed failed"
sed -i \
-e s:/usr/lib/cups/driver:$(cups-config --serverbin)/driver:g \
@@ -134,12 +140,12 @@ src_prepare() {
hplip-systray.desktop.in || die "sed failed"
fi
- epatch "${FILESDIR}"/${PN}-3.9.4+glibc-2.10.patch
-
eautoreconf
}
src_configure() {
+ local myconf
+
if use qt3 || use qt4 ; then
local gui_build="--enable-gui-build"
if use qt4; then
@@ -151,20 +157,35 @@ src_configure() {
local gui_build="--disable-gui-build"
fi
+ if use cupsddk; then
+ myconf="${myconf} $(use_enable foomatic foomatic-drv-install)"
+ else
+ myconf="${myconf} --disable-foomatic-drv-install"
+ fi
+
+ if use ppds; then
+ myconf="${myconf} $(use_enable foomatic foomatic-ppd-install)"
+ else
+ myconf="${myconf} --disable-foomatic-ppd-install"
+ fi
+
econf \
--disable-dependency-tracking \
--disable-cups11-build \
--with-cupsbackenddir=$(cups-config --serverbin)/backend \
--with-cupsfilterdir=$(cups-config --serverbin)/filter \
--disable-foomatic-rip-hplip-install \
+ --enable-udev-acl-rules \
+ ${myconf} \
${gui_build} \
$(use_enable doc doc-build) \
- $(use_enable cupsddk foomatic-drv-install) \
+ $(use_enable cups hpcups-install) \
+ $(use_enable ppds cups-ppd-install) \
+ $(use_enable cupsddk cups-drv-install) \
$(use_enable dbus dbus-build) \
$(use_enable fax fax-build) \
$(use_enable minimal hpijs-only-build) \
$(use_enable parport pp-build) \
- $(use_enable ppds foomatic-ppd-install) \
$(use_enable scanner scan-build) \
$(use_enable snmp network-build) \
$(use_enable policykit policykit)
@@ -186,6 +207,10 @@ src_install() {
insinto /usr/kde/3.5/share/autostart
doins hplip-systray.desktop
fi
+
+ pushd doc
+ dohtml -r *
+ popd
}
pkg_preinst() {
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index bd069c915d67..9becc09fdb77 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -33,6 +33,9 @@
<flag name='snmp'>Add support for <pkg>net-analyzer/net-snmp</pkg>
which enables this driver to work over networks (both for server and
client)</flag>
+ <flag name="cups">
+ Build the hpcups driver for cups.
+ </flag>
</use>
</pkgmetadata>