* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2017-11-26 23:26 David Seifert
0 siblings, 0 replies; 62+ messages in thread
From: David Seifert @ 2017-11-26 23:26 UTC (permalink / raw
To: gentoo-commits
commit: 846f6cc11c3713b87bc95bc1f0cc22a24afa846a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 13:02:20 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 23:25:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846f6cc1
sys-power/nut: [QA] Consistent whitespace in metadata.xml
sys-power/nut/metadata.xml | 116 ++++++++++++++++++++++-----------------------
1 file changed, 58 insertions(+), 58 deletions(-)
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index bfe6c746999..d9ab89aeb36 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -1,65 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>robbat2@gentoo.org</email>
- <name>Robin H. Johnson</name>
- </maintainer>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
- <use>
- <flag name="ipmi">Support IPMI-based UPSes.</flag>
- <flag name="ups_drivers_al175">Driver for Eltek UPS models with AL175 alarm module</flag>
- <flag name="ups_drivers_bcmxcp">Driver for UPSes supporting the serial BCM/XCP protocol</flag>
- <flag name="ups_drivers_belkin">Driver for Belkin serial UPS equipment</flag>
- <flag name="ups_drivers_belkinunv">Driver for Belkin "Universal UPS" and compatible</flag>
- <flag name="ups_drivers_bestfcom">Driver for Best Power Fortress/Ferrups</flag>
- <flag name="ups_drivers_bestfortress">Driver for old Best Fortress UPS equipment</flag>
- <flag name="ups_drivers_bestuferrups">Driver for Best Power Micro-Ferrups</flag>
- <flag name="ups_drivers_bestups">Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment</flag>
- <flag name="ups_drivers_dummy-ups">Driver for multi-purpose UPS emulation</flag>
- <flag name="ups_drivers_etapro">Driver for ETA UPS equipment</flag>
- <flag name="ups_drivers_everups">Driver for Ever UPS models</flag>
- <flag name="ups_drivers_gamatronic">Driver for Gamatronic UPS equipment</flag>
- <flag name="ups_drivers_genericups">Driver for contact-closure UPS equipment</flag>
- <flag name="ups_drivers_isbmex">Driver for ISBMEX UPS equipment</flag>
- <flag name="ups_drivers_liebert">Driver for Liebert contact-closure UPS equipment</flag>
- <flag name="ups_drivers_liebert-esp2">Driver for Liebert UPS, using the ESP-II serial protocol</flag>
- <flag name="ups_drivers_masterguard">Driver for Masterguard UPS equipment</flag>
- <flag name="ups_drivers_metasys">Driver for Meta System UPS equipment</flag>
- <flag name="ups_drivers_mge-utalk">Driver for MGE UPS SYSTEMS UTalk protocol equipment</flag>
- <flag name="ups_drivers_microdowell">Driver for Microdowell Enterprise UPS series</flag>
- <flag name="ups_drivers_mge-shut">Driver for SHUT Protocol UPS equipment</flag>
- <flag name="ups_drivers_oldmge-shut">Driver for SHUT Protocol UPS equipment (older implementation)</flag>
- <flag name="ups_drivers_oneac">Driver for Oneac UPS equipment</flag>
- <flag name="ups_drivers_optiups">Driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment</flag>
- <flag name="ups_drivers_powercom">UPS driver for serial Powercom/Trust/Advice UPS equipment</flag>
- <flag name="ups_drivers_rhino">Driver for Brazilian Microsol RHINO UPS equipment</flag>
- <flag name="ups_drivers_safenet">Driver for SafeNet compatible UPS equipment</flag>
- <flag name="ups_drivers_solis">Driver for Brazilian Microsol SOLIS UPS equipment</flag>
- <flag name="ups_drivers_tripplite">Driver for Tripp-Lite SmartPro UPS equipment</flag>
- <flag name="ups_drivers_tripplitesu">Driver for Tripp-Lite SmartOnline (SU) UPS equipment</flag>
- <flag name="ups_drivers_upscode2">Driver for UPScode II compatible UPS equipment</flag>
- <flag name="ups_drivers_victronups">Driver for IMV/Victron UPS unit Match, Match Lite, NetUps</flag>
- <flag name="ups_drivers_powerpanel">Driver for PowerPanel Plus compatible UPS equipment</flag>
- <flag name="ups_drivers_blazer_ser">Driver for Megatec/Q1 protocol serial based UPS equipment</flag>
- <flag name="ups_drivers_clone">Fake driver to clone outlets for device grouping</flag>
- <flag name="ups_drivers_clone-outlet">Fake driver to clone outlets for device grouping</flag>
- <flag name="ups_drivers_ivtscd">driver for the IVT Solar Controller Device</flag>
- <flag name="ups_drivers_apcsmart">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
- <flag name="ups_drivers_apcsmart-old">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
- <flag name="ups_drivers_apcupsd-ups">Driver for apcupsd client access</flag>
- <flag name="ups_drivers_riello_ser">Driver for Riello UPS Protocol UPS equipment</flag>
- <flag name="ups_drivers_nutdrv_qx">Driver for Q* protocol serial and USB based UPS equipment</flag>
- <flag name="ups_drivers_usbhid-ups">Driver for USB/HID UPS equipment</flag>
- <flag name="ups_drivers_bcmxcp_usb">Experimental driver for UPSes supporting the BCM/XCP protocol over USB</flag>
- <flag name="ups_drivers_tripplite_usb">Driver for older Tripp Lite USB UPSes (not PDC HID)</flag>
- <flag name="ups_drivers_blazer_usb">Driver for Megatec/Q1 protocol USB based UPS equipment</flag>
- <flag name="ups_drivers_richcomm_usb">Driver UPS equipment using Richcomm dry-contact to USB solution</flag>
- <flag name="ups_drivers_riello_usb">Driver for Riello UPS Protocol UPS equipment via USB</flag>
- <flag name="ups_drivers_netxml-ups">Driver for Eaton / MGE Network Management Card / Proxy (XML/HTTP Protocol) equipment</flag>
- <flag name="ups_drivers_snmp-ups">Multi-MIB Driver for SNMP UPS equipment</flag>
- <flag name="ups_drivers_nut-ipmipsu">Driver for IPMI Power Supply Units (PSU)</flag>
- </use>
+ <use>
+ <flag name="ipmi">Support IPMI-based UPSes.</flag>
+ <flag name="ups_drivers_al175">Driver for Eltek UPS models with AL175 alarm module</flag>
+ <flag name="ups_drivers_bcmxcp">Driver for UPSes supporting the serial BCM/XCP protocol</flag>
+ <flag name="ups_drivers_belkin">Driver for Belkin serial UPS equipment</flag>
+ <flag name="ups_drivers_belkinunv">Driver for Belkin "Universal UPS" and compatible</flag>
+ <flag name="ups_drivers_bestfcom">Driver for Best Power Fortress/Ferrups</flag>
+ <flag name="ups_drivers_bestfortress">Driver for old Best Fortress UPS equipment</flag>
+ <flag name="ups_drivers_bestuferrups">Driver for Best Power Micro-Ferrups</flag>
+ <flag name="ups_drivers_bestups">Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment</flag>
+ <flag name="ups_drivers_dummy-ups">Driver for multi-purpose UPS emulation</flag>
+ <flag name="ups_drivers_etapro">Driver for ETA UPS equipment</flag>
+ <flag name="ups_drivers_everups">Driver for Ever UPS models</flag>
+ <flag name="ups_drivers_gamatronic">Driver for Gamatronic UPS equipment</flag>
+ <flag name="ups_drivers_genericups">Driver for contact-closure UPS equipment</flag>
+ <flag name="ups_drivers_isbmex">Driver for ISBMEX UPS equipment</flag>
+ <flag name="ups_drivers_liebert">Driver for Liebert contact-closure UPS equipment</flag>
+ <flag name="ups_drivers_liebert-esp2">Driver for Liebert UPS, using the ESP-II serial protocol</flag>
+ <flag name="ups_drivers_masterguard">Driver for Masterguard UPS equipment</flag>
+ <flag name="ups_drivers_metasys">Driver for Meta System UPS equipment</flag>
+ <flag name="ups_drivers_mge-utalk">Driver for MGE UPS SYSTEMS UTalk protocol equipment</flag>
+ <flag name="ups_drivers_microdowell">Driver for Microdowell Enterprise UPS series</flag>
+ <flag name="ups_drivers_mge-shut">Driver for SHUT Protocol UPS equipment</flag>
+ <flag name="ups_drivers_oldmge-shut">Driver for SHUT Protocol UPS equipment (older implementation)</flag>
+ <flag name="ups_drivers_oneac">Driver for Oneac UPS equipment</flag>
+ <flag name="ups_drivers_optiups">Driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment</flag>
+ <flag name="ups_drivers_powercom">UPS driver for serial Powercom/Trust/Advice UPS equipment</flag>
+ <flag name="ups_drivers_rhino">Driver for Brazilian Microsol RHINO UPS equipment</flag>
+ <flag name="ups_drivers_safenet">Driver for SafeNet compatible UPS equipment</flag>
+ <flag name="ups_drivers_solis">Driver for Brazilian Microsol SOLIS UPS equipment</flag>
+ <flag name="ups_drivers_tripplite">Driver for Tripp-Lite SmartPro UPS equipment</flag>
+ <flag name="ups_drivers_tripplitesu">Driver for Tripp-Lite SmartOnline (SU) UPS equipment</flag>
+ <flag name="ups_drivers_upscode2">Driver for UPScode II compatible UPS equipment</flag>
+ <flag name="ups_drivers_victronups">Driver for IMV/Victron UPS unit Match, Match Lite, NetUps</flag>
+ <flag name="ups_drivers_powerpanel">Driver for PowerPanel Plus compatible UPS equipment</flag>
+ <flag name="ups_drivers_blazer_ser">Driver for Megatec/Q1 protocol serial based UPS equipment</flag>
+ <flag name="ups_drivers_clone">Fake driver to clone outlets for device grouping</flag>
+ <flag name="ups_drivers_clone-outlet">Fake driver to clone outlets for device grouping</flag>
+ <flag name="ups_drivers_ivtscd">driver for the IVT Solar Controller Device</flag>
+ <flag name="ups_drivers_apcsmart">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
+ <flag name="ups_drivers_apcsmart-old">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
+ <flag name="ups_drivers_apcupsd-ups">Driver for apcupsd client access</flag>
+ <flag name="ups_drivers_riello_ser">Driver for Riello UPS Protocol UPS equipment</flag>
+ <flag name="ups_drivers_nutdrv_qx">Driver for Q* protocol serial and USB based UPS equipment</flag>
+ <flag name="ups_drivers_usbhid-ups">Driver for USB/HID UPS equipment</flag>
+ <flag name="ups_drivers_bcmxcp_usb">Experimental driver for UPSes supporting the BCM/XCP protocol over USB</flag>
+ <flag name="ups_drivers_tripplite_usb">Driver for older Tripp Lite USB UPSes (not PDC HID)</flag>
+ <flag name="ups_drivers_blazer_usb">Driver for Megatec/Q1 protocol USB based UPS equipment</flag>
+ <flag name="ups_drivers_richcomm_usb">Driver UPS equipment using Richcomm dry-contact to USB solution</flag>
+ <flag name="ups_drivers_riello_usb">Driver for Riello UPS Protocol UPS equipment via USB</flag>
+ <flag name="ups_drivers_netxml-ups">Driver for Eaton / MGE Network Management Card / Proxy (XML/HTTP Protocol) equipment</flag>
+ <flag name="ups_drivers_snmp-ups">Multi-MIB Driver for SNMP UPS equipment</flag>
+ <flag name="ups_drivers_nut-ipmipsu">Driver for IPMI Power Supply Units (PSU)</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-10-12 11:22 Michał Górny
0 siblings, 0 replies; 62+ messages in thread
From: Michał Górny @ 2024-10-12 11:22 UTC (permalink / raw
To: gentoo-commits
commit: e9df8dfc6c5bf28ab08c62b8fdd1470121b5323c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 11:22:25 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 11:22:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9df8dfc
sys-power/nut: Stabilize 2.8.2 x86, #941370
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-power/nut/nut-2.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.2.ebuild b/sys-power/nut/nut-2.8.2.ebuild
index abe5616eda7c..a94d82dc5fab 100644
--- a/sys-power/nut/nut-2.8.2.ebuild
+++ b/sys-power/nut/nut-2.8.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="amd64 arm ~arm64 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64
+ KEYWORDS="amd64 arm ~arm64 ~riscv x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-10-12 10:08 Michał Górny
0 siblings, 0 replies; 62+ messages in thread
From: Michał Górny @ 2024-10-12 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 206576c19a16c86fade6e2b6442e9d836fd7fc88
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 10:07:59 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 10:07:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=206576c1
sys-power/nut: Stabilize 2.8.2 amd64, #941370
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-power/nut/nut-2.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.2.ebuild b/sys-power/nut/nut-2.8.2.ebuild
index 6d8c0b119562..abe5616eda7c 100644
--- a/sys-power/nut/nut-2.8.2.ebuild
+++ b/sys-power/nut/nut-2.8.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 arm ~arm64 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64
+ KEYWORDS="amd64 arm ~arm64 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-10-12 7:52 Michał Górny
0 siblings, 0 replies; 62+ messages in thread
From: Michał Górny @ 2024-10-12 7:52 UTC (permalink / raw
To: gentoo-commits
commit: 6c3a16d7de26a1a1248f9cd8c01bf3c61a0fd7d9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 07:52:14 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 07:52:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c3a16d7
sys-power/nut: Stabilize 2.8.2 arm, #941370
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-power/nut/nut-2.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.2.ebuild b/sys-power/nut/nut-2.8.2.ebuild
index 9a6702956acb..6d8c0b119562 100644
--- a/sys-power/nut/nut-2.8.2.ebuild
+++ b/sys-power/nut/nut-2.8.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64
+ KEYWORDS="~amd64 arm ~arm64 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-05-29 18:27 Robin H. Johnson
0 siblings, 0 replies; 62+ messages in thread
From: Robin H. Johnson @ 2024-05-29 18:27 UTC (permalink / raw
To: gentoo-commits
commit: fde10960ff6053e42cd0b2e882f9e3aa6ba3715b
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 15:58:48 2024 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed May 29 18:26:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde10960
sys-power/nut: fix newdoc bug introduced in d20e5788358b90edc2545386d0704981699f539c
Closes: https://bugs.gentoo.org/show_bug.cgi?id=932868
Fixes: d20e5788358b90edc2545386d0704981699f539c
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sys-power/nut/nut-2.8.2.ebuild | 4 ++--
sys-power/nut/nut-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-power/nut/nut-2.8.2.ebuild b/sys-power/nut/nut-2.8.2.ebuild
index e59050b0c4e5..fbd9812f3c08 100644
--- a/sys-power/nut/nut-2.8.2.ebuild
+++ b/sys-power/nut/nut-2.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -190,7 +190,7 @@ src_install() {
einstalldocs
if use doc; then
- newdoc lib/README.adoc
+ newdoc lib/README.adoc README.lib.adoc
dodoc docs/*.txt
docinto cables
dodoc docs/cables/*
diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-9999.ebuild
index e59050b0c4e5..fbd9812f3c08 100644
--- a/sys-power/nut/nut-9999.ebuild
+++ b/sys-power/nut/nut-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -190,7 +190,7 @@ src_install() {
einstalldocs
if use doc; then
- newdoc lib/README.adoc
+ newdoc lib/README.adoc README.lib.adoc
dodoc docs/*.txt
docinto cables
dodoc docs/cables/*
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-05-27 21:08 Robin H. Johnson
0 siblings, 0 replies; 62+ messages in thread
From: Robin H. Johnson @ 2024-05-27 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 3f28b2a2c28b02f270a2d682fdfabfdee9cff0cd
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 21:06:02 2024 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 27 21:08:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f28b2a2
sys-power/nut: bump
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Closes: https://bugs.gentoo.org/931652
sys-power/nut/Manifest | 1 +
sys-power/nut/{nut-9999.ebuild => nut-2.8.2.ebuild} | 2 +-
sys-power/nut/nut-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 20470d95ae84..feb2a82d2604 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -1,2 +1,3 @@
DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
DIST nut-2.8.0.tar.gz 3287640 BLAKE2B 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94 SHA512 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577
+DIST nut-2.8.2.tar.gz 5599935 BLAKE2B 87187293d8acda72c2d807d6f41f2601a318540f63a0ea93782b115402c6b43a0b61ecc710fd6de126d25e59dd4e03681f2b859a87549e9d5f7617ac7b2dad8c SHA512 b6f8f22318e4a4fcb8073a63132b1cb083952c665191b82a7d6765a61b859575a4b0c2ba84ed17cfb8c88d34179876d64520dd2f75f02fe8707b406da2c0821c
diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-2.8.2.ebuild
similarity index 98%
copy from sys-power/nut/nut-9999.ebuild
copy to sys-power/nut/nut-2.8.2.ebuild
index 22a0e6bc597a..e59050b0c4e5 100644
--- a/sys-power/nut/nut-9999.ebuild
+++ b/sys-power/nut/nut-2.8.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64
fi
S="${WORKDIR}/${MY_P}"
diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-9999.ebuild
index 22a0e6bc597a..e59050b0c4e5 100644
--- a/sys-power/nut/nut-9999.ebuild
+++ b/sys-power/nut/nut-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-05-27 21:08 Robin H. Johnson
0 siblings, 0 replies; 62+ messages in thread
From: Robin H. Johnson @ 2024-05-27 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 02546cec0e29db9953cf11a2ef554f2e504f29fa
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 21:07:41 2024 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 27 21:08:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02546cec
sys-power/nut: cleanup
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sys-power/nut/Manifest | 1 -
sys-power/nut/metadata.xml | 51 -------
sys-power/nut/nut-2.7.4-r8.ebuild | 274 --------------------------------------
sys-power/nut/nut-2.8.0-r2.ebuild | 221 ------------------------------
4 files changed, 547 deletions(-)
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index feb2a82d2604..3a2d7103c03c 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -1,3 +1,2 @@
-DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
DIST nut-2.8.0.tar.gz 3287640 BLAKE2B 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94 SHA512 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577
DIST nut-2.8.2.tar.gz 5599935 BLAKE2B 87187293d8acda72c2d807d6f41f2601a318540f63a0ea93782b115402c6b43a0b61ecc710fd6de126d25e59dd4e03681f2b859a87549e9d5f7617ac7b2dad8c SHA512 b6f8f22318e4a4fcb8073a63132b1cb083952c665191b82a7d6765a61b859575a4b0c2ba84ed17cfb8c88d34179876d64520dd2f75f02fe8707b406da2c0821c
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index 4579366e6071..35a29398e316 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -26,57 +26,6 @@
<flag name="snmp">Includes all UPS drivers that use SNMP.</flag>
<flag name="usb">Includes all UPS drivers that use USB.</flag>
<flag name="xml">Includes all UPS drivers that use XML.</flag>
- <flag name="ups_drivers_al175">Driver for Eltek UPS models with AL175 alarm module</flag>
- <flag name="ups_drivers_bcmxcp">Driver for UPSes supporting the serial BCM/XCP protocol</flag>
- <flag name="ups_drivers_belkin">Driver for Belkin serial UPS equipment</flag>
- <flag name="ups_drivers_belkinunv">Driver for Belkin "Universal UPS" and compatible</flag>
- <flag name="ups_drivers_bestfcom">Driver for Best Power Fortress/Ferrups</flag>
- <flag name="ups_drivers_bestfortress">Driver for old Best Fortress UPS equipment</flag>
- <flag name="ups_drivers_bestuferrups">Driver for Best Power Micro-Ferrups</flag>
- <flag name="ups_drivers_bestups">Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment</flag>
- <flag name="ups_drivers_dummy-ups">Driver for multi-purpose UPS emulation</flag>
- <flag name="ups_drivers_etapro">Driver for ETA UPS equipment</flag>
- <flag name="ups_drivers_everups">Driver for Ever UPS models</flag>
- <flag name="ups_drivers_gamatronic">Driver for Gamatronic UPS equipment</flag>
- <flag name="ups_drivers_genericups">Driver for contact-closure UPS equipment</flag>
- <flag name="ups_drivers_isbmex">Driver for ISBMEX UPS equipment</flag>
- <flag name="ups_drivers_liebert">Driver for Liebert contact-closure UPS equipment</flag>
- <flag name="ups_drivers_liebert-esp2">Driver for Liebert UPS, using the ESP-II serial protocol</flag>
- <flag name="ups_drivers_masterguard">Driver for Masterguard UPS equipment</flag>
- <flag name="ups_drivers_metasys">Driver for Meta System UPS equipment</flag>
- <flag name="ups_drivers_mge-utalk">Driver for MGE UPS SYSTEMS UTalk protocol equipment</flag>
- <flag name="ups_drivers_microdowell">Driver for Microdowell Enterprise UPS series</flag>
- <flag name="ups_drivers_mge-shut">Driver for SHUT Protocol UPS equipment</flag>
- <flag name="ups_drivers_oldmge-shut">Driver for SHUT Protocol UPS equipment (older implementation)</flag>
- <flag name="ups_drivers_oneac">Driver for Oneac UPS equipment</flag>
- <flag name="ups_drivers_optiups">Driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment</flag>
- <flag name="ups_drivers_powercom">UPS driver for serial Powercom/Trust/Advice UPS equipment</flag>
- <flag name="ups_drivers_rhino">Driver for Brazilian Microsol RHINO UPS equipment</flag>
- <flag name="ups_drivers_safenet">Driver for SafeNet compatible UPS equipment</flag>
- <flag name="ups_drivers_solis">Driver for Brazilian Microsol SOLIS UPS equipment</flag>
- <flag name="ups_drivers_tripplite">Driver for Tripp-Lite SmartPro UPS equipment</flag>
- <flag name="ups_drivers_tripplitesu">Driver for Tripp-Lite SmartOnline (SU) UPS equipment</flag>
- <flag name="ups_drivers_upscode2">Driver for UPScode II compatible UPS equipment</flag>
- <flag name="ups_drivers_victronups">Driver for IMV/Victron UPS unit Match, Match Lite, NetUps</flag>
- <flag name="ups_drivers_powerpanel">Driver for PowerPanel Plus compatible UPS equipment</flag>
- <flag name="ups_drivers_blazer_ser">Driver for Megatec/Q1 protocol serial based UPS equipment</flag>
- <flag name="ups_drivers_clone">Fake driver to clone outlets for device grouping</flag>
- <flag name="ups_drivers_clone-outlet">Fake driver to clone outlets for device grouping</flag>
- <flag name="ups_drivers_ivtscd">driver for the IVT Solar Controller Device</flag>
- <flag name="ups_drivers_apcsmart">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
- <flag name="ups_drivers_apcsmart-old">Driver for American Power Conversion Smart Protocol UPS equipment</flag>
- <flag name="ups_drivers_apcupsd-ups">Driver for apcupsd client access</flag>
- <flag name="ups_drivers_riello_ser">Driver for Riello UPS Protocol UPS equipment</flag>
- <flag name="ups_drivers_nutdrv_qx">Driver for Q* protocol serial and USB based UPS equipment</flag>
- <flag name="ups_drivers_usbhid-ups">Driver for USB/HID UPS equipment</flag>
- <flag name="ups_drivers_bcmxcp_usb">Experimental driver for UPSes supporting the BCM/XCP protocol over USB</flag>
- <flag name="ups_drivers_tripplite_usb">Driver for older Tripp Lite USB UPSes (not PDC HID)</flag>
- <flag name="ups_drivers_blazer_usb">Driver for Megatec/Q1 protocol USB based UPS equipment</flag>
- <flag name="ups_drivers_richcomm_usb">Driver UPS equipment using Richcomm dry-contact to USB solution</flag>
- <flag name="ups_drivers_riello_usb">Driver for Riello UPS Protocol UPS equipment via USB</flag>
- <flag name="ups_drivers_netxml-ups">Driver for Eaton / MGE Network Management Card / Proxy (XML/HTTP Protocol) equipment</flag>
- <flag name="ups_drivers_snmp-ups">Multi-MIB Driver for SNMP UPS equipment</flag>
- <flag name="ups_drivers_nut-ipmipsu">Driver for IPMI Power Supply Units (PSU)</flag>
</use>
<upstream>
<remote-id type="github">networkupstools/nut</remote-id>
diff --git a/sys-power/nut/nut-2.7.4-r8.ebuild b/sys-power/nut/nut-2.7.4-r8.ebuild
deleted file mode 100644
index f4f14a439035..000000000000
--- a/sys-power/nut/nut-2.7.4-r8.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic systemd toolchain-funcs
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="https://www.networkupstools.org/"
-SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
-
-IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
-
-CDEPEND="
- acct-group/nut
- acct-user/nut
-"
-
-DEPEND="
- dev-libs/libltdl
- net-libs/libnsl:=
- virtual/udev
- cgi? ( >=media-libs/gd-2[png] )
- ipmi? ( sys-libs/freeipmi )
- snmp? ( net-analyzer/net-snmp:= )
- ssl? ( >=dev-libs/openssl-1:= )
- tcpd? ( sys-apps/tcp-wrappers )
- usb? ( virtual/libusb:0= )
- xml? ( >=net-libs/neon-0.25.0:= )
- zeroconf? ( net-dns/avahi )"
-
-BDEPEND="
- ${CDEPEND}
- virtual/pkgconfig"
-
-RDEPEND="
- ${CDEPEND}
- ${DEPEND}
- selinux? ( sec-policy/selinux-nut )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
-SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
-SNMP_DRIVERLIST="snmp-ups"
-USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
-USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
-#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
-NEONXML_DRIVERLIST="netxml-ups"
-IPMI_DRIVERLIST="nut-ipmipsu"
-# Now we build from it:
-for name in ${SERIAL_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
-done
-for name in ${USB_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
-done
-for name in ${NEONXML_DRIVERLIST}; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
-done
-for name in ${SNMP_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
-done
-for name in ${IPMI_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
-done
-IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
-
-# public files should be 644 root:root
-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}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
- "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
- "${FILESDIR}"/nut-openssl-1.1-support.patch
- "${FILESDIR}"/nut-2.7.4-py3.patch
- "${FILESDIR}"/nut-2.7.4-nut-scanner.patch
- "${FILESDIR}"/nut-2.7.4-slibtool.patch
-)
-
-src_prepare() {
- default
-
- sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
- -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
- -i configure.ac || die
-
- sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
- -i scripts/udev/Makefile.am || die
-
- rm ltmain.sh m4/lt* m4/libtool.m4 || die
-
- sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
- -i lib/libupsclient{.pc,-config}.in || die #361685
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- filter-lto
- # bug #786702
- append-cxxflags -std=c++14
-
- tc-export CC
- tc-export CXX
- tc-export AR
-
- local UPS_DRIVERS=""
- for u in $USE ; do
- u2=${u#ups_drivers_}
- [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
- done
- UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
- myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
-
- use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
-
- # TODO: USE flag for sys-power/powerman
- econf \
- --sysconfdir=/etc/nut \
- --datarootdir=/usr/share/nut \
- --datadir=/usr/share/nut \
- --disable-static \
- --with-statepath=/var/lib/nut \
- --with-drvpath=/$(get_libdir)/nut \
- --with-htmlpath=/usr/share/nut/html \
- --with-user=nut \
- --with-group=nut \
- --with-logfacility=LOG_DAEMON \
- --with-dev \
- --with-serial \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- --without-powerman \
- $(use_with cgi) \
- $(use_with ipmi) \
- $(use_with ipmi freeipmi) \
- $(use_with snmp) \
- $(use_with ssl) \
- $(use_with tcpd wrap) \
- $(use_with usb) \
- $(use_with xml neon) \
- $(use_with zeroconf avahi) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- find "${D}" -name '*.la' -delete || die
-
- dodir /sbin
- use split-usr && dosym ../usr/sbin/upsdrvctl /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/}" || die
- done
-
- local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING )
- einstalldocs
-
- 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.6.5-init.d-upsd upsd
- newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
- newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
-
- keepdir /var/lib/nut
-
- einfo "Setting up permissions on files and directories"
- 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}
-
- # 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 virtual/udev; then
- einfo "Installing non-udev hotplug support"
- insinto /etc/hotplug/usb
- insopts -m 755
- doins scripts/hotplug/nut-usbups.hotplug
- fi
-
- newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
- bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
-}
-
-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
-
- # 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
-}
-
-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."
- ${msgfunc} ''
- ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
- ${msgfunc} ''
- ${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"
- ${msgfunc} ''
- ${msgfunc} 'If you want apcupsd to power off your UPS when it'
- ${msgfunc} 'shuts down your system in a power failure, you must'
- ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
- ${msgfunc} ''
- ${msgfunc} 'rc-update add nut.powerfail shutdown'
- ${msgfunc} ''
-
-}
diff --git a/sys-power/nut/nut-2.8.0-r2.ebuild b/sys-power/nut/nut-2.8.0-r2.ebuild
deleted file mode 100644
index d196168233bc..000000000000
--- a/sys-power/nut/nut-2.8.0-r2.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 flag-o-matic linux-info optfeature systemd
-inherit tmpfiles toolchain-funcs udev
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="https://networkupstools.org/"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/networkupstools/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd test xml zeroconf"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- acct-group/nut
- acct-user/nut
- dev-libs/libltdl
- virtual/udev
- cgi? ( >=media-libs/gd-2[png] )
- i2c? ( sys-apps/i2c-tools )
- ipmi? ( sys-libs/freeipmi )
- modbus? ( dev-libs/libmodbus )
- snmp? ( net-analyzer/net-snmp:= )
- ssl? ( >=dev-libs/openssl-1:= )
- tcpd? ( sys-apps/tcp-wrappers )
- usb? ( virtual/libusb:1 )
- xml? ( >=net-libs/neon-0.25.0:= )
- zeroconf? ( net-dns/avahi )
-"
-BDEPEND="
- virtual/pkgconfig
- man? ( app-text/asciidoc )
- test? ( dev-util/cppunit )
-"
-RDEPEND="
- ${DEPEND}
- selinux? ( sec-policy/selinux-nut )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch"
-)
-
-pkg_pretend() {
- if use i2c; then
- CONFIG_CHECK="~I2C_CHARDEV"
- ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
- fi
- if use usb; then
- CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
- ERROR_HIDRAW="HIDRAW is needed to support USB UPSes"
- ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB UPSes"
- fi
- if use serial; then
- CONFIG_CHECK="~SERIAL_8250"
- ERROR_SERIAL_8250="SERIAL_8250 is needed to support Serial UPSes"
- fi
-
- # Now do the actual checks setup above
- check_extra_config
-}
-
-src_prepare() {
- default
-
- if [[ ${PV} == *9999 ]] ; then
- ./autogen.sh || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --datadir=/usr/share/nut
- --datarootdir=/usr/share/nut
- --disable-static
- --disable-strip
- --disable-Werror
- --sysconfdir=/etc/nut
- --with-dev
- --with-drvpath="/$(get_libdir)/nut"
- --with-group=nut
- --with-htmlpath=/usr/share/nut/html
- --with-logfacility=LOG_DAEMON
- --with-statepath=/var/lib/nut
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- --with-systemdtmpfilesdir="/usr/lib/tmpfiles.d"
- --with-udev-dir="$(get_udevdir)"
- --with-user=nut
- --without-powerman
- --without-python
- --without-python2
- --without-python3
- --with-altpidpath=/run/nut
- --with-pidpath=/run/nut
- $(use_enable test cppunit)
- $(use_with cgi)
- $(use_with i2c linux_i2c)
- $(use_with ipmi freeipmi)
- $(use_with ipmi)
- $(use_with serial)
- $(use_with snmp)
- $(use_with ssl)
- $(use_with tcpd wrap)
- $(use_with usb)
- $(use_with xml neon)
- $(use_with zeroconf avahi)
- )
-
- filter-lto
- append-flags -fno-lto
- tc-export CC CXX AR
-
- use cgi && myeconfargs+=( --with-cgipath=/usr/share/nut/cgi )
- use man && myeconfargs+=( --with-doc=man )
-
- export bashcompdir="$(get_bashcompdir)"
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm -rf "${ED}/etc/hotplug" || die
-
- find "${ED}" -name '*.la' -delete || die
-
- dodir /sbin
- use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
-
- if use cgi; then
- elog "CGI monitoring scripts are installed in ${EPREFIX}/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."
- elog
- elog "Use script aliases according to the web server you use (apache, nginx, lighttpd, etc...)"
- fi
-
- # This must be done after all of the install phases
- local i
- for i in "${ED}"/etc/nut/*.sample ; do
- mv "${i}" "${i/.sample/}" || die
- done
-
- local DOCS=( AUTHORS MAINTAINERS NEWS README TODO UPGRADING )
- einstalldocs
-
- if use doc; then
- newdoc lib/README README.lib
- dodoc docs/*.txt
- docinto cables
- dodoc docs/cables/*
- fi
-
- newinitd "${FILESDIR}"/nut-2.8.0-init.d-upsd upsd
- newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
- newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
-
- newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
- bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
-
- if use zeroconf; then
- insinto /etc/avahi/services
- doins scripts/avahi/nut.service
- fi
-
- mv "${ED}"/usr/lib/tmpfiles.d/nut-common.tmpfiles "${ED}"/usr/lib/tmpfiles.d/nut-common-tmpfiles.conf || die
-
- # Fix double directory
- sed -i -e 's:/nut/nut:/nut:g' "${ED}"/usr/lib/tmpfiles.d/nut-common-tmpfiles.conf || die
-}
-
-pkg_postinst() {
- elog "Please note that NUT now runs under the 'nut' user."
- elog "NUT is in the uucp group for access to RS-232 UPS."
- elog "However if you use a USB UPS you may need to look at the udev or"
- elog "hotplug rules that are installed, and alter them suitably."
- elog
- elog "You are strongly advised to read the UPGRADING file provided by upstream."
- elog
- elog "Please note that upsdrv is NOT automatically started by upsd anymore."
- elog "If you have multiple UPS units, you can use their NUT names to"
- elog "have a service per UPS:"
- elog "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME"
- 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 nut.powerfail to your shutdown runlevel:'
- elog
- elog 'rc-update add nut.powerfail shutdown'
- elog
-
- optfeature "all notify events generate a global message (wall) to all users, plus they are logged via the syslog" \
- sys-apps/util-linux[logger,tty-helpers]
-
- udev_reload
-
- tmpfiles_process nut-common-tmpfiles.conf
-}
-
-pkg_postrm() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-02-06 6:54 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2024-02-06 6:54 UTC (permalink / raw
To: gentoo-commits
commit: dd6d354017b7ae633231d0a976a301745c8f3cd8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 06:53:54 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 06:53:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6d3540
sys-power/nut: Stabilize 2.8.0-r3 arm, #923861
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.0-r3.ebuild b/sys-power/nut/nut-2.8.0-r3.ebuild
index e715c0a515da..fbde9a676af0 100644
--- a/sys-power/nut/nut-2.8.0-r3.ebuild
+++ b/sys-power/nut/nut-2.8.0-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-02-06 6:47 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2024-02-06 6:47 UTC (permalink / raw
To: gentoo-commits
commit: c6fbcbcb1d594f0c74f0781bd5473167dfd4a976
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 06:47:10 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 06:47:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6fbcbcb
sys-power/nut: Stabilize 2.8.0-r3 ppc64, #923861
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.0-r3.ebuild b/sys-power/nut/nut-2.8.0-r3.ebuild
index 651720bb40ac..e715c0a515da 100644
--- a/sys-power/nut/nut-2.8.0-r3.ebuild
+++ b/sys-power/nut/nut-2.8.0-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-02-06 6:25 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2024-02-06 6:25 UTC (permalink / raw
To: gentoo-commits
commit: d3cf0d9dacbec940b88a06820216769e0b37cc92
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 06:16:45 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 06:16:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3cf0d9d
sys-power/nut: Stabilize 2.8.0-r3 x86, #923861
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-power/nut/nut-2.8.0-r3.ebuild b/sys-power/nut/nut-2.8.0-r3.ebuild
index 20eea7107c63..873c0d530443 100644
--- a/sys-power/nut/nut-2.8.0-r3.ebuild
+++ b/sys-power/nut/nut-2.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-02-06 6:25 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2024-02-06 6:25 UTC (permalink / raw
To: gentoo-commits
commit: 9c6ec7039100f47d613f815f7e1a51bb64ecaa37
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 06:17:02 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 06:17:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6ec703
sys-power/nut: Stabilize 2.8.0-r3 amd64, #923861
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.0-r3.ebuild b/sys-power/nut/nut-2.8.0-r3.ebuild
index 873c0d530443..651720bb40ac 100644
--- a/sys-power/nut/nut-2.8.0-r3.ebuild
+++ b/sys-power/nut/nut-2.8.0-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-01-17 2:46 Ionen Wolkens
0 siblings, 0 replies; 62+ messages in thread
From: Ionen Wolkens @ 2024-01-17 2:46 UTC (permalink / raw
To: gentoo-commits
commit: 1916cd9491c99053540fedf87ff524cc43161b99
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Jan 16 20:25:42 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 02:44:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1916cd94
sys-power/nut: Stabilize 2.8.0-r2 arm, #920226
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-power/nut/nut-2.8.0-r2.ebuild b/sys-power/nut/nut-2.8.0-r2.ebuild
index 4e661fae5ce2..d196168233bc 100644
--- a/sys-power/nut/nut-2.8.0-r2.ebuild
+++ b/sys-power/nut/nut-2.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2024-01-01 0:12 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2024-01-01 0:12 UTC (permalink / raw
To: gentoo-commits
commit: 53b5eaaeadda10e7c5591a9ff9452e9dde21af78
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Dec 31 18:48:50 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 00:12:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b5eaae
sys-power/nut: fix confusing split-usr handling
Almost a decade ago, upstream moved their binary from libdir to sbindir.
Historically, Gentoo symlinked the binary into sbindir to make up for
this -- and when upstream moved to follow the Gentoo layout, the Gentoo
symlink overwrote the actual binary.
For some reason, at the time, the solution used was to add a
USE=split-usr and install extra symlinks for /sbin -> /usr/sbin even
though this didn't actually do something meaningful. The split-usr USE
flag has issues and using it unnecessarily should be avoided if
possible. Drop the USE flag, and the symlink, and stick with /usr/sbin
as upstream intends.
This should be 100% fine in all cases. The /sbin directory is only
needed for users who both have /usr on a different partition, *and*
don't use an initramfs. In such a case, it is nonsensical to provide a
symlink in /sbin that is a broken symlink to an un-mounted partition.
Bug: https://bugs.gentoo.org/517954
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../nut/{nut-9999.ebuild => nut-2.8.0-r3.ebuild} | 65 ++++------------------
sys-power/nut/nut-9999.ebuild | 3 +-
2 files changed, 12 insertions(+), 56 deletions(-)
diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-2.8.0-r3.ebuild
similarity index 73%
copy from sys-power/nut/nut-9999.ebuild
copy to sys-power/nut/nut-2.8.0-r3.ebuild
index a56635519b2d..20eea7107c63 100644
--- a/sys-power/nut/nut-9999.ebuild
+++ b/sys-power/nut/nut-2.8.0-r3.ebuild
@@ -3,9 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 desktop flag-o-matic linux-info optfeature
-inherit python-single-r1 systemd tmpfiles toolchain-funcs udev wrapper xdg
+inherit bash-completion-r1 flag-o-matic linux-info optfeature systemd
+inherit tmpfiles toolchain-funcs udev
MY_P=${P/_/-}
@@ -17,37 +16,27 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
fi
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="0"
-IUSE="gpio cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd test xml zeroconf python monitor systemd"
+IUSE="cgi doc ipmi serial i2c +man snmp +usb modbus selinux ssl tcpd test xml zeroconf"
RESTRICT="!test? ( test )"
-REQUIRED_USE="
- monitor? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- snmp? ( python )
-"
-
-# sys-apps/systemd-253 required for Type=notify-reload
DEPEND="
acct-group/nut
acct-user/nut
dev-libs/libltdl
virtual/udev
cgi? ( >=media-libs/gd-2[png] )
- gpio? ( dev-libs/libgpiod )
i2c? ( sys-apps/i2c-tools )
ipmi? ( sys-libs/freeipmi )
modbus? ( dev-libs/libmodbus )
- python? ( ${PYTHON_DEPS} )
snmp? ( net-analyzer/net-snmp:= )
ssl? ( >=dev-libs/openssl-1:= )
- systemd? ( >=sys-apps/systemd-253 )
tcpd? ( sys-apps/tcp-wrappers )
usb? ( virtual/libusb:1 )
xml? ( >=net-libs/neon-0.25.0:= )
@@ -60,16 +49,11 @@ BDEPEND="
"
RDEPEND="
${DEPEND}
- monitor? ( $(python_gen_cond_dep '
- dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
- ')
- )
selinux? ( sec-policy/selinux-nut )
"
PATCHES=(
"${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch"
- "${FILESDIR}/systemd_notify.path"
)
pkg_pretend() {
@@ -82,10 +66,6 @@ pkg_pretend() {
ERROR_HIDRAW="HIDRAW is needed to support USB UPSes"
ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB UPSes"
fi
- if use gpio; then
- CONFIG_CHECK="~GPIO_CDEV_V1"
- ERROR_GPIO_CDEV_V1="GPIO_CDEV_V1 is needed to support GPIO UPSes"
- fi
if use serial; then
CONFIG_CHECK="~SERIAL_8250"
ERROR_SERIAL_8250="SERIAL_8250 is needed to support Serial UPSes"
@@ -95,18 +75,12 @@ pkg_pretend() {
check_extra_config
}
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
src_prepare() {
default
if [[ ${PV} == *9999 ]] ; then
./autogen.sh || die
fi
-
- xdg_environment_reset
}
src_configure() {
@@ -130,19 +104,17 @@ src_configure() {
--without-powerman
--without-python
--without-python2
+ --without-python3
--with-altpidpath=/run/nut
--with-pidpath=/run/nut
+ $(use_enable test cppunit)
$(use_with cgi)
- $(use_with gpio)
$(use_with i2c linux_i2c)
$(use_with ipmi freeipmi)
$(use_with ipmi)
- $(use_with monitor nut_monitor)
- $(use_with python pynut)
$(use_with serial)
$(use_with snmp)
$(use_with ssl)
- $(use_with systemd libsystemd)
$(use_with tcpd wrap)
$(use_with usb)
$(use_with xml neon)
@@ -155,7 +127,6 @@ src_configure() {
use cgi && myeconfargs+=( --with-cgipath=/usr/share/nut/cgi )
use man && myeconfargs+=( --with-doc=man )
- use python && myeconfargs+=( --with-python3="${PYTHON}" ) || myeconfargs+=( --without-python3 )
export bashcompdir="$(get_bashcompdir)"
@@ -170,7 +141,6 @@ src_install() {
find "${ED}" -name '*.la' -delete || die
dodir /sbin
- use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
if use cgi; then
elog "CGI monitoring scripts are installed in ${EPREFIX}/usr/share/nut/cgi."
@@ -187,11 +157,11 @@ src_install() {
mv "${i}" "${i/.sample/}" || die
done
- local DOCS=( AUTHORS MAINTAINERS NEWS.adoc README.adoc TODO.adoc UPGRADING.adoc )
+ local DOCS=( AUTHORS MAINTAINERS NEWS README TODO UPGRADING )
einstalldocs
if use doc; then
- newdoc lib/README.adoc
+ newdoc lib/README README.lib
dodoc docs/*.txt
docinto cables
dodoc docs/cables/*
@@ -211,21 +181,10 @@ src_install() {
doins scripts/avahi/nut.service
fi
- if use monitor; then
- make_wrapper NUT-Monitor-py3qt5 /usr/share/nut/nut-monitor/app/NUT-Monitor-py3qt5 /usr/share/nut/nut-monitor/app
-
- # Install desktop shortcut
- newmenu scripts/python/app/nut-monitor-py3qt5.desktop nut-monitor.desktop
-
- # Installing Application icons
- local res
- for res in 48 64 256; do
- doicon -s ${res} scripts/python/app/icons/${res}x${res}/nut-monitor.png
- done
- doicon -s scalable scripts/python/app/icons/scalable/nut-monitor.svg
- fi
+ mv "${ED}"/usr/lib/tmpfiles.d/nut-common.tmpfiles "${ED}"/usr/lib/tmpfiles.d/nut-common-tmpfiles.conf || die
- use python && python_optimize
+ # Fix double directory
+ sed -i -e 's:/nut/nut:/nut:g' "${ED}"/usr/lib/tmpfiles.d/nut-common-tmpfiles.conf || die
}
pkg_postinst() {
@@ -254,10 +213,8 @@ pkg_postinst() {
udev_reload
tmpfiles_process nut-common-tmpfiles.conf
- xdg_pkg_postinst
}
pkg_postrm() {
udev_reload
- xdg_pkg_postrm
}
diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-9999.ebuild
index a56635519b2d..22a0e6bc597a 100644
--- a/sys-power/nut/nut-9999.ebuild
+++ b/sys-power/nut/nut-9999.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="0"
-IUSE="gpio cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd test xml zeroconf python monitor systemd"
+IUSE="gpio cgi doc ipmi serial i2c +man snmp +usb modbus selinux ssl tcpd test xml zeroconf python monitor systemd"
RESTRICT="!test? ( test )"
REQUIRED_USE="
@@ -170,7 +170,6 @@ src_install() {
find "${ED}" -name '*.la' -delete || die
dodir /sbin
- use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
if use cgi; then
elog "CGI monitoring scripts are installed in ${EPREFIX}/usr/share/nut/cgi."
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-12-18 13:36 Joonas Niilola
0 siblings, 0 replies; 62+ messages in thread
From: Joonas Niilola @ 2023-12-18 13:36 UTC (permalink / raw
To: gentoo-commits
commit: 6a3920e13c3222d2fe7907d94a1a5b94423f8b60
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 13:36:35 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 13:36:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3920e1
sys-power/nut: Stabilize 2.8.0-r2 x86, #920226
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.0-r2.ebuild b/sys-power/nut/nut-2.8.0-r2.ebuild
index 8bc7d5fc8647..4e661fae5ce2 100644
--- a/sys-power/nut/nut-2.8.0-r2.ebuild
+++ b/sys-power/nut/nut-2.8.0-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-12-18 1:09 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2023-12-18 1:09 UTC (permalink / raw
To: gentoo-commits
commit: d6d515e3c0de29905736b61743d13fa2f4858ee7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 01:08:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 01:08:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6d515e3
sys-power/nut: Stabilize 2.8.0-r2 amd64, #920226
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.0-r2.ebuild b/sys-power/nut/nut-2.8.0-r2.ebuild
index e48706e11534..8bc7d5fc8647 100644
--- a/sys-power/nut/nut-2.8.0-r2.ebuild
+++ b/sys-power/nut/nut-2.8.0-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-12-18 0:11 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2023-12-18 0:11 UTC (permalink / raw
To: gentoo-commits
commit: dde931cf5d7ed7346c25a6d9fdd1feb24dcb5192
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 00:11:16 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 00:11:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde931cf
sys-power/nut: Stabilize 2.8.0-r2 ppc64, #920226
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.0-r2.ebuild b/sys-power/nut/nut-2.8.0-r2.ebuild
index be431f111c9e..e48706e11534 100644
--- a/sys-power/nut/nut-2.8.0-r2.ebuild
+++ b/sys-power/nut/nut-2.8.0-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-12-11 13:04 Joonas Niilola
0 siblings, 0 replies; 62+ messages in thread
From: Joonas Niilola @ 2023-12-11 13:04 UTC (permalink / raw
To: gentoo-commits
commit: d20e5788358b90edc2545386d0704981699f539c
Author: Francisco Javier Félix <web <AT> inode64 <DOT> com>
AuthorDate: Fri Sep 15 12:58:20 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 12:58:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20e5788
sys-power/nut: Rename asciidoc-ready documentation sources to *.adoc
https://github.com/networkupstools/nut/commit/83f3d8b18143baea8da0584ab11f3a4f59f56738
Signed-off-by: INODE64 <web <AT> inode64.com>
Closes: https://github.com/gentoo/gentoo/pull/32800
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-power/nut/nut-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-9999.ebuild
index 1d0b5e50edae..a56635519b2d 100644
--- a/sys-power/nut/nut-9999.ebuild
+++ b/sys-power/nut/nut-9999.ebuild
@@ -187,11 +187,11 @@ src_install() {
mv "${i}" "${i/.sample/}" || die
done
- local DOCS=( AUTHORS MAINTAINERS NEWS README TODO UPGRADING )
+ local DOCS=( AUTHORS MAINTAINERS NEWS.adoc README.adoc TODO.adoc UPGRADING.adoc )
einstalldocs
if use doc; then
- newdoc lib/README README.lib
+ newdoc lib/README.adoc
dodoc docs/*.txt
docinto cables
dodoc docs/cables/*
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-08-09 3:34 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2023-08-09 3:34 UTC (permalink / raw
To: gentoo-commits
commit: 027889960310a752b445a25d5b378c502ce72bac
Author: Francisco Javier Félix <web <AT> inode64 <DOT> com>
AuthorDate: Tue Aug 8 08:38:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 03:29:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02788996
sys-power/nut: Fix missing cgi flag in configure
Closes: https://bugs.gentoo.org/908689
Signed-off-by: INODE64 <web <AT> inode64.com>
Closes: https://github.com/gentoo/gentoo/pull/32218
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/{nut-2.8.0-r1.ebuild => nut-2.8.0-r2.ebuild} | 1 +
sys-power/nut/nut-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/sys-power/nut/nut-2.8.0-r1.ebuild b/sys-power/nut/nut-2.8.0-r2.ebuild
similarity index 99%
rename from sys-power/nut/nut-2.8.0-r1.ebuild
rename to sys-power/nut/nut-2.8.0-r2.ebuild
index a7497d227ba4..be431f111c9e 100644
--- a/sys-power/nut/nut-2.8.0-r1.ebuild
+++ b/sys-power/nut/nut-2.8.0-r2.ebuild
@@ -108,6 +108,7 @@ src_configure() {
--with-altpidpath=/run/nut
--with-pidpath=/run/nut
$(use_enable test cppunit)
+ $(use_with cgi)
$(use_with i2c linux_i2c)
$(use_with ipmi freeipmi)
$(use_with ipmi)
diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-9999.ebuild
index 1a18e915356e..1d0b5e50edae 100644
--- a/sys-power/nut/nut-9999.ebuild
+++ b/sys-power/nut/nut-9999.ebuild
@@ -132,6 +132,7 @@ src_configure() {
--without-python2
--with-altpidpath=/run/nut
--with-pidpath=/run/nut
+ $(use_with cgi)
$(use_with gpio)
$(use_with i2c linux_i2c)
$(use_with ipmi freeipmi)
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-06-24 1:18 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2023-06-24 1:18 UTC (permalink / raw
To: gentoo-commits
commit: 705b0ab9398948989874a4894c13cb79713c0466
Author: Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Thu Jun 8 01:13:25 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 01:16:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705b0ab9
sys-power/nut: replace 'append-flags -fno-lto' with filter-lto
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me>
Closes: https://github.com/gentoo/gentoo/pull/31345
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r8.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-power/nut/nut-2.7.4-r8.ebuild b/sys-power/nut/nut-2.7.4-r8.ebuild
index 52ae7661079a..f4f14a439035 100644
--- a/sys-power/nut/nut-2.7.4-r8.ebuild
+++ b/sys-power/nut/nut-2.7.4-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -112,7 +112,7 @@ src_prepare() {
src_configure() {
local myconf
- append-flags -fno-lto
+ filter-lto
# bug #786702
append-cxxflags -std=c++14
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-06-17 17:11 Arthur Zamarin
0 siblings, 0 replies; 62+ messages in thread
From: Arthur Zamarin @ 2023-06-17 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 807087baa57608727434e86dfe381057f4ab2b10
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 17:11:41 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 17:11:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807087ba
sys-power/nut: Keyword 2.8.0-r1 arm, #908616
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.0-r1.ebuild b/sys-power/nut/nut-2.8.0-r1.ebuild
index dbb545acd3c3..a7497d227ba4 100644
--- a/sys-power/nut/nut-2.8.0-r1.ebuild
+++ b/sys-power/nut/nut-2.8.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-06-17 17:11 Arthur Zamarin
0 siblings, 0 replies; 62+ messages in thread
From: Arthur Zamarin @ 2023-06-17 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 6767c41adf28ec241b5c0ddc18ebc37813215097
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 17:11:19 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 17:11:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6767c41a
sys-power/nut: Keyword 2.8.0-r1 ppc64, #908616
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.0-r1.ebuild b/sys-power/nut/nut-2.8.0-r1.ebuild
index 10abc07e865d..dbb545acd3c3 100644
--- a/sys-power/nut/nut-2.8.0-r1.ebuild
+++ b/sys-power/nut/nut-2.8.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-06-17 15:48 Arthur Zamarin
0 siblings, 0 replies; 62+ messages in thread
From: Arthur Zamarin @ 2023-06-17 15:48 UTC (permalink / raw
To: gentoo-commits
commit: 531eda8c82d4663bc0ea0af2bfed3382796c14d9
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 15:48:26 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 15:48:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531eda8c
sys-power/nut: Keyword 2.8.0-r1 ppc, #908616
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.0-r1.ebuild b/sys-power/nut/nut-2.8.0-r1.ebuild
index 27cda2cd2eb4..10abc07e865d 100644
--- a/sys-power/nut/nut-2.8.0-r1.ebuild
+++ b/sys-power/nut/nut-2.8.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-06-17 10:33 Yixun Lan
0 siblings, 0 replies; 62+ messages in thread
From: Yixun Lan @ 2023-06-17 10:33 UTC (permalink / raw
To: gentoo-commits
commit: 91bf2a6c787c93f9a107da52351ea33d33e45474
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 10:33:13 2023 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 10:33:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bf2a6c
sys-power/nut: Keyword 2.8.0-r1 riscv, #908616
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.8.0-r1.ebuild b/sys-power/nut/nut-2.8.0-r1.ebuild
index 653fa007ed62..27cda2cd2eb4 100644
--- a/sys-power/nut/nut-2.8.0-r1.ebuild
+++ b/sys-power/nut/nut-2.8.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-06-17 3:56 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2023-06-17 3:56 UTC (permalink / raw
To: gentoo-commits
commit: 89cc2a869a484dbc9d244f8f0ee375ee2d8ff894
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 03:56:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 03:56:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89cc2a86
sys-power/nut: fix typo + error
- Fix whitespace typo
- Oops, the elog is in src_install, not pkg_postinst, so EPREFIX.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.8.0-r1.ebuild | 2 +-
sys-power/nut/nut-9999.ebuild | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sys-power/nut/nut-2.8.0-r1.ebuild b/sys-power/nut/nut-2.8.0-r1.ebuild
index c08bb5d648d0..653fa007ed62 100644
--- a/sys-power/nut/nut-2.8.0-r1.ebuild
+++ b/sys-power/nut/nut-2.8.0-r1.ebuild
@@ -143,7 +143,7 @@ src_install() {
use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
if use cgi; then
- elog "CGI monitoring scripts are installed in ${EROOT}/usr/share/nut/cgi."
+ elog "CGI monitoring scripts are installed in ${EPREFIX}/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."
diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-9999.ebuild
index 0b2f92a75a29..1a18e915356e 100644
--- a/sys-power/nut/nut-9999.ebuild
+++ b/sys-power/nut/nut-9999.ebuild
@@ -20,7 +20,6 @@ else
KEYWORDS="~amd64 ~arm64 ~x86"
fi
-
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
@@ -173,7 +172,7 @@ src_install() {
use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
if use cgi; then
- elog "CGI monitoring scripts are installed in ${EROOT}/usr/share/nut/cgi."
+ elog "CGI monitoring scripts are installed in ${EPREFIX}/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."
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-06-17 3:55 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2023-06-17 3:55 UTC (permalink / raw
To: gentoo-commits
commit: a84735cb1e18ea166a702da5dc48f20e89f86fbb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 03:47:13 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 03:54:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a84735cb
sys-power/nut: misc tweaks
- Style tweaks to be closer to skel.ebuild
- Use EROOT and ED where appropriate
- Add missing 'local'
- Fix typo in pkg_postinst optfeature for util-linux
- Add additional configure options for tmpfiles, udev paths
- Wire up tests
Closes: https://bugs.gentoo.org/908615
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../nut/{nut-2.8.0.ebuild => nut-2.8.0-r1.ebuild} | 66 ++++++++++----------
sys-power/nut/nut-9999.ebuild | 71 +++++++++++-----------
2 files changed, 66 insertions(+), 71 deletions(-)
diff --git a/sys-power/nut/nut-2.8.0.ebuild b/sys-power/nut/nut-2.8.0-r1.ebuild
similarity index 83%
rename from sys-power/nut/nut-2.8.0.ebuild
rename to sys-power/nut/nut-2.8.0-r1.ebuild
index 163885862062..c08bb5d648d0 100644
--- a/sys-power/nut/nut-2.8.0.ebuild
+++ b/sys-power/nut/nut-2.8.0-r1.ebuild
@@ -3,30 +3,35 @@
EAPI=8
-inherit bash-completion-r1 flag-o-matic linux-info optfeature systemd tmpfiles toolchain-funcs udev
+inherit bash-completion-r1 flag-o-matic linux-info optfeature systemd
+inherit tmpfiles toolchain-funcs udev
MY_P=${P/_/-}
DESCRIPTION="Network-UPS Tools"
HOMEPAGE="https://networkupstools.org/"
-if [[ "${PV}" == *9999 ]] ; then
- inherit git-r3
+
+if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/networkupstools/${PN}.git"
+ inherit git-r3
else
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
+S="${WORKDIR}/${MY_P}"
+
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd xml zeroconf"
+IUSE="cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd test xml zeroconf"
+RESTRICT="!test? ( test )"
DEPEND="
acct-group/nut
acct-user/nut
- cgi? ( >=media-libs/gd-2[png] )
dev-libs/libltdl
+ virtual/udev
+ cgi? ( >=media-libs/gd-2[png] )
i2c? ( sys-apps/i2c-tools )
ipmi? ( sys-libs/freeipmi )
modbus? ( dev-libs/libmodbus )
@@ -34,23 +39,19 @@ DEPEND="
ssl? ( >=dev-libs/openssl-1:= )
tcpd? ( sys-apps/tcp-wrappers )
usb? ( virtual/libusb:1 )
- virtual/udev
xml? ( >=net-libs/neon-0.25.0:= )
zeroconf? ( net-dns/avahi )
"
-
BDEPEND="
- man? ( app-text/asciidoc )
virtual/pkgconfig
+ man? ( app-text/asciidoc )
+ test? ( dev-util/cppunit )
"
-
RDEPEND="
${DEPEND}
selinux? ( sec-policy/selinux-nut )
"
-S="${WORKDIR}/${MY_P}"
-
PATCHES=(
"${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch"
)
@@ -74,18 +75,11 @@ pkg_pretend() {
check_extra_config
}
-src_unpack() {
- if [[ "${PV}" == *9999 ]] ; then
- git-r3_src_unpack
- fi
- default
-}
-
src_prepare() {
default
- if [[ "${PV}" == *9999 ]] ; then
- ./autogen.sh
+ if [[ ${PV} == *9999 ]] ; then
+ ./autogen.sh || die
fi
}
@@ -94,6 +88,8 @@ src_configure() {
--datadir=/usr/share/nut
--datarootdir=/usr/share/nut
--disable-static
+ --disable-strip
+ --disable-Werror
--sysconfdir=/etc/nut
--with-dev
--with-drvpath="/$(get_libdir)/nut"
@@ -102,6 +98,8 @@ src_configure() {
--with-logfacility=LOG_DAEMON
--with-statepath=/var/lib/nut
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-systemdtmpfilesdir="/usr/lib/tmpfiles.d"
+ --with-udev-dir="$(get_udevdir)"
--with-user=nut
--without-powerman
--without-python
@@ -109,6 +107,7 @@ src_configure() {
--without-python3
--with-altpidpath=/run/nut
--with-pidpath=/run/nut
+ $(use_enable test cppunit)
$(use_with i2c linux_i2c)
$(use_with ipmi freeipmi)
$(use_with ipmi)
@@ -121,11 +120,9 @@ src_configure() {
$(use_with zeroconf avahi)
)
+ filter-lto
append-flags -fno-lto
-
- tc-export CC
- tc-export CXX
- tc-export AR
+ tc-export CC CXX AR
use cgi && myeconfargs+=( --with-cgipath=/usr/share/nut/cgi )
use man && myeconfargs+=( --with-doc=man )
@@ -138,15 +135,15 @@ src_configure() {
src_install() {
default
- rm -rf "${D}/etc/hotplug" || die
+ rm -rf "${ED}/etc/hotplug" || die
- find "${D}" -name '*.la' -delete || die
+ find "${ED}" -name '*.la' -delete || die
dodir /sbin
use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
if use cgi; then
- elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
+ elog "CGI monitoring scripts are installed in ${EROOT}/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."
@@ -154,8 +151,9 @@ src_install() {
elog "Use script aliases according to the web server you use (apache, nginx, lighttpd, etc...)"
fi
- # this must be done after all of the install phases
- for i in "${D}"/etc/nut/*.sample ; do
+ # This must be done after all of the install phases
+ local i
+ for i in "${ED}"/etc/nut/*.sample ; do
mv "${i}" "${i/.sample/}" || die
done
@@ -183,10 +181,10 @@ src_install() {
doins scripts/avahi/nut.service
fi
- mv "${D}"/usr/lib/tmpfiles.d/nut-common.tmpfiles "${D}"/usr/lib/tmpfiles.d/nut-common-tmpfiles.conf || die
+ mv "${ED}"/usr/lib/tmpfiles.d/nut-common.tmpfiles "${ED}"/usr/lib/tmpfiles.d/nut-common-tmpfiles.conf || die
# Fix double directory
- sed -i -e 's:/nut/nut:/nut:g' "${D}"/usr/lib/tmpfiles.d/nut-common-tmpfiles.conf || die
+ sed -i -e 's:/nut/nut:/nut:g' "${ED}"/usr/lib/tmpfiles.d/nut-common-tmpfiles.conf || die
}
pkg_postinst() {
@@ -210,7 +208,7 @@ pkg_postinst() {
elog
optfeature "all notify events generate a global message (wall) to all users, plus they are logged via the syslog" \
- sys-apps/util-linu[logger,tty-helpers]
+ sys-apps/util-linux[logger,tty-helpers]
udev_reload
diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-9999.ebuild
index 445fb3b9c78d..0b2f92a75a29 100644
--- a/sys-power/nut/nut-9999.ebuild
+++ b/sys-power/nut/nut-9999.ebuild
@@ -3,26 +3,30 @@
EAPI=8
-PYTHON_COMPAT=(python3_{10..12})
-inherit bash-completion-r1 desktop flag-o-matic linux-info optfeature python-single-r1 systemd tmpfiles \
- toolchain-funcs udev wrapper xdg
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 desktop flag-o-matic linux-info optfeature
+inherit python-single-r1 systemd tmpfiles toolchain-funcs udev wrapper xdg
MY_P=${P/_/-}
DESCRIPTION="Network-UPS Tools"
HOMEPAGE="https://networkupstools.org/"
-if [[ "${PV}" == *9999 ]] ; then
- inherit git-r3
+
+if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/networkupstools/${PN}.git"
+ inherit git-r3
else
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
+
+S="${WORKDIR}/${MY_P}"
+
LICENSE="GPL-2"
SLOT="0"
-
-IUSE="gpio cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd xml zeroconf python monitor systemd"
+IUSE="gpio cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd test xml zeroconf python monitor systemd"
+RESTRICT="!test? ( test )"
REQUIRED_USE="
monitor? ( python )
@@ -30,11 +34,13 @@ REQUIRED_USE="
snmp? ( python )
"
+# sys-apps/systemd-253 required for Type=notify-reload
DEPEND="
acct-group/nut
acct-user/nut
- cgi? ( >=media-libs/gd-2[png] )
dev-libs/libltdl
+ virtual/udev
+ cgi? ( >=media-libs/gd-2[png] )
gpio? ( dev-libs/libgpiod )
i2c? ( sys-apps/i2c-tools )
ipmi? ( sys-libs/freeipmi )
@@ -45,17 +51,14 @@ DEPEND="
systemd? ( >=sys-apps/systemd-253 )
tcpd? ( sys-apps/tcp-wrappers )
usb? ( virtual/libusb:1 )
- virtual/udev
xml? ( >=net-libs/neon-0.25.0:= )
zeroconf? ( net-dns/avahi )
"
-# sys-apps/systemd-253 required for Type=notify-reload
-
BDEPEND="
- man? ( app-text/asciidoc )
virtual/pkgconfig
+ man? ( app-text/asciidoc )
+ test? ( dev-util/cppunit )
"
-
RDEPEND="
${DEPEND}
monitor? ( $(python_gen_cond_dep '
@@ -65,8 +68,6 @@ RDEPEND="
selinux? ( sec-policy/selinux-nut )
"
-S="${WORKDIR}/${MY_P}"
-
PATCHES=(
"${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch"
"${FILESDIR}/systemd_notify.path"
@@ -95,22 +96,15 @@ pkg_pretend() {
check_extra_config
}
-src_unpack() {
- if [[ "${PV}" == *9999 ]] ; then
- git-r3_src_unpack
- fi
- default
-}
-
pkg_setup() {
- python-single-r1_pkg_setup
+ use python && python-single-r1_pkg_setup
}
src_prepare() {
default
- if [[ "${PV}" == *9999 ]] ; then
- ./autogen.sh
+ if [[ ${PV} == *9999 ]] ; then
+ ./autogen.sh || die
fi
xdg_environment_reset
@@ -121,6 +115,8 @@ src_configure() {
--datadir=/usr/share/nut
--datarootdir=/usr/share/nut
--disable-static
+ --disable-strip
+ --disable-Werror
--sysconfdir=/etc/nut
--with-dev
--with-drvpath="/$(get_libdir)/nut"
@@ -129,6 +125,8 @@ src_configure() {
--with-logfacility=LOG_DAEMON
--with-statepath=/var/lib/nut
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-systemdtmpfilesdir="/usr/lib/tmpfiles.d"
+ --with-udev-dir="$(get_udevdir)"
--with-user=nut
--without-powerman
--without-python
@@ -151,15 +149,13 @@ src_configure() {
$(use_with zeroconf avahi)
)
+ filter-lto
append-flags -fno-lto
-
- tc-export CC
- tc-export CXX
- tc-export AR
+ tc-export CC CXX AR
use cgi && myeconfargs+=( --with-cgipath=/usr/share/nut/cgi )
use man && myeconfargs+=( --with-doc=man )
- use python && myeconfargs+=( --with-python3=/usr/bin/python3 ) || myeconfargs+=( --without-python3 )
+ use python && myeconfargs+=( --with-python3="${PYTHON}" ) || myeconfargs+=( --without-python3 )
export bashcompdir="$(get_bashcompdir)"
@@ -169,15 +165,15 @@ src_configure() {
src_install() {
default
- rm -rf "${D}/etc/hotplug" || die
+ rm -rf "${ED}/etc/hotplug" || die
- find "${D}" -name '*.la' -delete || die
+ find "${ED}" -name '*.la' -delete || die
dodir /sbin
use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
if use cgi; then
- elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
+ elog "CGI monitoring scripts are installed in ${EROOT}/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."
@@ -185,8 +181,9 @@ src_install() {
elog "Use script aliases according to the web server you use (apache, nginx, lighttpd, etc...)"
fi
- # this must be done after all of the install phases
- for i in "${D}"/etc/nut/*.sample ; do
+ # This must be done after all of the install phases
+ local i
+ for i in "${ED}"/etc/nut/*.sample ; do
mv "${i}" "${i/.sample/}" || die
done
@@ -252,7 +249,7 @@ pkg_postinst() {
elog
optfeature "all notify events generate a global message (wall) to all users, plus they are logged via the syslog" \
- sys-apps/util-linu[logger,tty-helpers]
+ sys-apps/util-linux[logger,tty-helpers]
udev_reload
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2023-06-17 3:19 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2023-06-17 3:19 UTC (permalink / raw
To: gentoo-commits
commit: 0f6695de34345668ec2e74092fb9ea81a25c6c52
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 03:19:45 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 03:19:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f6695de
sys-power/nut: add explicit proxy-maint@
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index 1c8e02e16170..4579366e6071 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -12,6 +12,10 @@
<email>web@inode64.com</email>
<name>Fco. Javier Félix</name>
</maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="gpio">Includes all UPS drivers that use GPIO.</flag>
<flag name="i2c">Includes all UPS drivers that use I2C.</flag>
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2022-06-21 18:21 Arthur Zamarin
0 siblings, 0 replies; 62+ messages in thread
From: Arthur Zamarin @ 2022-06-21 18:21 UTC (permalink / raw
To: gentoo-commits
commit: f34846954dc18f8a0367c1cdd25cdefd93363750
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 18:21:30 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 18:21:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3484695
sys-power/nut: Keyword 2.7.4-r8 arm64, #849821
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r8.ebuild b/sys-power/nut/nut-2.7.4-r8.ebuild
index 7dd1503984cd..52ae7661079a 100644
--- a/sys-power/nut/nut-2.7.4-r8.ebuild
+++ b/sys-power/nut/nut-2.7.4-r8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2021-09-21 21:57 Marek Szuba
0 siblings, 0 replies; 62+ messages in thread
From: Marek Szuba @ 2021-09-21 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 2c4e1f9a9cfec9ce98e50d7475986f30fabf2caa
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 21 21:55:28 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 21:55:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c4e1f9a
sys-power/nut: keyword 2.7.4-r8 for ~riscv
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r8.ebuild b/sys-power/nut/nut-2.7.4-r8.ebuild
index 19e58c51547..c0ba578b14e 100644
--- a/sys-power/nut/nut-2.7.4-r8.ebuild
+++ b/sys-power/nut/nut-2.7.4-r8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 ~riscv x86"
IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2021-08-18 14:28 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2021-08-18 14:28 UTC (permalink / raw
To: gentoo-commits
commit: 238792d290fa030291dcad88011eb11300bf0912
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 18 14:10:39 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 14:27:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=238792d2
sys-power/nut: add missing slot deps (mainly libnsl)
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/{nut-2.7.4-r7.ebuild => nut-2.7.4-r8.ebuild} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-power/nut/nut-2.7.4-r7.ebuild b/sys-power/nut/nut-2.7.4-r8.ebuild
similarity index 98%
rename from sys-power/nut/nut-2.7.4-r7.ebuild
rename to sys-power/nut/nut-2.7.4-r8.ebuild
index d1fe21dbae5..19e58c51547 100644
--- a/sys-power/nut/nut-2.7.4-r7.ebuild
+++ b/sys-power/nut/nut-2.7.4-r8.ebuild
@@ -22,16 +22,16 @@ CDEPEND="
"
DEPEND="
- dev-libs/libltdl:*
- net-libs/libnsl
+ dev-libs/libltdl
+ net-libs/libnsl:=
virtual/udev
cgi? ( >=media-libs/gd-2[png] )
ipmi? ( sys-libs/freeipmi )
- snmp? ( net-analyzer/net-snmp )
+ snmp? ( net-analyzer/net-snmp:= )
ssl? ( >=dev-libs/openssl-1:= )
tcpd? ( sys-apps/tcp-wrappers )
usb? ( virtual/libusb:0= )
- xml? ( >=net-libs/neon-0.25.0 )
+ xml? ( >=net-libs/neon-0.25.0:= )
zeroconf? ( net-dns/avahi )"
BDEPEND="
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2021-08-04 19:37 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2021-08-04 19:37 UTC (permalink / raw
To: gentoo-commits
commit: a1af71cd65bb61bf0f39a5051723ba89508da5b4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 4 19:37:25 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 4 19:37:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1af71cd
sys-power/nut: workaround build failure with GCC 11
Closes: https://bugs.gentoo.org/786702
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r7.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-power/nut/nut-2.7.4-r7.ebuild b/sys-power/nut/nut-2.7.4-r7.ebuild
index 581389d74b1..fe89715a5ff 100644
--- a/sys-power/nut/nut-2.7.4-r7.ebuild
+++ b/sys-power/nut/nut-2.7.4-r7.ebuild
@@ -110,7 +110,11 @@ src_prepare() {
src_configure() {
local myconf
+
append-flags -fno-lto
+ # bug #786702
+ append-cxxflags -std=c++14
+
tc-export CC
tc-export CXX
tc-export AR
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2021-07-09 22:36 Conrad Kostecki
0 siblings, 0 replies; 62+ messages in thread
From: Conrad Kostecki @ 2021-07-09 22:36 UTC (permalink / raw
To: gentoo-commits
commit: c75bc7f4b5bdfd3a56cd02b9f6d79e87a4959f11
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 9 22:25:45 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jul 9 22:36:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75bc7f4
sys-power/nut: migrate to GLEP 81
Closes: https://bugs.gentoo.org/781509
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r7.ebuild | 269 ++++++++++++++++++++++++++++++++++++++
1 file changed, 269 insertions(+)
diff --git a/sys-power/nut/nut-2.7.4-r7.ebuild b/sys-power/nut/nut-2.7.4-r7.ebuild
new file mode 100644
index 00000000000..581389d74b1
--- /dev/null
+++ b/sys-power/nut/nut-2.7.4-r7.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic systemd toolchain-funcs
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="https://www.networkupstools.org/"
+SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86"
+
+IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
+
+CDEPEND="
+ acct-group/nut
+ acct-user/nut
+"
+
+DEPEND="
+ dev-libs/libltdl:*
+ net-libs/libnsl
+ virtual/udev
+ cgi? ( >=media-libs/gd-2[png] )
+ ipmi? ( sys-libs/freeipmi )
+ snmp? ( net-analyzer/net-snmp )
+ ssl? ( >=dev-libs/openssl-1:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ usb? ( virtual/libusb:0= )
+ xml? ( >=net-libs/neon-0.25.0 )
+ zeroconf? ( net-dns/avahi )"
+
+BDEPEND="
+ ${CDEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="
+ ${CDEPEND}
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-nut )"
+
+S="${WORKDIR}/${MY_P}"
+
+# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
+SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
+SNMP_DRIVERLIST="snmp-ups"
+USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
+USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
+#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
+NEONXML_DRIVERLIST="netxml-ups"
+IPMI_DRIVERLIST="nut-ipmipsu"
+# Now we build from it:
+for name in ${SERIAL_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
+done
+for name in ${USB_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
+done
+for name in ${NEONXML_DRIVERLIST}; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
+done
+for name in ${SNMP_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
+done
+for name in ${IPMI_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
+done
+IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
+
+# public files should be 644 root:root
+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}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.7.2-no-libdummy.patch
+ "${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
+ "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
+ "${FILESDIR}"/nut-openssl-1.1-support.patch
+ "${FILESDIR}"/nut-2.7.4-py3.patch
+)
+
+src_prepare() {
+ default
+
+ sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
+ -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
+ -i configure.ac || die
+
+ sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
+ -i scripts/udev/Makefile.am || die
+
+ rm ltmain.sh m4/lt* m4/libtool.m4 || die
+
+ sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
+ -i lib/libupsclient{.pc,-config}.in || die #361685
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ append-flags -fno-lto
+ tc-export CC
+ tc-export CXX
+ tc-export AR
+
+ local UPS_DRIVERS=""
+ for u in $USE ; do
+ u2=${u#ups_drivers_}
+ [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
+ done
+ UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
+ myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
+
+ use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
+
+ # TODO: USE flag for sys-power/powerman
+ econf \
+ --sysconfdir=/etc/nut \
+ --datarootdir=/usr/share/nut \
+ --datadir=/usr/share/nut \
+ --disable-static \
+ --with-statepath=/var/lib/nut \
+ --with-drvpath=/$(get_libdir)/nut \
+ --with-htmlpath=/usr/share/nut/html \
+ --with-user=nut \
+ --with-group=nut \
+ --with-logfacility=LOG_DAEMON \
+ --with-dev \
+ --with-serial \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ --without-powerman \
+ $(use_with cgi) \
+ $(use_with ipmi) \
+ $(use_with ipmi freeipmi) \
+ $(use_with snmp) \
+ $(use_with ssl) \
+ $(use_with tcpd wrap) \
+ $(use_with usb) \
+ $(use_with xml neon) \
+ $(use_with zeroconf avahi) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ find "${D}" -name '*.la' -delete || die
+
+ dodir /sbin
+ use split-usr && dosym ../usr/sbin/upsdrvctl /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/}" || die
+ done
+
+ local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING )
+ einstalldocs
+
+ 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.6.5-init.d-upsd upsd
+ newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
+ newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
+ newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
+ newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
+
+ keepdir /var/lib/nut
+
+ einfo "Setting up permissions on files and directories"
+ 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}
+
+ # 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 virtual/udev; then
+ einfo "Installing non-udev hotplug support"
+ insinto /etc/hotplug/usb
+ insopts -m 755
+ doins scripts/hotplug/nut-usbups.hotplug
+ fi
+
+ newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
+ bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
+}
+
+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
+
+ # 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
+}
+
+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."
+ ${msgfunc} ''
+ ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
+ ${msgfunc} ''
+ ${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"
+ ${msgfunc} ''
+ ${msgfunc} 'If you want apcupsd to power off your UPS when it'
+ ${msgfunc} 'shuts down your system in a power failure, you must'
+ ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
+ ${msgfunc} ''
+ ${msgfunc} 'rc-update add nut.powerfail shutdown'
+ ${msgfunc} ''
+
+}
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2021-07-09 22:36 Conrad Kostecki
0 siblings, 0 replies; 62+ messages in thread
From: Conrad Kostecki @ 2021-07-09 22:36 UTC (permalink / raw
To: gentoo-commits
commit: 43b989d2dbd829437d65f6c72fc13d45d79b6e62
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 9 22:27:16 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jul 9 22:36:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b989d2
sys-power/nut: drop old version
Closes: https://bugs.gentoo.org/781509
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r6.ebuild | 272 --------------------------------------
1 file changed, 272 deletions(-)
diff --git a/sys-power/nut/nut-2.7.4-r6.ebuild b/sys-power/nut/nut-2.7.4-r6.ebuild
deleted file mode 100644
index 740b94d0c14..00000000000
--- a/sys-power/nut/nut-2.7.4-r6.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic systemd toolchain-funcs user
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="https://www.networkupstools.org/"
-SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-
-IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
-
-DEPEND="
- dev-libs/libltdl:*
- net-libs/libnsl
- virtual/udev
- cgi? ( >=media-libs/gd-2[png] )
- ipmi? ( sys-libs/freeipmi )
- snmp? ( net-analyzer/net-snmp )
- ssl? ( >=dev-libs/openssl-1:= )
- tcpd? ( sys-apps/tcp-wrappers )
- usb? ( virtual/libusb:0= )
- xml? ( >=net-libs/neon-0.25.0 )
- zeroconf? ( net-dns/avahi )"
-
-BDEPEND="
- virtual/pkgconfig"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-nut )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
-SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
-SNMP_DRIVERLIST="snmp-ups"
-USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
-USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
-#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
-NEONXML_DRIVERLIST="netxml-ups"
-IPMI_DRIVERLIST="nut-ipmipsu"
-# Now we build from it:
-for name in ${SERIAL_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
-done
-for name in ${USB_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
-done
-for name in ${NEONXML_DRIVERLIST}; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
-done
-for name in ${SNMP_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
-done
-for name in ${IPMI_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
-done
-IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
-
-# public files should be 644 root:root
-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}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.7.2-no-libdummy.patch
- "${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
- "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
- "${FILESDIR}"/nut-openssl-1.1-support.patch
- "${FILESDIR}"/nut-2.7.4-py3.patch
-)
-
-pkg_setup() {
- 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
- # in some cases on old systems it wasn't in the nut group either!
- gpasswd -a nut nut 2>/dev/null
- warningmsg ewarn
-}
-
-src_prepare() {
- default
-
- sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
- -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
- -i configure.ac || die
-
- sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
- -i scripts/udev/Makefile.am || die
-
- rm ltmain.sh m4/lt* m4/libtool.m4 || die
-
- sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
- -i lib/libupsclient{.pc,-config}.in || die #361685
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
- append-flags -fno-lto
- tc-export CC
- tc-export CXX
- tc-export AR
-
- local UPS_DRIVERS=""
- for u in $USE ; do
- u2=${u#ups_drivers_}
- [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
- done
- UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
- myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
-
- use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
-
- # TODO: USE flag for sys-power/powerman
- econf \
- --sysconfdir=/etc/nut \
- --datarootdir=/usr/share/nut \
- --datadir=/usr/share/nut \
- --disable-static \
- --with-statepath=/var/lib/nut \
- --with-drvpath=/$(get_libdir)/nut \
- --with-htmlpath=/usr/share/nut/html \
- --with-user=nut \
- --with-group=nut \
- --with-logfacility=LOG_DAEMON \
- --with-dev \
- --with-serial \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- --without-powerman \
- $(use_with cgi) \
- $(use_with ipmi) \
- $(use_with ipmi freeipmi) \
- $(use_with snmp) \
- $(use_with ssl) \
- $(use_with tcpd wrap) \
- $(use_with usb) \
- $(use_with xml neon) \
- $(use_with zeroconf avahi) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- find "${D}" -name '*.la' -delete || die
-
- dodir /sbin
- use split-usr && dosym ../usr/sbin/upsdrvctl /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/}" || die
- done
-
- local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING )
- einstalldocs
-
- 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.6.5-init.d-upsd upsd
- newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
- newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
-
- keepdir /var/lib/nut
-
- einfo "Setting up permissions on files and directories"
- 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}
-
- # 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 virtual/udev; then
- einfo "Installing non-udev hotplug support"
- insinto /etc/hotplug/usb
- insopts -m 755
- doins scripts/hotplug/nut-usbups.hotplug
- fi
-
- newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
- bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
-}
-
-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
-
- # 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
-}
-
-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."
- ${msgfunc} ''
- ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
- ${msgfunc} ''
- ${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"
- ${msgfunc} ''
- ${msgfunc} 'If you want apcupsd to power off your UPS when it'
- ${msgfunc} 'shuts down your system in a power failure, you must'
- ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
- ${msgfunc} ''
- ${msgfunc} 'rc-update add nut.powerfail shutdown'
- ${msgfunc} ''
-
-}
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2020-08-30 1:17 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2020-08-30 1:17 UTC (permalink / raw
To: gentoo-commits
commit: 76e9115fa07903337fd395fc038dc06691e8d47b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 01:16:46 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 01:16:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e9115f
sys-power/nut: Stabilize 2.7.4-r6 ppc, #735498
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r6.ebuild b/sys-power/nut/nut-2.7.4-r6.ebuild
index 79cbbe8f3dc..abdd3bd8c69 100644
--- a/sys-power/nut/nut-2.7.4-r6.ebuild
+++ b/sys-power/nut/nut-2.7.4-r6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ~ppc64 x86"
IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2020-08-22 15:51 Michał Górny
0 siblings, 0 replies; 62+ messages in thread
From: Michał Górny @ 2020-08-22 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 5443e13a125572d22833bef871955b44aa3bd911
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 15:43:07 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 15:51:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5443e13a
sys-power/nut: Remove old (py2)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-power/nut/metadata.xml | 1 -
sys-power/nut/nut-2.7.4-r4.ebuild | 300 --------------------------------------
sys-power/nut/nut-2.7.4-r5.ebuild | 271 ----------------------------------
3 files changed, 572 deletions(-)
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index bde98d03e53..384bfbd43fc 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -9,7 +9,6 @@
<email>prometheanfire@gentoo.org</email>
</maintainer>
<use>
- <flag name="gui">Install NUT-Monitor python gui</flag>
<flag name="ipmi">Support IPMI-based UPSes.</flag>
<flag name="ups_drivers_al175">Driver for Eltek UPS models with AL175 alarm module</flag>
<flag name="ups_drivers_bcmxcp">Driver for UPSes supporting the serial BCM/XCP protocol</flag>
diff --git a/sys-power/nut/nut-2.7.4-r4.ebuild b/sys-power/nut/nut-2.7.4-r4.ebuild
deleted file mode 100644
index 38d45641885..00000000000
--- a/sys-power/nut/nut-2.7.4-r4.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic python-single-r1 systemd toolchain-funcs user
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="https://www.networkupstools.org/"
-SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-
-IUSE="cgi gui ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
-REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- dev-libs/libltdl:*
- net-libs/libnsl
- virtual/udev
- cgi? ( >=media-libs/gd-2[png] )
- gui? ( ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
- ')
- )
- ipmi? ( sys-libs/freeipmi )
- snmp? ( net-analyzer/net-snmp )
- ssl? ( >=dev-libs/openssl-1:= )
- tcpd? ( sys-apps/tcp-wrappers )
- usb? ( virtual/libusb:0= )
- xml? ( >=net-libs/neon-0.25.0 )
- zeroconf? ( net-dns/avahi )"
-
-BDEPEND="
- virtual/pkgconfig"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-nut )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
-SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
-SNMP_DRIVERLIST="snmp-ups"
-USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
-USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
-#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
-NEONXML_DRIVERLIST="netxml-ups"
-IPMI_DRIVERLIST="nut-ipmipsu"
-# Now we build from it:
-for name in ${SERIAL_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
-done
-for name in ${USB_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
-done
-for name in ${NEONXML_DRIVERLIST}; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
-done
-for name in ${SNMP_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
-done
-for name in ${IPMI_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
-done
-IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
-
-# public files should be 644 root:root
-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}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.7.2-no-libdummy.patch
- "${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
- "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
- "${FILESDIR}"/nut-openssl-1.1-support.patch
-)
-
-pkg_setup() {
- 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
- # in some cases on old systems it wasn't in the nut group either!
- gpasswd -a nut nut 2>/dev/null
- warningmsg ewarn
- use gui && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
- -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
- -i configure.ac || die
-
- sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
- -i scripts/udev/Makefile.am || die
-
- rm ltmain.sh m4/lt* m4/libtool.m4 || die
-
- sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
- -i lib/libupsclient{.pc,-config}.in || die #361685
-
- use gui && eapply "${FILESDIR}"/NUT-Monitor-1.3-paths.patch
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
- append-flags -fno-lto
- tc-export CC
- tc-export CXX
- tc-export AR
-
- local UPS_DRIVERS=""
- for u in $USE ; do
- u2=${u#ups_drivers_}
- [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
- done
- UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
- myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
-
- use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
-
- # TODO: USE flag for sys-power/powerman
- econf \
- --sysconfdir=/etc/nut \
- --datarootdir=/usr/share/nut \
- --datadir=/usr/share/nut \
- --disable-static \
- --with-statepath=/var/lib/nut \
- --with-drvpath=/$(get_libdir)/nut \
- --with-htmlpath=/usr/share/nut/html \
- --with-user=nut \
- --with-group=nut \
- --with-logfacility=LOG_DAEMON \
- --with-dev \
- --with-serial \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- --without-powerman \
- $(use_with cgi) \
- $(use_with ipmi) \
- $(use_with ipmi freeipmi) \
- $(use_with snmp) \
- $(use_with ssl) \
- $(use_with tcpd wrap) \
- $(use_with usb) \
- $(use_with xml neon) \
- $(use_with zeroconf avahi) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- find "${D}" -name '*.la' -delete || die
-
- dodir /sbin
- use split-usr && dosym ../usr/sbin/upsdrvctl /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
-
- if use gui; then
- python_fix_shebang scripts/python/app
- python_domodule scripts/python/module/PyNUT.py
- python_doscript scripts/python/app/NUT-Monitor
-
- insinto /usr/share/nut
- doins scripts/python/app/gui-1.3.glade
-
- dodir /usr/share/nut/pixmaps
- insinto /usr/share/nut/pixmaps
- doins scripts/python/app/pixmaps/*
-
- sed -i -e 's/nut-monitor.png/nut-monitor/' -e 's/Application;//' \
- scripts/python/app/${PN}-monitor.desktop || die
-
- doicon scripts/python/app/${PN}-monitor.png
- domenu scripts/python/app/${PN}-monitor.desktop
- fi
-
- # this must be done after all of the install phases
- for i in "${D}"/etc/nut/*.sample ; do
- mv "${i}" "${i/.sample/}" || die
- done
-
- local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING )
- einstalldocs
-
- 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.6.5-init.d-upsd upsd
- newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
- newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
-
- keepdir /var/lib/nut
-
- einfo "Setting up permissions on files and directories"
- 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}
-
- # 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 virtual/udev; then
- einfo "Installing non-udev hotplug support"
- insinto /etc/hotplug/usb
- insopts -m 755
- doins scripts/hotplug/nut-usbups.hotplug
- fi
-
- newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
- bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
-}
-
-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
-
- # 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
-}
-
-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."
- ${msgfunc} ''
- ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
- ${msgfunc} ''
- ${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"
- ${msgfunc} ''
- ${msgfunc} 'If you want apcupsd to power off your UPS when it'
- ${msgfunc} 'shuts down your system in a power failure, you must'
- ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
- ${msgfunc} ''
- ${msgfunc} 'rc-update add nut.powerfail shutdown'
- ${msgfunc} ''
-
-}
diff --git a/sys-power/nut/nut-2.7.4-r5.ebuild b/sys-power/nut/nut-2.7.4-r5.ebuild
deleted file mode 100644
index 3570688276d..00000000000
--- a/sys-power/nut/nut-2.7.4-r5.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic systemd toolchain-funcs user
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="https://www.networkupstools.org/"
-SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
-
-DEPEND="
- dev-libs/libltdl:*
- net-libs/libnsl
- virtual/udev
- cgi? ( >=media-libs/gd-2[png] )
- ipmi? ( sys-libs/freeipmi )
- snmp? ( net-analyzer/net-snmp )
- ssl? ( >=dev-libs/openssl-1:= )
- tcpd? ( sys-apps/tcp-wrappers )
- usb? ( virtual/libusb:0= )
- xml? ( >=net-libs/neon-0.25.0 )
- zeroconf? ( net-dns/avahi )"
-
-BDEPEND="
- virtual/pkgconfig"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-nut )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
-SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
-SNMP_DRIVERLIST="snmp-ups"
-USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
-USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
-#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
-NEONXML_DRIVERLIST="netxml-ups"
-IPMI_DRIVERLIST="nut-ipmipsu"
-# Now we build from it:
-for name in ${SERIAL_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
-done
-for name in ${USB_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
-done
-for name in ${NEONXML_DRIVERLIST}; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
-done
-for name in ${SNMP_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
-done
-for name in ${IPMI_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
-done
-IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
-
-# public files should be 644 root:root
-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}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.7.2-no-libdummy.patch
- "${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
- "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
- "${FILESDIR}"/nut-openssl-1.1-support.patch
-)
-
-pkg_setup() {
- 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
- # in some cases on old systems it wasn't in the nut group either!
- gpasswd -a nut nut 2>/dev/null
- warningmsg ewarn
-}
-
-src_prepare() {
- default
-
- sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
- -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
- -i configure.ac || die
-
- sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
- -i scripts/udev/Makefile.am || die
-
- rm ltmain.sh m4/lt* m4/libtool.m4 || die
-
- sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
- -i lib/libupsclient{.pc,-config}.in || die #361685
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
- append-flags -fno-lto
- tc-export CC
- tc-export CXX
- tc-export AR
-
- local UPS_DRIVERS=""
- for u in $USE ; do
- u2=${u#ups_drivers_}
- [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
- done
- UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
- myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
-
- use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
-
- # TODO: USE flag for sys-power/powerman
- econf \
- --sysconfdir=/etc/nut \
- --datarootdir=/usr/share/nut \
- --datadir=/usr/share/nut \
- --disable-static \
- --with-statepath=/var/lib/nut \
- --with-drvpath=/$(get_libdir)/nut \
- --with-htmlpath=/usr/share/nut/html \
- --with-user=nut \
- --with-group=nut \
- --with-logfacility=LOG_DAEMON \
- --with-dev \
- --with-serial \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- --without-powerman \
- $(use_with cgi) \
- $(use_with ipmi) \
- $(use_with ipmi freeipmi) \
- $(use_with snmp) \
- $(use_with ssl) \
- $(use_with tcpd wrap) \
- $(use_with usb) \
- $(use_with xml neon) \
- $(use_with zeroconf avahi) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- find "${D}" -name '*.la' -delete || die
-
- dodir /sbin
- use split-usr && dosym ../usr/sbin/upsdrvctl /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/}" || die
- done
-
- local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING )
- einstalldocs
-
- 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.6.5-init.d-upsd upsd
- newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
- newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
-
- keepdir /var/lib/nut
-
- einfo "Setting up permissions on files and directories"
- 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}
-
- # 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 virtual/udev; then
- einfo "Installing non-udev hotplug support"
- insinto /etc/hotplug/usb
- insopts -m 755
- doins scripts/hotplug/nut-usbups.hotplug
- fi
-
- newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
- bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
-}
-
-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
-
- # 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
-}
-
-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."
- ${msgfunc} ''
- ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
- ${msgfunc} ''
- ${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"
- ${msgfunc} ''
- ${msgfunc} 'If you want apcupsd to power off your UPS when it'
- ${msgfunc} 'shuts down your system in a power failure, you must'
- ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
- ${msgfunc} ''
- ${msgfunc} 'rc-update add nut.powerfail shutdown'
- ${msgfunc} ''
-
-}
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2020-08-11 18:46 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2020-08-11 18:46 UTC (permalink / raw
To: gentoo-commits
commit: 9ec3f85ff606d7a0e3991944e852e3e88a46ec17
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 18:46:49 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:46:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec3f85f
sys-power/nut: x86 stable (bug #735498)
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r6.ebuild b/sys-power/nut/nut-2.7.4-r6.ebuild
index adea97099ce..79cbbe8f3dc 100644
--- a/sys-power/nut/nut-2.7.4-r6.ebuild
+++ b/sys-power/nut/nut-2.7.4-r6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2020-08-10 14:33 Agostino Sarubbo
0 siblings, 0 replies; 62+ messages in thread
From: Agostino Sarubbo @ 2020-08-10 14:33 UTC (permalink / raw
To: gentoo-commits
commit: 93c3a249656c9da51075354c8cd66130fef0b159
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 14:33:34 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 14:33:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c3a249
sys-power/nut: amd64 stable wrt bug #735498
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r6.ebuild b/sys-power/nut/nut-2.7.4-r6.ebuild
index 08e4f06c266..adea97099ce 100644
--- a/sys-power/nut/nut-2.7.4-r6.ebuild
+++ b/sys-power/nut/nut-2.7.4-r6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86"
IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2020-08-07 18:51 Sam James
0 siblings, 0 replies; 62+ messages in thread
From: Sam James @ 2020-08-07 18:51 UTC (permalink / raw
To: gentoo-commits
commit: dbbdbac2289ccbb76a6cb67ce089008cbb12f259
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 7 18:37:32 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 18:37:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbbdbac2
sys-power/nut: Stabilize 2.7.4-r6 arm, #735498
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r6.ebuild b/sys-power/nut/nut-2.7.4-r6.ebuild
index c87a595fd37..08e4f06c266 100644
--- a/sys-power/nut/nut-2.7.4-r6.ebuild
+++ b/sys-power/nut/nut-2.7.4-r6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~ppc ~ppc64 ~x86"
IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2020-02-19 18:24 Robin H. Johnson
0 siblings, 0 replies; 62+ messages in thread
From: Robin H. Johnson @ 2020-02-19 18:24 UTC (permalink / raw
To: gentoo-commits
commit: f6b905dd92ecedf91f6fe02956124e05d7acbb0e
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 18:24:20 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 18:24:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b905dd
sys-power/nut: drop USE=gui due to python2-only
Fixes: https://bugs.gentoo.org/710160
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r5.ebuild | 271 ++++++++++++++++++++++++++++++++++++++
1 file changed, 271 insertions(+)
diff --git a/sys-power/nut/nut-2.7.4-r5.ebuild b/sys-power/nut/nut-2.7.4-r5.ebuild
new file mode 100644
index 00000000000..3570688276d
--- /dev/null
+++ b/sys-power/nut/nut-2.7.4-r5.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic systemd toolchain-funcs user
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="https://www.networkupstools.org/"
+SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
+
+DEPEND="
+ dev-libs/libltdl:*
+ net-libs/libnsl
+ virtual/udev
+ cgi? ( >=media-libs/gd-2[png] )
+ ipmi? ( sys-libs/freeipmi )
+ snmp? ( net-analyzer/net-snmp )
+ ssl? ( >=dev-libs/openssl-1:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ usb? ( virtual/libusb:0= )
+ xml? ( >=net-libs/neon-0.25.0 )
+ zeroconf? ( net-dns/avahi )"
+
+BDEPEND="
+ virtual/pkgconfig"
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-nut )"
+
+S="${WORKDIR}/${MY_P}"
+
+# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
+SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
+SNMP_DRIVERLIST="snmp-ups"
+USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
+USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
+#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
+NEONXML_DRIVERLIST="netxml-ups"
+IPMI_DRIVERLIST="nut-ipmipsu"
+# Now we build from it:
+for name in ${SERIAL_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
+done
+for name in ${USB_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
+done
+for name in ${NEONXML_DRIVERLIST}; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
+done
+for name in ${SNMP_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
+done
+for name in ${IPMI_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
+done
+IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
+
+# public files should be 644 root:root
+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}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.7.2-no-libdummy.patch
+ "${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
+ "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
+ "${FILESDIR}"/nut-openssl-1.1-support.patch
+)
+
+pkg_setup() {
+ 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
+ # in some cases on old systems it wasn't in the nut group either!
+ gpasswd -a nut nut 2>/dev/null
+ warningmsg ewarn
+}
+
+src_prepare() {
+ default
+
+ sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
+ -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
+ -i configure.ac || die
+
+ sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
+ -i scripts/udev/Makefile.am || die
+
+ rm ltmain.sh m4/lt* m4/libtool.m4 || die
+
+ sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
+ -i lib/libupsclient{.pc,-config}.in || die #361685
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ append-flags -fno-lto
+ tc-export CC
+ tc-export CXX
+ tc-export AR
+
+ local UPS_DRIVERS=""
+ for u in $USE ; do
+ u2=${u#ups_drivers_}
+ [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
+ done
+ UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
+ myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
+
+ use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
+
+ # TODO: USE flag for sys-power/powerman
+ econf \
+ --sysconfdir=/etc/nut \
+ --datarootdir=/usr/share/nut \
+ --datadir=/usr/share/nut \
+ --disable-static \
+ --with-statepath=/var/lib/nut \
+ --with-drvpath=/$(get_libdir)/nut \
+ --with-htmlpath=/usr/share/nut/html \
+ --with-user=nut \
+ --with-group=nut \
+ --with-logfacility=LOG_DAEMON \
+ --with-dev \
+ --with-serial \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ --without-powerman \
+ $(use_with cgi) \
+ $(use_with ipmi) \
+ $(use_with ipmi freeipmi) \
+ $(use_with snmp) \
+ $(use_with ssl) \
+ $(use_with tcpd wrap) \
+ $(use_with usb) \
+ $(use_with xml neon) \
+ $(use_with zeroconf avahi) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ find "${D}" -name '*.la' -delete || die
+
+ dodir /sbin
+ use split-usr && dosym ../usr/sbin/upsdrvctl /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/}" || die
+ done
+
+ local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING )
+ einstalldocs
+
+ 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.6.5-init.d-upsd upsd
+ newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
+ newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
+ newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
+ newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
+
+ keepdir /var/lib/nut
+
+ einfo "Setting up permissions on files and directories"
+ 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}
+
+ # 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 virtual/udev; then
+ einfo "Installing non-udev hotplug support"
+ insinto /etc/hotplug/usb
+ insopts -m 755
+ doins scripts/hotplug/nut-usbups.hotplug
+ fi
+
+ newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
+ bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
+}
+
+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
+
+ # 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
+}
+
+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."
+ ${msgfunc} ''
+ ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
+ ${msgfunc} ''
+ ${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"
+ ${msgfunc} ''
+ ${msgfunc} 'If you want apcupsd to power off your UPS when it'
+ ${msgfunc} 'shuts down your system in a power failure, you must'
+ ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
+ ${msgfunc} ''
+ ${msgfunc} 'rc-update add nut.powerfail shutdown'
+ ${msgfunc} ''
+
+}
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2020-02-09 16:42 Michał Górny
0 siblings, 0 replies; 62+ messages in thread
From: Michał Górny @ 2020-02-09 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 45c0e50e660772e8c8aa3350da94e35477c93e0a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 20:24:19 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:37:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c0e50e
sys-power/nut: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-power/nut/{nut-2.7.4-r3.ebuild => nut-2.7.4-r4.ebuild} | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r3.ebuild b/sys-power/nut/nut-2.7.4-r4.ebuild
similarity index 99%
rename from sys-power/nut/nut-2.7.4-r3.ebuild
rename to sys-power/nut/nut-2.7.4-r4.ebuild
index 0e0b748bd5e..38d45641885 100644
--- a/sys-power/nut/nut-2.7.4-r3.ebuild
+++ b/sys-power/nut/nut-2.7.4-r4.ebuild
@@ -24,7 +24,10 @@ DEPEND="
virtual/udev
cgi? ( >=media-libs/gd-2[png] )
gui? ( ${PYTHON_DEPS}
- dev-python/pygtk[${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
ipmi? ( sys-libs/freeipmi )
snmp? ( net-analyzer/net-snmp )
ssl? ( >=dev-libs/openssl-1:= )
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2020-01-08 22:27 David Seifert
0 siblings, 0 replies; 62+ messages in thread
From: David Seifert @ 2020-01-08 22:27 UTC (permalink / raw
To: gentoo-commits
commit: f533edcce514b28839c13fe68e65857a9854351d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 8 22:27:26 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 8 22:27:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f533edcc
sys-power/nut: Remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r1.ebuild | 268 ----------------------------------
sys-power/nut/nut-2.7.4-r2.ebuild | 297 --------------------------------------
2 files changed, 565 deletions(-)
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
deleted file mode 100644
index 48deb79389f..00000000000
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools bash-completion-r1 eutils fixheadtails multilib user systemd flag-o-matic toolchain-funcs
-
-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
- http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-
-IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
-CDEPEND="
- cgi? ( >=media-libs/gd-2[png] )
- snmp? ( net-analyzer/net-snmp )
- usb? ( virtual/libusb:0 )
- ssl? ( >=dev-libs/openssl-1:= )
- tcpd? ( sys-apps/tcp-wrappers )
- xml? ( >=net-libs/neon-0.25.0 )
- ipmi? ( sys-libs/freeipmi )
- zeroconf? ( net-dns/avahi )
- dev-libs/libltdl
- net-libs/libnsl
- virtual/udev"
-DEPEND="$CDEPEND
- >=sys-apps/sed-4
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-nut )
-"
-
-S=${WORKDIR}/${MY_P}
-
-# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
-SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
-SNMP_DRIVERLIST="snmp-ups"
-USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
-USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
-#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
-NEONXML_DRIVERLIST="netxml-ups"
-IPMI_DRIVERLIST="nut-ipmipsu"
-# Now we build from it:
-for name in ${SERIAL_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
-done
-for name in ${USB_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
-done
-for name in ${NEONXML_DRIVERLIST}; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
-done
-for name in ${SNMP_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
-done
-for name in ${IPMI_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
-done
-IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
-
-# public files should be 644 root:root
-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() {
- 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
- # in some cases on old systems it wasn't in the nut group either!
- gpasswd -a nut nut 2>/dev/null
- warningmsg ewarn
-}
-
-src_prepare() {
- #ht_fix_file configure.in
-
- epatch "${FILESDIR}"/nut-2.7.2-no-libdummy.patch
- epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
- epatch "${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
-
- sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
- -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
- -i configure.ac || die
-
- sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
- -i scripts/udev/Makefile.am || die
-
- rm -f ltmain.sh m4/lt* m4/libtool.m4
-
- sed -i \
- -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
- lib/libupsclient{.pc,-config}.in || die #361685
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
- append-flags -fno-lto
- tc-export CC
- tc-export CXX
- tc-export AR
-
- local UPS_DRIVERS=""
- for u in $USE ; do
- u2=${u#ups_drivers_}
- [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
- done
- UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
- myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
-
- use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
-
- # TODO: USE flag for sys-power/powerman
- econf \
- --sysconfdir=/etc/nut \
- --datarootdir=/usr/share/nut \
- --datadir=/usr/share/nut \
- --disable-static \
- --with-statepath=/var/lib/nut \
- --with-drvpath=/$(get_libdir)/nut \
- --with-htmlpath=/usr/share/nut/html \
- --with-user=nut \
- --with-group=nut \
- --with-logfacility=LOG_DAEMON \
- --with-dev \
- --with-serial \
- --without-powerman \
- $(use_with cgi) \
- $(use_with ipmi) \
- $(use_with ipmi freeipmi) \
- $(use_with snmp) \
- $(use_with ssl) \
- $(use_with tcpd wrap) \
- $(use_with usb) \
- $(use_with xml neon) \
- $(use_with zeroconf avahi) \
- $(systemd_with_unitdir) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- find "${D}" -name '*.la' -exec rm -f {} +
-
- dodir /sbin
- dosym /usr/sbin/upsdrvctl /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 AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING
-
- newdoc lib/README README.lib || die
- newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf || die
-
- docinto cables
- dodoc docs/cables/*
-
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd
- newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
- newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
-
- keepdir /var/lib/nut
-
- einfo "Setting up permissions on files and directories"
- 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}
-
- # 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 virtual/udev; then
- einfo "Installing non-udev hotplug support"
- insinto /etc/hotplug/usb
- insopts -m 755
- doins scripts/hotplug/nut-usbups.hotplug
- fi
-
- dobashcomp "${S}"/scripts/misc/nut.bash_completion
-}
-
-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
-
- # 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
-}
-
-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."
- ${msgfunc} ''
- ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
- ${msgfunc} ''
- ${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"
- ${msgfunc} ''
- ${msgfunc} 'If you want apcupsd to power off your UPS when it'
- ${msgfunc} 'shuts down your system in a power failure, you must'
- ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
- ${msgfunc} ''
- ${msgfunc} 'rc-update add nut.powerfail shutdown'
- ${msgfunc} ''
-
-}
diff --git a/sys-power/nut/nut-2.7.4-r2.ebuild b/sys-power/nut/nut-2.7.4-r2.ebuild
deleted file mode 100644
index ad94972b18b..00000000000
--- a/sys-power/nut/nut-2.7.4-r2.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic python-single-r1 systemd toolchain-funcs user
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="https://www.networkupstools.org/"
-SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf"
-REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- dev-libs/libltdl:*
- net-libs/libnsl
- virtual/udev
- cgi? ( >=media-libs/gd-2[png] )
- gui? ( ${PYTHON_DEPS}
- dev-python/pygtk[${PYTHON_USEDEP}] )
- ipmi? ( sys-libs/freeipmi )
- snmp? ( net-analyzer/net-snmp )
- ssl? ( >=dev-libs/openssl-1:= )
- tcpd? ( sys-apps/tcp-wrappers )
- usb? ( virtual/libusb:0= )
- xml? ( >=net-libs/neon-0.25.0 )
- zeroconf? ( net-dns/avahi )"
-
-BDEPEND="
- virtual/pkgconfig
- >=sys-apps/sed-4"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-nut )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
-SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
-SNMP_DRIVERLIST="snmp-ups"
-USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
-USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
-#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
-NEONXML_DRIVERLIST="netxml-ups"
-IPMI_DRIVERLIST="nut-ipmipsu"
-# Now we build from it:
-for name in ${SERIAL_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
-done
-for name in ${USB_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
-done
-for name in ${NEONXML_DRIVERLIST}; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
-done
-for name in ${SNMP_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
-done
-for name in ${IPMI_DRIVERLIST} ; do
- IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
- REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
-done
-IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
-
-# public files should be 644 root:root
-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}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.7.2-no-libdummy.patch"
- "${FILESDIR}/${PN}-2.7.1-snmpusb-order.patch"
- "${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch"
-)
-
-pkg_setup() {
- 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
- # in some cases on old systems it wasn't in the nut group either!
- gpasswd -a nut nut 2>/dev/null
- warningmsg ewarn
- use gui && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
- -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
- -i configure.ac || die
-
- sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
- -i scripts/udev/Makefile.am || die
-
- rm ltmain.sh m4/lt* m4/libtool.m4 || die
-
- sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
- -i lib/libupsclient{.pc,-config}.in || die #361685
-
- use gui && eapply "${FILESDIR}"/NUT-Monitor-1.3-paths.patch
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
- append-flags -fno-lto
- tc-export CC
- tc-export CXX
- tc-export AR
-
- local UPS_DRIVERS=""
- for u in $USE ; do
- u2=${u#ups_drivers_}
- [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
- done
- UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
- myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
-
- use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
-
- # TODO: USE flag for sys-power/powerman
- econf \
- --sysconfdir=/etc/nut \
- --datarootdir=/usr/share/nut \
- --datadir=/usr/share/nut \
- --disable-static \
- --with-statepath=/var/lib/nut \
- --with-drvpath=/$(get_libdir)/nut \
- --with-htmlpath=/usr/share/nut/html \
- --with-user=nut \
- --with-group=nut \
- --with-logfacility=LOG_DAEMON \
- --with-dev \
- --with-serial \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- --without-powerman \
- $(use_with cgi) \
- $(use_with ipmi) \
- $(use_with ipmi freeipmi) \
- $(use_with snmp) \
- $(use_with ssl) \
- $(use_with tcpd wrap) \
- $(use_with usb) \
- $(use_with xml neon) \
- $(use_with zeroconf avahi) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- find "${D}" -name '*.la' -delete || die
-
- dodir /sbin
- dosym ../usr/sbin/upsdrvctl /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
-
- if use gui; then
- python_fix_shebang scripts/python/app
- python_domodule scripts/python/module/PyNUT.py
- python_doscript scripts/python/app/NUT-Monitor
-
- insinto /usr/share/nut
- doins scripts/python/app/gui-1.3.glade
-
- dodir /usr/share/nut/pixmaps
- insinto /usr/share/nut/pixmaps
- doins scripts/python/app/pixmaps/*
-
- sed -i -e 's/nut-monitor.png/nut-monitor/' -e 's/Application;//' \
- scripts/python/app/${PN}-monitor.desktop || die
-
- doicon scripts/python/app/${PN}-monitor.png
- domenu scripts/python/app/${PN}-monitor.desktop
- fi
-
- # this must be done after all of the install phases
- for i in "${D}"/etc/nut/*.sample ; do
- mv "${i}" "${i/.sample/}" || die
- done
-
- local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING )
- einstalldocs
-
- 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.6.5-init.d-upsd upsd
- newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
- newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
- newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
-
- keepdir /var/lib/nut
-
- einfo "Setting up permissions on files and directories"
- 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}
-
- # 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 virtual/udev; then
- einfo "Installing non-udev hotplug support"
- insinto /etc/hotplug/usb
- insopts -m 755
- doins scripts/hotplug/nut-usbups.hotplug
- fi
-
- newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
- bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
-}
-
-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
-
- # 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
-}
-
-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."
- ${msgfunc} ''
- ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
- ${msgfunc} ''
- ${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"
- ${msgfunc} ''
- ${msgfunc} 'If you want apcupsd to power off your UPS when it'
- ${msgfunc} 'shuts down your system in a power failure, you must'
- ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
- ${msgfunc} ''
- ${msgfunc} 'rc-update add nut.powerfail shutdown'
- ${msgfunc} ''
-
-}
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2020-01-08 22:27 David Seifert
0 siblings, 0 replies; 62+ messages in thread
From: David Seifert @ 2020-01-08 22:27 UTC (permalink / raw
To: gentoo-commits
commit: 7989f72ca0d31224d50b740cab5f7b14486f8fac
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 8 22:27:33 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 8 22:27:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7989f72c
sys-power/nut: Fix dosym on usrmerge systems
Closes: https://bugs.gentoo.org/680980
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r3.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-power/nut/nut-2.7.4-r3.ebuild b/sys-power/nut/nut-2.7.4-r3.ebuild
index 245adf5452f..d1182c5e062 100644
--- a/sys-power/nut/nut-2.7.4-r3.ebuild
+++ b/sys-power/nut/nut-2.7.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf"
+IUSE="cgi gui ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
DEPEND="
@@ -169,7 +169,7 @@ src_install() {
find "${D}" -name '*.la' -delete || die
dodir /sbin
- dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
+ use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
if use cgi; then
elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2019-08-20 11:47 Louis Sautier
0 siblings, 0 replies; 62+ messages in thread
From: Louis Sautier @ 2019-08-20 11:47 UTC (permalink / raw
To: gentoo-commits
commit: 630a9755fe031f340818ac92aabf84c5fa0a6ad9
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 23:30:57 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 11:47:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=630a9755
sys-power/nut: add upstream info to metadata.xml
Package-Manager: Portage-2.3.71, Repoman-2.3.16
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
sys-power/nut/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index 85d0b12815a..bde98d03e53 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -63,4 +63,8 @@
<flag name="ups_drivers_snmp-ups">Multi-MIB Driver for SNMP UPS equipment</flag>
<flag name="ups_drivers_nut-ipmipsu">Driver for IPMI Power Supply Units (PSU)</flag>
</use>
+ <upstream>
+ <remote-id type="github">networkupstools/nut</remote-id>
+ <bugs-to>https://github.com/networkupstools/nut/issues</bugs-to>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2019-08-13 12:10 Michał Górny
0 siblings, 0 replies; 62+ messages in thread
From: Michał Górny @ 2019-08-13 12:10 UTC (permalink / raw
To: gentoo-commits
commit: 36e57109d0a23a8c43c536353866f407e6aef0f6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 11:43:51 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 12:10:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36e57109
sys-power/nut: Add missing PYTHON_DEPS
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r2.ebuild | 3 ++-
sys-power/nut/nut-2.7.4-r3.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys-power/nut/nut-2.7.4-r2.ebuild b/sys-power/nut/nut-2.7.4-r2.ebuild
index d4baf524a1f..4e93549bfb9 100644
--- a/sys-power/nut/nut-2.7.4-r2.ebuild
+++ b/sys-power/nut/nut-2.7.4-r2.ebuild
@@ -23,7 +23,8 @@ DEPEND="
net-libs/libnsl
virtual/udev
cgi? ( >=media-libs/gd-2[png] )
- gui? ( dev-python/pygtk[${PYTHON_USEDEP}] )
+ gui? ( ${PYTHON_DEPS}
+ dev-python/pygtk[${PYTHON_USEDEP}] )
ipmi? ( sys-libs/freeipmi )
snmp? ( net-analyzer/net-snmp )
ssl? ( >=dev-libs/openssl-1:= )
diff --git a/sys-power/nut/nut-2.7.4-r3.ebuild b/sys-power/nut/nut-2.7.4-r3.ebuild
index b146001d907..5b780f48de5 100644
--- a/sys-power/nut/nut-2.7.4-r3.ebuild
+++ b/sys-power/nut/nut-2.7.4-r3.ebuild
@@ -23,7 +23,8 @@ DEPEND="
net-libs/libnsl
virtual/udev
cgi? ( >=media-libs/gd-2[png] )
- gui? ( dev-python/pygtk[${PYTHON_USEDEP}] )
+ gui? ( ${PYTHON_DEPS}
+ dev-python/pygtk[${PYTHON_USEDEP}] )
ipmi? ( sys-libs/freeipmi )
snmp? ( net-analyzer/net-snmp )
ssl? ( >=dev-libs/openssl-1:= )
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2019-07-29 10:45 Mikle Kolyada
0 siblings, 0 replies; 62+ messages in thread
From: Mikle Kolyada @ 2019-07-29 10:45 UTC (permalink / raw
To: gentoo-commits
commit: 52a17e14fe876e24306372285796de90a0ea23c0
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 10:45:12 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 10:45:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52a17e14
sys-power/nut: arm stable wrt bug #688834
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r3.ebuild b/sys-power/nut/nut-2.7.4-r3.ebuild
index 84fcf9f8c40..b146001d907 100644
--- a/sys-power/nut/nut-2.7.4-r3.ebuild
+++ b/sys-power/nut/nut-2.7.4-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf"
REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2019-07-02 8:28 Sergei Trofimovich
0 siblings, 0 replies; 62+ messages in thread
From: Sergei Trofimovich @ 2019-07-02 8:28 UTC (permalink / raw
To: gentoo-commits
commit: bf667317b00e3e72892d573526d50d9ca1f8269b
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 08:26:32 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 08:26:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf667317
sys-power/nut: stable 2.7.4-r3 for ppc64, bug #688834
Package-Manager: Portage-2.3.68, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r3.ebuild b/sys-power/nut/nut-2.7.4-r3.ebuild
index e0b81799f3d..84fcf9f8c40 100644
--- a/sys-power/nut/nut-2.7.4-r3.ebuild
+++ b/sys-power/nut/nut-2.7.4-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf"
REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2019-07-02 8:24 Sergei Trofimovich
0 siblings, 0 replies; 62+ messages in thread
From: Sergei Trofimovich @ 2019-07-02 8:24 UTC (permalink / raw
To: gentoo-commits
commit: bc7d7f8f847704d8c6686147eeed634766ef916c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 08:21:36 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 08:21:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc7d7f8f
sys-power/nut: stable 2.7.4-r3 for ppc, bug #688834
Package-Manager: Portage-2.3.68, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r3.ebuild b/sys-power/nut/nut-2.7.4-r3.ebuild
index 916135c5c73..e0b81799f3d 100644
--- a/sys-power/nut/nut-2.7.4-r3.ebuild
+++ b/sys-power/nut/nut-2.7.4-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd"
IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf"
REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2019-06-29 13:03 Agostino Sarubbo
0 siblings, 0 replies; 62+ messages in thread
From: Agostino Sarubbo @ 2019-06-29 13:03 UTC (permalink / raw
To: gentoo-commits
commit: 44b66901ea289fb4f84143c418f31a38050374ee
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 13:03:01 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 13:03:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b66901
sys-power/nut: amd64 stable wrt bug #688834
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
sys-power/nut/nut-2.7.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r3.ebuild b/sys-power/nut/nut-2.7.4-r3.ebuild
index 91ab0d3f4e0..916135c5c73 100644
--- a/sys-power/nut/nut-2.7.4-r3.ebuild
+++ b/sys-power/nut/nut-2.7.4-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf"
REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2019-06-28 15:21 Agostino Sarubbo
0 siblings, 0 replies; 62+ messages in thread
From: Agostino Sarubbo @ 2019-06-28 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 0b1fffd6654549c99ce47a7ec6f91eea102b86d7
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 15:21:10 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 15:21:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b1fffd6
sys-power/nut: x86 stable wrt bug #688834
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"
sys-power/nut/nut-2.7.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r3.ebuild b/sys-power/nut/nut-2.7.4-r3.ebuild
index 5364ad86e5c..91ab0d3f4e0 100644
--- a/sys-power/nut/nut-2.7.4-r3.ebuild
+++ b/sys-power/nut/nut-2.7.4-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.networkupstools.org/"
SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf"
REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2018-11-18 15:27 Thomas Deutschmann
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Deutschmann @ 2018-11-18 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 527ea4bf7696a6ec516b2b7fc6c6d2d5ae32c372
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 14:57:20 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 15:26:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=527ea4bf
sys-power/nut: add subslot operator on dev-libs/openssl atom
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r1.ebuild | 2 +-
sys-power/nut/nut-2.7.4-r2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index f575b4fa11b..a57d0c12917 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -21,7 +21,7 @@ CDEPEND="
cgi? ( >=media-libs/gd-2[png] )
snmp? ( net-analyzer/net-snmp )
usb? ( virtual/libusb:0 )
- ssl? ( >=dev-libs/openssl-1 )
+ ssl? ( >=dev-libs/openssl-1:= )
tcpd? ( sys-apps/tcp-wrappers )
xml? ( >=net-libs/neon-0.25.0 )
ipmi? ( sys-libs/freeipmi )
diff --git a/sys-power/nut/nut-2.7.4-r2.ebuild b/sys-power/nut/nut-2.7.4-r2.ebuild
index 1e2c05067f4..d4baf524a1f 100644
--- a/sys-power/nut/nut-2.7.4-r2.ebuild
+++ b/sys-power/nut/nut-2.7.4-r2.ebuild
@@ -26,7 +26,7 @@ DEPEND="
gui? ( dev-python/pygtk[${PYTHON_USEDEP}] )
ipmi? ( sys-libs/freeipmi )
snmp? ( net-analyzer/net-snmp )
- ssl? ( >=dev-libs/openssl-1 )
+ ssl? ( >=dev-libs/openssl-1:= )
tcpd? ( sys-apps/tcp-wrappers )
usb? ( virtual/libusb:0= )
xml? ( >=net-libs/neon-0.25.0 )
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2018-11-14 18:23 Robin H. Johnson
0 siblings, 0 replies; 62+ messages in thread
From: Robin H. Johnson @ 2018-11-14 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 103b618877f4b117066f8672f3eee349ff2122c7
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 14 18:23:05 2018 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 14 18:23:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=103b6188
sys-power/nut: add net-libs/libnsl dep per glibc upgrade
Fixes: https://bugs.gentoo.org/659866
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sys-power/nut/nut-2.7.4-r1.ebuild | 1 +
sys-power/nut/nut-2.7.4-r2.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index ebebb9ba345..f575b4fa11b 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -27,6 +27,7 @@ CDEPEND="
ipmi? ( sys-libs/freeipmi )
zeroconf? ( net-dns/avahi )
dev-libs/libltdl
+ net-libs/libnsl
virtual/udev"
DEPEND="$CDEPEND
>=sys-apps/sed-4
diff --git a/sys-power/nut/nut-2.7.4-r2.ebuild b/sys-power/nut/nut-2.7.4-r2.ebuild
index f33d974e494..1e2c05067f4 100644
--- a/sys-power/nut/nut-2.7.4-r2.ebuild
+++ b/sys-power/nut/nut-2.7.4-r2.ebuild
@@ -20,6 +20,7 @@ REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
DEPEND="
dev-libs/libltdl:*
+ net-libs/libnsl
virtual/udev
cgi? ( >=media-libs/gd-2[png] )
gui? ( dev-python/pygtk[${PYTHON_USEDEP}] )
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2018-10-27 19:02 Andreas Sturmlechner
0 siblings, 0 replies; 62+ messages in thread
From: Andreas Sturmlechner @ 2018-10-27 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 840421337198b601ad8f22fb9cb8c403a03bb1d2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 17:59:39 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 19:02:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84042133
sys-power/nut: EAPI-7 bump
- drop superfluous || die
- dosym relative path
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-power/nut/nut-2.7.4-r2.ebuild | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/sys-power/nut/nut-2.7.4-r2.ebuild b/sys-power/nut/nut-2.7.4-r2.ebuild
index 031f61d9dd9..2c212243bab 100644
--- a/sys-power/nut/nut-2.7.4-r2.ebuild
+++ b/sys-power/nut/nut-2.7.4-r2.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python2_7 )
-
inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic python-single-r1 systemd toolchain-funcs user
MY_P=${P/_/-}
@@ -19,7 +18,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf"
REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
-COMMON_DEPEND="dev-libs/libltdl:*
+DEPEND="
+ dev-libs/libltdl:*
virtual/udev
cgi? ( >=media-libs/gd-2[png] )
gui? ( dev-python/pygtk[${PYTHON_USEDEP}] )
@@ -31,11 +31,11 @@ COMMON_DEPEND="dev-libs/libltdl:*
xml? ( >=net-libs/neon-0.25.0 )
zeroconf? ( net-dns/avahi )"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
virtual/pkgconfig
>=sys-apps/sed-4"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-nut )"
S="${WORKDIR}/${MY_P}"
@@ -78,7 +78,7 @@ NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
PATCHES=(
- "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch"
+ "${FILESDIR}/nut-2.7.2/${PN}-2.7.2-no-libdummy.patch"
"${FILESDIR}/${PN}-2.7.1-snmpusb-order.patch"
"${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch"
)
@@ -105,11 +105,10 @@ src_prepare() {
sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
-i scripts/udev/Makefile.am || die
- rm -f ltmain.sh m4/lt* m4/libtool.m4 || die
+ rm ltmain.sh m4/lt* m4/libtool.m4 || die
- sed -i \
- -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
- lib/libupsclient{.pc,-config}.in || die #361685
+ sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
+ -i lib/libupsclient{.pc,-config}.in || die #361685
use gui && eapply "${FILESDIR}"/NUT-Monitor-1.3-paths.patch
@@ -162,12 +161,12 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
find "${D}" -name '*.la' -delete || die
dodir /sbin
- dosym /usr/sbin/upsdrvctl /sbin/upsdrvctl
+ dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
if use cgi; then
elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2018-03-15 16:13 Mikle Kolyada
0 siblings, 0 replies; 62+ messages in thread
From: Mikle Kolyada @ 2018-03-15 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 80a9ca25a89db0e920f8df026ecbdfb67aa3d21e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 16:12:45 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 16:12:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a9ca25
sys-power/nut: arm stable wrt bug #643918
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-power/nut/nut-2.7.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index c461475fce6..ddbe49986a3 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
CDEPEND="
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2018-01-15 19:03 Tobias Klausmann
0 siblings, 0 replies; 62+ messages in thread
From: Tobias Klausmann @ 2018-01-15 19:03 UTC (permalink / raw
To: gentoo-commits
commit: fe059f0b96eba388d82c00625945da25784f7c8c
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 19:02:38 2018 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 19:02:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe059f0b
sys-power/nut-2.7.4-r1: amd64 stable
Gentoo-Bug: http://bugs.gentoo.org/643918
sys-power/nut/nut-2.7.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index 5ddcd060d4a..c461475fce6 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
CDEPEND="
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2018-01-08 22:50 Thomas Deutschmann
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Deutschmann @ 2018-01-08 22:50 UTC (permalink / raw
To: gentoo-commits
commit: 3d41d566db3a50e0ec50ca31989e71cae5580646
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 22:24:05 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 22:49:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d41d566
sys-power/nut: x86 stable (bug #643918)
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-power/nut/nut-2.7.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index bb9ae231202..5ddcd060d4a 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
CDEPEND="
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2018-01-08 22:24 Sergei Trofimovich
0 siblings, 0 replies; 62+ messages in thread
From: Sergei Trofimovich @ 2018-01-08 22:24 UTC (permalink / raw
To: gentoo-commits
commit: fa8f2c12449690cbd66c6ea7c98efdc4555c31d9
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 22:24:11 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 22:24:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8f2c12
sys-power/nut: stable 2.7.4-r1 for ppc/ppc64, bug #643918
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc ppc64"
sys-power/nut/nut-2.7.4-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index b12e97c160e..bb9ae231202 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ppc ppc64 ~x86 ~x86-fbsd"
IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
CDEPEND="
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2017-12-08 22:34 Matt Thode
0 siblings, 0 replies; 62+ messages in thread
From: Matt Thode @ 2017-12-08 22:34 UTC (permalink / raw
To: gentoo-commits
commit: 5946428c15a6940b0c2a11568c944753fab199c5
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 22:32:53 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 22:34:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5946428c
sys-power/nut: fix missing dep for nut-scanner
Package-Manager: Portage-2.3.14, Repoman-2.3.6
sys-power/nut/Manifest | 2 +-
sys-power/nut/nut-2.7.4-r1.ebuild | 270 ++++++++++++++++++++++++++++++++++++++
2 files changed, 271 insertions(+), 1 deletion(-)
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 104a2ea4747..eff76750888 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -1,4 +1,4 @@
DIST nut-2.6.5.tar.gz 2038832 SHA256 618df71cf1ca6e3700d1d3c282773a2dec85f9f20324c0d3234c824e97feb93f SHA512 f1c76e6280057dc558d53451e7de2bdc7f37a0f175b1c52c27e7dcb83deeb78f6885007ad188a7a3a19e411eba87e03eb2246310bd7a5a5bb6fa3ad2bebd49d8 WHIRLPOOL 2b189f77d18d26303c60f2c084796075b0a50b8aa9cbefc3ba9a83f037450ffc3ecdb289367435e784a6bbe8569f768a97130a1ccdf123e53f13e0cf8813fb9a
DIST nut-2.7.2.tar.gz 2223307 SHA256 4d5365359b059d96dfcb77458f361a114d26c84f1297ffcd0c6c166f7200376d SHA512 7d6b44e8f2d03544d9825274f4f3039911e335eb51620ded3dc08d51aeb096281c2ec848831815c54eecd4f2a25bdb1e6e5f479422e5291f03c3055da7ba52e6 WHIRLPOOL 6e7c45ef09fc2e86f0b79787043a9bf9954b5ef57fb16f9d453734680ff947abd8fb6665c5da4dac09850f5ab6a414039aa067803ecdeb2efd8537b8909f1ff9
-DIST nut-2.7.3.tar.gz 2317478 SHA256 ff44d95d06a51559a0a018eef7f8d17911c1002b6352a7d7580ff75acb12126b SHA512 3dd978712dc0fabe7e194dbf6d7bb442c456aa4d45bfc63ede8a3acae23c66811cbcf2705b55a6739129b5f120e6f5865bcb9d19eb9080507a85e2624d5663d6 WHIRLPOOL d9fe0c6545808a7daa25c45bd4f43fba1071cec0fd668d66b7926b6cd7af55e0d8c937bcdbb41e693f977c960c4e2ea95ff40d35b5f68695da5a7d1fc8da7265
+DIST nut-2.7.3.tar.gz 2317478 BLAKE2B 1a795e1c545894e14c5b0d3ac49a82d399af1c3e82cda60d74f855609dcc71f4970c087be5759ee5d25e6c756b6dd2b4a8d80ee28c0f84feb358a1df08648dab SHA512 3dd978712dc0fabe7e194dbf6d7bb442c456aa4d45bfc63ede8a3acae23c66811cbcf2705b55a6739129b5f120e6f5865bcb9d19eb9080507a85e2624d5663d6
DIST nut-2.7.4.tar.gz 2509831 SHA256 980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a WHIRLPOOL 79b2ad8d2bc1211ba67bb24fec77b61e93b62d3854d5fd908083ff061bcc247abbda8dbf27259d1c38fb6fbeeaf8db65c620b8b3fc4029f14c03b12855925178
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
new file mode 100644
index 00000000000..b12e97c160e
--- /dev/null
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools bash-completion-r1 eutils fixheadtails multilib user systemd flag-o-matic toolchain-funcs
+
+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
+ http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
+CDEPEND="
+ cgi? ( >=media-libs/gd-2[png] )
+ snmp? ( net-analyzer/net-snmp )
+ usb? ( virtual/libusb:0 )
+ ssl? ( >=dev-libs/openssl-1 )
+ tcpd? ( sys-apps/tcp-wrappers )
+ xml? ( >=net-libs/neon-0.25.0 )
+ ipmi? ( sys-libs/freeipmi )
+ zeroconf? ( net-dns/avahi )
+ dev-libs/libltdl
+ virtual/udev"
+DEPEND="$CDEPEND
+ >=sys-apps/sed-4
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-nut )
+"
+
+S=${WORKDIR}/${MY_P}
+
+# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
+SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
+SNMP_DRIVERLIST="snmp-ups"
+USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
+USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
+#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
+NEONXML_DRIVERLIST="netxml-ups"
+IPMI_DRIVERLIST="nut-ipmipsu"
+# Now we build from it:
+for name in ${SERIAL_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
+done
+for name in ${USB_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
+done
+for name in ${NEONXML_DRIVERLIST}; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
+done
+for name in ${SNMP_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
+done
+for name in ${IPMI_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
+done
+IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
+
+# public files should be 644 root:root
+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() {
+ 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
+ # in some cases on old systems it wasn't in the nut group either!
+ gpasswd -a nut nut 2>/dev/null
+ warningmsg ewarn
+}
+
+src_prepare() {
+ #ht_fix_file configure.in
+
+ epatch "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch"
+ epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
+ #epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch
+ #epatch "${FILESDIR}"/${PN}-2.6.5-freeipmi_fru.patch
+ #epatch "${FILESDIR}"/${PN}-2.7.1-fix-scanning.patch
+ epatch "${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
+
+ sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
+ -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
+ -i configure.ac || die
+
+ sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
+ -i scripts/udev/Makefile.am || die
+
+ rm -f ltmain.sh m4/lt* m4/libtool.m4
+
+ sed -i \
+ -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
+ lib/libupsclient{.pc,-config}.in || die #361685
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ append-flags -fno-lto
+ tc-export CC
+ tc-export CXX
+ tc-export AR
+
+ local UPS_DRIVERS=""
+ for u in $USE ; do
+ u2=${u#ups_drivers_}
+ [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
+ done
+ UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
+ myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
+
+ use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
+
+ # TODO: USE flag for sys-power/powerman
+ econf \
+ --sysconfdir=/etc/nut \
+ --datarootdir=/usr/share/nut \
+ --datadir=/usr/share/nut \
+ --disable-static \
+ --with-statepath=/var/lib/nut \
+ --with-drvpath=/$(get_libdir)/nut \
+ --with-htmlpath=/usr/share/nut/html \
+ --with-user=nut \
+ --with-group=nut \
+ --with-logfacility=LOG_DAEMON \
+ --with-dev \
+ --with-serial \
+ --without-powerman \
+ $(use_with cgi) \
+ $(use_with ipmi) \
+ $(use_with ipmi freeipmi) \
+ $(use_with snmp) \
+ $(use_with ssl) \
+ $(use_with tcpd wrap) \
+ $(use_with usb) \
+ $(use_with xml neon) \
+ $(use_with zeroconf avahi) \
+ $(systemd_with_unitdir) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ find "${D}" -name '*.la' -exec rm -f {} +
+
+ dodir /sbin
+ dosym /usr/sbin/upsdrvctl /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 AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING || die
+
+ newdoc lib/README README.lib || die
+ newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf || die
+
+ docinto cables
+ dodoc docs/cables/* || die
+
+ newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd || die
+ newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv || die
+ newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon || die
+ newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog || die
+ newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail || die
+
+ keepdir /var/lib/nut
+
+ einfo "Setting up permissions on files and directories"
+ 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}
+
+ # 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 virtual/udev; then
+ einfo "Installing non-udev hotplug support"
+ insinto /etc/hotplug/usb
+ insopts -m 755
+ doins scripts/hotplug/nut-usbups.hotplug
+ fi
+
+ dobashcomp "${S}"/scripts/misc/nut.bash_completion
+}
+
+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
+
+ # 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
+}
+
+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."
+ ${msgfunc} ''
+ ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
+ ${msgfunc} ''
+ ${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"
+ ${msgfunc} ''
+ ${msgfunc} 'If you want apcupsd to power off your UPS when it'
+ ${msgfunc} 'shuts down your system in a power failure, you must'
+ ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
+ ${msgfunc} ''
+ ${msgfunc} 'rc-update add nut.powerfail shutdown'
+ ${msgfunc} ''
+
+}
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2017-03-21 12:57 Michael Weber
0 siblings, 0 replies; 62+ messages in thread
From: Michael Weber @ 2017-03-21 12:57 UTC (permalink / raw
To: gentoo-commits
commit: d7430197c2f602fc381d01bf8e67177491144bbf
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 12:53:57 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 12:57:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7430197
sys-power/nut: arm stable (bug 594610).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sys-power/nut/nut-2.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.3.ebuild b/sys-power/nut/nut-2.7.3.ebuild
index e88546c60e0..55dd831f344 100644
--- a/sys-power/nut/nut-2.7.3.ebuild
+++ b/sys-power/nut/nut-2.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
CDEPEND="
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2016-12-20 18:21 Thomas Deutschmann
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Deutschmann @ 2016-12-20 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 82885a76762710e35464ae18ce5e5eeb9a472f57
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 18:19:55 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 18:20:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82885a76
sys-power/nut: x86 stable (bug #594610)
Package-Manager: Portage-2.3.2, Repoman-2.3.1
sys-power/nut/nut-2.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.3.ebuild b/sys-power/nut/nut-2.7.3.ebuild
index f09469c..ba1e1aa 100644
--- a/sys-power/nut/nut-2.7.3.ebuild
+++ b/sys-power/nut/nut-2.7.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
CDEPEND="
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2016-12-20 17:31 Tobias Klausmann
0 siblings, 0 replies; 62+ messages in thread
From: Tobias Klausmann @ 2016-12-20 17:31 UTC (permalink / raw
To: gentoo-commits
commit: da78c71106e296a0c1c8c0509cdc81167475a37a
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 17:20:13 2016 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 17:30:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da78c711
sys-power/nut-2.7.3-r0: stable on amd64
Gentoo-Bug: 594610
sys-power/nut/nut-2.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-power/nut/nut-2.7.3.ebuild b/sys-power/nut/nut-2.7.3.ebuild
index c083a5b..f09469c 100644
--- a/sys-power/nut/nut-2.7.3.ebuild
+++ b/sys-power/nut/nut-2.7.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
CDEPEND="
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2016-10-02 12:37 Pacho Ramos
0 siblings, 0 replies; 62+ messages in thread
From: Pacho Ramos @ 2016-10-02 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 7554472b32a61dd9dcbc41497e889518f6ef1daa
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 12:19:35 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 12:37:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7554472b
sys-power/nut: Use zeroconf instead of avahi USE flag (#477620)
Package-Manager: portage-2.3.1
sys-power/nut/nut-2.7.3.ebuild | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sys-power/nut/nut-2.7.3.ebuild b/sys-power/nut/nut-2.7.3.ebuild
index b137d65..c083a5b 100644
--- a/sys-power/nut/nut-2.7.3.ebuild
+++ b/sys-power/nut/nut-2.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,8 +17,8 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="avahi cgi ipmi snmp +usb selinux ssl tcpd xml"
-CDEPEND="avahi? ( net-dns/avahi )
+IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
+CDEPEND="
cgi? ( >=media-libs/gd-2[png] )
snmp? ( net-analyzer/net-snmp )
usb? ( virtual/libusb:0 )
@@ -26,6 +26,7 @@ CDEPEND="avahi? ( net-dns/avahi )
tcpd? ( sys-apps/tcp-wrappers )
xml? ( >=net-libs/neon-0.25.0 )
ipmi? ( sys-libs/freeipmi )
+ zeroconf? ( net-dns/avahi )
virtual/udev"
DEPEND="$CDEPEND
>=sys-apps/sed-4
@@ -142,7 +143,6 @@ src_configure() {
--with-dev \
--with-serial \
--without-powerman \
- $(use_with avahi) \
$(use_with cgi) \
$(use_with ipmi) \
$(use_with ipmi freeipmi) \
@@ -151,6 +151,7 @@ src_configure() {
$(use_with tcpd wrap) \
$(use_with usb) \
$(use_with xml neon) \
+ $(use_with zeroconf avahi) \
$(systemd_with_unitdir) \
${myconf}
}
^ permalink raw reply related [flat|nested] 62+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2016-03-18 19:11 Michał Górny
0 siblings, 0 replies; 62+ messages in thread
From: Michał Górny @ 2016-03-18 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 0d2b1f16bb834279e33365131ac3dd3ca350c4e6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 18:57:01 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 19:10:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2b1f16
sys-power/nut: Remove duplicate ups_drivers_nutdrv_qx flag desc
sys-power/nut/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index d7f35bd..bfe6c74 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -58,7 +58,6 @@
<flag name="ups_drivers_blazer_usb">Driver for Megatec/Q1 protocol USB based UPS equipment</flag>
<flag name="ups_drivers_richcomm_usb">Driver UPS equipment using Richcomm dry-contact to USB solution</flag>
<flag name="ups_drivers_riello_usb">Driver for Riello UPS Protocol UPS equipment via USB</flag>
- <flag name="ups_drivers_nutdrv_qx">Driver for Q* protocol serial and USB based UPS equipment</flag>
<flag name="ups_drivers_netxml-ups">Driver for Eaton / MGE Network Management Card / Proxy (XML/HTTP Protocol) equipment</flag>
<flag name="ups_drivers_snmp-ups">Multi-MIB Driver for SNMP UPS equipment</flag>
<flag name="ups_drivers_nut-ipmipsu">Driver for IPMI Power Supply Units (PSU)</flag>
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
@ 2015-09-03 4:53 Matt Thode
0 siblings, 0 replies; 62+ messages in thread
From: Matt Thode @ 2015-09-03 4:53 UTC (permalink / raw
To: gentoo-commits
commit: 69124d79c5423b564816167f78ca3b94a55a8720
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 04:52:40 2015 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 04:52:40 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69124d79
sys-power/nut: bup for bug 559390
Package-Manager: portage-2.2.20.1
sys-power/nut/Manifest | 1 +
sys-power/nut/nut-2.7.3.ebuild | 269 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 54a5d07..fcf9751 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -1,2 +1,3 @@
DIST nut-2.6.5.tar.gz 2038832 SHA256 618df71cf1ca6e3700d1d3c282773a2dec85f9f20324c0d3234c824e97feb93f SHA512 f1c76e6280057dc558d53451e7de2bdc7f37a0f175b1c52c27e7dcb83deeb78f6885007ad188a7a3a19e411eba87e03eb2246310bd7a5a5bb6fa3ad2bebd49d8 WHIRLPOOL 2b189f77d18d26303c60f2c084796075b0a50b8aa9cbefc3ba9a83f037450ffc3ecdb289367435e784a6bbe8569f768a97130a1ccdf123e53f13e0cf8813fb9a
DIST nut-2.7.2.tar.gz 2223307 SHA256 4d5365359b059d96dfcb77458f361a114d26c84f1297ffcd0c6c166f7200376d SHA512 7d6b44e8f2d03544d9825274f4f3039911e335eb51620ded3dc08d51aeb096281c2ec848831815c54eecd4f2a25bdb1e6e5f479422e5291f03c3055da7ba52e6 WHIRLPOOL 6e7c45ef09fc2e86f0b79787043a9bf9954b5ef57fb16f9d453734680ff947abd8fb6665c5da4dac09850f5ab6a414039aa067803ecdeb2efd8537b8909f1ff9
+DIST nut-2.7.3.tar.gz 2317478 SHA256 ff44d95d06a51559a0a018eef7f8d17911c1002b6352a7d7580ff75acb12126b SHA512 3dd978712dc0fabe7e194dbf6d7bb442c456aa4d45bfc63ede8a3acae23c66811cbcf2705b55a6739129b5f120e6f5865bcb9d19eb9080507a85e2624d5663d6 WHIRLPOOL d9fe0c6545808a7daa25c45bd4f43fba1071cec0fd668d66b7926b6cd7af55e0d8c937bcdbb41e693f977c960c4e2ea95ff40d35b5f68695da5a7d1fc8da7265
diff --git a/sys-power/nut/nut-2.7.3.ebuild b/sys-power/nut/nut-2.7.3.ebuild
new file mode 100644
index 0000000..b137d65
--- /dev/null
+++ b/sys-power/nut/nut-2.7.3.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools bash-completion-r1 eutils fixheadtails multilib user systemd flag-o-matic toolchain-funcs
+
+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
+ http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+IUSE="avahi cgi ipmi snmp +usb selinux ssl tcpd xml"
+CDEPEND="avahi? ( net-dns/avahi )
+ cgi? ( >=media-libs/gd-2[png] )
+ snmp? ( net-analyzer/net-snmp )
+ usb? ( virtual/libusb:0 )
+ ssl? ( >=dev-libs/openssl-1 )
+ tcpd? ( sys-apps/tcp-wrappers )
+ xml? ( >=net-libs/neon-0.25.0 )
+ ipmi? ( sys-libs/freeipmi )
+ virtual/udev"
+DEPEND="$CDEPEND
+ >=sys-apps/sed-4
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-nut )
+"
+
+S=${WORKDIR}/${MY_P}
+
+# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
+SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
+SNMP_DRIVERLIST="snmp-ups"
+USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
+USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
+#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
+NEONXML_DRIVERLIST="netxml-ups"
+IPMI_DRIVERLIST="nut-ipmipsu"
+# Now we build from it:
+for name in ${SERIAL_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
+done
+for name in ${USB_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
+done
+for name in ${NEONXML_DRIVERLIST}; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
+done
+for name in ${SNMP_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
+done
+for name in ${IPMI_DRIVERLIST} ; do
+ IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+ REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
+done
+IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
+
+# public files should be 644 root:root
+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() {
+ 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
+ # in some cases on old systems it wasn't in the nut group either!
+ gpasswd -a nut nut 2>/dev/null
+ warningmsg ewarn
+}
+
+src_prepare() {
+ #ht_fix_file configure.in
+
+ epatch "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch"
+ epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
+ #epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch
+ #epatch "${FILESDIR}"/${PN}-2.6.5-freeipmi_fru.patch
+ epatch "${FILESDIR}"/${PN}-2.7.1-fix-scanning.patch
+ epatch "${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
+
+ sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
+ -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
+ -i configure.ac || die
+
+ sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
+ -i scripts/udev/Makefile.am || die
+
+ rm -f ltmain.sh m4/lt* m4/libtool.m4
+
+ sed -i \
+ -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
+ lib/libupsclient{.pc,-config}.in || die #361685
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ append-flags -fno-lto
+ tc-export CC
+ tc-export CXX
+ tc-export AR
+
+ local UPS_DRIVERS=""
+ for u in $USE ; do
+ u2=${u#ups_drivers_}
+ [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
+ done
+ UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
+ myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
+
+ use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
+
+ # TODO: USE flag for sys-power/powerman
+ econf \
+ --sysconfdir=/etc/nut \
+ --datarootdir=/usr/share/nut \
+ --datadir=/usr/share/nut \
+ --disable-static \
+ --with-statepath=/var/lib/nut \
+ --with-drvpath=/$(get_libdir)/nut \
+ --with-htmlpath=/usr/share/nut/html \
+ --with-user=nut \
+ --with-group=nut \
+ --with-logfacility=LOG_DAEMON \
+ --with-dev \
+ --with-serial \
+ --without-powerman \
+ $(use_with avahi) \
+ $(use_with cgi) \
+ $(use_with ipmi) \
+ $(use_with ipmi freeipmi) \
+ $(use_with snmp) \
+ $(use_with ssl) \
+ $(use_with tcpd wrap) \
+ $(use_with usb) \
+ $(use_with xml neon) \
+ $(systemd_with_unitdir) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ find "${D}" -name '*.la' -exec rm -f {} +
+
+ dodir /sbin
+ dosym /usr/sbin/upsdrvctl /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 AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING || die
+
+ newdoc lib/README README.lib || die
+ newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf || die
+
+ docinto cables
+ dodoc docs/cables/* || die
+
+ newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd || die
+ newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv || die
+ newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon || die
+ newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog || die
+ newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail || die
+
+ keepdir /var/lib/nut
+
+ einfo "Setting up permissions on files and directories"
+ 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}
+
+ # 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 virtual/udev; then
+ einfo "Installing non-udev hotplug support"
+ insinto /etc/hotplug/usb
+ insopts -m 755
+ doins scripts/hotplug/nut-usbups.hotplug
+ fi
+
+ dobashcomp "${S}"/scripts/misc/nut.bash_completion
+}
+
+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
+
+ # 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
+}
+
+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."
+ ${msgfunc} ''
+ ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
+ ${msgfunc} ''
+ ${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"
+ ${msgfunc} ''
+ ${msgfunc} 'If you want apcupsd to power off your UPS when it'
+ ${msgfunc} 'shuts down your system in a power failure, you must'
+ ${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
+ ${msgfunc} ''
+ ${msgfunc} 'rc-update add nut.powerfail shutdown'
+ ${msgfunc} ''
+
+}
^ permalink raw reply related [flat|nested] 62+ messages in thread
end of thread, other threads:[~2024-10-12 11:22 UTC | newest]
Thread overview: 62+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-26 23:26 [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-10-12 11:22 Michał Górny
2024-10-12 10:08 Michał Górny
2024-10-12 7:52 Michał Górny
2024-05-29 18:27 Robin H. Johnson
2024-05-27 21:08 Robin H. Johnson
2024-05-27 21:08 Robin H. Johnson
2024-02-06 6:54 Sam James
2024-02-06 6:47 Sam James
2024-02-06 6:25 Sam James
2024-02-06 6:25 Sam James
2024-01-17 2:46 Ionen Wolkens
2024-01-01 0:12 Sam James
2023-12-18 13:36 Joonas Niilola
2023-12-18 1:09 Sam James
2023-12-18 0:11 Sam James
2023-12-11 13:04 Joonas Niilola
2023-08-09 3:34 Sam James
2023-06-24 1:18 Sam James
2023-06-17 17:11 Arthur Zamarin
2023-06-17 17:11 Arthur Zamarin
2023-06-17 15:48 Arthur Zamarin
2023-06-17 10:33 Yixun Lan
2023-06-17 3:56 Sam James
2023-06-17 3:55 Sam James
2023-06-17 3:19 Sam James
2022-06-21 18:21 Arthur Zamarin
2021-09-21 21:57 Marek Szuba
2021-08-18 14:28 Sam James
2021-08-04 19:37 Sam James
2021-07-09 22:36 Conrad Kostecki
2021-07-09 22:36 Conrad Kostecki
2020-08-30 1:17 Sam James
2020-08-22 15:51 Michał Górny
2020-08-11 18:46 Sam James
2020-08-10 14:33 Agostino Sarubbo
2020-08-07 18:51 Sam James
2020-02-19 18:24 Robin H. Johnson
2020-02-09 16:42 Michał Górny
2020-01-08 22:27 David Seifert
2020-01-08 22:27 David Seifert
2019-08-20 11:47 Louis Sautier
2019-08-13 12:10 Michał Górny
2019-07-29 10:45 Mikle Kolyada
2019-07-02 8:28 Sergei Trofimovich
2019-07-02 8:24 Sergei Trofimovich
2019-06-29 13:03 Agostino Sarubbo
2019-06-28 15:21 Agostino Sarubbo
2018-11-18 15:27 Thomas Deutschmann
2018-11-14 18:23 Robin H. Johnson
2018-10-27 19:02 Andreas Sturmlechner
2018-03-15 16:13 Mikle Kolyada
2018-01-15 19:03 Tobias Klausmann
2018-01-08 22:50 Thomas Deutschmann
2018-01-08 22:24 Sergei Trofimovich
2017-12-08 22:34 Matt Thode
2017-03-21 12:57 Michael Weber
2016-12-20 18:21 Thomas Deutschmann
2016-12-20 17:31 Tobias Klausmann
2016-10-02 12:37 Pacho Ramos
2016-03-18 19:11 Michał Górny
2015-09-03 4:53 Matt Thode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox