Clean up old ebuilds and fix quoting in present latest version.

(Portage version: 2.1.3.12)

20 files changed, 18 insertions, 1493 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index d87767199bcf..ac5c4aaf6bbb 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.46 2007/10/09 00:42:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.47 2007/10/09 00:45:34 robbat2 Exp $
+
+  09 Oct 2007; Robin H. Johnson <robbat2@gentoo.org> -nut-2.0.0.ebuild,
+  -nut-2.0.0-r1.ebuild, -nut-2.0.1_pre4.ebuild, -nut-2.0.3.ebuild,
+  -nut-2.0.3-r1.ebuild, -nut-2.0.4.ebuild, -nut-2.0.4-r1.ebuild,
+  -nut-2.0.5.ebuild, -nut-2.0.5-r1.ebuild, nut-2.0.5-r2.ebuild:
+  Clean up old ebuilds and fix quoting in present latest version.
 
   09 Oct 2007; Robin H. Johnson <robbat2@gentoo.org> files/upsd.rc6:
   Fix bug #195125 for pidfile locations.
diff --git a/sys-power/nut/files/digest-nut-2.0.0 b/sys-power/nut/files/digest-nut-2.0.0
deleted file mode 100644
index 783df5868fa7..000000000000
--- a/sys-power/nut/files/digest-nut-2.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 84649ad95809737b5ffc19efdd9e9952 nut-2.0.0.tar.gz 530492
-RMD160 7f36296b61b79fe13d78c65a66aa034b60e1c0d2 nut-2.0.0.tar.gz 530492
-SHA256 5015eda31ffae1e899c6b80d9c0c943e24fae1934591a50018f01e2622ebf9b8 nut-2.0.0.tar.gz 530492
diff --git a/sys-power/nut/files/digest-nut-2.0.0-r1 b/sys-power/nut/files/digest-nut-2.0.0-r1
deleted file mode 100644
index 783df5868fa7..000000000000
--- a/sys-power/nut/files/digest-nut-2.0.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 84649ad95809737b5ffc19efdd9e9952 nut-2.0.0.tar.gz 530492
-RMD160 7f36296b61b79fe13d78c65a66aa034b60e1c0d2 nut-2.0.0.tar.gz 530492
-SHA256 5015eda31ffae1e899c6b80d9c0c943e24fae1934591a50018f01e2622ebf9b8 nut-2.0.0.tar.gz 530492
diff --git a/sys-power/nut/files/digest-nut-2.0.1_pre4 b/sys-power/nut/files/digest-nut-2.0.1_pre4
deleted file mode 100644
index 137dd0b8c5d2..000000000000
--- a/sys-power/nut/files/digest-nut-2.0.1_pre4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 399f79406e07aa2a689bc6a119b0fcad nut-2.0.1-pre4.tar.gz 563526
-RMD160 5b0a3ab8a400e70f308471aa7b1fbcaa8052f739 nut-2.0.1-pre4.tar.gz 563526
-SHA256 6a374f34e155ef2f09c10c046ef34a628fe4cb9970973c88c57cbca16d78624f nut-2.0.1-pre4.tar.gz 563526
diff --git a/sys-power/nut/files/digest-nut-2.0.3 b/sys-power/nut/files/digest-nut-2.0.3
deleted file mode 100644
index 55c8a6e59877..000000000000
--- a/sys-power/nut/files/digest-nut-2.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed2d3104d021a6ddb864f23d8cbd1cf6 nut-2.0.3.tar.gz 656376
-RMD160 890c52b1ab538101c30e5be33e785817a773cdb9 nut-2.0.3.tar.gz 656376
-SHA256 e4ded1fd1f119a71ee500d043bfa08d912d84793738d81b2bd08871e34ed8f95 nut-2.0.3.tar.gz 656376
diff --git a/sys-power/nut/files/digest-nut-2.0.3-r1 b/sys-power/nut/files/digest-nut-2.0.3-r1
deleted file mode 100644
index 55c8a6e59877..000000000000
--- a/sys-power/nut/files/digest-nut-2.0.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed2d3104d021a6ddb864f23d8cbd1cf6 nut-2.0.3.tar.gz 656376
-RMD160 890c52b1ab538101c30e5be33e785817a773cdb9 nut-2.0.3.tar.gz 656376
-SHA256 e4ded1fd1f119a71ee500d043bfa08d912d84793738d81b2bd08871e34ed8f95 nut-2.0.3.tar.gz 656376
diff --git a/sys-power/nut/files/digest-nut-2.0.4 b/sys-power/nut/files/digest-nut-2.0.4
deleted file mode 100644
index 25ad2547dc35..000000000000
--- a/sys-power/nut/files/digest-nut-2.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 59b6f3038a5ef64c584913e72bd850a2 nut-2.0.4.tar.gz 699424
-RMD160 7368967572bd8b2361c6fdd642308ecbb661a994 nut-2.0.4.tar.gz 699424
-SHA256 6a8fb79fd5eb89baa36d321c8ffc1b6ec05265242c0ff3495aac49f008295db2 nut-2.0.4.tar.gz 699424
diff --git a/sys-power/nut/files/digest-nut-2.0.4-r1 b/sys-power/nut/files/digest-nut-2.0.4-r1
deleted file mode 100644
index 25ad2547dc35..000000000000
--- a/sys-power/nut/files/digest-nut-2.0.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 59b6f3038a5ef64c584913e72bd850a2 nut-2.0.4.tar.gz 699424
-RMD160 7368967572bd8b2361c6fdd642308ecbb661a994 nut-2.0.4.tar.gz 699424
-SHA256 6a8fb79fd5eb89baa36d321c8ffc1b6ec05265242c0ff3495aac49f008295db2 nut-2.0.4.tar.gz 699424
diff --git a/sys-power/nut/files/digest-nut-2.0.5 b/sys-power/nut/files/digest-nut-2.0.5
deleted file mode 100644
index 782b3150a09e..000000000000
--- a/sys-power/nut/files/digest-nut-2.0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b08fde86191154bbcfda860f95a5dca2 nut-2.0.5.tar.gz 809006
-RMD160 e5f90a73932e038d3dfee8cb32faf097d99a7e0b nut-2.0.5.tar.gz 809006
-SHA256 5e1bfecfca528104db7025050c81258ee20620df7497ab5988ad461d951c8203 nut-2.0.5.tar.gz 809006
diff --git a/sys-power/nut/files/digest-nut-2.0.5-r1 b/sys-power/nut/files/digest-nut-2.0.5-r1
deleted file mode 100644
index 782b3150a09e..000000000000
--- a/sys-power/nut/files/digest-nut-2.0.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b08fde86191154bbcfda860f95a5dca2 nut-2.0.5.tar.gz 809006
-RMD160 e5f90a73932e038d3dfee8cb32faf097d99a7e0b nut-2.0.5.tar.gz 809006
-SHA256 5e1bfecfca528104db7025050c81258ee20620df7497ab5988ad461d951c8203 nut-2.0.5.tar.gz 809006
diff --git a/sys-power/nut/nut-2.0.0-r1.ebuild b/sys-power/nut/nut-2.0.0-r1.ebuild
deleted file mode 100644
index b5d3029aa1c3..000000000000
--- a/sys-power/nut/nut-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.0-r1.ebuild,v 1.5 2007/07/15 07:08:11 mr_bones_ Exp $
-
-inherit eutils fixheadtails
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.networkupstools.org/"
-SRC_URI="mirror://nut/source/${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="cgi snmp usb"
-
-RDEPEND="cgi? ( media-libs/gd )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58"
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/state/nut nut
-}
-
-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
-
-	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`"
-
-	if [ -n "${NUT_DRIVERS}" ]; then
-		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
-	fi
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/usr/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-
-	if use snmp; then
-		emake snmp || die "snmp compile problem"
-	fi
-
-	if use usb; then
-		emake usb || die "snmp compile problem"
-	fi
-
-	if use cgi; then
-		emake cgi || die "compile cgi problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-lib || die "make install failed"
-
-	dodir /usr/sbin
-	dosym /usr/lib/nut/upsdrvctl /usr/sbin/upsdrvctl
-
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	if use snmp; then
-		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
-	fi
-
-	if use usb; then
-		make DESTDIR="${D}" install-usb || die "make install-usb failed"
-	fi
-
-	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}
-
-	newdoc lib/README README.lib
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}/upsd.rc6" upsd
-	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newinitd "${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/sys-power/nut/nut-2.0.0.ebuild b/sys-power/nut/nut-2.0.0.ebuild
deleted file mode 100644
index 1ba1dc7c80fd..000000000000
--- a/sys-power/nut/nut-2.0.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.0.ebuild,v 1.4 2007/07/15 07:08:11 mr_bones_ Exp $
-
-inherit eutils fixheadtails
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.networkupstools.org/"
-SRC_URI="mirror://nut/source/${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE="cgi snmp usb"
-
-RDEPEND="cgi? ( media-libs/gd )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58"
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/state/nut nut
-}
-
-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
-
-	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`"
-
-	if [ -n "${NUT_DRIVERS}" ]; then
-		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
-	fi
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-
-	if use snmp; then
-		emake snmp || die "snmp compile problem"
-	fi
-
-	if use usb; then
-		emake usb || die "snmp compile problem"
-	fi
-
-	if use cgi; then
-		emake cgi || die "compile cgi problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-lib || 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 snmp; then
-		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
-	fi
-
-	if use usb; then
-		make DESTDIR="${D}" install-usb || die "make install-usb failed"
-	fi
-
-	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}
-
-	newdoc lib/README README.lib
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}/upsd.rc6" upsd
-	newinitd "${FILESDIR}/upsdrv.rc6" upsdrv
-	newinitd "${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/sys-power/nut/nut-2.0.1_pre4.ebuild b/sys-power/nut/nut-2.0.1_pre4.ebuild
deleted file mode 100644
index deebe40a8a8f..000000000000
--- a/sys-power/nut/nut-2.0.1_pre4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.1_pre4.ebuild,v 1.4 2007/07/15 07:08:11 mr_bones_ Exp $
-
-inherit eutils fixheadtails
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.networkupstools.org/"
-SRC_URI="mirror://nut/source/2.0/testing/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cgi snmp usb"
-
-RDEPEND="cgi? ( media-libs/gd )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58"
-
-S=${WORKDIR}/${MY_P/-pre4//}
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/state/nut nut
-}
-
-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
-
-	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`"
-
-	if [ -n "${NUT_DRIVERS}" ]; then
-		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
-	fi
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/usr/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-
-	if use snmp; then
-		emake snmp || die "snmp compile problem"
-	fi
-
-	if use usb; then
-		emake usb || die "snmp compile problem"
-	fi
-
-	if use cgi; then
-		emake cgi || die "compile cgi problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-lib || die "make install failed"
-
-	dodir /usr/sbin
-	dosym /usr/lib/nut/upsdrvctl /usr/sbin/upsdrvctl
-
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	if use snmp; then
-		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
-	fi
-
-	if use usb; then
-		make DESTDIR="${D}" install-usb || die "make install-usb failed"
-	fi
-
-	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}
-
-	newdoc lib/README README.lib
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}/upsd.rc6" upsd
-	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newinitd "${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/sys-power/nut/nut-2.0.3-r1.ebuild b/sys-power/nut/nut-2.0.3-r1.ebuild
deleted file mode 100644
index c118896cd6a5..000000000000
--- a/sys-power/nut/nut-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.3-r1.ebuild,v 1.13 2007/07/15 07:08:11 mr_bones_ Exp $
-
-inherit eutils fixheadtails
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.networkupstools.org/"
-# Nut mirrors are presently broken
-#SRC_URI="mirror://nut/source/${PV%.*}/${MY_P}.tar.gz"
-SRC_URI="http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="cgi snmp usb ssl"
-
-RDEPEND="cgi? ( >=media-libs/gd-2 )
-		snmp? ( net-analyzer/net-snmp )
-		usb? ( dev-libs/libusb )
-		ssl? ( dev-libs/openssl )"
-DEPEND="$RDEPEND
-		>=sys-apps/sed-4
-		>=sys-devel/autoconf-2.58"
-
-# public files should be 644 root:root
-NUT_PUBLIC_FILES="/etc/nut/{{hosts,upsset,ups,upssched}.conf,upsstats{,-single}.html}"
-# private files should be 640 root:nut - readable by nut, writeable by root,
-NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/state/nut nut,tty
-	warningmsg
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/upsstats-upsset-link.patch
-
-	cd "${S}"
-
-	sed -e "s/install: install-dirs/install: install-dirs install-conf/" \
-		-i Makefile.in || die "sed failed"
-
-	ht_fix_file configure.in
-
-	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
-
-	if [ -n "${NUT_DRIVERS}" ]; then
-		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
-	fi
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		$(use_with ssl) \
-		$(use_with cgi) \
-		$(use_with cgi cgipath /usr/share/nut) \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-
-	if use snmp; then
-		emake snmp || die "snmp compile problem"
-	fi
-
-	if use usb; then
-		emake usb || die "usb compile problem"
-	fi
-
-	if use cgi; then
-		emake cgi || die "cgi compile problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-lib || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-	# This needs to exist for the scripts
-	dosym /lib/nut/upsdrvctl /usr/sbin/upsdrvctl
-
-	if use snmp; then
-		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
-	fi
-
-	if use usb; then
-		make DESTDIR="${D}" install-usb || die "make install-usb failed"
-	fi
-
-	if use cgi; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		make DESTDIR="${D}" install-cgi-conf || die "make install-cgi-conf failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut."
-		einfo "copy them to your web server's ScriptPath to activate."
-		einfo "If you use lighttpd, see lighttpd_nut.conf in the documentation."
-	fi
-
-	# this must be done after all of the install phases
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	dodoc CHANGES CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-			docs/{FAQ,*.txt}
-
-	newdoc lib/README README.lib
-
-	dodoc ${FILESDIR}/lighttpd_nut.conf
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}/upsd.rc6" upsd
-	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newinitd "${FILESDIR}/upsmon.rc6" upsmon
-
-	# This sets up permissions for nut to access a UPS
-	insinto /etc/udev/rules.d/
-	newins scripts/hotplug-ng/nut-usbups.rules 70-nut-usbups.rules
-
-	keepdir /var/lib/nut
-
-	fperms 0700 /var/lib/nut
-	fowners nut:nut /var/lib/nut
-
-	eval fperms 0640 ${NUT_PRIVATE_FILES}
-	eval fowners root:nut ${NUT_PRIVATE_FILES}
-
-	eval fperms 0644 ${NUT_PUBLIC_FILES}
-	eval fowners root:root ${NUT_PUBLIC_FILES}
-
-	# this is installed for 2.4 and fbsd guys
-	if ! has_version sys-fs/udev; then
-		insinto /etc/hotplug/usb
-		insopts -m 755
-		doins scripts/hotplug-ng/nut-usbups.hotplug
-	fi
-}
-
-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
-
-	eval chown root:nut ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-	eval chmod 0640 ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-
-	eval chown root:root ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-	eval chmod 0644 ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-
-	warningmsg
-}
-
-warningmsg() {
-	ewarn "Please note that NUT now runs under the 'nut' user."
-	ewarn "NUT is in the tty group for access to RS-232 UPS."
-	ewarn "However if you use a USB UPS you may need to look at the udev or"
-	ewarn "hotplug rules that are installed."
-}
diff --git a/sys-power/nut/nut-2.0.3.ebuild b/sys-power/nut/nut-2.0.3.ebuild
deleted file mode 100644
index 2388634353b5..000000000000
--- a/sys-power/nut/nut-2.0.3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.3.ebuild,v 1.4 2007/07/15 07:08:11 mr_bones_ Exp $
-
-inherit eutils fixheadtails
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.networkupstools.org/"
-# Nut mirrors are presently broken
-#SRC_URI="mirror://nut/source/${PV%.*}/${MY_P}.tar.gz"
-SRC_URI="http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cgi snmp usb ssl"
-
-RDEPEND="cgi? ( >=media-libs/gd-2 )
-		snmp? ( net-analyzer/net-snmp )
-		usb? ( dev-libs/libusb )
-		ssl? ( dev-libs/openssl )"
-DEPEND="$RDEPEND
-		>=sys-apps/sed-4
-		>=sys-devel/autoconf-2.58"
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/state/nut nut
-}
-
-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
-
-	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
-
-	if [ -n "${NUT_DRIVERS}" ]; then
-		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
-	fi
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		$(use_with ssl) \
-		$(use_with cgi) \
-		$(use_with cgi cgipath /usr/share/nut) \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-
-	if use snmp; then
-		emake snmp || die "snmp compile problem"
-	fi
-
-	if use usb; then
-		emake usb || die "usb compile problem"
-	fi
-
-	if use cgi; then
-		emake cgi || die "cgi compile problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-lib || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-	# This needs to exist for the scripts
-	dosym /lib/nut/upsdrvctl /usr/sbin/upsdrvctl
-
-	if use snmp; then
-		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
-	fi
-
-	if use usb; then
-		make DESTDIR="${D}" install-usb || die "make install-usb failed"
-	fi
-
-	if use cgi; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		make DESTDIR="${D}" install-cgi-conf || die "make install-cgi-conf failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut,"
-		einfo "copy them to your web server's ScriptPath to activate."
-	fi
-
-	# this must be done after all of the install phases
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	dodoc CHANGES CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-			docs/{FAQ,*.txt}
-
-	newdoc lib/README README.lib
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}/upsd.rc6" upsd
-	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newinitd "${FILESDIR}/upsmon.rc6" upsmon
-
-	# This sets up permissions for nut to access a UPS
-	insinto /etc/udev/rules.d/
-	newins scripts/hotplug-ng/nut-usbups.rules 70-nut-usbups.rules
-
-	keepdir /var/lib/nut
-
-	fperms 0700 /var/lib/nut
-	fowners nut:nut /var/lib/nut
-
-	fperms 0640 /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	fowners root:nut /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-
-	fperms 0640 /etc/nut/{hosts.conf,upsset.conf,upsstats{,-single}.html}
-	fowners root:nut /etc/nut/{hosts.conf,upsset.conf,upsstats{,-single}.html}
-}
-
-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
-
-	chown root:nut ${ROOT}/etc/nut/{hosts.conf,upsset.conf,upsstats{,-single}.html} 2>/dev/null
-	chmod 0640 ${ROOT}/etc/nut/{hosts.conf,upsset.conf,upsstats{,-single}.html} 2>/dev/null
-}
diff --git a/sys-power/nut/nut-2.0.4-r1.ebuild b/sys-power/nut/nut-2.0.4-r1.ebuild
deleted file mode 100644
index 9c0b78eee32b..000000000000
--- a/sys-power/nut/nut-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.4-r1.ebuild,v 1.15 2007/07/15 07:08:11 mr_bones_ Exp $
-
-inherit eutils fixheadtails
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.networkupstools.org/"
-# Nut mirrors are presently broken
-#SRC_URI="mirror://nut/source/${PV%.*}/${MY_P}.tar.gz"
-SRC_URI="http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="cgi snmp usb ssl"
-
-RDEPEND="cgi? ( >=media-libs/gd-2 )
-		snmp? ( net-analyzer/net-snmp )
-		usb? ( >=dev-libs/libusb-0.1.12 )
-		ssl? ( dev-libs/openssl )"
-DEPEND="$RDEPEND
-		>=sys-apps/sed-4
-		>=sys-devel/autoconf-2.58"
-
-# public files should be 644 root:root
-NUT_PUBLIC_FILES="/etc/nut/{{hosts,upsset,ups,upssched}.conf,upsstats{,-single}.html}"
-# private files should be 640 root:nut - readable by nut, writeable by root,
-NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/state/nut nut,tty
-	# try to add nut to the tty group for old cases where it already existed
-	gpasswd -a nut tty
-	warningmsg
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/upsstats-upsset-link-${PV}.patch
-
-	cd "${S}"
-
-	sed -e "s/install: install-dirs/install: install-dirs install-conf/" \
-		-i Makefile.in || die "sed failed"
-
-	ht_fix_file configure.in
-
-	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
-
-	if [ -n "${NUT_DRIVERS}" ]; then
-		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
-	fi
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		$(use_with ssl) \
-		$(use_with cgi) \
-		$(use_with cgi cgipath /usr/share/nut) \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-
-	if use snmp; then
-		emake snmp || die "snmp compile problem"
-	fi
-
-	if use usb; then
-		emake usb || die "usb compile problem"
-	fi
-
-	if use cgi; then
-		emake cgi || die "cgi compile problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-lib || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-	# This needs to exist for the scripts
-	dosym /lib/nut/upsdrvctl /usr/sbin/upsdrvctl
-
-	if use snmp; then
-		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
-	fi
-
-	if use usb; then
-		make DESTDIR="${D}" install-usb || die "make install-usb failed"
-	fi
-
-	if use cgi; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		make DESTDIR="${D}" install-cgi-conf || die "make install-cgi-conf failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut."
-		einfo "copy them to your web server's ScriptPath to activate."
-		einfo "If you use lighttpd, see lighttpd_nut.conf in the documentation."
-	fi
-
-	# this must be done after all of the install phases
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	dodoc CHANGES CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-			docs/{FAQ,*.txt}
-
-	newdoc lib/README README.lib
-
-	dodoc ${FILESDIR}/lighttpd_nut.conf
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}/upsd.rc6" upsd
-	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newinitd "${FILESDIR}/upsmon.rc6" upsmon
-
-	# This sets up permissions for nut to access a UPS
-	insinto /etc/udev/rules.d/
-	newins scripts/hotplug-ng/nut-usbups.rules 70-nut-usbups.rules
-
-	keepdir /var/lib/nut
-
-	fperms 0700 /var/lib/nut
-	fowners nut:nut /var/lib/nut
-
-	eval fperms 0640 ${NUT_PRIVATE_FILES}
-	eval fowners root:nut ${NUT_PRIVATE_FILES}
-
-	eval fperms 0644 ${NUT_PUBLIC_FILES}
-	eval fowners root:root ${NUT_PUBLIC_FILES}
-
-	# this is installed for 2.4 and fbsd guys
-	if ! has_version sys-fs/udev; then
-		insinto /etc/hotplug/usb
-		insopts -m 755
-		doins scripts/hotplug-ng/nut-usbups.hotplug
-	fi
-}
-
-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
-
-	eval chown root:nut ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-	eval chmod 0640 ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-
-	eval chown root:root ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-	eval chmod 0644 ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-
-	warningmsg
-}
-
-warningmsg() {
-	ewarn "Please note that NUT now runs under the 'nut' user."
-	ewarn "NUT is in the tty group for access to RS-232 UPS."
-	ewarn "However if you use a USB UPS you may need to look at the udev or"
-	ewarn "hotplug rules that are installed."
-}
diff --git a/sys-power/nut/nut-2.0.4.ebuild b/sys-power/nut/nut-2.0.4.ebuild
deleted file mode 100644
index fa97d5a60421..000000000000
--- a/sys-power/nut/nut-2.0.4.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.4.ebuild,v 1.4 2007/07/15 07:08:11 mr_bones_ Exp $
-
-inherit eutils fixheadtails
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.networkupstools.org/"
-# Nut mirrors are presently broken
-#SRC_URI="mirror://nut/source/${PV%.*}/${MY_P}.tar.gz"
-SRC_URI="http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cgi snmp usb ssl"
-
-RDEPEND="cgi? ( >=media-libs/gd-2 )
-		snmp? ( net-analyzer/net-snmp )
-		usb? ( dev-libs/libusb )
-		ssl? ( dev-libs/openssl )"
-DEPEND="$RDEPEND
-		>=sys-apps/sed-4
-		>=sys-devel/autoconf-2.58"
-
-# public files should be 644 root:root
-NUT_PUBLIC_FILES="/etc/nut/{{hosts,upsset,ups,upssched}.conf,upsstats{,-single}.html}"
-# private files should be 640 root:nut - readable by nut, writeable by root,
-NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/state/nut nut,tty
-	warningmsg
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/upsstats-upsset-link-${PV}.patch
-
-	cd "${S}"
-
-	sed -e "s/install: install-dirs/install: install-dirs install-conf/" \
-		-i Makefile.in || die "sed failed"
-
-	ht_fix_file configure.in
-
-	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
-
-	if [ -n "${NUT_DRIVERS}" ]; then
-		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
-	fi
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		$(use_with ssl) \
-		$(use_with cgi) \
-		$(use_with cgi cgipath /usr/share/nut) \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-
-	if use snmp; then
-		emake snmp || die "snmp compile problem"
-	fi
-
-	if use usb; then
-		emake usb || die "usb compile problem"
-	fi
-
-	if use cgi; then
-		emake cgi || die "cgi compile problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-lib || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-	# This needs to exist for the scripts
-	dosym /lib/nut/upsdrvctl /usr/sbin/upsdrvctl
-
-	if use snmp; then
-		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
-	fi
-
-	if use usb; then
-		make DESTDIR="${D}" install-usb || die "make install-usb failed"
-	fi
-
-	if use cgi; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		make DESTDIR="${D}" install-cgi-conf || die "make install-cgi-conf failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut."
-		einfo "copy them to your web server's ScriptPath to activate."
-		einfo "If you use lighttpd, see lighttpd_nut.conf in the documentation."
-	fi
-
-	# this must be done after all of the install phases
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	dodoc CHANGES CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-			docs/{FAQ,*.txt}
-
-	newdoc lib/README README.lib
-
-	dodoc ${FILESDIR}/lighttpd_nut.conf
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}/upsd.rc6" upsd
-	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newinitd "${FILESDIR}/upsmon.rc6" upsmon
-
-	# This sets up permissions for nut to access a UPS
-	insinto /etc/udev/rules.d/
-	newins scripts/hotplug-ng/nut-usbups.rules 70-nut-usbups.rules
-
-	keepdir /var/lib/nut
-
-	fperms 0700 /var/lib/nut
-	fowners nut:nut /var/lib/nut
-
-	eval fperms 0640 ${NUT_PRIVATE_FILES}
-	eval fowners root:nut ${NUT_PRIVATE_FILES}
-
-	eval fperms 0644 ${NUT_PUBLIC_FILES}
-	eval fowners root:root ${NUT_PUBLIC_FILES}
-
-	# this is installed for 2.4 and fbsd guys
-	if ! has_version sys-fs/udev; then
-		insinto /etc/hotplug/usb
-		insopts -m 755
-		doins scripts/hotplug-ng/nut-usbups.hotplug
-	fi
-}
-
-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
-
-	eval chown root:nut ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-	eval chmod 0640 ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-
-	eval chown root:root ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-	eval chmod 0644 ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-
-	warningmsg
-}
-
-warningmsg() {
-	ewarn "Please note that NUT now runs under the 'nut' user."
-	ewarn "NUT is in the tty group for access to RS-232 UPS."
-	ewarn "However if you use a USB UPS you may need to look at the udev or"
-	ewarn "hotplug rules that are installed."
-}
diff --git a/sys-power/nut/nut-2.0.5-r1.ebuild b/sys-power/nut/nut-2.0.5-r1.ebuild
deleted file mode 100644
index 5d29342c6922..000000000000
--- a/sys-power/nut/nut-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.5-r1.ebuild,v 1.9 2007/07/15 07:08:11 mr_bones_ Exp $
-
-inherit eutils fixheadtails
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.networkupstools.org/"
-# Nut mirrors are presently broken
-#SRC_URI="mirror://nut/source/${PV%.*}/${MY_P}.tar.gz"
-SRC_URI="http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="cgi snmp usb ssl"
-
-RDEPEND="cgi? ( >=media-libs/gd-2 )
-		snmp? ( net-analyzer/net-snmp )
-		usb? ( >=dev-libs/libusb-0.1.12 )
-		ssl? ( dev-libs/openssl )"
-DEPEND="$RDEPEND
-		>=sys-apps/sed-4
-		>=sys-devel/autoconf-2.58"
-
-# public files should be 644 root:root
-NUT_PUBLIC_FILES="/etc/nut/{{hosts,upsset,ups,upssched}.conf,upsstats{,-single}.html}"
-# private files should be 640 root:nut - readable by nut, writeable by root,
-NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/state/nut nut,tty
-	# try to add nut to the tty group for old cases where it already existed
-	gpasswd -a nut tty
-	# in some cases it wasn't in the nut group either!
-	gpasswd -a nut nut
-	warningmsg
-}
-
-src_unpack() {
-	unpack ${A}
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/upsstats-upsset-link-2.0.5.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/nut-2.0.5-bcmxcp-3phase.patch
-
-	cd "${S}"
-
-	sed -e "s/install: install-dirs/install: install-dirs install-conf/" \
-		-i Makefile.in || die "sed failed"
-
-	ht_fix_file configure.in
-
-	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
-
-	if [ -n "${NUT_DRIVERS}" ]; then
-		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
-	fi
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		$(use_with ssl) \
-		$(use_with cgi) \
-		$(use_with cgi cgipath /usr/share/nut) \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-
-	if use snmp; then
-		emake snmp || die "snmp compile problem"
-	fi
-
-	if use usb; then
-		emake usb || die "usb compile problem"
-	fi
-
-	if use cgi; then
-		emake cgi || die "cgi compile problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-lib || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-	# This needs to exist for the scripts
-	dosym /lib/nut/upsdrvctl /usr/sbin/upsdrvctl
-
-	if use snmp; then
-		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
-	fi
-
-	if use usb; then
-		make DESTDIR="${D}" install-usb || die "make install-usb failed"
-	fi
-
-	if use cgi; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		make DESTDIR="${D}" install-cgi-conf || die "make install-cgi-conf failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut."
-		einfo "copy them to your web server's ScriptPath to activate."
-		einfo "If you use lighttpd, see lighttpd_nut.conf in the documentation."
-	fi
-
-	# this must be done after all of the install phases
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	dodoc ChangeLog CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-			docs/{FAQ,*.txt}
-
-	newdoc lib/README README.lib
-
-	dodoc ${FILESDIR}/lighttpd_nut.conf
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}/upsd.rc6" upsd
-	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newinitd "${FILESDIR}/upsmon.rc6" upsmon
-
-	# This sets up permissions for nut to access a UPS
-	insinto /etc/udev/rules.d/
-	newins scripts/hotplug-ng/nut-usbups.rules 70-nut-usbups.rules
-
-	keepdir /var/lib/nut
-
-	fperms 0700 /var/lib/nut
-	fowners nut:nut /var/lib/nut
-
-	eval fperms 0640 ${NUT_PRIVATE_FILES}
-	eval fowners root:nut ${NUT_PRIVATE_FILES}
-
-	eval fperms 0644 ${NUT_PUBLIC_FILES}
-	eval fowners root:root ${NUT_PUBLIC_FILES}
-
-	# this is installed for 2.4 and fbsd guys
-	if ! has_version sys-fs/udev; then
-		insinto /etc/hotplug/usb
-		insopts -m 755
-		doins scripts/hotplug-ng/nut-usbups.hotplug
-	fi
-}
-
-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
-
-	eval chown root:nut ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-	eval chmod 0640 ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-
-	eval chown root:root ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-	eval chmod 0644 ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-
-	warningmsg
-}
-
-warningmsg() {
-	ewarn "Please note that NUT now runs under the 'nut' user."
-	ewarn "NUT is in the tty group for access to RS-232 UPS."
-	ewarn "However if you use a USB UPS you may need to look at the udev or"
-	ewarn "hotplug rules that are installed."
-}
diff --git a/sys-power/nut/nut-2.0.5-r2.ebuild b/sys-power/nut/nut-2.0.5-r2.ebuild
index f6f7253b694d..83d4559ace71 100644
--- a/sys-power/nut/nut-2.0.5-r2.ebuild
+++ b/sys-power/nut/nut-2.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.5-r2.ebuild,v 1.9 2007/07/15 07:08:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.5-r2.ebuild,v 1.10 2007/10/09 00:45:34 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -133,14 +133,14 @@ src_install() {
 
 	newdoc lib/README README.lib
 
-	dodoc ${FILESDIR}/lighttpd_nut.conf
+	dodoc "${FILESDIR}"/lighttpd_nut.conf
 
 	docinto cables
 	dodoc docs/cables/*
 
-	newinitd "${FILESDIR}/upsd.rc6" upsd
-	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newinitd "${FILESDIR}/upsmon.rc6" upsmon
+	newinitd "${FILESDIR}"/upsd.rc6 upsd
+	newinitd "${FILESDIR}"/upsdrv.rc6-r1 upsdrv
+	newinitd "${FILESDIR}"/upsmon.rc6 upsmon
 
 	# This sets up permissions for nut to access a UPS
 	insinto /etc/udev/rules.d/
@@ -168,14 +168,14 @@ src_install() {
 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 nut:nut "${ROOT}"/var/lib/nut 2>/dev/null
+	chmod 0700 "${ROOT}"/var/lib/nut 2>/dev/null
 
-	eval chown root:nut ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-	eval chmod 0640 ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
+	eval chown root:nut "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
+	eval chmod 0640 "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
 
-	eval chown root:root ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-	eval chmod 0644 ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
+	eval chown root:root "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
+	eval chmod 0644 "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
 
 	warningmsg elog
 }
diff --git a/sys-power/nut/nut-2.0.5.ebuild b/sys-power/nut/nut-2.0.5.ebuild
deleted file mode 100644
index d710a9c7164d..000000000000
--- a/sys-power/nut/nut-2.0.5.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.5.ebuild,v 1.5 2007/07/15 07:08:11 mr_bones_ Exp $
-
-inherit eutils fixheadtails
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.networkupstools.org/"
-# Nut mirrors are presently broken
-#SRC_URI="mirror://nut/source/${PV%.*}/${MY_P}.tar.gz"
-SRC_URI="http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cgi snmp usb ssl"
-
-RDEPEND="cgi? ( >=media-libs/gd-2 )
-		snmp? ( net-analyzer/net-snmp )
-		usb? ( >=dev-libs/libusb-0.1.12 )
-		ssl? ( dev-libs/openssl )"
-DEPEND="$RDEPEND
-		>=sys-apps/sed-4
-		>=sys-devel/autoconf-2.58"
-
-# public files should be 644 root:root
-NUT_PUBLIC_FILES="/etc/nut/{{hosts,upsset,ups,upssched}.conf,upsstats{,-single}.html}"
-# private files should be 640 root:nut - readable by nut, writeable by root,
-NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/state/nut nut,tty
-	# try to add nut to the tty group for old cases where it already existed
-	gpasswd -a nut tty
-	# in some cases it wasn't in the nut group either!
-	gpasswd -a nut nut
-	warningmsg
-}
-
-src_unpack() {
-	unpack ${A}
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/upsstats-upsset-link-2.0.5.patch
-
-	cd "${S}"
-
-	sed -e "s/install: install-dirs/install: install-dirs install-conf/" \
-		-i Makefile.in || die "sed failed"
-
-	ht_fix_file configure.in
-
-	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
-
-	if [ -n "${NUT_DRIVERS}" ]; then
-		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
-	fi
-
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		$(use_with ssl) \
-		$(use_with cgi) \
-		$(use_with cgi cgipath /usr/share/nut) \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-
-	if use snmp; then
-		emake snmp || die "snmp compile problem"
-	fi
-
-	if use usb; then
-		emake usb || die "usb compile problem"
-	fi
-
-	if use cgi; then
-		emake cgi || die "cgi compile problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-lib || die "make install failed"
-
-	dodir /sbin
-	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-	# This needs to exist for the scripts
-	dosym /lib/nut/upsdrvctl /usr/sbin/upsdrvctl
-
-	if use snmp; then
-		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
-	fi
-
-	if use usb; then
-		make DESTDIR="${D}" install-usb || die "make install-usb failed"
-	fi
-
-	if use cgi; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		make DESTDIR="${D}" install-cgi-conf || die "make install-cgi-conf failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut."
-		einfo "copy them to your web server's ScriptPath to activate."
-		einfo "If you use lighttpd, see lighttpd_nut.conf in the documentation."
-	fi
-
-	# this must be done after all of the install phases
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	dodoc ChangeLog CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-			docs/{FAQ,*.txt}
-
-	newdoc lib/README README.lib
-
-	dodoc ${FILESDIR}/lighttpd_nut.conf
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}/upsd.rc6" upsd
-	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newinitd "${FILESDIR}/upsmon.rc6" upsmon
-
-	# This sets up permissions for nut to access a UPS
-	insinto /etc/udev/rules.d/
-	newins scripts/hotplug-ng/nut-usbups.rules 70-nut-usbups.rules
-
-	keepdir /var/lib/nut
-
-	fperms 0700 /var/lib/nut
-	fowners nut:nut /var/lib/nut
-
-	eval fperms 0640 ${NUT_PRIVATE_FILES}
-	eval fowners root:nut ${NUT_PRIVATE_FILES}
-
-	eval fperms 0644 ${NUT_PUBLIC_FILES}
-	eval fowners root:root ${NUT_PUBLIC_FILES}
-
-	# this is installed for 2.4 and fbsd guys
-	if ! has_version sys-fs/udev; then
-		insinto /etc/hotplug/usb
-		insopts -m 755
-		doins scripts/hotplug-ng/nut-usbups.hotplug
-	fi
-}
-
-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
-
-	eval chown root:nut ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-	eval chmod 0640 ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
-
-	eval chown root:root ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-	eval chmod 0644 ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
-
-	warningmsg
-}
-
-warningmsg() {
-	ewarn "Please note that NUT now runs under the 'nut' user."
-	ewarn "NUT is in the tty group for access to RS-232 UPS."
-	ewarn "However if you use a USB UPS you may need to look at the udev or"
-	ewarn "hotplug rules that are installed."
-}