add support for kernel 2.6, bug #42921

5 files changed, 17 insertions, 8 deletions

diff --git a/net-print/hpoj/ChangeLog b/net-print/hpoj/ChangeLog
index c70dcb75b025..8bd81d849f4a 100644
--- a/net-print/hpoj/ChangeLog
+++ b/net-print/hpoj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/hpoj
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/ChangeLog,v 1.14 2004/03/27 17:33:46 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/ChangeLog,v 1.15 2004/04/08 10:26:37 lanius Exp $
+
+*hpoj-0.91-r3 (08 Apr 2004)
+
+  08 Apr 2004; Heinrich Wendel <lanius@gentoo.org> hpoj-0.91-r1.ebuild,
+  hpoj-0.91-r3.ebuild, files/hpoj-0.91-kernel26.patch.bz2:
+  add support for kernel 2.6, bug #42921
 
   27 Mar 2004; Heinrich Wendel <lanius@gentoo.org> hpoj-0.91-r2.ebuild,
   files/hpoj.init:
diff --git a/net-print/hpoj/Manifest b/net-print/hpoj/Manifest
index 44b98f9f55c1..572ac1eca7ad 100644
--- a/net-print/hpoj/Manifest
+++ b/net-print/hpoj/Manifest
@@ -1,8 +1,9 @@
 MD5 a2079cbf003203202b42e49aa5274977 hpoj-0.91-r2.ebuild 3023
-MD5 1d488e86de391b073a7d4227db341479 hpoj-0.91-r1.ebuild 2983
 MD5 27b5057dc06fff29926ad3f73ff2f6cb ChangeLog 2137
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 7b10c1855f92a1d1551de2c65128176f files/digest-hpoj-0.91-r1 58
+MD5 d8a5293859a063591352f89d7c996e56 hpoj-0.91-r3.ebuild 3067
+MD5 e78c4ef74538d9b47f113f580ce4bf28 files/hpoj-0.91-kernel26.patch.bz2 1191
 MD5 7b10c1855f92a1d1551de2c65128176f files/digest-hpoj-0.91-r2 58
+MD5 7b10c1855f92a1d1551de2c65128176f files/digest-hpoj-0.91-r3 58
 MD5 2b8258745c95cdde3dc7d0293aaaf0c4 files/hpoj.init 210
 MD5 4f722c5c6fcc7d16dcf56c5c52db9874 files/udev.patch 349
diff --git a/net-print/hpoj/files/digest-hpoj-0.91-r1 b/net-print/hpoj/files/digest-hpoj-0.91-r3
index 761da4e580e8..761da4e580e8 100644
--- a/net-print/hpoj/files/digest-hpoj-0.91-r1
+++ b/net-print/hpoj/files/digest-hpoj-0.91-r3
diff --git a/net-print/hpoj/files/hpoj-0.91-kernel26.patch.bz2 b/net-print/hpoj/files/hpoj-0.91-kernel26.patch.bz2
new file mode 100644
index 000000000000..36c339d9f3f7
--- /dev/null
+++ b/net-print/hpoj/files/hpoj-0.91-kernel26.patch.bz2
diff --git a/net-print/hpoj/hpoj-0.91-r1.ebuild b/net-print/hpoj/hpoj-0.91-r3.ebuild
index 89089b314dc1..5a1eb57e54af 100644
--- a/net-print/hpoj/hpoj-0.91-r1.ebuild
+++ b/net-print/hpoj/hpoj-0.91-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/hpoj-0.91-r1.ebuild,v 1.1 2003/12/12 21:47:03 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/hpoj-0.91-r3.ebuild,v 1.1 2004/04/08 10:26:37 lanius Exp $
 
 DESCRIPTION="HP OfficeJet Linux driver"
 HOMEPAGE="http://hpoj.sourceforge.net/"
 SRC_URI="mirror://sourceforge/hpoj/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 IUSE="ssl scanner qt X snmp cups usb"
 
 DEPEND="qt?      ( >=x11-libs/qt-3.1.0-r1 )
@@ -16,10 +16,12 @@ DEPEND="qt?      ( >=x11-libs/qt-3.1.0-r1 )
 	scanner? ( || ( X? ( >=media-gfx/xsane-0.89 ) >=media-gfx/sane-frontends-1.0.9 ) )
 	snmp?    ( virtual/snmp )
 	cups?    ( >=net-print/cups-1.1.18-r2 )
-	usb?     ( dev-libs/libusb )"
+	usb?     ( dev-libs/libusb sys-apps/hotplug )"
 
 src_compile() {
-	local myconf
+	epatch ${FILESDIR}/udev.patch
+	epatch ${FILESDIR}/${P}-kernel26.patch.bz2
+
 	use snmp \
 	&& myconf="${myconf} --with-snmp=/usr" \
 	|| myconf="${myconf} --without-snmp"