Updated ucd-snmp references to virtual/snmp which defaults to net-snmp the newer train of the same code base.

5 files changed, 106 insertions, 9 deletions

diff --git a/net-print/hpoj/Manifest b/net-print/hpoj/Manifest
index ad09b4443267..50d279919a98 100644
--- a/net-print/hpoj/Manifest
+++ b/net-print/hpoj/Manifest
@@ -1,8 +1,8 @@
-MD5 b4ec1f4e725cb70812090fe7487073bd ChangeLog 1686
-MD5 3dd37cb6768e08bfe5c310120e2a6088 hpoj-0.90-r1.ebuild 2921
+MD5 7371a030dfbbe8878c012976ffbbf223 ChangeLog 1688
+MD5 b179b1e5394e236cbe8df9e06976b458 hpoj-0.90-r1.ebuild 2923
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 3dde5d06522d76d92922978ba5873558 hpoj-0.91.ebuild 2978
-MD5 d0e0cc1dbc47ef6b9e9fe591e404573a hpoj-0.91-r1.ebuild 2882
+MD5 d363c3db796731985373bcdc6f0b3965 hpoj-0.91.ebuild 2980
+MD5 1d488e86de391b073a7d4227db341479 hpoj-0.91-r1.ebuild 2983
 MD5 7b10c1855f92a1d1551de2c65128176f files/digest-hpoj-0.91-r1 58
 MD5 c5cedb38ee0632e6d0ca973da68e6a5f files/digest-hpoj-0.90-r1 58
 MD5 6e2752d0e79c76507dccdc943f7c9cf0 files/hpoj.init 208
diff --git a/net-print/hpoj/files/digest-hpoj-0.91-r1 b/net-print/hpoj/files/digest-hpoj-0.91-r1
new file mode 100644
index 000000000000..761da4e580e8
--- /dev/null
+++ b/net-print/hpoj/files/digest-hpoj-0.91-r1
@@ -0,0 +1 @@
+MD5 0e083aeab9b00495aa433fa9465456e0 hpoj-0.91.tgz 542475
diff --git a/net-print/hpoj/hpoj-0.90-r1.ebuild b/net-print/hpoj/hpoj-0.90-r1.ebuild
index 24e9a0528f4e..f60f6e2ef8c7 100644
--- a/net-print/hpoj/hpoj-0.90-r1.ebuild
+++ b/net-print/hpoj/hpoj-0.90-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2003/09/09 06:50:56 lanius Exp $
+# $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/"
@@ -14,10 +14,9 @@ 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?    ( >=net-analyzer/ucd-snmp-4.2.6 )
+	snmp?    ( virtual/snmp )
 	cups?    ( >=net-print/cups-1.1.18-r2 )
 	usb?     ( dev-libs/libusb )"
-RDEPEND=""
 
 S=${WORKDIR}/${P}
 
diff --git a/net-print/hpoj/hpoj-0.91-r1.ebuild b/net-print/hpoj/hpoj-0.91-r1.ebuild
new file mode 100644
index 000000000000..89089b314dc1
--- /dev/null
+++ b/net-print/hpoj/hpoj-0.91-r1.ebuild
@@ -0,0 +1,97 @@
+# 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-r1.ebuild,v 1.1 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 )"
+
+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}
+	emake || die "compilation failed"
+}
+
+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
+	einfo "If you are upgrading from a previous version, re-run ptal-init setup"
+	einfo "as the format of	the connection has changed again and your previously"
+	einfo "installed hpoj-device will not be recognized."
+	echo
+}
diff --git a/net-print/hpoj/hpoj-0.91.ebuild b/net-print/hpoj/hpoj-0.91.ebuild
index 11159f5d6174..6ecd438f4338 100644
--- a/net-print/hpoj/hpoj-0.91.ebuild
+++ b/net-print/hpoj/hpoj-0.91.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2003/12/10 18:29:23 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/hpoj-0.91.ebuild,v 1.4 2003/12/12 21:47:03 blauwers Exp $
 
 DESCRIPTION="HP OfficeJet Linux driver"
 HOMEPAGE="http://hpoj.sourceforge.net/"
@@ -14,7 +14,7 @@ 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?    ( >=net-analyzer/ucd-snmp-4.2.6 )
+	snmp?    ( virtual/snmp )
 	cups?    ( >=net-print/cups-1.1.18-r2 )
 	usb?     ( dev-libs/libusb )"