mattm       14/07/03 21:28:45

  Modified:             ChangeLog
  Added:                apcupsd-3.14.12-r1.ebuild
  Log:
  Fix bugs 515504, 515502
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
786037A7)

Revision  Changes    Path
1.102                sys-power/apcupsd/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/apcupsd/ChangeLog?rev=1.102&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/apcupsd/ChangeLog?rev=1.102&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/apcupsd/ChangeLog?r1=1.101&r2=1.102

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ChangeLog   25 Jun 2014 21:44:21 -0000      1.101
+++ ChangeLog   3 Jul 2014 21:28:45 -0000       1.102
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.101 
2014/06/25 21:44:21 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.102 
2014/07/03 21:28:45 mattm Exp $
+
+*apcupsd-3.14.12-r1 (03 Jul 2014)
+
+  03 Jul 2014; Matthew Marlowe <[email protected]> +apcupsd-3.14.12-r1.ebuild:
+  Fix bugs 515504, 515502
 
   25 Jun 2014; Matthew Marlowe <[email protected]> apcupsd-3.14.12.ebuild:
   Unmask apcupsd-3.14.12 for general testing, several weeks w/o bug reports -



1.1                  sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild?rev=1.1&content-type=text/plain

Index: apcupsd-3.14.12-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild,v 1.1 
2014/07/03 21:28:45 mattm Exp $

EAPI=4

inherit eutils linux-info flag-o-matic systemd udev

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 ~arm ~ppc ~x86 ~x86-fbsd"
IUSE="snmp +usb cgi nls gnome kernel_linux"

DEPEND="
        ||      ( >=sys-apps/util-linux-2.23[tty-helpers(-)]
                  <=sys-apps/sysvinit-2.88-r4
                  sys-freebsd/freebsd-ubin
                )
        cgi? ( >=media-libs/gd-1.8.4 )
        nls? ( sys-devel/gettext )
        snmp? ( >=net-analyzer/net-snmp-5.7.2 )
        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=/run/apcupsd \
                --with-pid-dir=/run/apcupsd \
                --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
        doins "${FILESDIR}"/apcupsd.conf

        dodoc ChangeLog* ReleaseNotes
        doman doc/*.8 doc/*.5

        dohtml -r doc/manual/*

        rm "${D}"/etc/init.d/apcupsd
        newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
        newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail

        systemd_dounit "${FILESDIR}"/${PN}.service
        systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf

        # 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
                udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
        fi

}

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 with openRC."
        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
}




Reply via email to