--- /usr/portage/sys-power/nut/nut-2.0.5-r2.ebuild	2007-07-15 09:36:21.000000000 +0200
+++ nut-2.0.5-r3.ebuild	2007-10-04 20:00:46.000000000 +0200
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="cgi snmp usb ssl"
 
 RDEPEND="cgi? ( >=media-libs/gd-2 )
@@ -29,7 +29,7 @@
 		>=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}"
+NUT_PUBLIC_FILES="/etc/nut/{ups.conf,upssched.conf}"
 # private files should be 640 root:nut - readable by nut, writeable by root,
 NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
 
@@ -37,7 +37,7 @@
 	enewgroup nut 84
 	enewuser nut 84 -1 /var/state/nut nut,uucp
 	# As of udev-104, NUT must be in uucp and NOT in tty.
-	gpasswd -d nut tty
+	gpasswd -d nut tty 2>/dev/null
 	gpasswd -a nut uucp
 	# in some cases on old systems it wasn't in the nut group either!
 	gpasswd -a nut nut