remove a pile of old ebuilds, keeping just the stable heads of recent trees.

25 files changed, 30 insertions, 1223 deletions

diff --git a/net-misc/nut/ChangeLog b/net-misc/nut/ChangeLog
index c79a65e8def1..1e3ceaebb9a6 100644
--- a/net-misc/nut/ChangeLog
+++ b/net-misc/nut/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nut
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/ChangeLog,v 1.30 2004/04/01 05:56:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/ChangeLog,v 1.31 2004/04/07 22:20:04 robbat2 Exp $
+
+  07 Apr 2004; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org>
+  nut-1.0.0.ebuild, nut-1.2.1-r1.ebuild, nut-1.2.1.ebuild, nut-1.2.2.ebuild,
+  nut-1.3.6.ebuild, nut-1.4.0-r3.ebuild, nut-1.4.0.ebuild, nut-1.5.1.ebuild,
+  nut-1.5.6-r2.ebuild, nut-1.5.7.ebuild, nut-1.5.8-r1.ebuild,
+  nut-1.5.8.ebuild:
+  remove a pile of old ebuilds, keeping just the stable heads of recent trees.
 
 *nut-2.0.0 (31 Mar 2004)
 
diff --git a/net-misc/nut/Manifest b/net-misc/nut/Manifest
index 58bf1de5ef32..bddc5841fcfe 100644
--- a/net-misc/nut/Manifest
+++ b/net-misc/nut/Manifest
@@ -1,37 +1,15 @@
-MD5 53b3c22e90b76d9ed4ac9cbbef393c31 files/digest-nut-1.0.0 61
-MD5 4f6c951306e95660e88086bc591f03d0 files/digest-nut-1.2.1 61
-MD5 4f6c951306e95660e88086bc591f03d0 files/digest-nut-1.2.1-r1 61
+MD5 e6929ba912a778d25d35e6cd2cdaa20c nut-2.0.0.ebuild 3051
+MD5 616cb93b262d3b70178b3e85d860f66a nut-1.5.12.ebuild 3280
+MD5 6b5835433d636d900a0069ddeb027c4e nut-1.4.1.ebuild 2294
+MD5 58e6e710912fd108c5475e0e1e34f988 nut-1.2.2.ebuild 3395
+MD5 289b7073eef0b778e4272c4bc67f1780 ChangeLog 5056
+MD5 91a159b983332d5ed0fb985cc1fe1b80 metadata.xml 330
 MD5 ab96c8181bf3780dae5e3377987b05c2 files/digest-nut-1.2.2 61
-MD5 391798e93c10d171a3a7f9941527e293 files/digest-nut-1.3.6 61
-MD5 de17bbc812bdd76ec7b807a0deb5e636 files/digest-nut-1.4.0 61
-MD5 de17bbc812bdd76ec7b807a0deb5e636 files/digest-nut-1.4.0-r3 61
-MD5 884831c15f0700dbc89db196a32a2695 files/digest-nut-1.5.1 61
-MD5 7ae6f61ceeee54557c5ad414688b82d0 files/digest-nut-1.5.6-r2 61
-MD5 95e684fab414b46c58d8a46114a9b0ca files/digest-nut-1.5.7 61
-MD5 a9ef824765dcb50fb2565e905921b268 files/digest-nut-1.5.8 61
-MD5 a9ef824765dcb50fb2565e905921b268 files/digest-nut-1.5.8-r1 61
-MD5 7e8c4aebf3de0a56b058a685f104dfa9 files/upsd-init 586
-MD5 4ebbbc97ea9ab9e6a3ac743148020d84 files/upsd.rc6 595
-MD5 6a3412030571af06d3bef42c99eef2ca files/upsdrv.rc6 486
-MD5 c4b76b8ceaa2c772d9ceb126b180bc37 files/upsmon-init 481
-MD5 a373cd2584d3b851388842d70f2aa4fe files/upsmon.rc6 481
 MD5 af157fac0a88e11c79527d952fce75ec files/digest-nut-1.4.1 61
-MD5 7b76eef352ad93b1369096360bbc3a11 files/digest-nut-1.5.12 62
 MD5 891b50cff5827a4e77573ee8f2f40e48 files/digest-nut-2.0.0 61
-MD5 30e935eab6f9f8687b44fe068967114b ChangeLog 4664
-MD5 91a159b983332d5ed0fb985cc1fe1b80 metadata.xml 330
-MD5 788fd324fe168a7baa6dc543bb6410e9 nut-1.0.0.ebuild 2524
-MD5 1c9c49c23229389becaa6b48ae1c7951 nut-1.2.1-r1.ebuild 3277
-MD5 82e3943d183f5cef03dd5e9913e0a905 nut-1.2.1.ebuild 2961
-MD5 d3c394dc6d7c91a32575dd4350936131 nut-1.2.2.ebuild 3319
-MD5 be432cd92cb298ea9fe12c6091d66ba0 nut-1.3.6.ebuild 3379
-MD5 fe0b40e807fa136e39b3b9b417fec14a nut-1.4.0-r3.ebuild 2328
-MD5 f9d05e191714009f0712b61c4206e72d nut-1.4.0.ebuild 3398
-MD5 35031d87688ecc799d8359c15aa2f1fb nut-1.5.1.ebuild 3402
-MD5 796f1cf4124160a2faeaf74c08835aed nut-1.5.6-r2.ebuild 2332
-MD5 31244c0bbcc922de2fffe771e3a17739 nut-1.5.7.ebuild 2329
-MD5 6dce3f7061da57df456726c7dbadbbd2 nut-1.5.8-r1.ebuild 2799
-MD5 89fc436fc3c64125e6abedda46aeaadd nut-1.5.8.ebuild 2311
-MD5 24f8744a1c787e52ac80dd9e0b17745c nut-1.4.1.ebuild 2295
-MD5 52486b9338bfdade76eb2be32b09238b nut-1.5.12.ebuild 3281
-MD5 77cbd6cd5e623a7a0e264dd5926dd6ee nut-2.0.0.ebuild 3052
+MD5 ffa9209a6b5f2e02460630cb844324f0 files/upsmon-init 480
+MD5 7b76eef352ad93b1369096360bbc3a11 files/digest-nut-1.5.12 62
+MD5 d9f15db2fd0a18b34b2ba4e83f76cb1f files/upsd.rc6 594
+MD5 6e11c5b10da2a5c6d2b01b7caf97fbea files/upsdrv.rc6 485
+MD5 1c346f53bb156dea9b9c60fe1251c788 files/upsmon.rc6 480
+MD5 5e6d1b6932c79a059573a6dbb5fa80bc files/upsd-init 585
diff --git a/net-misc/nut/files/digest-nut-1.0.0 b/net-misc/nut/files/digest-nut-1.0.0
deleted file mode 100644
index 0b63bf86d4b8..000000000000
--- a/net-misc/nut/files/digest-nut-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 653c7d90eb44c57f77423baed2b9a5f4 nut-1.0.0.tar.gz 402891
diff --git a/net-misc/nut/files/digest-nut-1.2.1 b/net-misc/nut/files/digest-nut-1.2.1
deleted file mode 100644
index 519b08fcd6db..000000000000
--- a/net-misc/nut/files/digest-nut-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf1147dbc04a6d5bb982d03720d2331e nut-1.2.1.tar.gz 444256
diff --git a/net-misc/nut/files/digest-nut-1.2.1-r1 b/net-misc/nut/files/digest-nut-1.2.1-r1
deleted file mode 100644
index 519b08fcd6db..000000000000
--- a/net-misc/nut/files/digest-nut-1.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf1147dbc04a6d5bb982d03720d2331e nut-1.2.1.tar.gz 444256
diff --git a/net-misc/nut/files/digest-nut-1.3.6 b/net-misc/nut/files/digest-nut-1.3.6
deleted file mode 100644
index 2c193216a043..000000000000
--- a/net-misc/nut/files/digest-nut-1.3.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0de885049ad39208927cdbdca8487578 nut-1.3.6.tar.gz 485880
diff --git a/net-misc/nut/files/digest-nut-1.4.0 b/net-misc/nut/files/digest-nut-1.4.0
deleted file mode 100644
index 1a233a0f22a5..000000000000
--- a/net-misc/nut/files/digest-nut-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ddf547866db0f1eeb9c535ba0339906 nut-1.4.0.tar.gz 523924
diff --git a/net-misc/nut/files/digest-nut-1.4.0-r3 b/net-misc/nut/files/digest-nut-1.4.0-r3
deleted file mode 100644
index 1a233a0f22a5..000000000000
--- a/net-misc/nut/files/digest-nut-1.4.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ddf547866db0f1eeb9c535ba0339906 nut-1.4.0.tar.gz 523924
diff --git a/net-misc/nut/files/digest-nut-1.5.1 b/net-misc/nut/files/digest-nut-1.5.1
deleted file mode 100644
index 75d9bbd7b295..000000000000
--- a/net-misc/nut/files/digest-nut-1.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38117286a322b13bb3df28a7437deb37 nut-1.5.1.tar.gz 471282
diff --git a/net-misc/nut/files/digest-nut-1.5.6-r2 b/net-misc/nut/files/digest-nut-1.5.6-r2
deleted file mode 100644
index 5edaab2f6e61..000000000000
--- a/net-misc/nut/files/digest-nut-1.5.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59d0e0952a68fa04a63a25bc181a68c0 nut-1.5.6.tar.gz 479689
diff --git a/net-misc/nut/files/digest-nut-1.5.7 b/net-misc/nut/files/digest-nut-1.5.7
deleted file mode 100644
index 332960aa495f..000000000000
--- a/net-misc/nut/files/digest-nut-1.5.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09d3e2795fd2b5e43cc99e788ac69ed3 nut-1.5.7.tar.gz 485442
diff --git a/net-misc/nut/files/digest-nut-1.5.8 b/net-misc/nut/files/digest-nut-1.5.8
deleted file mode 100644
index 5537ba164580..000000000000
--- a/net-misc/nut/files/digest-nut-1.5.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a40d106bf20d193258842adfc3843bfb nut-1.5.8.tar.gz 488558
diff --git a/net-misc/nut/files/digest-nut-1.5.8-r1 b/net-misc/nut/files/digest-nut-1.5.8-r1
deleted file mode 100644
index 5537ba164580..000000000000
--- a/net-misc/nut/files/digest-nut-1.5.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a40d106bf20d193258842adfc3843bfb nut-1.5.8.tar.gz 488558
diff --git a/net-misc/nut/nut-1.0.0.ebuild b/net-misc/nut/nut-1.0.0.ebuild
deleted file mode 100644
index ebd3aabda6d7..000000000000
--- a/net-misc/nut/nut-1.0.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.0.0.ebuild,v 1.7 2004/03/16 00:05:03 max Exp $
-
-IUSE="png"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Network-UPS Tools"
-SRC_URI="http://www.exploits.org/nut/release/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-KEYWORDS="x86 sparc "
-LICENSE="GPL-2"
-SLOT="0"
-
-# -- [ FIXME ] --
-# a better idea would be to have virtual/httpd dependencies and
-# USE cgi-bin support.  USE png is used for now :/
-
-DEPEND="png? ( =sys-libs/zlib-1* =media-libs/libgd-1* =media-libs/libpng-1.2* )"
-RDEPEND="${DEPEND} png? ( =net-www/apache-1* ) >=sys-apps/baselayout-1.8.2"
-
-src_compile() {
-	local myconf
-	use png && myconf="--with-cgi --with-cgipath=/home/httpd/cgi-bin"
-	use png || myconf="--without-cgi"
-
-	#default is to build all drivers; but the following is common:
-	#--with-drivers=apcsmart,hidups
-	./configure \
-		--prefix=/usr \
-		--with-user=nut \
-		--with-group=nut \
-		--with-port=3493 \
-		--with-drvpath=/sbin \
-		--sysconfdir=/etc/nut \
-		--mandir=/usr/share/man \
-		--with-pidpath=/var/run \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/state/nut \
-		--with-altpidpath=/var/state/nut \
-		--host=${CHOST} ${myconf} || die
-
-	emake || die
-
-	if [ -n "`use png`" ]
-	then
-		emake cgi || die
-	fi
-}
-
-src_install() {
-	# Makefile: user/group nut might not exist until after
-	# pkg_preinst() runs; so use root for now, and fix it
-	# up in pkg_postinst().
-	make DESTDIR=${D} RUNUID=root RUNGID=root install || die
-
-	if [ -n "`use png`" ]
-	then
-		make DESTDIR=${D} install-cgi || die
-	fi
-	# see above note...
-	rm -rf ${D}/var/state/nut
-
-	dodoc CHANGES COPYING CREDITS INSTALL NEWS \
-		README docs/{FAQ,*.txt}
-	docinto cables ; dodoc docs/cables/*.txt
-	docinto drivers ; dodoc docs/drivers/*.txt
-
-	# clean up /etc/nut/*.sample files
-	cd ${D}/etc/nut
-	for i in *.sample
-	do
-		mv $i ${i/.sample/}
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/upsd-init upsd
-	newexe ${FILESDIR}/upsmon-init upsmon
-}
-
-pkg_preinst() {
-	if ! groupmod nut ; then
-		groupadd -g 84 nut || die "problem adding group nut"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	usermod nut &>/dev/null
-	if [ $? != 2 ] ; then
-		useradd -u 84 -g nut -s /bin/false -c "nut" \
-			-d /var/state/nut nut || die "problem adding user nut"
-	fi
-}
-
-pkg_postinst() {
-	install -m0700 -o nut -g nut -d ${ROOT}/var/state/nut
-	ewarn "Dont forget to merge the changes in /etc/init.d/._cfgXXXX_halt.sh"
-}
diff --git a/net-misc/nut/nut-1.2.1-r1.ebuild b/net-misc/nut/nut-1.2.1-r1.ebuild
deleted file mode 100644
index f7cf78b6972f..000000000000
--- a/net-misc/nut/nut-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.1-r1.ebuild,v 1.7 2004/03/16 00:05:03 max Exp $
-
-IUSE="png"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Network-UPS Tools"
-SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-KEYWORDS="x86 ~sparc"
-LICENSE="GPL-2"
-SLOT="0"
-
-# -- [ FIXME ] --
-# a better idea would be to have virtual/httpd dependencies and
-# USE cgi-bin support.  USE png and apache are used for now :\
-
-DEPEND="png? ( =sys-libs/zlib-1* =media-libs/libgd-1* =media-libs/libpng-1.2* )"
-RDEPEND="${DEPEND} png? ( net-www/apache ) >=sys-apps/baselayout-1.8.2"
-DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	cp configure.in configure.in.orig
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		configure.in.orig >configure.in
-	WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-	local myconf
-	use png && myconf="--with-cgi --with-cgipath=/home/httpd/cgi-bin"
-	use png || myconf="--without-cgi"
-
-	#default is to build all drivers; but the following is common:
-	#--with-drivers=apcsmart,hidups
-	./configure \
-		--prefix=/usr \
-		--with-user=nut \
-		--with-group=nut \
-		--with-port=3493 \
-		--with-drvpath=/sbin \
-		--sysconfdir=/etc/nut \
-		--mandir=/usr/share/man \
-		--with-pidpath=/var/run \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/state/nut \
-		--with-altpidpath=/var/state/nut \
-		--with-linux-hiddev \
-		--host=${CHOST} ${myconf} || die
-
-	cp ${S}/drivers/Makefile ${S}/drivers/Makefile.orig
-	sed -e "s:= bestups:= hidups bestups:" ${S}/drivers/Makefile.orig \
-		> ${S}/drivers/Makefile
-	cp ${S}/man/Makefile ${S}/man/Makefile.orig
-	sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-		${S}/man/Makefile.orig > ${S}/man/Makefile
-
-	emake || die
-
-	if [ -n "`use png`" ]
-	then
-		emake cgi || die
-	fi
-}
-
-src_install() {
-	# Makefile: user/group nut might not exist until after
-	# pkg_preinst() runs; so use root for now, and fix it
-	# up in pkg_postinst().
-	make DESTDIR=${D} RUNUID=root RUNGID=root install || die
-
-	if [ -n "`use png`" ]
-	then
-		make DESTDIR=${D} install-cgi || die
-	fi
-	# see above note...
-	rm -rf ${D}/var/state/nut
-
-	dodoc CHANGES COPYING CREDITS INSTALL NEWS README \
-		UPGRADING docs/{FAQ,*.txt,driver.list}
-	docinto cables ; dodoc docs/cables/*
-	docinto drivers ; dodoc docs/drivers/*
-
-	# clean up /etc/nut/*.sample files
-	cd ${D}/etc/nut
-	for i in *.sample
-	do
-		mv $i ${i/.sample/}
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/upsd-init upsd
-	newexe ${FILESDIR}/upsmon-init upsmon
-}
-
-pkg_preinst() {
-	if ! groupmod nut ; then
-		groupadd -g 84 nut || die "problem adding group nut"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	usermod nut &>/dev/null
-	if [ $? != 2 ] ; then
-		useradd -u 84 -g nut -s /bin/false -c "nut" \
-			-d /var/state/nut nut || die "problem adding user nut"
-	fi
-}
-
-pkg_postinst() {
-	install -m0700 -o nut -g nut -d ${ROOT}/var/state/nut
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	chmod 640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	ewarn "Dont forget to merge any changes in /etc/init.d/._cfgXXXX_halt.sh"
-}
diff --git a/net-misc/nut/nut-1.2.1.ebuild b/net-misc/nut/nut-1.2.1.ebuild
deleted file mode 100644
index 5e8023a519f8..000000000000
--- a/net-misc/nut/nut-1.2.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.1.ebuild,v 1.7 2004/03/16 00:05:03 max Exp $
-
-IUSE="png"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Network-UPS Tools"
-SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-KEYWORDS="x86 ~sparc"
-LICENSE="GPL-2"
-SLOT="0"
-
-# -- [ FIXME ] --
-# a better idea would be to have virtual/httpd dependencies and
-# USE cgi-bin support.  USE png and apache are used for now :\
-
-DEPEND="png? ( =sys-libs/zlib-1* =media-libs/libgd-1* =media-libs/libpng-1.2* )"
-RDEPEND="${DEPEND} png? ( net-www/apache ) >=sys-apps/baselayout-1.8.2"
-DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	cp configure.in configure.in.orig
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		configure.in.orig >configure.in
-	WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-	local myconf
-	use png && myconf="--with-cgi --with-cgipath=/home/httpd/cgi-bin"
-	use png || myconf="--without-cgi"
-
-	#default is to build all drivers; but the following is common:
-	#--with-drivers=apcsmart,hidups
-	./configure \
-		--prefix=/usr \
-		--with-user=nut \
-		--with-group=nut \
-		--with-port=3493 \
-		--with-drvpath=/sbin \
-		--sysconfdir=/etc/nut \
-		--mandir=/usr/share/man \
-		--with-pidpath=/var/run \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/state/nut \
-		--with-altpidpath=/var/state/nut \
-		--host=${CHOST} ${myconf} || die
-
-	emake || die
-
-	if [ -n "`use png`" ]
-	then
-		emake cgi || die
-	fi
-}
-
-src_install() {
-	# Makefile: user/group nut might not exist until after
-	# pkg_preinst() runs; so use root for now, and fix it
-	# up in pkg_postinst().
-	make DESTDIR=${D} RUNUID=root RUNGID=root install || die
-
-	if [ -n "`use png`" ]
-	then
-		make DESTDIR=${D} install-cgi || die
-	fi
-	# see above note...
-	rm -rf ${D}/var/state/nut
-
-	dodoc CHANGES COPYING CREDITS INSTALL NEWS README \
-		UPGRADING docs/{FAQ,*.txt,driver.list}
-	docinto cables ; dodoc docs/cables/*
-	docinto drivers ; dodoc docs/drivers/*
-
-	# clean up /etc/nut/*.sample files
-	cd ${D}/etc/nut
-	for i in *.sample
-	do
-		mv $i ${i/.sample/}
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/upsd-init upsd
-	newexe ${FILESDIR}/upsmon-init upsmon
-}
-
-pkg_preinst() {
-	if ! groupmod nut ; then
-		groupadd -g 84 nut || die "problem adding group nut"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	usermod nut &>/dev/null
-	if [ $? != 2 ] ; then
-		useradd -u 84 -g nut -s /bin/false -c "nut" \
-			-d /var/state/nut nut || die "problem adding user nut"
-	fi
-}
-
-pkg_postinst() {
-	install -m0700 -o nut -g nut -d ${ROOT}/var/state/nut
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	chmod 640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	ewarn "Dont forget to merge any changes in /etc/init.d/._cfgXXXX_halt.sh"
-}
diff --git a/net-misc/nut/nut-1.2.2.ebuild b/net-misc/nut/nut-1.2.2.ebuild
index 2a38b270c430..55f3908e4b1c 100644
--- a/net-misc/nut/nut-1.2.2.ebuild
+++ b/net-misc/nut/nut-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.2.ebuild,v 1.7 2004/03/16 00:05:03 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.2.2.ebuild,v 1.8 2004/04/07 22:20:04 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Network-UPS Tools"
@@ -13,10 +13,13 @@ SLOT="0"
 DEPEND=""
 RDEPEND=">=sys-apps/baselayout-1.8.2"
 
-APACHE="`which apache`"
-if [ -z "${APACHE}" -a -x /usr/sbin/apache ]; then
-	APACHE=/usr/sbin/apache
-fi
+APACHE=""
+function setapache() {
+	APACHE="`which apache 2>/dev/null`"
+	if [ -z "${APACHE}" -a -x /usr/sbin/apache ]; then
+		APACHE=/usr/sbin/apache
+	fi
+}
 
 if [ -n "${APACHE}" ]; then
 	DEPEND="${DEPEND} =sys-libs/zlib-1* =media-libs/libgd-1* =media-libs/libpng-1.2*"
@@ -36,6 +39,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
+	setapache
 	[ -n "${APACHE}" ] && myconf="--with-cgi --with-cgipath=/home/httpd/cgi-bin"
 	[ -n "${APACHE}" ] || myconf="--without-cgi"
 
@@ -72,6 +76,7 @@ src_compile() {
 }
 
 src_install() {
+	setapache
 	# Makefile: user/group nut might not exist until after
 	# pkg_preinst() runs; so use root for now, and fix it
 	# up in pkg_postinst().
diff --git a/net-misc/nut/nut-1.3.6.ebuild b/net-misc/nut/nut-1.3.6.ebuild
deleted file mode 100644
index 4f866fea848c..000000000000
--- a/net-misc/nut/nut-1.3.6.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.3.6.ebuild,v 1.7 2004/03/16 00:05:03 max Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Network-UPS Tools"
-SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-KEYWORDS="x86 ~sparc"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-devel/autoconf-2.58"
-RDEPEND=">=sys-apps/baselayout-1.8.2"
-
-if [ "`use apache2`" ]; then
-	APACHEBIN="apache2"
-else
-	APACHEBIN="apache"
-fi
-
-APACHE="`which ${APACHEBIN}`"
-if [ -z "${APACHE}" -a -x /usr/sbin/${APACHEBIN} ]; then
-	APACHE=/usr/sbin/${APACHEBIN}
-fi
-
-if [ -n "${APACHE}" ]; then
-	DEPEND="${DEPEND} =sys-libs/zlib-1* =media-libs/libgd-1* =media-libs/libpng-1.2*"
-	RDEPEND="${RDEPEND} net-www/apache"
-fi
-RDEPEND="${RDEPEND} ${DEPEND}"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	cp configure.in configure.in.orig
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		configure.in.orig >configure.in
-	WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-	local myconf
-	[ -n "${APACHE}" ] && myconf="--with-cgi --with-cgipath=/home/httpd/cgi-bin" || myconf="--without-cgi"
-
-	#default is to build all drivers; but the following is common:
-	#--with-drivers=apcsmart,hidups
-	./configure \
-		--prefix=/usr \
-		--with-user=nut \
-		--with-group=nut \
-		--with-port=3493 \
-		--with-drvpath=/sbin \
-		--sysconfdir=/etc/nut \
-		--mandir=/usr/share/man \
-		--with-pidpath=/var/run \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/state/nut \
-		--with-altpidpath=/var/state/nut \
-		--with-linux-hiddev \
-		--host=${CHOST} ${myconf} || die
-
-	cp ${S}/drivers/Makefile ${S}/drivers/Makefile.orig
-	sed -e "s:= bestups:= hidups bestups:" ${S}/drivers/Makefile.orig \
-		> ${S}/drivers/Makefile
-	cp ${S}/man/Makefile ${S}/man/Makefile.orig
-	sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-		${S}/man/Makefile.orig > ${S}/man/Makefile
-
-	emake || die
-
-	if [ -n "${APACHE}" ]
-	then
-		emake cgi || die
-	fi
-}
-
-src_install() {
-	# Makefile: user/group nut might not exist until after
-	# pkg_preinst() runs; so use root for now, and fix it
-	# up in pkg_postinst().
-	make DESTDIR=${D} RUNUID=root RUNGID=root install || die
-
-	if [ -n "${APACHE}" ]
-	then
-		make DESTDIR=${D} install-cgi || die
-	fi
-	# see above note...
-	rm -rf ${D}/var/state/nut
-
-	dodoc CHANGES COPYING CREDITS INSTALL NEWS README \
-		UPGRADING docs/{FAQ,*.txt,driver.list}
-	docinto cables ; dodoc docs/cables/*
-	docinto drivers ; dodoc docs/drivers/*
-
-	# clean up /etc/nut/*.sample files
-	cd ${D}/etc/nut
-	for i in *.sample
-	do
-		mv $i ${i/.sample/}
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/upsd-init upsd
-	newexe ${FILESDIR}/upsmon-init upsmon
-}
-
-pkg_preinst() {
-	if ! groupmod nut ; then
-		groupadd -g 84 nut || die "problem adding group nut"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	usermod nut &>/dev/null
-	if [ $? != 2 ] ; then
-		useradd -u 84 -g nut -s /bin/false -c "nut" \
-			-d /var/state/nut nut || die "problem adding user nut"
-	fi
-}
-
-pkg_postinst() {
-	install -m0700 -o nut -g nut -d ${ROOT}/var/state/nut
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	chmod 640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	ewarn "Dont forget to merge any changes in /etc/init.d/._cfgXXXX_halt.sh"
-}
diff --git a/net-misc/nut/nut-1.4.0-r3.ebuild b/net-misc/nut/nut-1.4.0-r3.ebuild
deleted file mode 100644
index 4a1fb8d60c86..000000000000
--- a/net-misc/nut/nut-1.4.0-r3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.0-r3.ebuild,v 1.4 2004/03/16 00:05:03 max Exp $
-
-DESCRIPTION="Network-UPS Tools."
-SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="cgi"
-
-RDEPEND="cgi? ( =media-libs/libgd-1* )"
-DEPEND="$RDEPEND
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		-i configure.in || die "sed failed"
-
-	ebegin "Recreating configure"
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-	eend $?
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		--with-linux-hiddev \
-		${myconf}
-
-	sed -e "s:= bestups:= hidups bestups:" \
-		-i drivers/Makefile || die "sed failed"
-	sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-		-i man/Makefile || "sed failed"
-
-	emake || die "compile problem"
-
-	if [ "`use cgi`" ] ; then
-		emake cgi || die "compile cgi problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	if [ "`use cgi`" ] ; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut,"
-		einfo "copy them to your web server's ScriptPath to activate."
-	fi
-
-	dodoc CHANGES COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-		docs/{FAQ,*.txt,driver.list}
-
-	docinto cables
-	dodoc docs/cables/*
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
-
-	keepdir /var/lib/nut
-}
-
-pkg_postinst() {
-	chown nut:nut ${ROOT}/var/lib/nut
-	chmod 0700 ${ROOT}/var/lib/nut
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	chmod 0640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-}
diff --git a/net-misc/nut/nut-1.4.0.ebuild b/net-misc/nut/nut-1.4.0.ebuild
deleted file mode 100644
index 25abb24bb0f6..000000000000
--- a/net-misc/nut/nut-1.4.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.0.ebuild,v 1.6 2004/03/16 00:05:03 max Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Network-UPS Tools"
-SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-KEYWORDS="~x86 ~sparc"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=""
-RDEPEND=">=sys-apps/baselayout-1.8.2"
-
-if [ "`use apache2`" ]; then
-	APACHEBIN="apache2"
-else
-	APACHEBIN="apache"
-fi
-
-APACHE="`which ${APACHEBIN}`"
-if [ -z "${APACHE}" -a -x /usr/sbin/${APACHEBIN} ]; then
-	APACHE=/usr/sbin/${APACHEBIN}
-fi
-
-if [ -n "${APACHE}" ]; then
-	DEPEND="${DEPEND} =sys-libs/zlib-1* =media-libs/libgd-1* =media-libs/libpng-1.2*"
-	RDEPEND="${RDEPEND} net-www/apache"
-fi
-RDEPEND="${RDEPEND} ${DEPEND}"
-DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	cp configure.in configure.in.orig
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		configure.in.orig >configure.in
-	WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-	local myconf
-	[ -n "${APACHE}" ] && myconf="--with-cgi --with-cgipath=/home/httpd/cgi-bin" || myconf="--without-cgi"
-
-	#default is to build all drivers; but the following is common:
-	#--with-drivers=apcsmart,hidups
-	./configure \
-		--prefix=/usr \
-		--with-user=nut \
-		--with-group=nut \
-		--with-port=3493 \
-		--with-drvpath=/sbin \
-		--sysconfdir=/etc/nut \
-		--mandir=/usr/share/man \
-		--with-pidpath=/var/run \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/state/nut \
-		--with-altpidpath=/var/state/nut \
-		--with-linux-hiddev \
-		--host=${CHOST} ${myconf} || die
-
-	cp ${S}/drivers/Makefile ${S}/drivers/Makefile.orig
-	sed -e "s:= bestups:= hidups bestups:" ${S}/drivers/Makefile.orig \
-		> ${S}/drivers/Makefile
-	cp ${S}/man/Makefile ${S}/man/Makefile.orig
-	sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-		${S}/man/Makefile.orig > ${S}/man/Makefile
-
-	emake || die
-
-	if [ -n "${APACHE}" ]
-	then
-		emake cgi || die
-	fi
-}
-
-src_install() {
-	# Makefile: user/group nut might not exist until after
-	# pkg_preinst() runs; so use root for now, and fix it
-	# up in pkg_postinst().
-	make DESTDIR=${D} RUNUID=root RUNGID=root install || die
-
-	if [ -n "${APACHE}" ]
-	then
-		make DESTDIR=${D} install-cgi || die
-	fi
-	# see above note...
-	rm -rf ${D}/var/state/nut
-
-	dodoc CHANGES COPYING CREDITS INSTALL NEWS README \
-		UPGRADING docs/{FAQ,*.txt,driver.list}
-	docinto cables ; dodoc docs/cables/*
-	docinto drivers ; dodoc docs/drivers/*
-
-	# clean up /etc/nut/*.sample files
-	cd ${D}/etc/nut
-	for i in *.sample
-	do
-		mv $i ${i/.sample/}
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/upsd-init upsd
-	newexe ${FILESDIR}/upsmon-init upsmon
-}
-
-pkg_preinst() {
-	if ! groupmod nut ; then
-		groupadd -g 84 nut || die "problem adding group nut"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	usermod nut &>/dev/null
-	if [ $? != 2 ] ; then
-		useradd -u 84 -g nut -s /bin/false -c "nut" \
-			-d /var/state/nut nut || die "problem adding user nut"
-	fi
-}
-
-pkg_postinst() {
-	install -m0700 -o nut -g nut -d ${ROOT}/var/state/nut
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	chmod 640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	ewarn "Dont forget to merge any changes in /etc/init.d/._cfgXXXX_halt.sh"
-}
diff --git a/net-misc/nut/nut-1.5.1.ebuild b/net-misc/nut/nut-1.5.1.ebuild
deleted file mode 100644
index 04aba2b5921f..000000000000
--- a/net-misc/nut/nut-1.5.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.1.ebuild,v 1.6 2004/03/16 00:05:03 max Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Network-UPS Tools"
-SRC_URI="http://www.exploits.org/nut/development/${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-KEYWORDS="~x86 ~sparc"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=""
-RDEPEND=">=sys-apps/baselayout-1.8.2"
-
-if [ "`use apache2`" ]; then
-	APACHEBIN="apache2"
-else
-	APACHEBIN="apache"
-fi
-
-APACHE="`which ${APACHEBIN}`"
-if [ -z "${APACHE}" -a -x /usr/sbin/${APACHEBIN} ]; then
-	APACHE=/usr/sbin/${APACHEBIN}
-fi
-
-if [ -n "${APACHE}" ]; then
-	DEPEND="${DEPEND} =sys-libs/zlib-1* =media-libs/libgd-1* =media-libs/libpng-1.2*"
-	RDEPEND="${RDEPEND} net-www/apache"
-fi
-RDEPEND="${RDEPEND} ${DEPEND}"
-DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	cp configure.in configure.in.orig
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		configure.in.orig >configure.in
-	WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-	local myconf
-	[ -n "${APACHE}" ] && myconf="--with-cgi --with-cgipath=/home/httpd/cgi-bin" || myconf="--without-cgi"
-
-	#default is to build all drivers; but the following is common:
-	#--with-drivers=apcsmart,hidups
-	./configure \
-		--prefix=/usr \
-		--with-user=nut \
-		--with-group=nut \
-		--with-port=3493 \
-		--with-drvpath=/sbin \
-		--sysconfdir=/etc/nut \
-		--mandir=/usr/share/man \
-		--with-pidpath=/var/run \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/state/nut \
-		--with-altpidpath=/var/state/nut \
-		--with-linux-hiddev \
-		--host=${CHOST} ${myconf} || die
-
-	cp ${S}/drivers/Makefile ${S}/drivers/Makefile.orig
-	sed -e "s:= bestups:= hidups bestups:" ${S}/drivers/Makefile.orig \
-		> ${S}/drivers/Makefile
-	cp ${S}/man/Makefile ${S}/man/Makefile.orig
-	sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-		${S}/man/Makefile.orig > ${S}/man/Makefile
-
-	emake || die
-
-	if [ -n "${APACHE}" ]
-	then
-		emake cgi || die
-	fi
-}
-
-src_install() {
-	# Makefile: user/group nut might not exist until after
-	# pkg_preinst() runs; so use root for now, and fix it
-	# up in pkg_postinst().
-	make DESTDIR=${D} RUNUID=root RUNGID=root install || die
-
-	if [ -n "${APACHE}" ]
-	then
-		make DESTDIR=${D} install-cgi || die
-	fi
-	# see above note...
-	rm -rf ${D}/var/state/nut
-
-	dodoc CHANGES COPYING CREDITS INSTALL NEWS README \
-		UPGRADING docs/{FAQ,*.txt,driver.list}
-	docinto cables ; dodoc docs/cables/*
-	docinto drivers ; dodoc docs/drivers/*
-
-	# clean up /etc/nut/*.sample files
-	cd ${D}/etc/nut
-	for i in *.sample
-	do
-		mv $i ${i/.sample/}
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/upsd-init upsd
-	newexe ${FILESDIR}/upsmon-init upsmon
-}
-
-pkg_preinst() {
-	if ! groupmod nut ; then
-		groupadd -g 84 nut || die "problem adding group nut"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	usermod nut &>/dev/null
-	if [ $? != 2 ] ; then
-		useradd -u 84 -g nut -s /bin/false -c "nut" \
-			-d /var/state/nut nut || die "problem adding user nut"
-	fi
-}
-
-pkg_postinst() {
-	install -m0700 -o nut -g nut -d ${ROOT}/var/state/nut
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	chmod 640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	ewarn "Dont forget to merge any changes in /etc/init.d/._cfgXXXX_halt.sh"
-}
diff --git a/net-misc/nut/nut-1.5.6-r2.ebuild b/net-misc/nut/nut-1.5.6-r2.ebuild
deleted file mode 100644
index ec4e850db18b..000000000000
--- a/net-misc/nut/nut-1.5.6-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.6-r2.ebuild,v 1.4 2004/03/16 00:05:03 max Exp $
-
-DESCRIPTION="Network-UPS Tools."
-SRC_URI="http://www.exploits.org/nut/development/${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="cgi"
-
-RDEPEND="cgi? ( =media-libs/libgd-1* )"
-DEPEND="$RDEPEND
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		-i configure.in || die "sed failed"
-
-	ebegin "Recreating configure"
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-	eend $?
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		--with-linux-hiddev \
-		${myconf}
-
-	sed -e "s:= bestups:= hidups bestups:" \
-		-i drivers/Makefile || die "sed failed"
-	sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-		-i man/Makefile || "sed failed"
-
-	emake || die "compile problem"
-
-	if [ "`use cgi`" ] ; then
-		emake cgi || die "compile cgi problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	if [ "`use cgi`" ] ; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut,"
-		einfo "copy them to your web server's ScriptPath to activate."
-	fi
-
-	dodoc CHANGES COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-		docs/{FAQ,*.txt,driver.list}
-
-	docinto cables
-	dodoc docs/cables/*
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
-
-	keepdir /var/lib/nut
-}
-
-pkg_postinst() {
-	chown nut:nut ${ROOT}/var/lib/nut
-	chmod 0700 ${ROOT}/var/lib/nut
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	chmod 0640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-}
diff --git a/net-misc/nut/nut-1.5.7.ebuild b/net-misc/nut/nut-1.5.7.ebuild
deleted file mode 100644
index e9c3921981f4..000000000000
--- a/net-misc/nut/nut-1.5.7.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.7.ebuild,v 1.4 2004/03/16 00:05:03 max Exp $
-
-DESCRIPTION="Network-UPS Tools."
-SRC_URI="http://www.exploits.org/nut/development/${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="cgi"
-
-RDEPEND="cgi? ( =media-libs/libgd-1* )"
-DEPEND="$RDEPEND
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		-i configure.in || die "sed failed"
-
-	ebegin "Recreating configure"
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-	eend $?
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		--with-linux-hiddev \
-		${myconf}
-
-	sed -e "s:= bestups:= hidups bestups:" \
-		-i drivers/Makefile || die "sed failed"
-	sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-		-i man/Makefile || "sed failed"
-
-	emake || die "compile problem"
-
-	if [ "`use cgi`" ] ; then
-		emake cgi || die "compile cgi problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	if [ "`use cgi`" ] ; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut,"
-		einfo "copy them to your web server's ScriptPath to activate."
-	fi
-
-	dodoc CHANGES COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-		docs/{FAQ,*.txt,driver.list}
-
-	docinto cables
-	dodoc docs/cables/*
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
-
-	keepdir /var/lib/nut
-}
-
-pkg_postinst() {
-	chown nut:nut ${ROOT}/var/lib/nut
-	chmod 0700 ${ROOT}/var/lib/nut
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	chmod 0640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-}
diff --git a/net-misc/nut/nut-1.5.8-r1.ebuild b/net-misc/nut/nut-1.5.8-r1.ebuild
deleted file mode 100644
index a6663e32caa9..000000000000
--- a/net-misc/nut/nut-1.5.8-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.8-r1.ebuild,v 1.4 2004/01/30 07:11:04 drobbins Exp $
-
-inherit fixheadtails
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.exploits.org/nut/"
-SRC_URI="http://www.exploits.org/nut/development/${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="cgi"
-
-RDEPEND="cgi? ( =media-libs/libgd-1* )"
-DEPEND="$RDEPEND
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	sed -e "s/install: install-dirs/install: install-dirs install-conf/" \
-		-i Makefile.in || die "sed failed"
-
-	ht_fix_file configure.in config.guess
-
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		-i configure.in || die "sed failed"
-
-	ebegin "Recreating configure"
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-	eend $?
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		--with-linux-hiddev \
-		${myconf}
-
-	sed -e "s:= bestups:= hidups bestups:" \
-		-i drivers/Makefile || die "sed failed"
-	sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-		-i man/Makefile || "sed failed"
-
-	emake || die "compile problem"
-
-	if use cgi; then
-		emake cgi || die "compile cgi problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	if use cgi; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut,"
-		einfo "copy them to your web server's ScriptPath to activate."
-	fi
-
-	dodoc CHANGES COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-		docs/{FAQ,*.txt}
-
-	docinto cables
-	dodoc docs/cables/*
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
-
-	keepdir /var/lib/nut
-
-	fperms 0700 /var/lib/nut
-	fperms 0640 /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	fowners nut:nut /var/lib/nut
-	fowners root:nut /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-}
-
-pkg_postinst() {
-	# this is to ensure that everybody that installed old versions still has correct
-	# permissions
-	chown nut:nut ${ROOT}/var/lib/nut 2>/dev/null
-	chmod 0700 ${ROOT}/var/lib/nut 2>/dev/null
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf} 2>/dev/null
-	chmod 0640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf} 2>/dev/null
-}
diff --git a/net-misc/nut/nut-1.5.8.ebuild b/net-misc/nut/nut-1.5.8.ebuild
deleted file mode 100644
index 0664d59cb439..000000000000
--- a/net-misc/nut/nut-1.5.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.8.ebuild,v 1.4 2004/03/16 00:05:03 max Exp $
-
-DESCRIPTION="Network-UPS Tools."
-SRC_URI="http://www.exploits.org/nut/development/${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="cgi"
-
-RDEPEND="cgi? ( =media-libs/libgd-1* )"
-DEPEND="$RDEPEND
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		-i configure.in || die "sed failed"
-
-	ebegin "Recreating configure"
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-	eend $?
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		--with-linux-hiddev \
-		${myconf}
-
-	sed -e "s:= bestups:= hidups bestups:" \
-		-i drivers/Makefile || die "sed failed"
-	sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-		-i man/Makefile || "sed failed"
-
-	emake || die "compile problem"
-
-	if use cgi; then
-		emake cgi || die "compile cgi problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	if use cgi; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut,"
-		einfo "copy them to your web server's ScriptPath to activate."
-	fi
-
-	dodoc CHANGES COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-		docs/{FAQ,*.txt,driver.list}
-
-	docinto cables
-	dodoc docs/cables/*
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
-
-	keepdir /var/lib/nut
-}
-
-pkg_postinst() {
-	chown nut:nut ${ROOT}/var/lib/nut
-	chmod 0700 ${ROOT}/var/lib/nut
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	chmod 0640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-}