Updated udev rules, to work with kernel 2.6.22. This uses new udev-syntax, so block versions before udev-114, Bug #186906.

Package-Manager: portage-2.1.3.6

5 files changed, 167 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 6672b0748f21..ec5d7400de68 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.72 2007/08/08 23:28:56 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.73 2007/08/21 12:06:26 zzam Exp $
+
+*hplip-2.7.7-r1 (21 Aug 2007)
+
+  21 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/hplip-2.7.7-udev-kernel.2.6.22.diff, +hplip-2.7.7-r1.ebuild:
+  Updated udev rules, to work with kernel 2.6.22. This uses new udev-syntax,
+  so block versions before udev-114, Bug #186906.
 
 *hplip-2.7.7 (08 Aug 2007)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index bf3e79d3b1f4..ada06c4ded81 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX hplip-2.7.7-udev-kernel.2.6.22.diff 486 RMD160 c07db4125135d3c15fd15934f943268cdd57aefb SHA1 6ba90f7d140c251835ef07d17fb281bc46877d21 SHA256 0df160691557523bb090bb339360c721eb8e274a438d6777fca3bfd9d6c469fa
+MD5 82340e766e2bad747841e0b184a1e260 files/hplip-2.7.7-udev-kernel.2.6.22.diff 486
+RMD160 c07db4125135d3c15fd15934f943268cdd57aefb files/hplip-2.7.7-udev-kernel.2.6.22.diff 486
+SHA256 0df160691557523bb090bb339360c721eb8e274a438d6777fca3bfd9d6c469fa files/hplip-2.7.7-udev-kernel.2.6.22.diff 486
 AUX hplip.init.d 948 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c SHA1 bc9c9a8767c5f253cd9c0dd40bb7e4248cd13b0b SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c files/hplip.init.d 948
@@ -20,14 +27,18 @@ EBUILD hplip-2.7.6.ebuild 3690 RMD160 89cdb47e316e56c46c2280fad7ef1bc1e44a9f51 S
 MD5 7da0c3f3a05f993039ae0b0ef5bb9785 hplip-2.7.6.ebuild 3690
 RMD160 89cdb47e316e56c46c2280fad7ef1bc1e44a9f51 hplip-2.7.6.ebuild 3690
 SHA256 c70f0151b8d53ac462316acf72cb8a83825db64e1fdbdebd06392fba46cd0bd5 hplip-2.7.6.ebuild 3690
+EBUILD hplip-2.7.7-r1.ebuild 3890 RMD160 e5b4f178871928f7eef1245dd857a0e66be56acd SHA1 e840bfb7d4b3b8c57af15241abb3aa5417d716db SHA256 95440e0074515ed8f3341f21bd4bdd45999ef87585aa2dc9d265cff4209d1dc6
+MD5 031a1dfc818fa7957c0548b5afae1bc4 hplip-2.7.7-r1.ebuild 3890
+RMD160 e5b4f178871928f7eef1245dd857a0e66be56acd hplip-2.7.7-r1.ebuild 3890
+SHA256 95440e0074515ed8f3341f21bd4bdd45999ef87585aa2dc9d265cff4209d1dc6 hplip-2.7.7-r1.ebuild 3890
 EBUILD hplip-2.7.7.ebuild 3759 RMD160 96bb907923c93c89b2c3992b83714fd173357680 SHA1 27691aed8a27468a9d6dc89ce1e348d397be3492 SHA256 30451f2900e118eba6497af4da963a2bf236df5873e1dbc0bf73136c37948f9b
 MD5 e5fb5ce31f271f67d386fc0fa890ad68 hplip-2.7.7.ebuild 3759
 RMD160 96bb907923c93c89b2c3992b83714fd173357680 hplip-2.7.7.ebuild 3759
 SHA256 30451f2900e118eba6497af4da963a2bf236df5873e1dbc0bf73136c37948f9b hplip-2.7.7.ebuild 3759
-MISC ChangeLog 12160 RMD160 6a073baa010074c81c97d52e8fcc287b5a13ca10 SHA1 07c06d42ee7d981ce11a168848c6fca20f1575e8 SHA256 92e4ba7f3996e56a395b2e68c589f8c2344f0ef9f8afce738430e9d02b445111
-MD5 24c3aca2aa811c3d71d101e861ef69d8 ChangeLog 12160
-RMD160 6a073baa010074c81c97d52e8fcc287b5a13ca10 ChangeLog 12160
-SHA256 92e4ba7f3996e56a395b2e68c589f8c2344f0ef9f8afce738430e9d02b445111 ChangeLog 12160
+MISC ChangeLog 12439 RMD160 fbd6872d70c70ef1e86191a285a13a66d0f819c5 SHA1 14dded5727d7ce4675611bd48a4a573859d0d282 SHA256 4af8acad5e00a921fd9129b7f414f466be06fb9e18c7f17ff869135b7521d792
+MD5 5b7306169b777f39394088ba5e96cd5b ChangeLog 12439
+RMD160 fbd6872d70c70ef1e86191a285a13a66d0f819c5 ChangeLog 12439
+SHA256 4af8acad5e00a921fd9129b7f414f466be06fb9e18c7f17ff869135b7521d792 ChangeLog 12439
 MISC metadata.xml 250 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 SHA1 f91d1e6c01026cba252d042ba254f4a4bc61194a SHA256 ab106df12671f3f541e0416f8c0d5a96b6e725ed7b3b111d27af7a584c4bf164
 MD5 a7f39f5758507140c896dcc24a3e0e2f metadata.xml 250
 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 metadata.xml 250
@@ -44,3 +55,13 @@ SHA256 8b4586dffb135b543d1d4809733ca82651d4bb523b9f4286c22cd11ed8255832 files/di
 MD5 f2a0a963b9b861e21a85682d0c052886 files/digest-hplip-2.7.7 241
 RMD160 65b7854d37748cd9132fe9a021cd75af7324e442 files/digest-hplip-2.7.7 241
 SHA256 c0010a4a83dce3e4d7f01acb21db5cf45068c4060a7bc99f3f37554de50e9fba files/digest-hplip-2.7.7 241
+MD5 f2a0a963b9b861e21a85682d0c052886 files/digest-hplip-2.7.7-r1 241
+RMD160 65b7854d37748cd9132fe9a021cd75af7324e442 files/digest-hplip-2.7.7-r1 241
+SHA256 c0010a4a83dce3e4d7f01acb21db5cf45068c4060a7bc99f3f37554de50e9fba files/digest-hplip-2.7.7-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFGytVNt2vP6XvVdOcRAtODAKDnPAvDsvLspHC/C5EHujCRlFoacgCgpIqW
+CQ6NXlDxgDJFfYjU1RkY3nk=
+=SnTX
+-----END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/digest-hplip-2.7.7-r1 b/net-print/hplip/files/digest-hplip-2.7.7-r1
new file mode 100644
index 000000000000..3dbaf8aeb6e1
--- /dev/null
+++ b/net-print/hplip/files/digest-hplip-2.7.7-r1
@@ -0,0 +1,3 @@
+MD5 086bd6a306fa2dfbd6e8c962fddcdef4 hplip-2.7.7.tar.gz 14412854
+RMD160 d3bc36b44b2fd07d8938fce2f508bbc9b4c47b5b hplip-2.7.7.tar.gz 14412854
+SHA256 0804bda4dd18480597bf408351fe56412b84f737d2554b07aafaa1fb089674ba hplip-2.7.7.tar.gz 14412854
diff --git a/net-print/hplip/files/hplip-2.7.7-udev-kernel.2.6.22.diff b/net-print/hplip/files/hplip-2.7.7-udev-kernel.2.6.22.diff
new file mode 100644
index 000000000000..d3aab3e37d7f
--- /dev/null
+++ b/net-print/hplip/files/hplip-2.7.7-udev-kernel.2.6.22.diff
@@ -0,0 +1,12 @@
+Index: hplip-2.7.7/55-hpmud.rules
+===================================================================
+--- hplip-2.7.7.orig/55-hpmud.rules
++++ hplip-2.7.7/55-hpmud.rules
+@@ -1,5 +1,5 @@
+ # TODO: add PROGRAM rule for 7/xx/xx printer class interface
+-SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
++SUBSYSTEM!="usb|usb_device", GOTO="hpmud_rules_end"
+ ACTION!="add", GOTO="hpmud_rules_end"
+-SYSFS{idVendor}=="03f0", GROUP="lp"
++ATTR{idVendor}=="03f0", GROUP="lp"
+ LABEL="hpmud_rules_end"
diff --git a/net-print/hplip/hplip-2.7.7-r1.ebuild b/net-print/hplip/hplip-2.7.7-r1.ebuild
new file mode 100644
index 000000000000..f693a1a7db8a
--- /dev/null
+++ b/net-print/hplip/hplip-2.7.7-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.7-r1.ebuild,v 1.1 2007/08/21 12:06:26 zzam Exp $
+
+inherit eutils linux-info
+
+DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
+HOMEPAGE="http://hplip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X doc fax minimal parport ppds scanner snmp"
+
+DEPEND="!net-print/hpijs
+	!net-print/hpoj
+	dev-libs/openssl
+	virtual/ghostscript
+	>=media-libs/jpeg-6b
+	>=net-print/cups-1.2
+	dev-libs/libusb
+	>=dev-lang/python-2.2
+	net-print/foomatic-filters
+	fax? ( >=dev-lang/python-2.3 )
+	snmp? ( net-analyzer/net-snmp )"
+
+RDEPEND="${DEPEND}
+	!<sys-fs/udev-114
+	fax? ( dev-python/reportlab )
+	X? ( >=dev-python/PyQt-3.14 )
+	scanner? (
+		X? ( >=media-gfx/xsane-0.89 )
+		!X? ( >=media-gfx/sane-frontends-1.0.9 )
+		)"
+
+CONFIG_CHECK="PARPORT"
+ERROR_PARPORT="Please make sure Device Drivers -> Parallel port support is enabled in your kernel"
+
+pkg_setup() {
+	use parport && linux-info_pkg_setup
+
+	# avoid collisions with cups-1.2 compat symlinks
+	if [ -e ${ROOT}/usr/lib/cups/backend/hp ] && [ -e ${ROOT}/usr/libexec/cups/backend/hp ]; then
+		rm -f ${ROOT}/usr/libexec/cups/backend/hp{,fax};
+	fi
+
+	use ppds || ewarn "Not installing built-in PPD files. You need USE=ppds if you want to install them."
+	use minimal && ewarn "Installing hpijs driver only, make sure you know what you are doing."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "s:toolbox:toolbox.py:" hplip.desktop.in || die "Patching hplip.desktop.in failed"
+	sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
+	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
+		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
+		base/utils.py  || die "Patching base/utils.py failed"
+
+	# bug 98428
+	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Patching hpssd.py failed"
+
+	# bug 161926, until fixed by upstream probably in 2.7.7
+	sed -i -e "s:if (!localOnly):if (1):" scan/sane/hpaio.c  || die "Patching scan/sane/hpaio.c failed"
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die "sed core_install.py"
+
+	# bug 186906, makes udev-rules work also for kernel-2.6.22
+	epatch "${FILESDIR}/${P}-udev-kernel.2.6.22.diff"
+}
+
+src_compile() {
+	econf \
+		--disable-cups11-build \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		$(use_enable minimal hpijs-only-build) \
+		$(use_enable doc doc-build) \
+		$(use_enable snmp network-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable scanner scan-build) \
+		$(use_enable X gui-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable ppds foomatic-ppd-install) \
+		--disable-foomatic-xml-install \
+		|| die "econf failed"
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	# bug 106035
+	use X || rm -Rf "${D}"/usr/share/applications
+}
+
+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 ] && cp ${ROOT}/etc/sane.d/dll.conf .
+		grep -q hpaio dll.conf || echo hpaio >> dll.conf
+		doins dll.conf
+	fi
+}
+
+pkg_postinst() {
+	elog "You should run hp-setup as root if you are installing hplip for the first time, and may also"
+	elog "need to run it if you are upgrading from an earlier version."
+	elog
+	elog "If your device is connected using USB, users will need to be in the lp group to access it."
+	elog
+	elog "This release doesn't use an init script anymore, so you should probably do a"
+	elog "'rc-update del hplip' if you are updating."
+}