* [gentoo-commits] gentoo-x86 commit in sys-power/nut: ChangeLog nut-2.2.2.ebuild
@ 2008-06-25 2:29 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-06-25 2:29 UTC (permalink / raw
To: gentoo-commits
robbat2 08/06/25 02:29:04
Modified: ChangeLog
Added: nut-2.2.2.ebuild
Log:
Version bump per bug #226157. Fix bugs #177887, #211505 for baselayout2. Provide better support for multiple UPS per bug #149687. Please read the postinst about upsdrv!.
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64)
Revision Changes Path
1.54 sys-power/nut/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?r1=1.53&r2=1.54
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -p -w -b -B -u -u -r1.53 -r1.54
--- ChangeLog 25 Jun 2008 01:19:47 -0000 1.53
+++ ChangeLog 25 Jun 2008 02:29:03 -0000 1.54
@@ -1,6 +1,15 @@
# ChangeLog for sys-power/nut
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.53 2008/06/25 01:19:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.54 2008/06/25 02:29:03 robbat2 Exp $
+
+*nut-2.2.2 (25 Jun 2008)
+
+ 25 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+ +files/nut-2.2.2-init.d-upsd, +files/nut-2.2.2-init.d-upsdrv,
+ +files/nut-2.2.2-init.d-upsmon, +nut-2.2.2.ebuild:
+ Version bump per bug #226157. Fix bugs #177887, #211505 for baselayout2.
+ Provide better support for multiple UPS per bug #149687. Please read the
+ postinst about upsdrv!.
25 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> nut-2.2.1.ebuild:
Add warning about shell expansions.
1.1 sys-power/nut/nut-2.2.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.1&content-type=text/plain
Index: nut-2.2.2.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.1 2008/06/25 02:29:03 robbat2 Exp $
inherit eutils fixheadtails autotools
MY_P="${P/_/-}"
DESCRIPTION="Network-UPS Tools"
HOMEPAGE="http://www.networkupstools.org/"
# Nut mirrors are presently broken
SRC_URI="http://random.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 xml"
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 )
xml? ( >=net-misc/neon-0.25.0 )
>=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() {
if use cgi && ! built_with_use media-libs/gd png ; then
eerror "CGI support requested, bug GD not built with PNG support"
eerror "Please rebuild gd with 'USE=png'"
die
fi
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}"
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"
sed -e "s:52_nut-usbups.rules:70-nut-usbups.rules:" \
-i scripts/udev/Makefile.am || die "sed failed"
WANT_AUTOCONF=2.5 eautoreconf || die "autoconf 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-dev \
$(use_with xml neonxml) \
$(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}"/nut-2.2.2-init.d-upsd upsd
newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsmon 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
# Do not remove eval here, because the variables contain shell expansions.
eval fperms 0640 ${NUT_PRIVATE_FILES}
eval fowners root:nut ${NUT_PRIVATE_FILES}
# Do not remove eval here, because the variables contain shell expansions.
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
# Do not remove eval here, because the variables contain shell expansions.
eval chown root:nut "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
eval chmod 0640 "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
# Do not remove eval here, because the variables contain shell expansions.
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."
echo
${msgfunc} "Please note that upsdrv is NOT automatically started by upsd anymore."
${msgfunc} "If you have multiple UPS units, you can use their NUT names to"
${msgfunc} "have a service per UPS:"
${msgfunc} "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME"
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-power/nut: ChangeLog nut-2.2.2.ebuild
@ 2008-07-05 3:15 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-07-05 3:15 UTC (permalink / raw
To: gentoo-commits
robbat2 08/07/05 03:15:16
Modified: ChangeLog nut-2.2.2.ebuild
Log:
Bug #229443, compile-fix for newer libtool setups.
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64)
Revision Changes Path
1.57 sys-power/nut/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?r1=1.56&r2=1.57
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -p -w -b -B -u -u -r1.56 -r1.57
--- ChangeLog 25 Jun 2008 02:53:07 -0000 1.56
+++ ChangeLog 5 Jul 2008 03:15:15 -0000 1.57
@@ -1,6 +1,10 @@
# ChangeLog for sys-power/nut
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.56 2008/06/25 02:53:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.57 2008/07/05 03:15:15 robbat2 Exp $
+
+ 05 Jul 2008; Robin H. Johnson <robbat2@gentoo.org>
+ +files/nut-2.2.2-no-libdummy.patch, nut-2.2.2.ebuild:
+ Bug #229443, compile-fix for newer libtool setups.
25 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
files/nut-2.2.2-init.d-upsmon:
1.3 sys-power/nut/nut-2.2.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?r1=1.2&r2=1.3
Index: nut-2.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- nut-2.2.2.ebuild 25 Jun 2008 16:03:48 -0000 1.2
+++ nut-2.2.2.ebuild 5 Jul 2008 03:15:15 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.2 2008/06/25 16:03:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.3 2008/07/05 03:15:15 robbat2 Exp $
inherit eutils fixheadtails autotools
@@ -58,6 +58,8 @@ src_unpack() {
ht_fix_file configure.in
+ epatch "${FILESDIR}"/${P}-no-libdummy.patch
+
sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-i configure.in || die "sed failed"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-power/nut: ChangeLog nut-2.2.2.ebuild
@ 2008-07-05 3:22 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-07-05 3:22 UTC (permalink / raw
To: gentoo-commits
robbat2 08/07/05 03:22:15
Modified: ChangeLog nut-2.2.2.ebuild
Log:
Bug #229345 - do not bother with the CGI files unless USE=cgi.
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64)
Revision Changes Path
1.58 sys-power/nut/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?r1=1.57&r2=1.58
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -p -w -b -B -u -u -r1.57 -r1.58
--- ChangeLog 5 Jul 2008 03:15:15 -0000 1.57
+++ ChangeLog 5 Jul 2008 03:22:14 -0000 1.58
@@ -1,6 +1,9 @@
# ChangeLog for sys-power/nut
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.57 2008/07/05 03:15:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.58 2008/07/05 03:22:14 robbat2 Exp $
+
+ 05 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> nut-2.2.2.ebuild:
+ Bug #229345 - do not bother with the CGI files unless USE=cgi.
05 Jul 2008; Robin H. Johnson <robbat2@gentoo.org>
+files/nut-2.2.2-no-libdummy.patch, nut-2.2.2.ebuild:
1.4 sys-power/nut/nut-2.2.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?r1=1.3&r2=1.4
Index: nut-2.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -w -b -B -u -u -r1.3 -r1.4
--- nut-2.2.2.ebuild 5 Jul 2008 03:15:15 -0000 1.3
+++ nut-2.2.2.ebuild 5 Jul 2008 03:22:14 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.3 2008/07/05 03:15:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.4 2008/07/05 03:22:14 robbat2 Exp $
inherit eutils fixheadtails autotools
@@ -30,9 +30,11 @@ DEPEND="$RDEPEND
>=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,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}"
+# public files should be 644 root:root, only installed if USE=cgi
+NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
pkg_setup() {
if use cgi && ! built_with_use media-libs/gd png ; then
@@ -152,6 +154,12 @@ src_install() {
eval fperms 0644 ${NUT_PUBLIC_FILES}
eval fowners root:root ${NUT_PUBLIC_FILES}
+ # Do not remove eval here, because the variables contain shell expansions.
+ if use cgi; then
+ eval fperms 0644 ${NUT_CGI_FILES}
+ eval fowners root:root ${NUT_CGI_FILES}
+ fi
+
# this is installed for 2.4 and fbsd guys
if ! has_version sys-fs/udev; then
insinto /etc/hotplug/usb
@@ -184,6 +192,12 @@ pkg_postinst() {
eval chown root:root "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
eval chmod 0644 "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
+ # Do not remove eval here, because the variables contain shell expansions.
+ if use cgi; then
+ eval chown root:root "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
+ eval chmod 0644 "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
+ fi
+
warningmsg elog
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-power/nut: ChangeLog nut-2.2.2.ebuild
@ 2009-03-07 20:30 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 5+ messages in thread
From: Petteri Raty (betelgeuse) @ 2009-03-07 20:30 UTC (permalink / raw
To: gentoo-commits
betelgeuse 09/03/07 20:30:14
Modified: ChangeLog nut-2.2.2.ebuild
Log:
Migrate to EAPI 2.
(Portage version: 2.2_rc20/cvs/Linux 2.6.29-rc6 i686)
Revision Changes Path
1.60 sys-power/nut/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?r1=1.59&r2=1.60
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog 7 Mar 2009 20:25:38 -0000 1.59
+++ ChangeLog 7 Mar 2009 20:30:14 -0000 1.60
@@ -1,6 +1,9 @@
# ChangeLog for sys-power/nut
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.59 2009/03/07 20:25:38 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.60 2009/03/07 20:30:14 betelgeuse Exp $
+
+ 07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> nut-2.2.2.ebuild:
+ Migrate to EAPI 2.
07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> -nut-2.2.0.ebuild,
-nut-2.2.1.ebuild:
1.6 sys-power/nut/nut-2.2.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?r1=1.5&r2=1.6
Index: nut-2.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nut-2.2.2.ebuild 5 Jul 2008 15:39:35 -0000 1.5
+++ nut-2.2.2.ebuild 7 Mar 2009 20:30:14 -0000 1.6
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.5 2008/07/05 15:39:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.6 2009/03/07 20:30:14 betelgeuse Exp $
+
+EAPI="2"
inherit eutils fixheadtails autotools
@@ -18,7 +20,7 @@
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE="cgi snmp usb ssl hal xml"
-RDEPEND="cgi? ( >=media-libs/gd-2 )
+RDEPEND="cgi? ( >=media-libs/gd-2[png] )
snmp? ( net-analyzer/net-snmp )
usb? ( >=dev-libs/libusb-0.1.12 )
hal? ( >=sys-apps/hal-0.5.9.1 )
@@ -37,11 +39,6 @@
NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
pkg_setup() {
- if use cgi && ! built_with_use media-libs/gd png ; then
- eerror "CGI support requested, bug GD not built with PNG support"
- eerror "Please rebuild gd with 'USE=png'"
- die
- fi
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.
@@ -53,11 +50,7 @@
warningmsg ewarn
}
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
-
+src_prepare() {
ht_fix_file configure.in
epatch "${FILESDIR}"/${P}-no-libdummy.patch
@@ -71,7 +64,7 @@
WANT_AUTOCONF=2.5 eautoreconf || die "autoconf failed"
}
-src_compile() {
+src_configure() {
local myconf
if [ -n "${NUT_DRIVERS}" ]; then
@@ -98,13 +91,11 @@
$(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"
+ emake DESTDIR="${D}" install || die "make install failed"
dodir /sbin
dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
@@ -124,14 +115,14 @@
done
dodoc ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING \
- docs/{FAQ,*.txt}
+ docs/{FAQ,*.txt} || die
- newdoc lib/README README.lib
+ newdoc lib/README README.lib || die
- newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf
+ newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf || die
docinto cables
- dodoc docs/cables/*
+ dodoc docs/cables/* || die
newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsd upsd
newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-power/nut: ChangeLog nut-2.2.2.ebuild
@ 2009-04-15 12:27 Brent Baude (ranger)
0 siblings, 0 replies; 5+ messages in thread
From: Brent Baude (ranger) @ 2009-04-15 12:27 UTC (permalink / raw
To: gentoo-commits
ranger 09/04/15 12:27:43
Modified: ChangeLog nut-2.2.2.ebuild
Log:
Marking nut-2.2.2 ppc64 for bug 264897
(Portage version: 2.1.6.11/cvs/Linux ppc64)
Revision Changes Path
1.62 sys-power/nut/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/ChangeLog?r1=1.61&r2=1.62
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog 12 Apr 2009 21:18:27 -0000 1.61
+++ ChangeLog 15 Apr 2009 12:27:43 -0000 1.62
@@ -1,6 +1,9 @@
# ChangeLog for sys-power/nut
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.61 2009/04/12 21:18:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.62 2009/04/15 12:27:43 ranger Exp $
+
+ 15 Apr 2009; Brent Baude <ranger@gentoo.org> nut-2.2.2.ebuild:
+ Marking nut-2.2.2 ppc64 for bug 264897
*nut-2.4.1 (12 Apr 2009)
1.7 sys-power/nut/nut-2.2.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild?r1=1.6&r2=1.7
Index: nut-2.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nut-2.2.2.ebuild 7 Mar 2009 20:30:14 -0000 1.6
+++ nut-2.2.2.ebuild 15 Apr 2009 12:27:43 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.6 2009/03/07 20:30:14 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.2.2.ebuild,v 1.7 2009/04/15 12:27:43 ranger Exp $
EAPI="2"
@@ -17,7 +17,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="cgi snmp usb ssl hal xml"
RDEPEND="cgi? ( >=media-libs/gd-2[png] )
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-04-15 12:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-05 3:22 [gentoo-commits] gentoo-x86 commit in sys-power/nut: ChangeLog nut-2.2.2.ebuild Robin H. Johnson (robbat2)
-- strict thread matches above, loose matches on Subject: below --
2009-04-15 12:27 Brent Baude (ranger)
2009-03-07 20:30 Petteri Raty (betelgeuse)
2008-07-05 3:15 Robin H. Johnson (robbat2)
2008-06-25 2:29 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox