summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Góes <vanquirius@gentoo.org>2006-01-14 19:12:41 +0000
committerMarcelo Góes <vanquirius@gentoo.org>2006-01-14 19:12:41 +0000
commit64685b45cf88a072b7f45da909e320a8aaebe18d (patch)
tree135736a7e4075062c2edafe51c40bc0be9266d68 /net-print
parentMarked ppc-macos stable (bug #118946) (diff)
downloadgentoo-2-64685b45cf88a072b7f45da909e320a8aaebe18d.tar.gz
gentoo-2-64685b45cf88a072b7f45da909e320a8aaebe18d.tar.bz2
gentoo-2-64685b45cf88a072b7f45da909e320a8aaebe18d.zip
Do not install qt applications with USE=-qt. Fixes bug 106035.
(Portage version: 2.0.53)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/hplip/ChangeLog9
-rw-r--r--net-print/hplip/Manifest4
-rw-r--r--net-print/hplip/files/digest-hplip-0.9.7-r2 (renamed from net-print/hplip/files/digest-hplip-0.9.7-r1)0
-rw-r--r--net-print/hplip/hplip-0.9.7-r2.ebuild (renamed from net-print/hplip/hplip-0.9.7-r1.ebuild)10
4 files changed, 19 insertions, 4 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 91783cba25c4..aba0821ed38e 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-print/hplip
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.13 2006/01/14 18:53:41 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.14 2006/01/14 19:12:41 vanquirius Exp $
+
+*hplip-0.9.7-r2 (14 Jan 2006)
+
+ 14 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -hplip-0.9.7-r1.ebuild,
+ +hplip-0.9.7-r2.ebuild:
+ Do not install qt applications with USE=-qt. Fixes bug 106035. Thanks to
+ Chris White <chriswhite at gentoo dot org> and others.
14 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> files/hplip.init.d:
Add Alex Rostovtsev <tetromino at gmail dot com>'s init fix for bug 97033.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 9a909d4bbd13..90c1e4fde4cd 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,10 +2,10 @@ MD5 3b7b3837b1d8b688857ecefc461337e9 ChangeLog 2156
MD5 ce4ebffecf6776bf8b594d515f151b0e files/digest-hplip-0.9.3 146
MD5 6d67b8483b9c21c792fda3ed690cb26a files/digest-hplip-0.9.4 145
MD5 cbf1b3a3716e0de9faef1b950ad93b9d files/digest-hplip-0.9.5 145
-MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r1 208
+MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r2 208
MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
MD5 f3a777f2c6eeebb99f32e02b52b65a70 hplip-0.9.3.ebuild 2570
MD5 39df325ae3f38e64a979900d6c54d24f hplip-0.9.4.ebuild 2575
MD5 b8797d3c934c32f6ad30b83ac842356b hplip-0.9.5.ebuild 2709
-MD5 127906ecd8a5afb5c6270d744af5075b hplip-0.9.7-r1.ebuild 3060
+MD5 e71719873616396267d503d1ee19f44a hplip-0.9.7-r2.ebuild 3253
MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
diff --git a/net-print/hplip/files/digest-hplip-0.9.7-r1 b/net-print/hplip/files/digest-hplip-0.9.7-r2
index baf9a50595f4..baf9a50595f4 100644
--- a/net-print/hplip/files/digest-hplip-0.9.7-r1
+++ b/net-print/hplip/files/digest-hplip-0.9.7-r2
diff --git a/net-print/hplip/hplip-0.9.7-r1.ebuild b/net-print/hplip/hplip-0.9.7-r2.ebuild
index 1e8a759ec3e0..10089bfac971 100644
--- a/net-print/hplip/hplip-0.9.7-r1.ebuild
+++ b/net-print/hplip/hplip-0.9.7-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r1.ebuild,v 1.1 2006/01/14 18:23:03 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r2.ebuild,v 1.1 2006/01/14 19:12:41 vanquirius Exp $
inherit eutils
@@ -85,6 +85,14 @@ src_install() {
rm -f "${D}"/usr/lib/libsane-hpaio.so.1.0.0
fi
+ # bug 106035
+ if ! use qt ; then
+ rm -f "${D}"/usr/bin/hp-print
+ rm -f "${D}"/usr/bin/hp-toolbox
+ rm -f "${D}"/usr/share/hplip/print
+ rm -f "${D}"/usr/share/hplip/toolbox
+ fi
+
if use ppds; then
dodir /usr/share
mv "${S}"/prnt/hpijs/ppd "${D}"/usr/share