| 1 |
vapier 07/12/30 18:39:14 |
| 2 |
|
| 3 |
Modified: hplip-2.7.12.ebuild hplip-2.7.10.ebuild |
| 4 |
Log: |
| 5 |
rewrite the pkg_preinst hack so that it screws around with dll.conf much less often ... break my setup once, fine ... screw me twice, i stab you: *stab* |
| 6 |
(Portage version: 2.1.4_rc12) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-print/hplip/hplip-2.7.12.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.7.12.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.7.12.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.7.12.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: hplip-2.7.12.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.12.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- hplip-2.7.12.ebuild 23 Dec 2007 10:29:11 -0000 1.1 |
| 22 |
+++ hplip-2.7.12.ebuild 30 Dec 2007 18:39:13 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.12.ebuild,v 1.1 2007/12/23 10:29:11 calchan Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.12.ebuild,v 1.2 2007/12/30 18:39:13 vapier Exp $ |
| 28 |
|
| 29 |
inherit eutils linux-info |
| 30 |
|
| 31 |
@@ -110,13 +110,16 @@ |
| 32 |
} |
| 33 |
|
| 34 |
pkg_preinst() { |
| 35 |
- if ! use minimal && use scanner ; then |
| 36 |
- insinto /etc/sane.d |
| 37 |
- [ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf . |
| 38 |
- [ -e "${ROOT}"/etc/sane.d/dll.conf ] && cp "${ROOT}"/etc/sane.d/dll.conf . |
| 39 |
- grep -q hpaio dll.conf || echo hpaio >> "${T}"/dll.conf |
| 40 |
- doins "${T}"/dll.conf |
| 41 |
- fi |
| 42 |
+ # try to be very conservative as to when we screw around with config files |
| 43 |
+ use minimal && return 0 |
| 44 |
+ use scanner || return 0 |
| 45 |
+ [[ ! -e ${ROOT}/etc/sane.d/dll.conf ]] && return 0 |
| 46 |
+ grep -qs '\<hpaio\>' "${ROOT}"/etc/sane.d/dll.conf && return 0 |
| 47 |
+ |
| 48 |
+ cp "${ROOT}"/etc/sane.d/dll.conf "${T}"/dll.conf || return 1 |
| 49 |
+ echo hpaio >> "${T}"/dll.conf |
| 50 |
+ insinto /etc/sane.d |
| 51 |
+ doins "${T}"/dll.conf |
| 52 |
} |
| 53 |
|
| 54 |
pkg_postinst() { |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.6 net-print/hplip/hplip-2.7.10.ebuild |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.7.10.ebuild?rev=1.6&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.7.10.ebuild?rev=1.6&content-type=text/plain |
| 62 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.7.10.ebuild?r1=1.5&r2=1.6 |
| 63 |
|
| 64 |
Index: hplip-2.7.10.ebuild |
| 65 |
=================================================================== |
| 66 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.10.ebuild,v |
| 67 |
retrieving revision 1.5 |
| 68 |
retrieving revision 1.6 |
| 69 |
diff -u -r1.5 -r1.6 |
| 70 |
--- hplip-2.7.10.ebuild 26 Dec 2007 09:46:05 -0000 1.5 |
| 71 |
+++ hplip-2.7.10.ebuild 30 Dec 2007 18:39:13 -0000 1.6 |
| 72 |
@@ -1,6 +1,6 @@ |
| 73 |
# Copyright 1999-2007 Gentoo Foundation |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.10.ebuild,v 1.5 2007/12/26 09:46:05 drac Exp $ |
| 76 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.10.ebuild,v 1.6 2007/12/30 18:39:13 vapier Exp $ |
| 77 |
|
| 78 |
inherit eutils linux-info |
| 79 |
|
| 80 |
@@ -110,13 +110,16 @@ |
| 81 |
} |
| 82 |
|
| 83 |
pkg_preinst() { |
| 84 |
- if ! use minimal && use scanner ; then |
| 85 |
- insinto /etc/sane.d |
| 86 |
- [ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf . |
| 87 |
- [ -e "${ROOT}"/etc/sane.d/dll.conf ] && cp "${ROOT}"/etc/sane.d/dll.conf . |
| 88 |
- grep -q hpaio dll.conf || echo hpaio >> "${T}"/dll.conf |
| 89 |
- doins "${T}"/dll.conf |
| 90 |
- fi |
| 91 |
+ # try to be very conservative as to when we screw around with config files |
| 92 |
+ use minimal && return 0 |
| 93 |
+ use scanner || return 0 |
| 94 |
+ [[ ! -e ${ROOT}/etc/sane.d/dll.conf ]] && return 0 |
| 95 |
+ grep -qs '\<hpaio\>' "${ROOT}"/etc/sane.d/dll.conf && return 0 |
| 96 |
+ |
| 97 |
+ cp "${ROOT}"/etc/sane.d/dll.conf "${T}"/dll.conf || return 1 |
| 98 |
+ echo hpaio >> "${T}"/dll.conf |
| 99 |
+ insinto /etc/sane.d |
| 100 |
+ doins "${T}"/dll.conf |
| 101 |
} |
| 102 |
|
| 103 |
pkg_postinst() { |
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
-- |
| 108 |
gentoo-commits@g.o mailing list |
Archives