added udev support, removed old ebuilds

7 files changed, 26 insertions, 105 deletions

diff --git a/net-print/hpoj/ChangeLog b/net-print/hpoj/ChangeLog
index da8eb61c9f88..397280f9ca25 100644
--- a/net-print/hpoj/ChangeLog
+++ b/net-print/hpoj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/hpoj
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/ChangeLog,v 1.11 2003/12/12 21:47:03 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/ChangeLog,v 1.12 2003/12/22 15:46:36 lanius Exp $
+
+*hpoj-0.91-r2 (22 Dec 2003)
+
+  22 Dec 2003; Heinrich Wendel <lanius@gentoo.org> hpoj-0.90-r1.ebuild,
+  hpoj-0.91-r2.ebuild, hpoj-0.91.ebuild, files/udev.patch:
+  added udev support, removed old ebuilds
 
 *hpoj-0.91-r1 (12 Dec 2003)
 
diff --git a/net-print/hpoj/Manifest b/net-print/hpoj/Manifest
index 0f9a8f60edf8..49dfa9c06aac 100644
--- a/net-print/hpoj/Manifest
+++ b/net-print/hpoj/Manifest
@@ -1,8 +1,8 @@
-MD5 a189a9aa627838d50f27fd6f149a2e60 hpoj-0.91-r2.ebuild 3001
+MD5 44ed0c242a93b02fab976e76ab9107d7 hpoj-0.91-r2.ebuild 3000
 MD5 1d488e86de391b073a7d4227db341479 hpoj-0.91-r1.ebuild 2983
-MD5 7371a030dfbbe8878c012976ffbbf223 ChangeLog 1688
+MD5 abdef5d2fca8a957124dc0bbfa71ad66 ChangeLog 1889
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 7b10c1855f92a1d1551de2c65128176f files/digest-hpoj-0.91-r1 58
 MD5 7b10c1855f92a1d1551de2c65128176f files/digest-hpoj-0.91-r2 58
 MD5 6e2752d0e79c76507dccdc943f7c9cf0 files/hpoj.init 208
-MD5 9285a18e1878481d6ec1d53688222d9e files/udev.patch 327
+MD5 4f722c5c6fcc7d16dcf56c5c52db9874 files/udev.patch 349
diff --git a/net-print/hpoj/files/digest-hpoj-0.90-r1 b/net-print/hpoj/files/digest-hpoj-0.90-r1
deleted file mode 100644
index c59058653efc..000000000000
--- a/net-print/hpoj/files/digest-hpoj-0.90-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dd76385c20bccabf6f5446b1004d8372 hpoj-0.90.tgz 492881
diff --git a/net-print/hpoj/files/digest-hpoj-0.91 b/net-print/hpoj/files/digest-hpoj-0.91-r2
index 761da4e580e8..761da4e580e8 100644
--- a/net-print/hpoj/files/digest-hpoj-0.91
+++ b/net-print/hpoj/files/digest-hpoj-0.91-r2
diff --git a/net-print/hpoj/files/udev.patch b/net-print/hpoj/files/udev.patch
new file mode 100644
index 000000000000..809ff8a9fe13
--- /dev/null
+++ b/net-print/hpoj/files/udev.patch
@@ -0,0 +1,12 @@
+--- scripts/ptal-init.in.org	2003-12-22 16:36:49.981003792 +0100
++++ scripts/ptal-init.in	2003-12-22 16:38:02.786653659 +0100
+@@ -42,7 +42,8 @@
+ 	);
+ my @usbWildcards=(
+ 	"/dev/usb/lp[0-9]*",
+-	"/dev/usblp[0-9]*"
++	"/dev/usblp[0-9]*",
++	"/dev/lp[0-9]*"
+ 	);
+ # These wildcards are only used as a last resort for the ptal-printd
+ # "-like" template.
diff --git a/net-print/hpoj/hpoj-0.90-r1.ebuild b/net-print/hpoj/hpoj-0.90-r1.ebuild
deleted file mode 100644
index f60f6e2ef8c7..000000000000
--- a/net-print/hpoj/hpoj-0.90-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/hpoj-0.90-r1.ebuild,v 1.8 2003/12/12 21:47:03 blauwers 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"
-IUSE="ssl scanner qt X snmp cups usb"
-
-DEPEND="qt?      ( >=x11-libs/qt-3.1.0-r1 )
-	ssl?     ( >=dev-libs/openssl-0.9.6h )
-	scanner? ( >=media-gfx/sane-backends-1.0.9 )
-	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 )"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	local myconf
-	use snmp \
-	&& myconf="${myconf} --with-snmp=/usr" \
-	|| myconf="${myconf} --without-snmp"
-
-	use cups \
-	&& myconf="${myconf} --with-cups-backend=/usr" \
-	|| myconf="${myconf} --without-cups"
-
-	# xojpanel
-	use qt \
-	&& myconf="${myconf} --with-qt=/usr/qt/3" \
-	|| myconf="${myconf} --without-qt"
-
-	use scanner \
-	&& myconf="${myconf} --with-sane-packend=/usr" \
-	|| myconf="${myconf} --without-sane"
-
-	econf ${myconf}
-#   patch -p0 ${S}/mlcd/Makefile < ${FILESDIR}/mlcd_make.patch
-#   patch -p0 ${S}/mlcd/ExMgr.cpp < ${FILESDIR}/ExMgr.cpp_patch
-	make || die "compilation failed"
-}
-## after cups
-src_install() {
-	cd apps/cmdline
-	dobin ptal-print hpojip-test ptal-connect ptal-device ptal-devid ptal-hp ptal-pml
-	cd ../../doc
-	dohtml *html
-	cd ..
-	dodoc COPYING LICENSE LICENSE.OpenSSL README
-	use qt && dobin apps/xojpanel/xojpanel
-	dodir /usr/include
-	insinto /usr/include
-	doins include/hpojip.h include/ptal.h
-	cd lib
-	dolib.so hpojip/libhpojip.so*
-	dolib.so ptal/libptal.so*
-	dodir /usr/lib/sane
-	insinto /usr/lib/sane
-	doins sane/libsane-hpoj.so*
-	dodir /usr/lib/ghostscript/filt \
-	/usr/lib/ghostscript/filt/bjc600 \
-	/usr/lib/ghostscript/filt/bjc600.1 \
-	/usr/lib/ghostscript/filt/bjc600.16 \
-	/usr/lib/ghostscript/filt/bjc600.24 \
-	/usr/lib/ghostscript/filt/bjc600.24.3 \
-	/usr/lib/ghostscript/filt/bjc600.32 \
-	/usr/lib/ghostscript/filt/bjc600.8 \
-	/usr/lib/ghostscript/filt/bjc600.8.1 \
-	/usr/lib/ghostscript/filt/bjt600.32 \
-	/usr/lib/ghostscript/filt/direct \
-	/usr/lib/ghostscript/filt/gsif \
-	/usr/lib/ghostscript/filt/indirect \
-	/usr/lib/ghostscript/filt
-	cd ..
-	dosbin apps/cmdline/ptal-photod apps/cmdline/ptal-printd mlcd/ptal-mlcd scripts/ptal-cups
-	exeinto /usr/sbin
-	doexe scripts/ptal-init
-	dodir /usr/lib/cups/backend
-	dosym /usr/sbin/ptal-cups /usr/lib/cups/backend/ptal
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hpoj.init hpoj
-}
-
-pkg_postinst() {
-	echo
-	einfo "You might want to emerge app-admin/mtools for photo-card support."
-	echo
-	einfo "You might want to emerge net-print/hpijs for better printing quality."
-	echo
-	einfo "Before starting hpoj you have to set it up with 'ptal-init setup'"
-	echo
-}
diff --git a/net-print/hpoj/hpoj-0.91.ebuild b/net-print/hpoj/hpoj-0.91-r2.ebuild
index 6ecd438f4338..292732ce9292 100644
--- a/net-print/hpoj/hpoj-0.91.ebuild
+++ b/net-print/hpoj/hpoj-0.91-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 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.ebuild,v 1.4 2003/12/12 21:47:03 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/hpoj-0.91-r2.ebuild,v 1.1 2003/12/22 15:46:36 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"
 IUSE="ssl scanner qt X snmp cups usb"
 
 DEPEND="qt?      ( >=x11-libs/qt-3.1.0-r1 )
@@ -19,7 +19,8 @@ DEPEND="qt?      ( >=x11-libs/qt-3.1.0-r1 )
 	usb?     ( dev-libs/libusb )"
 
 src_compile() {
-	local myconf
+	epatch ${FILESDIR}/udev.patch
+
 	use snmp \
 	&& myconf="${myconf} --with-snmp=/usr" \
 	|| myconf="${myconf} --without-snmp"