Version bump. Reworked minimal installation to fix bug #193671, thanks to Jakub Moc for his suggestions and Dan Ost for reporting and testing.

Package-Manager: portage-2.1.3.11

4 files changed, 139 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 5426f2c21887..065b9af805ce 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.76 2007/09/29 20:31:08 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.77 2007/09/30 14:14:13 calchan Exp $
+
+*hplip-2.7.9 (30 Sep 2007)
+
+  30 Sep 2007; Denis Dupeyron <calchan@gentoo.org> +hplip-2.7.9.ebuild:
+  Version bump. Reworked minimal installation to fix bug #193671, thanks to
+  Jakub Moc for his suggestions and Dan Ost for reporting and testing.
 
 *hplip-2.7.7-r3 (29 Sep 2007)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index ce2b727f6105..1bb0f8089b47 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -10,6 +10,7 @@ DIST foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd99
 DIST hplip-1.6.10.tar.gz 10561620 RMD160 3608757fca36865528565c0c40571d91a936fd3f SHA1 7c877cac132fc8695c693800c7e34322bdc8d858 SHA256 45f4eafd4568a06889bf4b996a3c75ef571a157b921f56b027b567766d8e239f
 DIST hplip-1.7.4a.tar.gz 13566965 RMD160 e2777b8b065abe385bfe557b9eed86848029e2c9 SHA1 98fcb0ce13ee7d9f17cc6c61c568528dd9cbf71d SHA256 903957b1b1aa86438d546a205a3d526a600b1e56754a5ba5ce99228a26cc475e
 DIST hplip-2.7.7.tar.gz 14412854 RMD160 d3bc36b44b2fd07d8938fce2f508bbc9b4c47b5b SHA1 5b80ba8a62035985cbc4a0ae656df8a1779dbbdb SHA256 0804bda4dd18480597bf408351fe56412b84f737d2554b07aafaa1fb089674ba
+DIST hplip-2.7.9.tar.gz 14488632 RMD160 007a4c888bde277e86b1a78628062774a43ff2f7 SHA1 1ac491fd2b49f8a5a658532fd44e2aa0b008e072 SHA256 e8867529434411f6c44ef6224405f92fd6be25f04513946621bf209b2e81baaf
 EBUILD hplip-1.6.10.ebuild 3675 RMD160 877081de0015019133f1031fda241b7709771b87 SHA1 c09c30009fb5a98caefe8bf1b75e856160f1be26 SHA256 583c89b73d79581d51e8ca1dff6d2139bd5a2137c4871e536c0d5d3e00f04070
 MD5 8446d1a564a05b03114e9a4cc7e35d1f hplip-1.6.10.ebuild 3675
 RMD160 877081de0015019133f1031fda241b7709771b87 hplip-1.6.10.ebuild 3675
@@ -22,10 +23,14 @@ EBUILD hplip-2.7.7-r3.ebuild 3640 RMD160 ea6608f71a41f451f5170dfbf5baedd461e242f
 MD5 c57089ac7c68f7b2cf3e8c311bd326e7 hplip-2.7.7-r3.ebuild 3640
 RMD160 ea6608f71a41f451f5170dfbf5baedd461e242f1 hplip-2.7.7-r3.ebuild 3640
 SHA256 cd31a789f69d2ff5297b8f5e3f2b25483421b37c0d34e94ad79c71d244061772 hplip-2.7.7-r3.ebuild 3640
-MISC ChangeLog 13070 RMD160 c3599d904b53da5997dd798a4c7351ec79c7d080 SHA1 ca98f894911f19371ce85dc8b69a429307dd8d72 SHA256 77836dd3e30ee8688e732eb7c3904d0fa5b73f54a3e94efba8d17da195e6cbe9
-MD5 c9e5763e21c548d932ea6f8a0adb79f6 ChangeLog 13070
-RMD160 c3599d904b53da5997dd798a4c7351ec79c7d080 ChangeLog 13070
-SHA256 77836dd3e30ee8688e732eb7c3904d0fa5b73f54a3e94efba8d17da195e6cbe9 ChangeLog 13070
+EBUILD hplip-2.7.9.ebuild 3721 RMD160 3196dd46b9b9f742bd006016e9daab148c466f3c SHA1 4e28f0288be2bf66f48954b0b2133d672dad4ae9 SHA256 012d62f5a0dd880e6e395bed4103050ba3c6a8390c991c7ac2ae7241829ca5e7
+MD5 189ab8a769e1f03be6433c4bee922cb8 hplip-2.7.9.ebuild 3721
+RMD160 3196dd46b9b9f742bd006016e9daab148c466f3c hplip-2.7.9.ebuild 3721
+SHA256 012d62f5a0dd880e6e395bed4103050ba3c6a8390c991c7ac2ae7241829ca5e7 hplip-2.7.9.ebuild 3721
+MISC ChangeLog 13318 RMD160 ca9a1bc8cf0c4ad7ca789542a77efde50bafcf9f SHA1 814b82d26fd1576452949a110a5c3df8128c079d SHA256 af39f3fe85609ecbaeb65fdf16037f3ca2535dde5bc470bc7bf2ddc1cd7703cf
+MD5 bddae1ca912734e16820e997dd10c3aa ChangeLog 13318
+RMD160 ca9a1bc8cf0c4ad7ca789542a77efde50bafcf9f ChangeLog 13318
+SHA256 af39f3fe85609ecbaeb65fdf16037f3ca2535dde5bc470bc7bf2ddc1cd7703cf ChangeLog 13318
 MISC metadata.xml 250 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 SHA1 f91d1e6c01026cba252d042ba254f4a4bc61194a SHA256 ab106df12671f3f541e0416f8c0d5a96b6e725ed7b3b111d27af7a584c4bf164
 MD5 a7f39f5758507140c896dcc24a3e0e2f metadata.xml 250
 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 metadata.xml 250
@@ -39,3 +44,6 @@ SHA256 4d98dfc9fec72da07fc2405364c623aaed10c8476d582920a75639e8499cd135 files/di
 MD5 f2a0a963b9b861e21a85682d0c052886 files/digest-hplip-2.7.7-r3 241
 RMD160 65b7854d37748cd9132fe9a021cd75af7324e442 files/digest-hplip-2.7.7-r3 241
 SHA256 c0010a4a83dce3e4d7f01acb21db5cf45068c4060a7bc99f3f37554de50e9fba files/digest-hplip-2.7.7-r3 241
+MD5 f68fb8f4981ef3faecff859da377ddb1 files/digest-hplip-2.7.9 241
+RMD160 1c32e9bb5148d9cafb89f9c096e793197fc76485 files/digest-hplip-2.7.9 241
+SHA256 6854a0c055d17b18ecdf0d14a071a5c01b818a85a2fcc47fef928fb4aa1cb2f7 files/digest-hplip-2.7.9 241
diff --git a/net-print/hplip/files/digest-hplip-2.7.9 b/net-print/hplip/files/digest-hplip-2.7.9
new file mode 100644
index 000000000000..46ad4669e85f
--- /dev/null
+++ b/net-print/hplip/files/digest-hplip-2.7.9
@@ -0,0 +1,3 @@
+MD5 a05aeb5679c3ce429bea7f3335609aee hplip-2.7.9.tar.gz 14488632
+RMD160 007a4c888bde277e86b1a78628062774a43ff2f7 hplip-2.7.9.tar.gz 14488632
+SHA256 e8867529434411f6c44ef6224405f92fd6be25f04513946621bf209b2e81baaf hplip-2.7.9.tar.gz 14488632
diff --git a/net-print/hplip/hplip-2.7.9.ebuild b/net-print/hplip/hplip-2.7.9.ebuild
new file mode 100644
index 000000000000..8c58857ad512
--- /dev/null
+++ b/net-print/hplip/hplip-2.7.9.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.9.ebuild,v 1.1 2007/09/30 14:14:13 calchan Exp $
+
+inherit linux-info
+
+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 ~ppc ~ppc64 ~x86"
+IUSE="X doc fax minimal parport ppds scanner snmp"
+
+DEPEND="!net-print/hpijs
+	!net-print/hpoj
+	virtual/ghostscript
+	>=media-libs/jpeg-6b
+	net-print/foomatic-filters
+	!minimal? ( dev-libs/openssl
+		>=net-print/cups-1.2
+		dev-libs/libusb
+		snmp? ( net-analyzer/net-snmp ) )"
+
+RDEPEND="${DEPEND}
+	!minimal? ( !<sys-fs/udev-114
+		fax? ( dev-python/reportlab )
+		scanner? ( X? ( >=media-gfx/xsane-0.89 )
+			!X? ( >=media-gfx/sane-frontends-1.0.9 ) )
+		X? ( >=dev-python/PyQt-3.14 ) )"
+
+CONFIG_CHECK="PARPORT"
+ERROR_PARPORT="Please make sure Device Drivers -> Parallel port support is enabled in your kernel"
+
+pkg_setup() {
+	if ! use ppds ; then
+		ewarn "Not installing built-in PPD files, which is probably not what you want."
+		ewarn "You need USE=ppds if you want to install them."
+	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
+
+	# 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
+}
+
+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"
+
+	# bug 186906, makes udev-rules work also for kernel-2.6.22
+	sed -i -e "s/usb_device/usb|usb_device/" -e "s/SYSFS/ATTRS/g" \
+		data/rules/55-hpmud.rules || die "Patching 55-hpmud.rules failed"
+}
+
+src_compile() {
+	econf \
+		--disable-cups11-build \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		$(use_enable minimal hpijs-only-build) \
+		$(use_enable doc doc-build) \
+		$(use_enable snmp network-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable scanner scan-build) \
+		$(use_enable X gui-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable ppds foomatic-ppd-install) \
+		--disable-foomatic-xml-install \
+		|| die "econf failed"
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	# bug 106035
+	use X || rm -Rf "${D}"/usr/share/applications
+
+	use minimal && rm -rf "${D}"/usr/lib
+}
+
+pkg_preinst() {
+	if ! use minimal && use scanner ; then
+		insinto /etc/sane.d
+		[ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf .
+		[ -e ${ROOT}/etc/sane.d/dll.conf ] && cp ${ROOT}/etc/sane.d/dll.conf .
+		grep -q hpaio dll.conf || echo hpaio >> dll.conf
+		doins dll.conf
+	fi
+}
+
+pkg_postinst() {
+	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 "This release doesn't use an init script anymore, so you should probably do a"
+	elog "'rc-update del hplip' if you are updating."
+}