1 |
calchan 08/07/30 14:54:27 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: hplip-2.8.6b.ebuild |
5 |
Log: |
6 |
Version bump. Fixed bugs #223121, #223715 and #230913. |
7 |
(Portage version: 2.2_rc3/cvs/Linux 2.6.25-gentoo-r6 i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.101 net-print/hplip/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.101&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.101&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?r1=1.100&r2=1.101 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v |
19 |
retrieving revision 1.100 |
20 |
retrieving revision 1.101 |
21 |
diff -u -r1.100 -r1.101 |
22 |
--- ChangeLog 29 May 2008 17:47:41 -0000 1.100 |
23 |
+++ ChangeLog 30 Jul 2008 14:54:26 -0000 1.101 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for net-print/hplip |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.100 2008/05/29 17:47:41 hawking Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.101 2008/07/30 14:54:26 calchan Exp $ |
29 |
+ |
30 |
+*hplip-2.8.6b (30 Jul 2008) |
31 |
+ |
32 |
+ 30 Jul 2008; Denis Dupeyron <calchan@g.o> +hplip-2.8.6b.ebuild: |
33 |
+ Version bump. Fixed bugs #223121, #223715 and #230913. |
34 |
|
35 |
29 May 2008; Ali Polatel <hawking@g.o> hplip-2.7.12-r1.ebuild: |
36 |
python_mod_optimize is ROOT aware. |
37 |
|
38 |
|
39 |
|
40 |
1.1 net-print/hplip/hplip-2.8.6b.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: hplip-2.8.6b.ebuild |
46 |
=================================================================== |
47 |
# Copyright 1999-2008 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild,v 1.1 2008/07/30 14:54:26 calchan Exp $ |
50 |
|
51 |
inherit eutils linux-info python |
52 |
|
53 |
DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools." |
54 |
HOMEPAGE="http://hplip.sourceforge.net/" |
55 |
SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz" |
56 |
|
57 |
LICENSE="GPL-2" |
58 |
SLOT="0" |
59 |
KEYWORDS="~amd64 ~ppc64 ~x86" |
60 |
|
61 |
IUSE="cupsddk dbus doc fax minimal parport ppds qt3 qt4 scanner snmp" |
62 |
|
63 |
DEPEND="!net-print/hpijs |
64 |
!net-print/hpoj |
65 |
virtual/ghostscript |
66 |
>=media-libs/jpeg-6b |
67 |
>=net-print/foomatic-filters-3.0.20080507 |
68 |
!minimal? ( |
69 |
>=net-print/cups-1.2 |
70 |
dev-libs/libusb |
71 |
cupsddk? ( net-print/cupsddk ) |
72 |
dbus? ( >=sys-apps/dbus-1.0.0 ) |
73 |
scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) |
74 |
snmp? ( |
75 |
net-analyzer/net-snmp |
76 |
dev-libs/openssl |
77 |
) |
78 |
)" |
79 |
|
80 |
RDEPEND="${DEPEND} |
81 |
!minimal? ( |
82 |
!<sys-fs/udev-114 |
83 |
scanner? ( |
84 |
dev-python/imaging |
85 |
qt3? ( >=media-gfx/xsane-0.89 ) |
86 |
qt4? ( >=media-gfx/xsane-0.89 ) |
87 |
!qt3? ( !qt4? ( >=media-gfx/sane-frontends-1.0.9 ) ) |
88 |
) |
89 |
qt4? ( !qt3? ( |
90 |
dev-python/PyQt4 |
91 |
dbus? ( >=dev-python/dbus-python-0.80 ) |
92 |
fax? ( dev-python/reportlab ) |
93 |
) ) |
94 |
qt3? ( |
95 |
>=dev-python/PyQt-3.14 |
96 |
dev-python/ctypes |
97 |
dbus? ( >=dev-python/dbus-python-0.80 ) |
98 |
fax? ( dev-python/reportlab ) |
99 |
) |
100 |
)" |
101 |
|
102 |
CONFIG_CHECK="PARPORT PPDEV" |
103 |
ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)." |
104 |
|
105 |
pkg_setup() { |
106 |
if ! use ppds && ! use cupsddk; then |
107 |
ewarn "Installing neither static (USE=-ppds) nor dynamic (USE=-cupsddk) PPD files," |
108 |
ewarn "which is probably not what you want. You will almost certainly not be able to " |
109 |
ewarn "print (recommended: USE=\"cupsddk -ppds\")." |
110 |
fi |
111 |
if use minimal ; then |
112 |
ewarn "Installing hpijs driver only, make sure you know what you are doing." |
113 |
else |
114 |
use parport && linux-info_pkg_setup |
115 |
fi |
116 |
} |
117 |
|
118 |
src_unpack() { |
119 |
unpack ${A} |
120 |
cd "${S}" |
121 |
|
122 |
sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed" |
123 |
sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \ |
124 |
-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \ |
125 |
base/utils.py || die "Patching base/utils.py failed" |
126 |
|
127 |
# bug 98428 |
128 |
sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Patching hpssd.py failed" |
129 |
|
130 |
# Force recognition of Gentoo distro by hp-check |
131 |
sed -i \ |
132 |
-e "s:file('/etc/issue', 'r').read():'Gentoo':" \ |
133 |
installer/core_install.py || die "sed core_install.py" |
134 |
|
135 |
# Replace udev rules, see bug #197726. |
136 |
rm data/rules/55-hpmud.rules |
137 |
cp "${FILESDIR}"/70-hpmud.rules data/rules |
138 |
sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html || die "sed failed" |
139 |
|
140 |
# Use system foomatic-rip instead of foomatic-rip-hplip |
141 |
sed -i -e 's/foomatic-rip-hplip/foomatic-rip/' ppd/*.ppd || die "sed failed" |
142 |
|
143 |
# Qt4 is still undocumented by upstream, so use with caution |
144 |
local QT_VER |
145 |
use qt4 && QT_VER="4" |
146 |
use qt3 && QT_VER="3" |
147 |
sed -i -e "s/--force-startup/--force-startup --qt${QT_VER}/" base/device.py || die "sed failed" |
148 |
sed -i -e "s/Exec=hp-systray/Exec=hp-systray --qt${QT_VER}/" hplip-systray.desktop.in || die "sed failed" |
149 |
} |
150 |
|
151 |
src_compile() { |
152 |
if use qt3 || use qt4 ; then |
153 |
local GUI_BUILD="--enable-gui-build" |
154 |
else |
155 |
local GUI_BUILD="--disable-gui-build" |
156 |
fi |
157 |
|
158 |
econf \ |
159 |
--disable-dependency-tracking \ |
160 |
--disable-cups11-build \ |
161 |
--with-cupsbackenddir=$(cups-config --serverbin)/backend \ |
162 |
--with-cupsfilterdir=$(cups-config --serverbin)/filter \ |
163 |
--disable-foomatic-rip-hplip-install \ |
164 |
${GUI_BUILD} \ |
165 |
$(use_enable doc doc-build) \ |
166 |
$(use_enable cupsddk foomatic-drv-install) \ |
167 |
$(use_enable dbus dbus-build) \ |
168 |
$(use_enable fax fax-build) \ |
169 |
$(use_enable minimal hpijs-only-build) \ |
170 |
$(use_enable parport pp-build) \ |
171 |
$(use_enable ppds foomatic-ppd-install) \ |
172 |
$(use_enable scanner scan-build) \ |
173 |
$(use_enable snmp network-build) \ |
174 |
|| die "econf failed" |
175 |
emake || die "Compilation failed" |
176 |
} |
177 |
|
178 |
src_install() { |
179 |
emake -j1 DESTDIR="${D}" install || die "emake install failed" |
180 |
rm -f "${D}"/etc/sane.d/dll.conf |
181 |
|
182 |
# bug 106035 |
183 |
use qt3 || use qt4 || rm -Rf "${D}"/usr/share/applications |
184 |
|
185 |
use minimal && rm -rf "${D}"/usr/lib |
186 |
} |
187 |
|
188 |
pkg_preinst() { |
189 |
# avoid collisions with cups-1.2 compat symlinks |
190 |
if [ -e "${ROOT}"/usr/lib/cups/backend/hp ] && [ -e "${ROOT}"/usr/libexec/cups/backend/hp ]; then |
191 |
rm -f "${ROOT}"/usr/libexec/cups/backend/hp{,fax}; |
192 |
fi |
193 |
} |
194 |
|
195 |
pkg_postinst() { |
196 |
python_mod_optimize /usr/share/${PN} |
197 |
|
198 |
elog "You should run hp-setup as root if you are installing hplip for the first time, and may also" |
199 |
elog "need to run it if you are upgrading from an earlier version." |
200 |
elog |
201 |
elog "If your device is connected using USB, users will need to be in the lp group to access it." |
202 |
elog |
203 |
elog "This release doesn't use an init script anymore, so you should probably do a" |
204 |
elog "'rc-update del hplip' if you are updating from an old version." |
205 |
} |
206 |
|
207 |
pkg_postrm() { |
208 |
python_mod_cleanup /usr/share/${PN} |
209 |
} |