Revision bump. Add systray segfault patch from upstream reported by netfab in bug #312301. Remove needless rules file.

(Portage version: 2.1.7.17/cvs/Linux i686)

4 files changed, 25 insertions, 24 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index a2c1389ef714..bbf7a2a247d8 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.152 2010/03/30 17:32:44 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.153 2010/03/31 18:50:24 billie Exp $
+
+*hplip-3.10.2-r3 (31 Mar 2010)
+
+  31 Mar 2010; Daniel Pielmeier <billie@gentoo.org> -files/70-hpmud.rules,
+  -hplip-3.10.2-r2.ebuild, +hplip-3.10.2-r3.ebuild,
+  +files/hplip-3.10.2-systray-segfault.patch:
+  Revision bump. Add systray segfault patch from upstream reported by netfab
+  in bug #312301. Remove needless rules file.
 
 *hplip-3.10.2-r2 (30 Mar 2010)
 
diff --git a/net-print/hplip/files/70-hpmud.rules b/net-print/hplip/files/70-hpmud.rules
deleted file mode 100644
index 1e6ab666d239..000000000000
--- a/net-print/hplip/files/70-hpmud.rules
+++ /dev/null
@@ -1,19 +0,0 @@
-# Udev rules file for HP printer products.
-
-ACTION!="add", GOTO="hpmud_rules_end"
-
-SUBSYSTEM!="usb|usb_device", GOTO="hpmud_rules_end"
-SUBSYSTEM=="usb", ENV{DEVTYPE}!="usb_device" ,GOTO="hpmud_rules_end"
-
-# Check for AiO products (0x03f0xx11).
-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??11", GROUP="lp"
-# Check for Photosmart products (0x03f0xx02).
-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??02", GROUP="lp"
-# Check for Business Inkjet products (0x03f0xx12).
-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", GROUP="lp"
-# Check for Deskjet products (0x03f0xx04).
-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", GROUP="lp"
-# Check for LaserJet products (0x03f0xx17).
-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", GROUP="lp"
-
-LABEL="hpmud_rules_end"
diff --git a/net-print/hplip/files/hplip-3.10.2-systray-segfault.patch b/net-print/hplip/files/hplip-3.10.2-systray-segfault.patch
new file mode 100644
index 000000000000..9e42c1caa27a
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.10.2-systray-segfault.patch
@@ -0,0 +1,11 @@
+diff -up hplip-3.9.8/ui4/systemtray.py.tray-icon-crash hplip-3.9.8/ui4/systemtray.py
+--- hplip-3.9.8/ui4/systemtray.py.tray-icon-crash	2010-03-23 16:36:55.545632224 +0000
++++ hplip-3.9.8/ui4/systemtray.py	2010-03-23 16:37:51.944509885 +0000
+@@ -489,6 +489,7 @@ class SystemTrayApp(QApplication):
+         log.debug("Exiting")
+         self.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT)
+         self.quit()
++        del self.tray_icon
+ 
+ 
+     def toolboxTriggered(self):
diff --git a/net-print/hplip/hplip-3.10.2-r2.ebuild b/net-print/hplip/hplip-3.10.2-r3.ebuild
index 495d20099a2e..762568a24e81 100644
--- a/net-print/hplip/hplip-3.10.2-r2.ebuild
+++ b/net-print/hplip/hplip-3.10.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.2-r2.ebuild,v 1.1 2010/03/30 17:32:44 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.2-r3.ebuild,v 1.1 2010/03/31 18:50:24 billie Exp $
 
 EAPI=2
 
@@ -124,6 +124,10 @@ src_prepare() {
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/346390
 	epatch "${FILESDIR}"/${P}-udev-attrs.patch
 
+	# Fix crash when trying to close the systray
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/486698
+	epatch "${FILESDIR}"/${P}-systray-segfault.patch
+
 	# Force recognition of Gentoo distro by hp-check
 	sed -i \
 		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
@@ -244,9 +248,6 @@ pkg_postinst() {
 	elog "If your device is connected using USB, users will need to be in the lp group to"
 	elog "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."
-	elog
 	elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
 	elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
 	elog "If you prefer the SLP method you have to choose this when configuring the"