From 5c4786a868bad6e3f46aecf32ad6c6dc5de98408 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 May 2024 00:07:15 +0100 Subject: gentoo auto-resync : 29:05:2024 - 00:07:15 --- sys-power/Manifest.gz | Bin 5742 -> 5742 bytes sys-power/nut/Manifest | 9 +- 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 --------------------------- sys-power/nut/nut-2.8.2.ebuild | 262 ++++++++++++++++++++++++++++++++ sys-power/nut/nut-9999.ebuild | 2 +- sys-power/upower/Manifest | 2 +- sys-power/upower/upower-1.90.4.ebuild | 2 +- 9 files changed, 269 insertions(+), 554 deletions(-) delete mode 100644 sys-power/nut/nut-2.7.4-r8.ebuild delete mode 100644 sys-power/nut/nut-2.8.0-r2.ebuild create mode 100644 sys-power/nut/nut-2.8.2.ebuild (limited to 'sys-power') diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz index 8f38f14e139c..1faaf1c2d9c5 100644 Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest index 00001ab6c6b0..92160a37d833 100644 --- a/sys-power/nut/Manifest +++ b/sys-power/nut/Manifest @@ -12,10 +12,9 @@ AUX nut-2.8.0-init.d-upsd 667 BLAKE2B f3ec275cd401df017428c3772fb3f0d51b66173e3d AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1 AUX nut.powerfail.initd 1305 BLAKE2B 88bd2a1b5b3fbb2ab9ea4d408e4cc57399702c587ec8314c5b78aa5ce03d4de0f4850ecd580140bf5a42947853f7f64953e0a2859fb1f83de185682d6b600500 SHA512 9e171fc192efaa16e554725b6bf40377e648400f6f6e860d436218289fadcf96c7209fed76129d0dfec912dc5702cca11c90fea072767135fe1a2ba8e11ef2ac AUX systemd_notify.path 1753 BLAKE2B a44167bf491b393474b94ee4c375013cd23d1e1151311eab40ba6ca2c190019631aeb3fd21e20b9ce0a0b98d98506c88ddd9fe043a1000268d8b7b4195d8b489 SHA512 9984fb879a002cd00949dd7e10f5720f3b50ce871312750dbdb8b805903b37b1f8be2c7b2f6b79a13739fba2c28bf0f85427af7c9b7421ebf13cabfb3cd88381 -DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a DIST nut-2.8.0.tar.gz 3287640 BLAKE2B 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94 SHA512 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577 -EBUILD nut-2.7.4-r8.ebuild 8839 BLAKE2B df9cfb0d44952cf6847964a15721153a57f4effd146ef9f9ffcff29c87a09038167ff74009a086132d21a06ae72a16a6c39758eb2cbe59e6eb1b4a660ccb3e7a SHA512 8cae8d96ad22e44ba3594ee09e399dee5a566e5e16b140a5fd707d2f4efc794655fa6cf83602ba4c3a7667cb304294a7b3898ed28812a0ec56dad01e26312fd0 -EBUILD nut-2.8.0-r2.ebuild 5808 BLAKE2B 267fbf12c94da4b9516ccdf7524a87210fa14e547993a2476f61f76f39126384ce7f1a9eec42fe0c05b77bc29e50260c96bff29914d4fb775a9b29600b6010c9 SHA512 935fa8fb6a67786abe5d5afe8be9ad3053dfeccde935ece806b9ac8392246d0db11f90e45b36d912c3d8c137e2d5bb46a9284bb21f4d952fa7c09b4a7bd7acf4 +DIST nut-2.8.2.tar.gz 5599935 BLAKE2B 87187293d8acda72c2d807d6f41f2601a318540f63a0ea93782b115402c6b43a0b61ecc710fd6de126d25e59dd4e03681f2b859a87549e9d5f7617ac7b2dad8c SHA512 b6f8f22318e4a4fcb8073a63132b1cb083952c665191b82a7d6765a61b859575a4b0c2ba84ed17cfb8c88d34179876d64520dd2f75f02fe8707b406da2c0821c EBUILD nut-2.8.0-r3.ebuild 5736 BLAKE2B ff76344746befe48fbdcd9c3f9d6230151c5443504e26cf55fc4dd6e24aa98f361470d80a2ce913a08eb66fe0d9ac8a3fa7c9bd3bbff98c2f82a4ee98ee635e9 SHA512 6f213d2a7e9affa7b598ce3bea7c0cf2915e25d9143007fe679733a95cf584ac6a810a4ccd8dc12b8b3ce8184cafc4d45572ca26130068409efd43754bdd62c0 -EBUILD nut-9999.ebuild 6881 BLAKE2B 3be9c0da9c89ad7b6bbc1a51d3b85d21a2462b5caea152dc4b0356005494cd7329f5d4156e696e5ca11824d0036d2519f28771977f240672900401b2b4fffd36 SHA512 1f2f2ad0a4d9ef14a125fd4cc8c7e589a994b36d1315d0c7639b3b85c11572bd765242babbe238348d1868ea98c69e934d1b4b2cc52d383a2b5c85251f7a645f -MISC metadata.xml 6068 BLAKE2B 499dd975b0364733e71175eb061d935f754343d32d6eba547a26659438a0488a25509e907516b73d7bfd9714be28bc2159dd8688d2578611c9b9fca419881446 SHA512 cc42c7645c78516a2b2e82ec09098c88c1f7fbcc68f5685906811b9182dd4869c31c4eb865c5deab8cc105cf24e32161cf7db746fe793e6bea08fbf12f561e79 +EBUILD nut-2.8.2.ebuild 6947 BLAKE2B af572f794a44c2c2f3e33261604dfc42cce5f5a868201345487b7269cf0160c3aa5bde31e629d40b8728a4446ce05418b128d107af2e0f54883dbe9d86795264 SHA512 96892af86c21b5217829770eb441e02fef88e921e78516fb9fb2e3959ac9b50cc8b90bfbc324738b4894d9bda00aa47534a14cc6a69a6833fd6ffc996fd45dcf +EBUILD nut-9999.ebuild 6947 BLAKE2B af572f794a44c2c2f3e33261604dfc42cce5f5a868201345487b7269cf0160c3aa5bde31e629d40b8728a4446ce05418b128d107af2e0f54883dbe9d86795264 SHA512 96892af86c21b5217829770eb441e02fef88e921e78516fb9fb2e3959ac9b50cc8b90bfbc324738b4894d9bda00aa47534a14cc6a69a6833fd6ffc996fd45dcf +MISC metadata.xml 1351 BLAKE2B 7673ac0c20af6c4b5e3a57f2cad063b40f4141069974544202fe0c34e1df3996fa91af47598616208b17c100c590db4afeff3d0ef61731c6a05768ed2421c9b3 SHA512 7f4755b84bd2c84f42c987a035cd4b91f74a57bbfa57289cfe7aafd02e10e43beca25edced1273a4282db6a257262201e6921190c5ac069fc9ffcd0767ebb31b 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 @@ Includes all UPS drivers that use SNMP. Includes all UPS drivers that use USB. Includes all UPS drivers that use XML. - Driver for Eltek UPS models with AL175 alarm module - Driver for UPSes supporting the serial BCM/XCP protocol - Driver for Belkin serial UPS equipment - Driver for Belkin "Universal UPS" and compatible - Driver for Best Power Fortress/Ferrups - Driver for old Best Fortress UPS equipment - Driver for Best Power Micro-Ferrups - Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment - Driver for multi-purpose UPS emulation - Driver for ETA UPS equipment - Driver for Ever UPS models - Driver for Gamatronic UPS equipment - Driver for contact-closure UPS equipment - Driver for ISBMEX UPS equipment - Driver for Liebert contact-closure UPS equipment - Driver for Liebert UPS, using the ESP-II serial protocol - Driver for Masterguard UPS equipment - Driver for Meta System UPS equipment - Driver for MGE UPS SYSTEMS UTalk protocol equipment - Driver for Microdowell Enterprise UPS series - Driver for SHUT Protocol UPS equipment - Driver for SHUT Protocol UPS equipment (older implementation) - Driver for Oneac UPS equipment - Driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment - UPS driver for serial Powercom/Trust/Advice UPS equipment - Driver for Brazilian Microsol RHINO UPS equipment - Driver for SafeNet compatible UPS equipment - Driver for Brazilian Microsol SOLIS UPS equipment - Driver for Tripp-Lite SmartPro UPS equipment - Driver for Tripp-Lite SmartOnline (SU) UPS equipment - Driver for UPScode II compatible UPS equipment - Driver for IMV/Victron UPS unit Match, Match Lite, NetUps - Driver for PowerPanel Plus compatible UPS equipment - Driver for Megatec/Q1 protocol serial based UPS equipment - Fake driver to clone outlets for device grouping - Fake driver to clone outlets for device grouping - driver for the IVT Solar Controller Device - Driver for American Power Conversion Smart Protocol UPS equipment - Driver for American Power Conversion Smart Protocol UPS equipment - Driver for apcupsd client access - Driver for Riello UPS Protocol UPS equipment - Driver for Q* protocol serial and USB based UPS equipment - Driver for USB/HID UPS equipment - Experimental driver for UPSes supporting the BCM/XCP protocol over USB - Driver for older Tripp Lite USB UPSes (not PDC HID) - Driver for Megatec/Q1 protocol USB based UPS equipment - Driver UPS equipment using Richcomm dry-contact to USB solution - Driver for Riello UPS Protocol UPS equipment via USB - Driver for Eaton / MGE Network Management Card / Proxy (XML/HTTP Protocol) equipment - Multi-MIB Driver for SNMP UPS equipment - Driver for IPMI Power Supply Units (PSU) networkupstools/nut 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 -} diff --git a/sys-power/nut/nut-2.8.2.ebuild b/sys-power/nut/nut-2.8.2.ebuild new file mode 100644 index 000000000000..e59050b0c4e5 --- /dev/null +++ b/sys-power/nut/nut-2.8.2.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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 + +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 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64 +fi + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +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=" + 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:= ) + zeroconf? ( net-dns/avahi ) +" +BDEPEND=" + virtual/pkgconfig + man? ( app-text/asciidoc ) + test? ( dev-util/cppunit ) +" +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() { + 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 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" + fi + + # Now do the actual checks setup above + 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() { + 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 + --with-altpidpath=/run/nut + --with-pidpath=/run/nut + $(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) + $(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 ) + use python && myeconfargs+=( --with-python3="${PYTHON}" ) || myeconfargs+=( --without-python3 ) + + export bashcompdir="$(get_bashcompdir)" + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + rm -rf "${ED}/etc/hotplug" || die + + find "${ED}" -name '*.la' -delete || die + + dodir /sbin + + 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.adoc README.adoc TODO.adoc UPGRADING.adoc ) + einstalldocs + + if use doc; then + newdoc lib/README.adoc + 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 + + 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 + + use python && python_optimize +} + +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 + 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 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}" diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest index b8828accffc4..a41d9ecf1148 100644 --- a/sys-power/upower/Manifest +++ b/sys-power/upower/Manifest @@ -4,5 +4,5 @@ DIST upower-v1.90.2.tar.bz2 138265 BLAKE2B f00b3a584f5564a0edc7fadad2e005da5938e DIST upower-v1.90.4.tar.bz2 139422 BLAKE2B a06be2d483773a2115f4cdd4f7c023589ebc937846fc360341cd57d1a225f4dc1b448f50438216c3ae679effa86d61b96f7c4b9d59f6b0f30e9dcbc047a5cac7 SHA512 2db8f2fea4086939c7ec236674ddd03ff043eeb1c7e46deb40b45aed5d31b6eb0e84fa44f189336b0a171f3e2f92f2f50e2f355b9366e0d686e570d0107e88da EBUILD upower-0.99.20.ebuild 2794 BLAKE2B b6d2482072d87a91d3e22a78ba5909c3cb08cc761eec4c276c59405a9bd3a1ab01b38eacc870bc0411ac34c243f6d49dba82f8da9f597a89d5f7970fe125cbc3 SHA512 d21cc207336b1ff3e033a375b3b8bbbb5aec847aeb54d1982bb2a01bbd04c96acd9b8d42a8009aadfa4883dd1641152038c5821b140aba9844d943d8bba43aa8 EBUILD upower-1.90.2.ebuild 2868 BLAKE2B 837f5a6e1293dbc58bb854a03f55f6743d8bf61adb5285cce4e6ae52107f07def48dfe943e0ee5570c80f34be9f5a50e3fec49454101d0710b3db0ea56f6feb1 SHA512 8350b522953c0ce8e1b0f99dc76891770e590d8a57ac075d86a41be9159efa7a9986d4e273e50f726ef8a41e3e797728983108ab851ae0801e2a68769ee8dca4 -EBUILD upower-1.90.4.ebuild 2807 BLAKE2B a9d97fb9859b7022da706990dc1f6183bb3ae77ce0594baadd40a56bdabd0930e96395b11876c9eb6e42701e615ba95a52a09e65522322b3b0c842a2bcc044b0 SHA512 2a9f000a8d529406a664a11a06c4c9e407e6a4e42168290d98d1fa3bc3e84af731a7c856948a25a35175c8fae73c500f1cef164c44f71a39a68a9bac197ddbbc +EBUILD upower-1.90.4.ebuild 2810 BLAKE2B 5ef270ade046d0442ee2f31fd2a59af81a7cf659f3d09ca758e8def60d907d8a40c184d65ea1f11224cceda96e924c2c309028d2ad09395ed925a8fc97999829 SHA512 40e6cae61f2f847f129c8c36eec71a3d654fd07f18048bc939cdbe453a042a951b0357a49010ca0eb30894e8290ef40e91076fb07299fa2ae508e9fc760f39f9 MISC metadata.xml 319 BLAKE2B deed435a52138ca25bc6db202a294303839a6be54e3c257f25e25b8050ae30992fd18054cf568bcfd33e14211523a328546cf9732fc10844437994fa79e3f63d SHA512 47a7e588aee976740610165259518b427b425dc9aaff3afd74d4abb34717dd4ca23c0d062347a1257e192a56ce16d7793d4d58738d0cfd178adcc55992136194 diff --git a/sys-power/upower/upower-1.90.4.ebuild b/sys-power/upower/upower-1.90.4.ebuild index aab38ecfe71d..e82c9b767870 100644 --- a/sys-power/upower/upower-1.90.4.ebuild +++ b/sys-power/upower/upower-1.90.4.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-v${PV}" LICENSE="GPL-2+" SLOT="0/3" # based on SONAME of libupower-glib.so -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" # gtk-doc files are not available as prebuilt in the tarball IUSE="doc +introspection ios selinux test" -- cgit v1.2.3