Bug #184595, version bump to new major version. Read the UPGRADING file provided by upstream, there is a strong chance you need to change your config files. ~ppc64 was dropped due to the hald dependancy.

(Portage version: 2.1.3.12)

4 files changed, 230 insertions, 1 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index ac5c4aaf6bbb..87f1f62ecbf0 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,14 @@
 # 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.47 2007/10/09 00:45:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.48 2007/10/09 00:48:43 robbat2 Exp $
+
+*nut-2.2.0 (09 Oct 2007)
+
+  09 Oct 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/lighttpd_nut.conf-2.2.0, +nut-2.2.0.ebuild:
+  Bug #184595, version bump to new major version. Read the UPGRADING file
+  provided by upstream, there is a strong chance you need to change your
+  config files.
 
   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,
diff --git a/sys-power/nut/files/digest-nut-2.2.0 b/sys-power/nut/files/digest-nut-2.2.0
new file mode 100644
index 000000000000..38e4fd8b5e04
--- /dev/null
+++ b/sys-power/nut/files/digest-nut-2.2.0
@@ -0,0 +1,3 @@
+MD5 a3570515d80804051d4e7631e8a3eb12 nut-2.2.0.tar.gz 1173801
+RMD160 d4e0e50239ba2b020060445869b6d364a56092f4 nut-2.2.0.tar.gz 1173801
+SHA256 e670ff7b51a652fd61472aa5fa5a1ed4730b5411671068be456551ea46094120 nut-2.2.0.tar.gz 1173801
diff --git a/sys-power/nut/files/lighttpd_nut.conf-2.2.0 b/sys-power/nut/files/lighttpd_nut.conf-2.2.0
new file mode 100644
index 000000000000..958ac4d42e0f
--- /dev/null
+++ b/sys-power/nut/files/lighttpd_nut.conf-2.2.0
@@ -0,0 +1,23 @@
+###############################################################################
+# Lighttpd configuration for using NUT under Gentoo Linux.
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/lighttpd_nut.conf-2.2.0,v 1.1 2007/10/09 00:48:44 robbat2 Exp $
+###############################################################################
+
+# Simple copy this to /etc/lighttpd/ and include it in your lighttpd.conf.
+# It will make NUT available at http://$HOST/nut/ 
+
+server.modules += ("mod_cgi")
+
+# If you want to limit it to some host, uncomment the host check and modify it to your needs.
+# $HTTP["host"] == "www2.example.org" {
+alias.url += ( "/nut/" => "/usr/share/nut/cgi/" )
+$HTTP["url"] =~ "^/nut/" {
+  dir-listing.activate = "disable"
+  cgi.assign = ( ".cgi" => "" )
+  index-file.names = ( "upsstats.cgi" )
+}
+# }
+
+# vim: set ft=conf foldmethod=marker et :
diff --git a/sys-power/nut/nut-2.2.0.ebuild b/sys-power/nut/nut-2.2.0.ebuild
new file mode 100644
index 000000000000..8e8b17888da0
--- /dev/null
+++ b/sys-power/nut/nut-2.2.0.ebuild
@@ -0,0 +1,195 @@
+# 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.2.0.ebuild,v 1.1 2007/10/09 00:48:43 robbat2 Exp $
+
+inherit eutils fixheadtails
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="http://www.networkupstools.org/"
+# Nut mirrors are presently broken
+SRC_URI="http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="cgi snmp usb ssl hal"
+
+RDEPEND="cgi? ( >=media-libs/gd-2 )
+		snmp? ( net-analyzer/net-snmp )
+		usb? ( >=dev-libs/libusb-0.1.12 )
+		hal? ( >=sys-apps/hal-0.5.9.1 )
+		ssl? ( dev-libs/openssl )
+		>=sys-fs/udev-114"
+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/lib/nut nut,uucp
+	# As of udev-104, NUT must be in uucp and NOT in tty.
+	gpasswd -d nut tty 2>/dev/null
+	gpasswd -a nut uucp 2>/dev/null
+	use hal && gpasswd -a haldaemon nut 2>/dev/null
+	# in some cases on old systems it wasn't in the nut group either!
+	gpasswd -a nut nut 2>/dev/null
+	warningmsg ewarn
+}
+
+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 $?
+
+	sed -e "s:52_nut-usbups.rules:70-nut-usbups.rules:" \
+		-i scripts/udev/Makefile.in || die "sed failed"
+}
+
+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 \
+		--with-htmlpath=/usr/share/nut/html \
+		--datarootdir=/usr/share/nut \
+		--datadir=/usr/share/nut \
+		--with-lib \
+		$(use_with hal) \
+		$(use_with ssl) \
+		$(use_with usb) \
+		$(use_with snmp) \
+		$(use_with cgi) \
+		$(use_with cgi cgipath /usr/share/nut/cgi) \
+		${myconf} || die "econf failed"
+
+	emake || die "compile problem"
+
+}
+
+src_install() {
+
+	make DESTDIR="${D}" install || 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 cgi; then
+		elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
+		elog "copy them to your web server's ScriptPath to activate (this is a"
+		elog "change from the old location)."
+		elog "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 INSTALL MAINTAINERS NEWS README UPGRADING \
+			docs/{FAQ,*.txt}
+
+	newdoc lib/README README.lib
+
+	newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 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/udev/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/nut-usbups.hotplug
+	fi
+
+	if use hal; then
+		insinto /usr/share/hal/fdi/information/20thirdparty/
+		doins scripts/hal/20-ups-nut-device.fdi
+		insinto /usr/libexec
+		insopts -m 755
+		doins drivers/hald-addon-*
+	    rm "${D}"/lib/nut/hald-addon-*
+	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 elog
+}
+
+warningmsg() {
+	msgfunc="$1"
+	[ -z "$msgfunc" ] && die "msgfunc not specified in call to warningmsg!"
+	${msgfunc} "Please note that NUT now runs under the 'nut' user."
+	${msgfunc} "NUT is in the uucp group for access to RS-232 UPS."
+	${msgfunc} "However if you use a USB UPS you may need to look at the udev or"
+	${msgfunc} "hotplug rules that are installed, and alter them suitably."
+	echo
+	${msgfunc} "If you use hald, you may be able to skip the normal init scripts."
+	echo
+	${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
+}