13 files changed, 760 insertions, 0 deletions
diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
new file mode 100644
index 000000000000..8f70ed97d577
--- /dev/null
+++ b/sys-power/nut/ChangeLog
@@ -0,0 +1,220 @@
+# ChangeLog for www-apps/nut
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.1 2006/05/15 23:43:08 robbat2 Exp $
+
+  15 May 2006; Robin H. Johnson <robbat2@gentoo.org> +files/upsd.rc6,
+  +files/upsdrv.rc6, +files/upsdrv.rc6-r1, +files/upsmon.rc6, +metadata.xml,
+  +nut-2.0.0.ebuild, +nut-2.0.0-r1.ebuild, +nut-2.0.1_pre4.ebuild:
+  Bug #111701 - Move from www-apps to sys-power.
+
+  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/sys-power/nut/Manifest b/sys-power/nut/Manifest
new file mode 100644
index 000000000000..90b7340ce757
--- /dev/null
+++ b/sys-power/nut/Manifest
@@ -0,0 +1,47 @@
+AUX upsd.rc6 587 RMD160 3a4c313d7ea20551fd6ea2f6b46901a5a082245b SHA1 c8d5f3294aa2b9a267d304c1d0a0619c617c2313 SHA256 7ce640a11d1d74a260a10d313f7d688463d80ea9649c27a99f14f4f8526253d3 size 587
+MD5 75ae39e289ce8dbcc2b48bb1c2761e63 files/upsd.rc6 587
+RMD160 3a4c313d7ea20551fd6ea2f6b46901a5a082245b files/upsd.rc6 587
+SHA256 7ce640a11d1d74a260a10d313f7d688463d80ea9649c27a99f14f4f8526253d3 files/upsd.rc6 587
+AUX upsdrv.rc6 479 RMD160 0a4d9cde7208d48e4d93fbc29706069dec36c09d SHA1 bea80ef3068af7769668d0b7b705436ef3489b46 SHA256 6156b2fcc99d55a37667d9fd73e107506b27ae9930fe126730a669bad27d06df size 479
+MD5 8d8c88b238ec20a05ca2470431199bd8 files/upsdrv.rc6 479
+RMD160 0a4d9cde7208d48e4d93fbc29706069dec36c09d files/upsdrv.rc6 479
+SHA256 6156b2fcc99d55a37667d9fd73e107506b27ae9930fe126730a669bad27d06df files/upsdrv.rc6 479
+AUX upsdrv.rc6-r1 490 RMD160 b13a0dcc1facd1d857d15838da65a5bc360daa83 SHA1 ffbcc64d07317e6a3275156bbdcbbb08497415aa SHA256 4b2f21251cdf789ebe0688ad27ad699940f5cfb0ddaa4d9c5d22f8343ccbfd84 size 490
+MD5 c8c6884bf28075258869c57941147944 files/upsdrv.rc6-r1 490
+RMD160 b13a0dcc1facd1d857d15838da65a5bc360daa83 files/upsdrv.rc6-r1 490
+SHA256 4b2f21251cdf789ebe0688ad27ad699940f5cfb0ddaa4d9c5d22f8343ccbfd84 files/upsdrv.rc6-r1 490
+AUX upsmon.rc6 473 RMD160 6ad1ce54be6199d3399e77d008229acb2f02bc43 SHA1 bde917f09b74a9efc563d91b9dd74a4e8b793e3f SHA256 f338e5955c6f1e601cb0b90b95c00cbde47ef3dc56e970d8f42bb335203fbcc7 size 473
+MD5 db84bb9f67df55c305f5903ceb6e8244 files/upsmon.rc6 473
+RMD160 6ad1ce54be6199d3399e77d008229acb2f02bc43 files/upsmon.rc6 473
+SHA256 f338e5955c6f1e601cb0b90b95c00cbde47ef3dc56e970d8f42bb335203fbcc7 files/upsmon.rc6 473
+DIST nut-2.0.0.tar.gz 530492 RMD160 7f36296b61b79fe13d78c65a66aa034b60e1c0d2 SHA256 5015eda31ffae1e899c6b80d9c0c943e24fae1934591a50018f01e2622ebf9b8 size 530492
+DIST nut-2.0.1-pre4.tar.gz 563526 RMD160 5b0a3ab8a400e70f308471aa7b1fbcaa8052f739 SHA256 6a374f34e155ef2f09c10c046ef34a628fe4cb9970973c88c57cbca16d78624f size 563526
+EBUILD nut-2.0.0-r1.ebuild 3201 RMD160 f1df0ecc6d618da617aa65cb9f4f7868901d0ae5 SHA1 f429deba2efecb67faf63006df86843cee76c642 SHA256 1f96055d8b8799daeaa65d811e687f08d5b19637a311846345c3465c24bcac77 size 3201
+MD5 317ca948257c2d787a7a37d15f2db473 nut-2.0.0-r1.ebuild 3201
+RMD160 f1df0ecc6d618da617aa65cb9f4f7868901d0ae5 nut-2.0.0-r1.ebuild 3201
+SHA256 1f96055d8b8799daeaa65d811e687f08d5b19637a311846345c3465c24bcac77 nut-2.0.0-r1.ebuild 3201
+EBUILD nut-2.0.0.ebuild 3175 RMD160 9b067e76049e139c8434f7eb7534d2fbb4f0ef6b SHA1 71cf840b2260c62ca2ce30fef682b718417a384d SHA256 86054faed3a57b970a661d96b957e38e4411e16c276bf5e6c0bd24b6b9a3e5b1 size 3175
+MD5 8e299b76f3c233ccce0d6eb2863a1542 nut-2.0.0.ebuild 3175
+RMD160 9b067e76049e139c8434f7eb7534d2fbb4f0ef6b nut-2.0.0.ebuild 3175
+SHA256 86054faed3a57b970a661d96b957e38e4411e16c276bf5e6c0bd24b6b9a3e5b1 nut-2.0.0.ebuild 3175
+EBUILD nut-2.0.1_pre4.ebuild 3261 RMD160 bbd843faf48eded2af803a1bb7e6c5d05c30549c SHA1 8b5dc580ea24d3934b74eb9417bc8786e86e3391 SHA256 4b772a64f70a129326768d1f6f1436ff38564983f3dd92ac3c2eb8632e50d83f size 3261
+MD5 8809b41802e3ee3222dc5304021142bb nut-2.0.1_pre4.ebuild 3261
+RMD160 bbd843faf48eded2af803a1bb7e6c5d05c30549c nut-2.0.1_pre4.ebuild 3261
+SHA256 4b772a64f70a129326768d1f6f1436ff38564983f3dd92ac3c2eb8632e50d83f nut-2.0.1_pre4.ebuild 3261
+MISC ChangeLog 7682 RMD160 ee91b069edf1437840eb37a6e1a16aecd2e07963 SHA1 433c20bd1b4026a35e95313eb582640a5a82c4d6 SHA256 0b871e0cf9f9aabd4ed3bb5fd5dbecf3bdcce21e49552ba480cd8626746c1996 size 7682
+MD5 9cb9885df26ef498b0f82b5ff38572a6 ChangeLog 7682
+RMD160 ee91b069edf1437840eb37a6e1a16aecd2e07963 ChangeLog 7682
+SHA256 0b871e0cf9f9aabd4ed3bb5fd5dbecf3bdcce21e49552ba480cd8626746c1996 ChangeLog 7682
+MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b size 219
+MD5 a961228140ef319b2ddba54d99b6e401 metadata.xml 219
+RMD160 7737543ce33cd412792e332121aa1c6ed452adfc metadata.xml 219
+SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b metadata.xml 219
+MD5 3a97398adb3755eecc42c2a4127956f4 files/digest-nut-2.0.0 229
+RMD160 126dc7d964ea57bccfff1c9d897adbed4e7a1813 files/digest-nut-2.0.0 229
+SHA256 26d7796b5c899ee0d07325b0c27578a14843ec27a510806e941ed83decbaf71f files/digest-nut-2.0.0 229
+MD5 3a97398adb3755eecc42c2a4127956f4 files/digest-nut-2.0.0-r1 229
+RMD160 126dc7d964ea57bccfff1c9d897adbed4e7a1813 files/digest-nut-2.0.0-r1 229
+SHA256 26d7796b5c899ee0d07325b0c27578a14843ec27a510806e941ed83decbaf71f files/digest-nut-2.0.0-r1 229
+MD5 e6a7669f1606c70c25f83573bc75ad22 files/digest-nut-2.0.1_pre4 244
+RMD160 f5ea2b7e207be7589eff32656404d7da1a42c35e files/digest-nut-2.0.1_pre4 244
+SHA256 4866c4f95b4b98a1189f00ea4e5d3447f4f7ee5bfff71dd9c59f6c25b4bf73ca files/digest-nut-2.0.1_pre4 244
diff --git a/sys-power/nut/files/digest-nut-2.0.0 b/sys-power/nut/files/digest-nut-2.0.0
new file mode 100644
index 000000000000..783df5868fa7
--- /dev/null
+++ b/sys-power/nut/files/digest-nut-2.0.0
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..783df5868fa7
--- /dev/null
+++ b/sys-power/nut/files/digest-nut-2.0.0-r1
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..137dd0b8c5d2
--- /dev/null
+++ b/sys-power/nut/files/digest-nut-2.0.1_pre4
@@ -0,0 +1,3 @@
+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/upsd.rc6 b/sys-power/nut/files/upsd.rc6
new file mode 100755
index 000000000000..ebe6414b06e7
--- /dev/null
+++ b/sys-power/nut/files/upsd.rc6
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/upsd.rc6,v 1.1 2006/05/15 23:43:08 robbat2 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/sys-power/nut/files/upsdrv.rc6 b/sys-power/nut/files/upsdrv.rc6
new file mode 100755
index 000000000000..85a0c84debad
--- /dev/null
+++ b/sys-power/nut/files/upsdrv.rc6
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/upsdrv.rc6,v 1.1 2006/05/15 23:43:08 robbat2 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/sys-power/nut/files/upsdrv.rc6-r1 b/sys-power/nut/files/upsdrv.rc6-r1
new file mode 100755
index 000000000000..fef39d17ac91
--- /dev/null
+++ b/sys-power/nut/files/upsdrv.rc6-r1
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/upsdrv.rc6-r1,v 1.1 2006/05/15 23:43:08 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/sys-power/nut/files/upsmon.rc6 b/sys-power/nut/files/upsmon.rc6
new file mode 100755
index 000000000000..ba488c7d8ce5
--- /dev/null
+++ b/sys-power/nut/files/upsmon.rc6
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/upsmon.rc6,v 1.1 2006/05/15 23:43:08 robbat2 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/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
new file mode 100644
index 000000000000..25a38732ed2b
--- /dev/null
+++ b/sys-power/nut/metadata.xml
@@ -0,0 +1,6 @@
+<?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/sys-power/nut/nut-2.0.0-r1.ebuild b/sys-power/nut/nut-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..98f4410f54e4
--- /dev/null
+++ b/sys-power/nut/nut-2.0.0-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2006 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.1 2006/05/15 23:43:08 robbat2 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/sys-power/nut/nut-2.0.0.ebuild b/sys-power/nut/nut-2.0.0.ebuild
new file mode 100644
index 000000000000..a89e83f73322
--- /dev/null
+++ b/sys-power/nut/nut-2.0.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2006 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.1 2006/05/15 23:43:08 robbat2 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/sys-power/nut/nut-2.0.1_pre4.ebuild b/sys-power/nut/nut-2.0.1_pre4.ebuild
new file mode 100644
index 000000000000..c4afad918e24
--- /dev/null
+++ b/sys-power/nut/nut-2.0.1_pre4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2006 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.1 2006/05/15 23:43:08 robbat2 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
+}