diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-11-26 20:10:02 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-11-26 20:10:02 +0000 |
| commit | fbcb91e88c6e2d68e200a46ee25a2c7f3e3458f8 (patch) | |
| tree | 6ee584c078c7521689bd1d5ad03ff9ab34548e46 /net-print | |
| parent | Remove misc hacks that are no longer needed with the fix from #156252. (diff) | |
| download | gentoo-2-fbcb91e88c6e2d68e200a46ee25a2c7f3e3458f8.tar.gz gentoo-2-fbcb91e88c6e2d68e200a46ee25a2c7f3e3458f8.tar.bz2 gentoo-2-fbcb91e88c6e2d68e200a46ee25a2c7f3e3458f8.zip | |
Add missing cp, thanks jakub in bug 150801
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/hplip/ChangeLog | 5 | ||||
| -rw-r--r-- | net-print/hplip/hplip-1.6.10.ebuild | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index c6883abe43c4..85be60ebad7b 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,9 @@ # 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.44 2006/10/20 18:38:05 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.45 2006/11/26 20:10:02 genstef Exp $ + + 26 Nov 2006; Stefan Schweizer <genstef@gentoo.org> hplip-1.6.10.ebuild: + Add missing cp, thanks jakub in bug 150801 *hplip-1.6.10 (20 Oct 2006) diff --git a/net-print/hplip/hplip-1.6.10.ebuild b/net-print/hplip/hplip-1.6.10.ebuild index 4efac1c34128..8b472d45fc3e 100644 --- a/net-print/hplip/hplip-1.6.10.ebuild +++ b/net-print/hplip/hplip-1.6.10.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-1.6.10.ebuild,v 1.1 2006/10/20 18:38:05 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.10.ebuild,v 1.2 2006/11/26 20:10:02 genstef Exp $ inherit eutils @@ -21,9 +21,8 @@ IUSE="foomaticdb snmp X qt3 ppds scanner" DEPEND=">=dev-lang/python-2.2.0 snmp? ( >=net-analyzer/net-snmp-5.0.9 ) !net-print/hpijs - !net-print/hpoj" - -RDEPEND="virtual/ghostscript + !net-print/hpoj + virtual/ghostscript scanner? ( >=media-gfx/sane-backends-1.0.9 || ( @@ -36,8 +35,8 @@ RDEPEND="virtual/ghostscript sys-apps/hotplug-base net-print/cups foomaticdb? ( net-print/foomatic-db-engine ) - >=net-print/foomatic-filters-3.0.2 - ${DEPEND}" + >=net-print/foomatic-filters-3.0.2" +RDEPEND="${DEPEND}" pkg_setup() { # avoid collisions with cups-1.2 compat symlinks @@ -117,7 +116,7 @@ pkg_preinst() { if 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 ] && ${ROOT}/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 |