Bug #143813, force usage of a new version of libusb to avoid problems with newhidups.

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 205 insertions, 5 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 7292a2c757e5..51daca552e9f 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.13 2006/07/30 04:09:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.14 2006/08/13 21:43:09 robbat2 Exp $
+
+*nut-2.0.4-r1 (13 Aug 2006)
+
+  13 Aug 2006; Robin H. Johnson <robbat2@gentoo.org> +nut-2.0.4-r1.ebuild:
+  Bug #143813, force usage of a new version of libusb to avoid problems with
+  newhidups.
 
 *nut-2.0.4 (30 Jul 2006)
 
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 2300c971cd18..c86b0ae0e197 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -50,14 +50,18 @@ EBUILD nut-2.0.3.ebuild 4098 RMD160 24a7562be85a1f97e7a66097755c58a8cdb80665 SHA
 MD5 61484ea86863e51b9c9a1652bdeae3bf nut-2.0.3.ebuild 4098
 RMD160 24a7562be85a1f97e7a66097755c58a8cdb80665 nut-2.0.3.ebuild 4098
 SHA256 c4d7ac980e746d0a4fbefabd68e2f557b7327f87cb377fa870487bf3d837d35f nut-2.0.3.ebuild 4098
+EBUILD nut-2.0.4-r1.ebuild 4811 RMD160 f10b9ab05c3cc88bdc9d6beec328bf7bdebd410f SHA1 475b3e9b15aaf0dbabd5dc384fee4a3d2af1fe66 SHA256 d6402cffb94dd9f2b6a45b1cec66bb637cedc11a172407b79aae72d61411297d
+MD5 847956a3014312f3ab41522bab6f3b57 nut-2.0.4-r1.ebuild 4811
+RMD160 f10b9ab05c3cc88bdc9d6beec328bf7bdebd410f nut-2.0.4-r1.ebuild 4811
+SHA256 d6402cffb94dd9f2b6a45b1cec66bb637cedc11a172407b79aae72d61411297d nut-2.0.4-r1.ebuild 4811
 EBUILD nut-2.0.4.ebuild 4799 RMD160 4fbcbaa4c7e719146fa2e64729521865f9b9151f SHA1 d6428f92bc655c970274ad2e4ab385cae5e5cb3f SHA256 a3014053beb6142acffe8a33704ce08e0427ac2789bd7e62dc0d18d6246ece44
 MD5 25382ac4db5d91a9c1d589192675a289 nut-2.0.4.ebuild 4799
 RMD160 4fbcbaa4c7e719146fa2e64729521865f9b9151f nut-2.0.4.ebuild 4799
 SHA256 a3014053beb6142acffe8a33704ce08e0427ac2789bd7e62dc0d18d6246ece44 nut-2.0.4.ebuild 4799
-MISC ChangeLog 9344 RMD160 6fd79804fa38d952b44c95ef3818b185e6db8ec9 SHA1 26f2befce9dcdd88d6e6f95cbdc85389da08d214 SHA256 02b46a1545afc3ccae007ca0223260a9d25a8101aca355bd95eb2504df1f4095
-MD5 3e5ed8b1b5c8a707afe31f0d2990cb10 ChangeLog 9344
-RMD160 6fd79804fa38d952b44c95ef3818b185e6db8ec9 ChangeLog 9344
-SHA256 02b46a1545afc3ccae007ca0223260a9d25a8101aca355bd95eb2504df1f4095 ChangeLog 9344
+MISC ChangeLog 9539 RMD160 3ec127ea15ea663397e1e09a4653670b9384a714 SHA1 224c3c9a1ada0ee802b90522cfc4c217b31049b8 SHA256 f3f38969c6da956e2655e30f4450c4ae8844c45180426318ade0a4c6e1c6c1e9
+MD5 528592988c40f83732afc37e1fa68334 ChangeLog 9539
+RMD160 3ec127ea15ea663397e1e09a4653670b9384a714 ChangeLog 9539
+SHA256 f3f38969c6da956e2655e30f4450c4ae8844c45180426318ade0a4c6e1c6c1e9 ChangeLog 9539
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b
 MD5 a961228140ef319b2ddba54d99b6e401 metadata.xml 219
 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc metadata.xml 219
@@ -80,3 +84,6 @@ SHA256 017d3a946060089d62dfdd42621bacfc1b226a902c114a956e3326f77a2bc7dc files/di
 MD5 e543f547d66497cff5e191b08c8ff8d9 files/digest-nut-2.0.4 229
 RMD160 d2fa5931dfa65c607c09b62a70c3281d69919e73 files/digest-nut-2.0.4 229
 SHA256 4d18f4ecac989c959db626584630384b449594a864db3308df3801807620e705 files/digest-nut-2.0.4 229
+MD5 e543f547d66497cff5e191b08c8ff8d9 files/digest-nut-2.0.4-r1 229
+RMD160 d2fa5931dfa65c607c09b62a70c3281d69919e73 files/digest-nut-2.0.4-r1 229
+SHA256 4d18f4ecac989c959db626584630384b449594a864db3308df3801807620e705 files/digest-nut-2.0.4-r1 229
diff --git a/sys-power/nut/files/digest-nut-2.0.4-r1 b/sys-power/nut/files/digest-nut-2.0.4-r1
new file mode 100644
index 000000000000..25ad2547dc35
--- /dev/null
+++ b/sys-power/nut/files/digest-nut-2.0.4-r1
@@ -0,0 +1,3 @@
+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/nut-2.0.4-r1.ebuild b/sys-power/nut/nut-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..aa738ca94bea
--- /dev/null
+++ b/sys-power/nut/nut-2.0.4-r1.ebuild
@@ -0,0 +1,184 @@
+# 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.4-r1.ebuild,v 1.1 2006/08/13 21:43:09 robbat2 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="~alpha ~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
+	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/*
+
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/upsd.rc6" upsd
+	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newexe "${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."
+}