summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Dupeyron <calchan@gentoo.org>2008-08-15 11:08:00 +0000
committerDenis Dupeyron <calchan@gentoo.org>2008-08-15 11:08:00 +0000
commiteb09a57de84ee766fff3318dcf4da8c8bd4b955b (patch)
tree1970870e10073848cb1eb450e3d90934ff23d9fb /net-print/hplip
parentRemove no-nptl profile. Marked deprecated long ago (diff)
downloadhistorical-eb09a57de84ee766fff3318dcf4da8c8bd4b955b.tar.gz
historical-eb09a57de84ee766fff3318dcf4da8c8bd4b955b.tar.bz2
historical-eb09a57de84ee766fff3318dcf4da8c8bd4b955b.zip
Fixed minor bug in debug output of device.py.
Package-Manager: portage-2.2_rc7/cvs/Linux 2.6.25-gentoo-r6 i686
Diffstat (limited to 'net-print/hplip')
-rw-r--r--net-print/hplip/ChangeLog5
-rw-r--r--net-print/hplip/Manifest4
-rw-r--r--net-print/hplip/hplip-2.8.6b.ebuild11
3 files changed, 14 insertions, 6 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 6b38ceea69d8..3afabe86a3c6 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,9 @@
# 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.106 2008/08/12 15:53:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.107 2008/08/15 11:08:00 calchan Exp $
+
+ 15 Aug 2008; Denis Dupeyron <calchan@gentoo.org> hplip-2.8.6b.ebuild:
+ Fixed minor bug in debug output of device.py.
12 Aug 2008; Brent Baude <ranger@gentoo.org> hplip-2.8.6b.ebuild:
Marking hplip-2.8.6b ppc stable. Went direct to stable per security
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 17a9f80e4237..1023d840306a 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -9,6 +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 5044 RMD160 0313d06a4c337a0a8a6032b75df88ad46bc1443f SHA1 7e1424464f05587ec0bfe1a93e44aca124e855f7 SHA256 1939c7758ba26f775453696cf533b0d76bd9eb092bdd2ef70356ebaf02d984d5
-MISC ChangeLog 17672 RMD160 e8878326f1c63f928703dc79f561d1c3e2618b29 SHA1 95b150531f0c463cf9a17c586a99de47eaf1d86d SHA256 6aace206849395e39ef75182db0567afad5e1c3d8005f25642281626a0412111
+EBUILD hplip-2.8.6b.ebuild 5129 RMD160 58d1d76c7751a1771e17f494088be874c75a8c03 SHA1 ae07bc0161b64790263ea1a3e6de1276b5c1299d SHA256 a3c20dc29d341fccb16295465f98a677eb1ecb6598fdd8e1d60b8a5798a361d0
+MISC ChangeLog 17794 RMD160 765816d69e4283d17911e34e597b9f6b29855062 SHA1 cd3e1d489e7bb69c7597651e042c0a3aa97868ca SHA256 7bfc9b4dfeeb9dd3eb151b7f4f15cd9f29a4d9f24a2192ce667c1e7ed1e507b9
MISC metadata.xml 1592 RMD160 caf7fbb9f3e8f1fecfbe22963bcd0d29d5adb1c4 SHA1 c325171f26bb06a71a0d21e56faf4558359fe1e0 SHA256 27bc66ec46984e674466082e820d3d6065f3b83b4563d1e3d5e2f0243a55137c
diff --git a/net-print/hplip/hplip-2.8.6b.ebuild b/net-print/hplip/hplip-2.8.6b.ebuild
index 8f350472a459..fd373208c149 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.5 2008/08/12 15:53:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild,v 1.6 2008/08/15 11:08:00 calchan Exp $
inherit eutils linux-info python
@@ -98,8 +98,13 @@ 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/Exec=hp-systray/Exec=hp-systray --qt${QT_VER}/" hplip-systray.desktop.in || die "sed failed"
+ 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() {