Only depend on dev-python/dbus-python if USE=minimal. This fixes bug #449402. Thanks to turtle for the report and Nick Bowler for the suggested dependency change.

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

3 files changed, 275 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 7fda81242ee1..5a2abda58cf8 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.296 2014/01/24 18:30:00 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.297 2014/03/05 18:51:58 billie Exp $
+
+*hplip-3.14.1-r1 (05 Mar 2014)
+
+  05 Mar 2014; Daniel Pielmeier <billie@gentoo.org> +hplip-3.14.1-r1.ebuild:
+  Only depend on dev-python/dbus-python if USE=minimal. This fixes bug #449402.
+  Thanks to turtle for the report and Nick Bowler for the suggested dependency
+  change.
 
   24 Jan 2014; Daniel Pielmeier <billie@gentoo.org> -hplip-3.12.10a.ebuild,
   -hplip-3.13.9.ebuild, -hplip-3.13.11-r1.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 166db784a0dd..2dfb0187f2da 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,13 +3,14 @@ Hash: SHA256
 
 DIST hplip-3.13.11-patches-1.tar.xz 6280 SHA256 e1e301b01a94c6565d9acd4b868e1b69e7420a586addd9439529713a30d68100 SHA512 054b62bfde6f2b41894c0da2644aae8d8f592d14021fbf5e7eede9f0b3f6f1bea9b6a219c2807102bfa7c6c738565d9910e6fdefabd45eccd3c62c6313714595 WHIRLPOOL ec7102dfbced0886ca64c83743b90bd3fa8308510c71f56246ab47acd3cf4770e2e3538b84265a8d096869881c85c98f477207a8e802c763db57255236479ed9
 DIST hplip-3.14.1.tar.gz 21116532 SHA256 5c1e79d4426c00c3eb7ec9b689c430ea3d132e23849c08ae3dc58cd8d3d0eb14 SHA512 caeeda3e641dd2a15d272a20272c220a2ea7ecabde0fad3b579e9cf351a0f44de2b32e0dc5b2880c231e61eaacb9d8d19e8ecd3ff1945027412089a43fee2ca7 WHIRLPOOL 75caf28546f42f3f436c7eeb108f1cb8ce26f57ab9fb8b2ae64d9de4c1f03a71b28f281353ca6240ecaa2ff6918b926d749aad50f4ea50a5312a07292d30c216
+EBUILD hplip-3.14.1-r1.ebuild 7711 SHA256 cb5f342d127afc0972fe900e4797ce1617061a09b3c96ce258217413835223af SHA512 4e7dc8f33dc9716da22a59a2003ac67fa21a4ee3f77066df182cbc3df36d50894e8d3dde2231dd573076239936d56c90b27462fad5d777da5936b983c9071b97 WHIRLPOOL 77df99524f8cfe21732386a37f43f4b7fcec2ba8ae90ba8dd3f25413f9e388aac9b2c01d5c9bc101d054cad8e1718202f17590dec26f13fe1fc677b24f525e65
 EBUILD hplip-3.14.1.ebuild 7700 SHA256 75b86b0dcc9e3472cad114efef2bcd50dc7a0ed12c90b84bd690545afdf9fb32 SHA512 ee320d0767969ed14cb3ed80a9084d4f79398300921297caf50eaa94070c94fe9df094bc6477bde1ccfaa1d32d38165b3edc8d79b2bd98285b9ab3d542c44588 WHIRLPOOL 76654dd0e207de71239e99c3a26fd7a6194abb43845139969eaf9cd6b6dc22959dd462238ba75d35263db9de80949a649e593988087a220f0a7cc3ea7b0b6b6d
-MISC ChangeLog 50031 SHA256 2bd283a7a023dc5a6dd04ed7c9d36abfbcde57dc6a4b11c9dcab466dd75b56ed SHA512 76da1dd201bd2be86280ad98a56708df18b271b3eaaeb24f72b4e41c3d22b7c5cf024324437cbcb680bc13aec77bc9ffa1555decf8ebd71b9e0b1d53b3055574 WHIRLPOOL 6ff658d1fe0ce111a231d2dfe1ea649f0f67bb5f023d87e7eae281a4ad44261f03c5419c384ab6cfe5f7202e426afeac8e1f46b5d584afb4186de7821213a171
+MISC ChangeLog 50310 SHA256 4cd19e39d05e2f7a0f3268cccd36f2155e39fc68cbc21029f6f74177aa56543b SHA512 d478ae93823d3e54eff624db0282ea08dda03110ff64d4a1c9b68455d5e6de115a4fcb611fa1669bb8abd0cddc02e40bdd0273503519a49f2e90650304e48eca WHIRLPOOL 44910becab72c2ad2ae7ff9235ff2d7be1a7e39194794e41006816ef71a3c75c9f69adaeb0ef30b79fa2bb76fd1bdbf32fe1d9841f0e86067c2baf581ce0df3c
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEUEAREIAAYFAlLisSkACgkQlcuUeyFa0U1DpwCXcj1ikyrSPNTmw2KggqR+M5Ld
-gwCg1wW4Qp6oQxsTiI2OlblQ2NB7njI=
-=jm2W
+iEYEAREIAAYFAlMXclMACgkQlcuUeyFa0U28lwCeLl5tJw5BluxdPak7BxiQizP+
+YuUAoIzPYvK9kUxhqYRnv+Y4IuE08pKS
+=3oFa
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.14.1-r1.ebuild b/net-print/hplip/hplip-3.14.1-r1.ebuild
new file mode 100644
index 000000000000..3912af9c41d7
--- /dev/null
+++ b/net-print/hplip/hplip-3.14.1-r1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.14.1-r1.ebuild,v 1.1 2014/03/05 18:51:58 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.11-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/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 !<sys-fs/udev-114 )
+		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=$(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_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
+}