| 1 |
calchan 07/10/18 13:08:22 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: hplip-2.7.9-r1.ebuild |
| 5 |
Removed: hplip-2.7.7-r3.ebuild hplip-2.7.9.ebuild |
| 6 |
Log: |
| 7 |
Fixed bug #195565 for new 2.x branch. Fixed quoting. |
| 8 |
(Portage version: 2.1.3.14) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.79 net-print/hplip/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.79&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.79&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?r1=1.78&r2=1.79 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v |
| 20 |
retrieving revision 1.78 |
| 21 |
retrieving revision 1.79 |
| 22 |
diff -u -r1.78 -r1.79 |
| 23 |
--- ChangeLog 10 Oct 2007 18:19:47 -0000 1.78 |
| 24 |
+++ ChangeLog 18 Oct 2007 13:08:21 -0000 1.79 |
| 25 |
@@ -1,6 +1,14 @@ |
| 26 |
# ChangeLog for net-print/hplip |
| 27 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.78 2007/10/10 18:19:47 genstef Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.79 2007/10/18 13:08:21 calchan Exp $ |
| 30 |
+ |
| 31 |
+*hplip-2.7.9-r1 (18 Oct 2007) |
| 32 |
+ |
| 33 |
+ 18 Oct 2007; Denis Dupeyron <calchan@g.o> |
| 34 |
+ -files/hplip-2.7.7-udev-kernel.2.6.22.diff, |
| 35 |
+ +files/hplip-2.7.9-subprocess_replacement.patch, -hplip-2.7.7-r3.ebuild, |
| 36 |
+ -hplip-2.7.9.ebuild, +hplip-2.7.9-r1.ebuild: |
| 37 |
+ Fixed bug #195565 for new 2.x branch. Fixed quoting. |
| 38 |
|
| 39 |
10 Oct 2007; Stefan Schweizer <genstef@g.o> hplip-2.7.9.ebuild: |
| 40 |
Improve DEPEND-accuracy for jakub in bug 193671 |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 net-print/hplip/hplip-2.7.9-r1.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.7.9-r1.ebuild?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.7.9-r1.ebuild?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: hplip-2.7.9-r1.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2007 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.9-r1.ebuild,v 1.1 2007/10/18 13:08:21 calchan Exp $ |
| 54 |
|
| 55 |
inherit eutils linux-info |
| 56 |
|
| 57 |
DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools." |
| 58 |
HOMEPAGE="http://hplip.sourceforge.net/" |
| 59 |
SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz" |
| 60 |
|
| 61 |
LICENSE="GPL-2" |
| 62 |
SLOT="0" |
| 63 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 64 |
IUSE="X doc fax minimal parport ppds scanner snmp" |
| 65 |
|
| 66 |
DEPEND="!net-print/hpijs |
| 67 |
!net-print/hpoj |
| 68 |
virtual/ghostscript |
| 69 |
>=media-libs/jpeg-6b |
| 70 |
net-print/foomatic-filters |
| 71 |
!minimal? ( |
| 72 |
>=net-print/cups-1.2 |
| 73 |
dev-libs/libusb |
| 74 |
scanner? ( X? ( >=media-gfx/xsane-0.89 ) |
| 75 |
!X? ( >=media-gfx/sane-frontends-1.0.9 ) ) |
| 76 |
snmp? ( |
| 77 |
net-analyzer/net-snmp |
| 78 |
dev-libs/openssl |
| 79 |
) )" |
| 80 |
|
| 81 |
RDEPEND="${DEPEND} |
| 82 |
!minimal? ( !<sys-fs/udev-114 |
| 83 |
fax? ( dev-python/reportlab ) |
| 84 |
X? ( >=dev-python/PyQt-3.14 ) )" |
| 85 |
|
| 86 |
CONFIG_CHECK="PARPORT" |
| 87 |
ERROR_PARPORT="Please make sure Device Drivers -> Parallel port support is enabled in your kernel" |
| 88 |
|
| 89 |
pkg_setup() { |
| 90 |
if ! use ppds ; then |
| 91 |
ewarn "Not installing built-in PPD files, which is probably not what you want." |
| 92 |
ewarn "You need USE=ppds if you want to install them." |
| 93 |
fi |
| 94 |
if use minimal ; then |
| 95 |
ewarn "Installing hpijs driver only, make sure you know what you are doing." |
| 96 |
else |
| 97 |
use parport && linux-info_pkg_setup |
| 98 |
fi |
| 99 |
|
| 100 |
# avoid collisions with cups-1.2 compat symlinks |
| 101 |
if [ -e "${ROOT}"/usr/lib/cups/backend/hp ] && [ -e "${ROOT}"/usr/libexec/cups/backend/hp ]; then |
| 102 |
rm -f "${ROOT}"/usr/libexec/cups/backend/hp{,fax}; |
| 103 |
fi |
| 104 |
} |
| 105 |
|
| 106 |
src_unpack() { |
| 107 |
unpack ${A} |
| 108 |
cd "${S}" |
| 109 |
|
| 110 |
# Fix bug #195565 |
| 111 |
epatch "${FILESDIR}"/${P}-subprocess_replacement.patch |
| 112 |
|
| 113 |
sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed" |
| 114 |
sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \ |
| 115 |
-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \ |
| 116 |
base/utils.py || die "Patching base/utils.py failed" |
| 117 |
|
| 118 |
# bug 98428 |
| 119 |
sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Patching hpssd.py failed" |
| 120 |
|
| 121 |
# Force recognition of Gentoo distro by hp-check |
| 122 |
sed -i \ |
| 123 |
-e "s:file('/etc/issue', 'r').read():'Gentoo':" \ |
| 124 |
installer/core_install.py || die "sed core_install.py" |
| 125 |
|
| 126 |
# bug 186906, makes udev-rules work also for kernel-2.6.22 |
| 127 |
sed -i -e "s/usb_device/usb|usb_device/" -e "s/SYSFS/ATTRS/g" \ |
| 128 |
data/rules/55-hpmud.rules || die "Patching 55-hpmud.rules failed" |
| 129 |
} |
| 130 |
|
| 131 |
src_compile() { |
| 132 |
econf \ |
| 133 |
--disable-cups11-build \ |
| 134 |
--with-cupsbackenddir=$(cups-config --serverbin)/backend \ |
| 135 |
$(use_enable minimal hpijs-only-build) \ |
| 136 |
$(use_enable doc doc-build) \ |
| 137 |
$(use_enable snmp network-build) \ |
| 138 |
$(use_enable parport pp-build) \ |
| 139 |
$(use_enable scanner scan-build) \ |
| 140 |
$(use_enable X gui-build) \ |
| 141 |
$(use_enable fax fax-build) \ |
| 142 |
$(use_enable ppds foomatic-ppd-install) \ |
| 143 |
--disable-foomatic-xml-install \ |
| 144 |
|| die "econf failed" |
| 145 |
emake || die "Compilation failed" |
| 146 |
} |
| 147 |
|
| 148 |
src_install() { |
| 149 |
emake -j1 DESTDIR="${D}" install || die "emake install failed" |
| 150 |
|
| 151 |
# bug 106035 |
| 152 |
use X || rm -Rf "${D}"/usr/share/applications |
| 153 |
|
| 154 |
use minimal && rm -rf "${D}"/usr/lib |
| 155 |
} |
| 156 |
|
| 157 |
pkg_preinst() { |
| 158 |
if ! use minimal && use scanner ; then |
| 159 |
insinto /etc/sane.d |
| 160 |
[ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf . |
| 161 |
[ -e "${ROOT}"/etc/sane.d/dll.conf ] && cp "${ROOT}"/etc/sane.d/dll.conf . |
| 162 |
grep -q hpaio dll.conf || echo hpaio >> dll.conf |
| 163 |
doins dll.conf |
| 164 |
fi |
| 165 |
} |
| 166 |
|
| 167 |
pkg_postinst() { |
| 168 |
elog "You should run hp-setup as root if you are installing hplip for the first time, and may also" |
| 169 |
elog "need to run it if you are upgrading from an earlier version." |
| 170 |
elog |
| 171 |
elog "This release doesn't use an init script anymore, so you should probably do a" |
| 172 |
elog "'rc-update del hplip' if you are updating." |
| 173 |
} |
| 174 |
|
| 175 |
|
| 176 |
|
| 177 |
-- |
| 178 |
gentoo-commits@g.o mailing list |
Archives