diff options
| -rw-r--r-- | sys-power/apcupsd/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-power/apcupsd/apcupsd-3.14.10.ebuild | 137 | ||||
| -rw-r--r-- | sys-power/apcupsd/files/apcupsd.init.2 | 38 |
3 files changed, 6 insertions, 177 deletions
diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog index 6f1780156e7f..78a6d887ff09 100644 --- a/sys-power/apcupsd/ChangeLog +++ b/sys-power/apcupsd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-power/apcupsd -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.77 2011/10/21 22:06:43 flameeyes Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.78 2012/05/16 02:06:45 flameeyes Exp $ + + 16 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> -apcupsd-3.14.10.ebuild, + -files/apcupsd.init.2: + Remove old version. *apcupsd-3.14.10-r1 (21 Oct 2011) diff --git a/sys-power/apcupsd/apcupsd-3.14.10.ebuild b/sys-power/apcupsd/apcupsd-3.14.10.ebuild deleted file mode 100644 index e984905745ec..000000000000 --- a/sys-power/apcupsd/apcupsd-3.14.10.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.10.ebuild,v 1.1 2011/09/29 13:45:58 flameeyes Exp $ - -EAPI=4 - -inherit eutils linux-info flag-o-matic - -DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown" -HOMEPAGE="http://www.apcupsd.org/" -SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="snmp +usb cgi nls gnome kernel_linux" - -DEPEND=" - cgi? ( >=media-libs/gd-1.8.4 ) - nls? ( sys-devel/gettext ) - snmp? ( net-analyzer/net-snmp ) - gnome? ( >=x11-libs/gtk+-2.4.0:2 - dev-libs/glib:2 - >=gnome-base/gconf-2.0 )" -RDEPEND="${DEPEND} - sys-apps/openrc - virtual/mailx" - -CONFIG_CHECK="~USB_HIDDEV ~HIDRAW" -ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV: needed to access USB-attached UPSes" -ERROR_HIDRAW="CONFIG_HIDRAW: needed to access USB-attached UPSes" - -pkg_setup() { - if use kernel_linux && use usb && linux_config_exists; then - check_extra_config - fi -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch" -} - -src_configure() { - local myconf - use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin" - if use usb; then - myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= " - else - myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb" - fi - - # We force the DISTNAME to gentoo so it will use gentoo's layout also - # when installed on non-linux systems. - econf \ - --sbindir=/sbin \ - --sysconfdir=/etc/apcupsd \ - --with-pwrfail-dir=/etc/apcupsd \ - --with-lock-dir=/var/lock \ - --with-pid-dir=/var/run \ - --with-log-dir=/var/log \ - --with-nis-port=3551 \ - --enable-net --enable-pcnet \ - --with-distname=gentoo \ - $(use_enable snmp net-snmp) \ - $(use_enable gnome gapcmon) \ - ${myconf} \ - APCUPSD_MAIL=/bin/mail -} - -src_compile() { - # Workaround for bug #280674; upstream should really just provide - # the text files in the distribution, but I wouldn't count on them - # doing that anytime soon. - MANPAGER=$(type -p cat) \ - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "installed failed" - rm -f "${D}"/etc/init.d/halt - - insinto /etc/apcupsd - newins examples/safe.apccontrol safe.apccontrol - - dodoc ChangeLog* ReleaseNotes - doman doc/*.8 doc/*.5 - - dohtml -r doc/manual/* - - rm "${D}"/etc/init.d/apcupsd - newinitd "${FILESDIR}/${PN}.init.2" "${PN}" - newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail - - # remove hal settings, we don't really want to have it around still. - rm -r "${D}"/usr/share/hal - - # replace it with our udev rules if we're in Linux - if use kernel_linux; then - insinto /lib/udev/rules.d - newins "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules - fi - - # Without this it'll crash at startup. When merging in ROOT= this - # won't be created by default, so we want to make sure we got it! - keepdir /var/lock - fowners root:uucp /var/lock - fperms 0775 /var/lock -} - -pkg_postinst() { - if use cgi; then - elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin." - elog "Set up your ScriptAlias or symbolic links accordingly." - fi - - elog "" - elog "Since version 3.14.0 you can use multiple apcupsd instances to" - elog "control more than one UPS in a single box." - elog "To do this, create a link between /etc/init.d/apcupsd to a new" - elog "/etc/init.d/apcupsd.something, and it will then load the" - elog "configuration file at /etc/apcupsd/something.conf." - elog "" - - elog 'If you want apcupsd to power off your UPS when it' - elog 'shuts down your system in a power failure, you must' - elog 'add apcupsd.powerfail to your shutdown runlevel:' - elog '' - elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m' - elog '' - - if use kernel_linux; then - elog "Starting from version 3.14.9-r1, ${PN} installs udev rules" - elog "for persistent device naming. If you have multiple UPS" - elog "connected to the machine, you can point them to the devices" - elog "in /dev/apcups/by-id directory." - fi -} diff --git a/sys-power/apcupsd/files/apcupsd.init.2 b/sys-power/apcupsd/files/apcupsd.init.2 deleted file mode 100644 index 6764e335f40a..000000000000 --- a/sys-power/apcupsd/files/apcupsd.init.2 +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/apcupsd.init.2,v 1.3 2011/08/22 14:27:25 flameeyes Exp $ - -INSTANCE="${SVCNAME#*.}" -if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then - INSTANCE="apcupsd" -fi - -depend() { - use net -} - -start() { - rm -f /etc/apcupsd/powerfail - - export SERVICE="${SVCNAME}" - - ebegin "Starting APC UPS daemon" - start-stop-daemon \ - --start --pidfile "/var/run/${SVCNAME}.pid" \ - --wait 3000 \ - --exec /sbin/apcupsd -- \ - -f "/etc/apcupsd/${INSTANCE}.conf" \ - -P "/var/run/${SVCNAME}.pid" - eend $? -} - -stop() { - ebegin "Stopping APC UPS daemon" - start-stop-daemon \ - --stop --pidfile "/var/run/${SVCNAME}.pid" \ - --retry TERM/5/TERM/5 \ - --exec /sbin/apcupsd - eend $? -} - |