clean ups

8 files changed, 73 insertions, 153 deletions

diff --git a/net-print/hp-web-jetadmin/files/20hpwebjetadmin b/net-print/hp-web-jetadmin/files/20hpwebjetadmin
deleted file mode 100644
index 6c6a65dce492..000000000000
--- a/net-print/hp-web-jetadmin/files/20hpwebjetadmin
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH=/opt/hp-web-jetadmin-6.5
diff --git a/net-print/hp-web-jetadmin/files/20jetadmin b/net-print/hp-web-jetadmin/files/20jetadmin
new file mode 100644
index 000000000000..006e8feb7466
--- /dev/null
+++ b/net-print/hp-web-jetadmin/files/20jetadmin
@@ -0,0 +1 @@
+LDPATH=/opt/jetadmin
diff --git a/net-print/hp-web-jetadmin/files/digest-hp-web-jetadmin-6.5 b/net-print/hp-web-jetadmin/files/digest-hp-web-jetadmin-6.5
deleted file mode 100644
index 23198a9dcdf5..000000000000
--- a/net-print/hp-web-jetadmin/files/digest-hp-web-jetadmin-6.5
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 d6f4116fd16f084dde6b8195e36c2f81 bpj06492.pdf
-MD5 24ff66aadffc605347b8fe532bee1b23 hpwebjet_linux.selfx
-MD5 e1059f4c0f3d12a237638b924905c107 wjaen_readme.txt
-MD5 d04bdbd82961d090f44d9e70789bab4b wjainfo_pps.html
-MD5 24a35a0567702b3a19956b42b9e710f2 wjainfo_rda.html
-MD5 f8b08976d71164a934648109729fce84 wjapps_linux_bundle.fpb
-MD5 9d2bb37af088571eb0366cd154316964 wjarda_linux_bundle.fpb
diff --git a/net-print/hp-web-jetadmin/files/digest-hp-web-jetadmin-6.5-r1 b/net-print/hp-web-jetadmin/files/digest-hp-web-jetadmin-6.5-r1
new file mode 100644
index 000000000000..594cc1bb6395
--- /dev/null
+++ b/net-print/hp-web-jetadmin/files/digest-hp-web-jetadmin-6.5-r1
@@ -0,0 +1,2 @@
+MD5 d6f4116fd16f084dde6b8195e36c2f81 bpj06492.pdf
+MD5 24ff66aadffc605347b8fe532bee1b23 hpwebjet_linux.selfx
diff --git a/net-print/hp-web-jetadmin/files/hpwebjetd-6.5.rc6 b/net-print/hp-web-jetadmin/files/hpwebjetd-6.5.rc6
deleted file mode 100644
index 4781bfef5cdf..000000000000
--- a/net-print/hp-web-jetadmin/files/hpwebjetd-6.5.rc6
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-    need net
-}
-
-start() {
-    ebegin "Starting HP Web JetAdmin"
-    start-stop-daemon --start --quiet --exec /opt/hp-web-jetadmin-6.5/hpwebjetd -- -start
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping HP Web JetAdmin"
-    start-stop-daemon --stop --quiet --exec /opt/hp-web-jetadmin-6.5/hpwebjetd -- -stop
-    eend $?
-}
diff --git a/net-print/hp-web-jetadmin/files/jetadmin.rc6 b/net-print/hp-web-jetadmin/files/jetadmin.rc6
new file mode 100644
index 000000000000..3054f61c8229
--- /dev/null
+++ b/net-print/hp-web-jetadmin/files/jetadmin.rc6
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting HP Web JetAdmin"
+	start-stop-daemon --start --quiet --exec /opt/jetadmin/hpwebjetd -- -start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping HP Web JetAdmin"
+	start-stop-daemon --stop --quiet --exec /opt/jetadmin/hpwebjetd -- -stop
+	eend $?
+}
diff --git a/net-print/hp-web-jetadmin/hp-web-jetadmin-6.5-r1.ebuild b/net-print/hp-web-jetadmin/hp-web-jetadmin-6.5-r1.ebuild
new file mode 100644
index 000000000000..c3891b4e71ea
--- /dev/null
+++ b/net-print/hp-web-jetadmin/hp-web-jetadmin-6.5-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-print/hp-web-jetadmin/hp-web-jetadmin-6.5-r1.ebuild,v 1.1 2001/10/02 04:45:34 woodchip Exp $
+
+# This package, in its most basic form (no optional components) will install
+# some 4300 files, totalling some 45MB. According to HP the minimum system
+# requirements are a 400MHz CPU with 128MB RAM.
+
+DESCRIPTION="Remotely install, monitor, and troubleshoot network-connected printers"
+HOMEPAGE="http://www.hp.com/go/webjetadmin/"
+
+# Optional files, just over 8MB. Havent worked them in yet.
+# o wjarda_linux_bundle.fpb: HP Remote Discovery Agent Component
+# o wjapps_linux_bundle.fpb: HP Web Print Server Manager Bundle
+SRC_URI="http://ftp.hp.com/pub/networking/software/hpwebjet_linux.selfx
+         http://www.hp.com/cposupport/manual_set/bpj06492.pdf"
+#        http://www.hp.com/pond/wja/live/manual/bundles/wjarda_linux_bundle.fpb
+#        http://www.hp.com/pond/wja/live/manual/bundles/wjapps_linux_bundle.fpb"
+DEPEND="virtual/glibc"
+
+src_unpack() { :; } ; src_compile() { :; }
+
+src_install() {
+	# masquerade as redhat; neccesary
+	install -m 644 ${FILESDIR}/etc.redhat-release /etc/redhat-release
+
+	this-ll_take_a_bit
+	chmod 755 ${DISTDIR}/hpwebjet_linux.selfx
+	${DISTDIR}/hpwebjet_linux.selfx -s -d ${D}/opt/jetadmin
+	assert "Probably missing a DEPEND. Hmm what could it be!"
+	dodoc ${DISTDIR}/bpj06492.pdf
+
+	# convenient LDPATH entry
+	insinto /etc/env.d ; doins ${FILESDIR}/20jetadmin
+
+	rm -f /etc/init.d/hpwebjetd # this is a little icky
+	exeinto /etc/init.d ; newexe ${FILESDIR}/jetadmin.rc6 jetadmin
+
+	# costume
+	rm -f /etc/redhat-release # so is this
+	# residue
+	rm -f /var/lib/fpm/hp* # and this too
+}
+
+this-ll_take_a_bit() {
+	einfo "+ ------------------------------------------------- +"
+	einfo "+   This will take some time to completely merge!   +"
+	einfo "+ ------------------------------------------------- +"
+	einfo "+  Dont go hitting cntrl-c thinking that its stuck  +"
+	einfo "+                 because its not!                  +"
+	einfo "+ ------------------------------------------------- +"
+}
diff --git a/net-print/hp-web-jetadmin/hp-web-jetadmin-6.5.ebuild b/net-print/hp-web-jetadmin/hp-web-jetadmin-6.5.ebuild
deleted file mode 100644
index 384225440f1b..000000000000
--- a/net-print/hp-web-jetadmin/hp-web-jetadmin-6.5.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-print/hp-web-jetadmin/hp-web-jetadmin-6.5.ebuild,v 1.4 2001/09/28 08:03:16 woodchip Exp $
-
-# *** README ***
-#
-# This package, in its most basic form (no optional components) will install
-# some 4300 files, totalling some 45MB. According to HP the minimum system
-# requirements are a 400MHz CPU with 128MB RAM. Note that this uses HP's own
-# self-extracting program to install to gentoo's tempdir, during which it
-# runs some tests. It will _appear_ like its stuck, but its not. Please be
-# patient and wait for it to completely merge. You might see some funny
-# debugging information, which potentially looks like an error message.
-# Dont worry about that, just ignore it. Furthermore, this package installs
-# a whole truckload of doc files into /opt/hp-web-jetadmin/doc, totalling
-# some 34MB. The daemon even writes configuration info into that directory
-# which you'll notice if you play with the program, and then unmerge it.
-#
-# I probably need to tweak the depends a little; I couldn't make it install
-# on an rc5 box with no X. Suggestions and or help welcomed.
-#
-# *** README ***
-
-DESCRIPTION="Remotely install, monitor, and troubleshoot network-connected printers"
-HOMEPAGE="http://www.hp.com/go/webjetadmin/"
-#
-# Hey! These files total 30MB! Biggest one is hpwebjet_linux.selfx, which is 20MB!
-# When we get dependency support for SRC_URI, this can be spiffed up a little bit.
-# For the time being, if you really wanted to, you could remove stuff from SRC_URI
-# below then rebuild the digest by doing: ebuild hp-web-jetadmin-6.5.ebuild digest
-#
-# The .fpb files are optional components, and total just over 8MB:
-#   o wjarda_linux_bundle.fpb: HP Remote Discovery Agent Component
-#   o wjapps_linux_bundle.fpb: HP Web Print Server Manager Bundle
-#
-SRC_URI="http://ftp.hp.com/pub/networking/software/hpwebjet_linux.selfx
-         http://ftp.hp.com/pub/networking/software/wjaen_readme.txt
-         http://www.hp.com/cposupport/manual_set/bpj06492.pdf
-         http://www.hp.com/pond/wja/live/manual/html/wjainfo_rda.html
-         http://www.hp.com/pond/wja/live/manual/bundles/wjarda_linux_bundle.fpb
-         http://www.hp.com/pond/wja/live/manual/html/wjainfo_pps.html
-         http://www.hp.com/pond/wja/live/manual/bundles/wjapps_linux_bundle.fpb"
-DEPEND="virtual/glibc"
-
-src_unpack() { :; } ; src_compile() { :; }
-
-src_install() {
-	chmod 755 ${DISTDIR}/hpwebjet_linux.selfx
-
-	#
-	# Won't install without this hack -- cmon HP you can do better
-	# than this. This is really sad. If you donate to me a decent
-	# enough printer, I'll do QA/testing for you! :)
-	#
-	install -m 644 ${FILESDIR}/etc.redhat-release /etc/redhat-release
-
-	#
-	# The self-extracting installation program tries to get your
-	# hostname automatically. It also configures itself by default
-	# to use tcp/8000 unless its already in use by something else.
-	# You can change those by supplying the following arguments to
-	# the command below if you really want to:
-	#
-	# -m <name>  Sets the hostname to <name> if <name> is valid
-	# -p <num>   Sets the port number to <num> if <num> is valid
-	#
-	# You can change the port in /opt/hp-web-jetadmin/httpd.ini
-	# after installing. Maybe the hostname can be changed too.
-	#
-	go_grab_a_coffee_and_a_donut
-	${DISTDIR}/hpwebjet_linux.selfx -s -d ${D}/opt/hp-web-jetadmin-6.5
-	assert "Fatal install problem. Please file a gentoo bug report."
-
-	#
-	# /etc/init.d/hpwebjetd (not in $D) is getting installed by
-	# this wonderful self-extracting program. I'd rather remove
-	# it now, so a better one can be dropped in without forcing
-	# people to do the ._cfg tango unconditionally.
-	#
-	rm -f /etc/init.d/hpwebjetd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/hpwebjetd-6.5.rc6 hpwebjetd
-	
-	#
-	# This adds an LDPATH entry, which allows you to use the
-	# initscript to start the daemon from anywhere. You need
-	# not cd into /opt/hp-web-jetadmin first, which is nice.
-	#
-	insinto /etc/env.d ; doins ${FILESDIR}/20hpwebjetadmin
-
-	#
-	# Some docs. Not ideal I know, but at least its something.
-	#
-	dodoc ${DISTDIR}/wjaen_readme.txt 
-	dodoc ${DISTDIR}/bpj06492.pdf
-	dodoc ${DISTDIR}/wjainfo_rda.html
-	dodoc ${DISTDIR}/wjainfo_pps.html
-
-	#
-	# Butcher alert -- this is ridiculous. Ciao baby.
-	#
-	rm -f /etc/redhat-release
-}
-
-go_grab_a_coffee_and_a_donut() {
-	einfo "+ ------------------------------------------------- +"
-	einfo "+   This will take some time to completely merge!   +"
-	einfo "+ ------------------------------------------------- +"
-	einfo "+  Dont go hitting cntrl-c thinking that its stuck  +"
-	einfo "+  because its not! Just be patient and wait for it +"
-	einfo "+               to finish installing.               +"
-	einfo "+ ------------------------------------------------- +"
-}
-
-#
-#  TODO:
-#
-# o I havent gotten around to working in the optional components
-#   yet, but those are next. Im commiting it now so that anybody
-#   interested can try it out.
-#
-# o Maybe leave the /etc/redhat-release file alone (permanently
-#   install it) or add some code in src_install to check for it,
-#   back it up if there, drop in our file, install, then move
-#   the backup back. I dont see the need for this nonsense. Why
-#   cant vendors just say you need libc this, ssl that, libfoo
-#   this and libbar that.
-#