Fixed hp-systray not starting up automatically with hp-toolbox, thanks to Gordon Malm (see bug #233968).

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.25-gentoo-r6 i686

3 files changed, 10 insertions, 16 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index ba3f8e1469ba..6cd613270959 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.103 2008/08/06 19:37:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.104 2008/08/07 08:56:13 calchan Exp $
+
+  07 Aug 2008; Denis Dupeyron <calchan@gentoo.org> hplip-2.8.6b.ebuild:
+  Fixed hp-systray not starting up automatically with hp-toolbox, thanks to
+  Gordon Malm (see bug #233968).
 
   06 Aug 2008; Markus Meier <maekke@gentoo.org> hplip-2.8.6b.ebuild:
   amd64/x86 stable, bug #233968
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index b3dfb67616fd..ee0e49bc61ca 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70-hpmud.rules 763 RMD160 b8326b26658b8e8355ae3d74423b51e2e15001e2 SHA1 fdb6b4937a814db50dc3ac3ca9b9c04cb44a6590 SHA256 6e7f2a0fd5a2111505066a412daea0d29c1ce858f09dbbaa489bb5a2f231e837
 DIST hplip-2.7.10.tar.gz 14441901 RMD160 1bbfd405eb3d75fa38c0f2fc485438ee064ccce9 SHA1 722e95d0a2b5e4b9535a68c94ed3aef0f3c28ab6 SHA256 e289d5f6190caf4596f6770037569638d96915583339933d6c202f35fc02d8c3
 DIST hplip-2.7.12.tar.gz 14543662 RMD160 6d278ccd3d19df46c6d7fc6bd1b9a6b995749f88 SHA1 4a80e46a633674db53d8063349b8bbb3f9070d49 SHA256 22c1b626c633acac74ab5f7994060304570a81a038f2be5b9e35e44e938a30a0
-DIST hplip-2.8.2.tar.gz 14195737 RMD160 52ad20b3900d038ed5ed91ca2396a66c6cd5897d SHA1 65541eee6fc4d1b2b0be535bff8590ec4efabb14 SHA256 2135f2e02077cf5388c4b9b8214f0fd56f24f8bb2ccfa564a80402520e2d5aa8
+DIST hplip-2.8.2.tar.gz 158117 RMD160 3ee6fca8eef6c11f2f98bdc6477a521fd98336e1 SHA1 1ad853bee10fe8cafec960ca646e300e9f56b782 SHA256 a0e14f0489d2385341d823292bb02f3fbdc1ddce54f7091ab0aa4012ffeb7376
 DIST hplip-2.8.5.tar.gz 15307909 RMD160 67c32175635828160995b0dafede339dfb986364 SHA1 f393ed57d3b5bb811551896a3a08fad268733f24 SHA256 9d78597a6d7d10f07f4fbe4fd023d4ccd9f1aab77ab902d92e5cc60a03928f6c
 DIST hplip-2.8.6b.tar.gz 10955713 RMD160 fa903344c59f4bc474aeb049dd75631e72435b92 SHA1 b15e1dcb00d745ccc424633a84ba062c307740f9 SHA256 aa1094f0f91bbc0b5a611ce6ece40651edc7b3da8fa111921a3524916fc179fa
 EBUILD hplip-2.7.10.ebuild 4049 RMD160 c17835ca07868e4ae83a7bdfef86d4e663aefdb3 SHA1 d1acdaff237aeb2f941cfaf8c9214aecf7d89130 SHA256 f1473d68cfd129c274e1791e1789561cd694de069c2875ac0f46125bc118db5d
@@ -12,13 +9,6 @@ EBUILD hplip-2.7.12-r1.ebuild 4156 RMD160 64e1752d02c1c7a96f2c8e6fd7e7e2c07b875e
 EBUILD hplip-2.7.12.ebuild 4053 RMD160 d611810ff118f923e20163187d203b454f3b08b9 SHA1 9a65992aa1ea0b0ebcd28cf40363729dceb38e3d SHA256 547209f50f10cc5a1e55f32ce16bb30db4d53666378a663f2aae523052949864
 EBUILD hplip-2.8.2.ebuild 4592 RMD160 aab228762a8719450b504794ac3d65a871738e3b SHA1 a1eeaecd17bf86dd83c842b38567feb6f06357a3 SHA256 90af3dc5697f02df7be2e24eea0cf3a2743960410c6267285561f2cf5bd83382
 EBUILD hplip-2.8.5.ebuild 4286 RMD160 0709b4781da6bcb9e32f81092b28cfba910e5ca7 SHA1 4fe6b04bfbc958f0b55c3bbf577881e316175c74 SHA256 b3420b603ee93146ca9116bec1d3cdf210c1a9dcf962020dbde3ec1699150441
-EBUILD hplip-2.8.6b.ebuild 5037 RMD160 45af1ecab2f55fb6294cf2dd4e41f991f574cfd7 SHA1 4c521614303d3d2ece1918657c1c6ccd78330118 SHA256 9165aa9402ba51da4fb0ebe9cb2e85957273cd829190709f10417098f788a408
-MISC ChangeLog 17235 RMD160 c06b21219a1531ac641469a501a78d4da2659464 SHA1 fa6e843e9af574758533d304b4ff1f9d68ae5b3f SHA256 87e483ecb51a9e0f0e1b4dd5ab27a1b96c56453f4f26161ff751d1710cb1844a
+EBUILD hplip-2.8.6b.ebuild 5041 RMD160 7de668fdce3319639e7ee61b714684acdc58ef62 SHA1 7476ded8eafce9a6d19f5a82b54b1d04f9282954 SHA256 8ccbd45cd73f683033922ef327531855ac96fe31e3c69ff5d85288ce9785377f
+MISC ChangeLog 17418 RMD160 2e7b431403a841c15cde5e17d8c44fac9b87371b SHA1 f86cc9b0862147475894644ce82158c1b9ea9c5c SHA256 10c26a9a7d0ff69260ca8ee58cc8ce000dfbe1d93443b755dc40c33eb3fd1916
 MISC metadata.xml 250 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 SHA1 f91d1e6c01026cba252d042ba254f4a4bc61194a SHA256 ab106df12671f3f541e0416f8c0d5a96b6e725ed7b3b111d27af7a584c4bf164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiZ/doACgkQkKaRLQcq0GKK7wCeLrSdm09MkwfRfCRmf2Vp9BTA
-INsAoJPNAFlSWy08djYEUJFqgHHaIay0
-=t+sl
------END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-2.8.6b.ebuild b/net-print/hplip/hplip-2.8.6b.ebuild
index 5317225ace30..2cea07ca8e6b 100644
--- a/net-print/hplip/hplip-2.8.6b.ebuild
+++ b/net-print/hplip/hplip-2.8.6b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild,v 1.3 2008/08/06 19:37:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild,v 1.4 2008/08/07 08:56:13 calchan Exp $
 
 inherit eutils linux-info python
 
@@ -98,7 +98,7 @@ src_unpack() {
 	local QT_VER
 	use qt4 && QT_VER="4"
 	use qt3 && QT_VER="3"
-	sed -i -e "s/--force-startup/--force-startup --qt${QT_VER}/" base/device.py || die "sed failed"
+	sed -i -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"
 }