Bug #111701 - Move from www-apps to sys-power.

13 files changed, 0 insertions, 714 deletions

diff --git a/www-apps/nut/ChangeLog b/www-apps/nut/ChangeLog
deleted file mode 100644
index 0d5f1c8e170f..000000000000
--- a/www-apps/nut/ChangeLog
+++ /dev/null
@@ -1,215 +0,0 @@
-# ChangeLog for www-apps/nut
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/ChangeLog,v 1.16 2006/05/07 20:22:23 corsair Exp $
-
-  07 May 2006; Markus Rothe <corsair@gentoo.org> nut-2.0.0-r1.ebuild:
-  Stable on ppc64
-
-  10 Feb 2006; Mike Frysinger <vapier@gentoo.org> nut-2.0.0.ebuild,
-  nut-2.0.0-r1.ebuild, nut-2.0.1_pre4.ebuild:
-  Add the nut user/group #99601.
-
-  17 Dec 2005; Markus Rothe <corsair@gentoo.org> nut-2.0.1_pre4.ebuild:
-  Added ~ppc64
-
-  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> nut-2.0.0-r1.ebuild:
-  Mark 2.0.0-r1 stable on alpha
-
-  12 Jul 2005; Simon Stelling <blubb@gentoo.org> nut-2.0.0-r1.ebuild:
-  stable on amd64
-
-*nut-2.0.1_pre4 (17 Feb 2005)
-
-  17 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> +nut-2.0.1_pre4.ebuild:
-  Bug #82382: bump.
-
-*nut-2.0.0-r1 (13 Feb 2005)
-
-  13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> -files/upsd-init,
-  +files/upsdrv.rc6-r1, -files/upsmon-init, +nut-2.0.0-r1.ebuild:
-  Bug #47482. Move stuff away from the root filesystem where it wouldn't work
-  anyway.
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  12 Nov 2004; Simon Stelling <blubb@gentoo.org> nut-2.0.0.ebuild:
-  added ~amd64
-
-  08 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> nut-2.0.0.ebuild:
-  fix media-libs/gd dep per bug #69959; clean out nut-1
-
-  28 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> nut-2.0.0.ebuild:
-  Add ~alpha.
-
-  18 Sep 2004; Jason Wever <weeve@gentoo.org> nut-2.0.0.ebuild:
-  Stable on sparc.
-
-  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
-  Fixed ChangeLog header.
-
-  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> nut-2.0.0.ebuild:
-  Masked nut-2.0.0.ebuild stable for ppc
-
-  31 Aug 2004; David Holm <dholm@gentoo.org> nut-2.0.0.ebuild:
-  Added to ~ppc.
-
-*nut-1.2.2 (15 Aug 2004)
-
-  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml,
-  +files/upsd-init, +files/upsd.rc6, +files/upsdrv.rc6, +files/upsmon-init,
-  +files/upsmon.rc6, +nut-1.2.2.ebuild, +nut-1.4.1.ebuild, +nut-1.5.12.ebuild,
-  +nut-2.0.0.ebuild:
-  Moved from net-misc/nut to www-apps/nut.
-
-  18 May 2004; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org>
-  nut-2.0.0.ebuild:
-  stable now on x86. upgrade with care!
-
-  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> nut-1.4.1.ebuild,
-  nut-1.5.12.ebuild, nut-2.0.0.ebuild:
-  Add die following econf for bug 48950
-
-  25 Apr 2004; Jon Hood <squinky86@gentoo.org> nut-1.4.1.ebuild,
-  nut-1.5.12.ebuild:
-  added "die"
-
-  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)
-
-  31 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> nut-2.0.0.ebuild,
-  files/upsmon.rc6:
-  fix bug #46079. add in new version 2.0.0 from upstream, bug #45928.
-
-  15 Mar 2004; Max Kalika <max@gentoo.org> nut-1.4.1.ebuild:
-  Bump to stable x86.
-
-*nut-1.4.1 (08 Mar 2004)
-*nut-1.5.12 (08 Mar 2004)
-
-  08 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> files/upsd.rc6:
-  bug #42883, nut snmp-ups support. bug #42195, version bump. bug #43551, catch
-  nut problems with leftover pidfile.
-
-  05 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> 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.ebuild,
-  nut-1.5.1.ebuild:
-  fix chown . to : as per bug #35127
-
-*nut-1.5.8-r1 (23 Nov 2003)
-
-  23 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> nut-1.5.8-r1.ebuild:
-  fix bugs from #34174, partially based on submitted patch
-
-*nut-1.5.8 (20 Nov 2003)
-
-  20 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> nut-1.5.8.ebuild:
-  version bump
-
-*nut-1.5.7 (29 Oct 2003)
-*nut-1.5.6-r2 (29 Oct 2003)
-*nut-1.4.0-r3 (29 Oct 2003)
-
-  29 Oct 2003; Max Kalika <max@gentoo.org> nut-1.4.0-r1.ebuild,
-  nut-1.4.0-r2.ebuild, nut-1.4.0-r3.ebuild, nut-1.5.6-r1.ebuild,
-  nut-1.5.6-r2.ebuild, nut-1.5.6.ebuild, nut-1.5.7.ebuild, files/upsd.rc6,
-  files/upsdrv.rc6, files/upsmon.rc6:
-  Bump to version 1.5.7. Cleanup Move drivers to /lib/nut and link control to
-  /sbin for halt.sh to work properly. Fix pid file handling in startup scripts.
-  Fixes all of bug 31665.
-
-  21 Oct 2003; Max Kalika <max@gentoo.org> files/upsd.rc6:
-  Fix pid path.
-
-*nut-1.5.6-r1 (20 Oct 2003)
-*nut-1.4.0-r2 (20 Oct 2003)
-
-  20 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> nut-1.4.0-r2.ebuild,
-  nut-1.5.6-r1.ebuild, files/upsd.rc6, files/upsdrv.rc6, files/upsmon.rc6:
-  add seperate upsdrv init script, make sure it gets called properly, fixes bug
-  #31572
-
-*nut-1.5.6 (17 Oct 2003)
-
-  17 Oct 2003; Preston A. Elder <prez@gentoo.org> nut-1.5.6.ebuild : 
-  New development tree version.
-
-*nut-1.4.0-r1 (16 Oct 2003)
-
-  16 Oct 2003; Max Kalika <max@gentoo.org> metadata.xml, nut-1.4.0-r1.ebuild,
-  files/upsd.rc6, files/upsmon.rc6:
-  Major cleanup.
-
-*nut-1.5.1 (10 Aug 2003)
-
-  10 Aug 2003; Preston A. Elder <prez@gentoo.org> nut-1.5.1.ebuild : 
-  New development tree version.
-
-*nut-1.4.0 (29 Jul 2003)
-
-  29 Jul 2003; Robin Johnson <robbat2@gentoo.org> nut-1.4.0.ebuild:
-  Version bump as 1.4 is now the stable series.
-
-*nut-1.3.6 (09 May 2003)
-
-  09 May 2003; Robin Johnson <robbat2@gentoo.org> nut-1.3.6.ebuild :
-  Added in apache2 support instead of just apache1.
-  Add this new version for the insane folk that want to try it out.
-  In unstable only.
-
-*nut-1.2.2 (20 Apr 2003)
-
-  28 Apr 2003; Preston A. Elder <prez@gentoo.org> nut-1.2.2.ebuild : 
-  Used better way to add cgi-bin depenancy, and unmasked.
-	
-  20 Apr 2003; Preston A. Elder <prez@gentoo.org> nut-1.2.2.ebuild : 
-  New stable version
-	
-*nut-1.2.1-r1 (24 Feb 2003)
-
-  24 Feb 2003; Jared Hudson <jhhudso@gentoo.org> : Added hiddev driver support.
-  Used by several USB based UPSs.
-	
-*nut-1.2.1 (27 Jan 2003)
-
-  27 Jan 2003; Donny Davies <woodchip@gentoo.org> : New testing release.
-  Fixed SRC_URI, half-of #12947, (the other half is commited to rc-scripts
-  CVS).  Fixed #10745.  Thanks btowe@gbis.com, and
-  tdickenson@geminidataloggers.com.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*nut-1.0.0 (26 Aug 2002)
-
-  12 Oct 2002; Donny Davies <woodchip@gentoo.org> nut-1.0.0.ebuild :
-  Added sparc sparc64 KEYWORDS.  Old ebuilds have busted SRC_URI's.
-
-  26 Aug 2002; Donny Davies <woodchip@gentoo.org> nut-1.0.0.ebuild :
-  Glorious timing; nut went 1.0 and as of baselayout-1.8.2, halt.sh
-  support is merged.
-
-*nut-0.50.1 (3 Aug 2002)
-
-  3 Aug 2002; Donny Davies <woodchip@gentoo.org> nut-0.50.1.ebuild,
-  upsd-init, upsmon-init :
-  This release adds proper initscripts, the USE cgi-bin option
-  for building the web monitoring programs, and proper shutdown
-  sequence merged into the baselayout halt.sh shutdown script.
-  Pending release of a new baselayout, this package is masked.
-
-*nut-0.44.1-r1 (12 Apr 2002)
-
-  11 Aug 2002; phoen][x <phoenix@gentoo.org> nut-0.44.1-r1.ebuild :
-  Fixed src_install() (This closes bug 5827)
-
-  09 Jul 2002; phoen][x <phoenix@gentoo.org> nut-0.44.1-r1.ebuild :
-  Added KEYWORDS, LICENSE, SLOT.
-
-  12 Apr 2002; Spider <spider@gentoo.org> 
-  libpng update, remove RPEND tag, unnecessary. (or typo;)
diff --git a/www-apps/nut/Manifest b/www-apps/nut/Manifest
deleted file mode 100644
index be3cf4d552cd..000000000000
--- a/www-apps/nut/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 97fdffccb04c9f9bdbd5049d58d9c1bd ChangeLog 7418
-MD5 891b50cff5827a4e77573ee8f2f40e48 files/digest-nut-2.0.0 61
-MD5 891b50cff5827a4e77573ee8f2f40e48 files/digest-nut-2.0.0-r1 61
-MD5 23c9faa5fc009d873bac5c36b1d02b4e files/digest-nut-2.0.1_pre4 66
-MD5 057b35a5ced412ebf01c952b55d2e4db files/upsd.rc6 585
-MD5 d369e7d9bf8a83e47b0a958ec30baf43 files/upsdrv.rc6 477
-MD5 2d1326c3eefc364c474ea2f191810bfc files/upsdrv.rc6-r1 489
-MD5 5962635c2a91e3df315cc69f5aa52f6a files/upsmon.rc6 471
-MD5 a961228140ef319b2ddba54d99b6e401 metadata.xml 219
-MD5 5c23a2aae3035c601f76f5bf23ad8e24 nut-2.0.0-r1.ebuild 3200
-MD5 b227faab7e9c151e60317e2198a75da1 nut-2.0.0.ebuild 3174
-MD5 0af6ee1e6c18490423d66203f60eb633 nut-2.0.1_pre4.ebuild 3259
diff --git a/www-apps/nut/files/digest-nut-2.0.0 b/www-apps/nut/files/digest-nut-2.0.0
deleted file mode 100644
index 21263cf7a3cc..000000000000
--- a/www-apps/nut/files/digest-nut-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84649ad95809737b5ffc19efdd9e9952 nut-2.0.0.tar.gz 530492
diff --git a/www-apps/nut/files/digest-nut-2.0.0-r1 b/www-apps/nut/files/digest-nut-2.0.0-r1
deleted file mode 100644
index 21263cf7a3cc..000000000000
--- a/www-apps/nut/files/digest-nut-2.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84649ad95809737b5ffc19efdd9e9952 nut-2.0.0.tar.gz 530492
diff --git a/www-apps/nut/files/digest-nut-2.0.1_pre4 b/www-apps/nut/files/digest-nut-2.0.1_pre4
deleted file mode 100644
index 890f606ffcfa..000000000000
--- a/www-apps/nut/files/digest-nut-2.0.1_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 399f79406e07aa2a689bc6a119b0fcad nut-2.0.1-pre4.tar.gz 563526
diff --git a/www-apps/nut/files/upsd.rc6 b/www-apps/nut/files/upsd.rc6
deleted file mode 100644
index 1f2f1330abf1..000000000000
--- a/www-apps/nut/files/upsd.rc6
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/files/upsd.rc6,v 1.1 2004/08/15 15:19:10 stuart Exp $
-
-depend() {
-	need net upsdrv
-	before upsmon
-}
-
-start() {
-	ebegin "Starting upsd"
-	# clean up first
-	pkill -u root -x upsd
-	sleep 1s
-	rm -f /var/state/nut/upsd.pid
-	# now start up
-	start-stop-daemon --start --quiet --exec /usr/sbin/upsd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping upsd"
-	start-stop-daemon --stop --quiet --pidfile /var/lib/nut/upsd.pid
-	eend $?
-}
diff --git a/www-apps/nut/files/upsdrv.rc6 b/www-apps/nut/files/upsdrv.rc6
deleted file mode 100644
index 2da25447b8f7..000000000000
--- a/www-apps/nut/files/upsdrv.rc6
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/files/upsdrv.rc6,v 1.1 2004/08/15 15:19:10 stuart Exp $
-
-depend() {
-	need net
-	before upsd
-}
-
-start() {
-	ebegin "Starting UPS drivers"
-	/sbin/upsdrvctl start
-	eend $? "Failed to start UPS drivers!"
-}
-
-stop() {
-	ebegin "Stopping UPS drivers"
-	/sbin/upsdrvctl stop
-	eend $? "Failed to stop UPS drivers!"
-}
diff --git a/www-apps/nut/files/upsdrv.rc6-r1 b/www-apps/nut/files/upsdrv.rc6-r1
deleted file mode 100755
index 794f53359c89..000000000000
--- a/www-apps/nut/files/upsdrv.rc6-r1
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/files/upsdrv.rc6-r1,v 1.1 2005/02/14 07:57:16 robbat2 Exp $
-
-depend() {
-	need net
-	before upsd
-}
-
-start() {
-	ebegin "Starting UPS drivers"
-	/usr/sbin/upsdrvctl start
-	eend $? "Failed to start UPS drivers!"
-}
-
-stop() {
-	ebegin "Stopping UPS drivers"
-	/usr/sbin/upsdrvctl stop
-	eend $? "Failed to stop UPS drivers!"
-}
diff --git a/www-apps/nut/files/upsmon.rc6 b/www-apps/nut/files/upsmon.rc6
deleted file mode 100644
index 8b89dc0ad714..000000000000
--- a/www-apps/nut/files/upsmon.rc6
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/files/upsmon.rc6,v 1.1 2004/08/15 15:19:10 stuart Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting upsmon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/upsmon
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping upsmon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/upsmon.pid
-	eend $?
-}
diff --git a/www-apps/nut/metadata.xml b/www-apps/nut/metadata.xml
deleted file mode 100644
index 25a38732ed2b..000000000000
--- a/www-apps/nut/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer><email>robbat2@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/www-apps/nut/nut-2.0.0-r1.ebuild b/www-apps/nut/nut-2.0.0-r1.ebuild
deleted file mode 100644
index 8a266763fed9..000000000000
--- a/www-apps/nut/nut-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-2.0.0-r1.ebuild,v 1.6 2006/05/07 20:22:23 corsair 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="alpha 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/*
-
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" 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/www-apps/nut/nut-2.0.0.ebuild b/www-apps/nut/nut-2.0.0.ebuild
deleted file mode 100644
index f48158a1d730..000000000000
--- a/www-apps/nut/nut-2.0.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-2.0.0.ebuild,v 1.10 2006/02/10 04:34:14 vapier 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="~alpha ~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/*
-
-
-	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/www-apps/nut/nut-2.0.1_pre4.ebuild b/www-apps/nut/nut-2.0.1_pre4.ebuild
deleted file mode 100644
index 7ca5e31f818a..000000000000
--- a/www-apps/nut/nut-2.0.1_pre4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-2.0.1_pre4.ebuild,v 1.5 2006/02/10 04:34:14 vapier 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="~alpha ~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/*
-
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" 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
-}