From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E238D138334 for ; Mon, 1 Oct 2018 14:04:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AE87E0971; Mon, 1 Oct 2018 14:04:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D24F8E0971 for ; Mon, 1 Oct 2018 14:04:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D561335C31 for ; Mon, 1 Oct 2018 14:04:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FC192C6 for ; Mon, 1 Oct 2018 14:04:19 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1538402648.612d1d4af0bc1c062c9711b153e5e0fa803cdc75.pinkbyte@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild X-VCS-Directories: sys-power/apcupsd/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: 612d1d4af0bc1c062c9711b153e5e0fa803cdc75 X-VCS-Branch: master Date: Mon, 1 Oct 2018 14:04:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d000048d-61fb-45a3-85dc-a8e0b296b09a X-Archives-Hash: 9f96b4b88d66a41c1b089191dc3b16c6 commit: 612d1d4af0bc1c062c9711b153e5e0fa803cdc75 Author: Sergey Popov gentoo org> AuthorDate: Mon Oct 1 13:58:09 2018 +0000 Commit: Sergey Popov gentoo org> CommitDate: Mon Oct 1 14:04:08 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=612d1d4a sys-power/apcupsd: amd64/ppc/x86 stable, drop old Signed-off-by: Sergey Popov gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.10 sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild | 139 ---------------------------- sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild | 2 +- 2 files changed, 1 insertion(+), 140 deletions(-) diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild deleted file mode 100644 index dc193a1d0fe..00000000000 --- a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -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 +modbus cgi nls gnome kernel_linux" - -DEPEND=" - || ( >=sys-apps/util-linux-2.23[tty-helpers(-)] - sys-freebsd/freebsd-ubin - ) - modbus? ( usb? ( virtual/libusb:0 ) ) - 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} - 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= " - use modbus && myconf="${myconf} --enable-modbus-usb" - else - myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb" - use modbus || myconf="${myconf} --disable-modbus" - 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) \ - $(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 -} - -src_install() { - emake DESTDIR="${D}" install - rm -f "${D}"/etc/init.d/halt || die - - 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 || die - 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 || die - - # 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 -} diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild index 9212cf4864c..6b1c1f839c9 100644 --- a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild +++ b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd" IUSE="snmp +usb +modbus cgi nls gnome kernel_linux" DEPEND="