From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B574D158287 for ; Fri, 16 May 2025 06:13:25 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A20583437C0 for ; Fri, 16 May 2025 06:13:25 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9F9C311036D; Fri, 16 May 2025 06:13:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 94F8C11036D for ; Fri, 16 May 2025 06:13:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 447453437AE for ; Fri, 16 May 2025 06:13:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8C85C3A for ; Fri, 16 May 2025 06:13:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1747375961.cb1f30a658b607217a34a42a54fb6f11ad0451fc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/nut/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-power/nut/Manifest sys-power/nut/nut-2.8.0-r3.ebuild sys-power/nut/nut-2.8.2.ebuild X-VCS-Directories: sys-power/nut/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cb1f30a658b607217a34a42a54fb6f11ad0451fc X-VCS-Branch: master Date: Fri, 16 May 2025 06:13:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 402161d8-046d-4579-a62f-6236cc69f453 X-Archives-Hash: d75a8e70e467b6d674948932fbfa8a8d commit: cb1f30a658b607217a34a42a54fb6f11ad0451fc Author: Sam James gentoo org> AuthorDate: Fri May 16 06:12:04 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 16 06:12:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb1f30a6 sys-power/nut: drop 2.8.0-r3, 2.8.2 Signed-off-by: Sam James gentoo.org> sys-power/nut/Manifest | 1 - sys-power/nut/nut-2.8.0-r3.ebuild | 219 ------------------------------- sys-power/nut/nut-2.8.2.ebuild | 262 -------------------------------------- 3 files changed, 482 deletions(-) diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest index 3f96fe4e9732..7d9f7ed8a94f 100644 --- a/sys-power/nut/Manifest +++ b/sys-power/nut/Manifest @@ -1,3 +1,2 @@ -DIST nut-2.8.0.tar.gz 3287640 BLAKE2B 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94 SHA512 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577 DIST nut-2.8.2.tar.gz 5599935 BLAKE2B 87187293d8acda72c2d807d6f41f2601a318540f63a0ea93782b115402c6b43a0b61ecc710fd6de126d25e59dd4e03681f2b859a87549e9d5f7617ac7b2dad8c SHA512 b6f8f22318e4a4fcb8073a63132b1cb083952c665191b82a7d6765a61b859575a4b0c2ba84ed17cfb8c88d34179876d64520dd2f75f02fe8707b406da2c0821c DIST nut-2.8.3.tar.gz 6240908 BLAKE2B 515e829286b123610a856003a8838a022ae365b193988477086a683b9da0a99b3b1cf048cecd75c764c8a9a03856e966bd9d82333475670d1df43899d9b8a7bf SHA512 0aeafad02ab323b02041a370c586dede91483cab57e0a9d1256a685716ca9f0d0f114df904ef472d48fa53ac1896690b7878828eb3b00934959c7aeaa63af99f diff --git a/sys-power/nut/nut-2.8.0-r3.ebuild b/sys-power/nut/nut-2.8.0-r3.ebuild deleted file mode 100644 index c477f083e7df..000000000000 --- a/sys-power/nut/nut-2.8.0-r3.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2025 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 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 - 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 - - 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 deleted file mode 100644 index 4f2e397b5bab..000000000000 --- a/sys-power/nut/nut-2.8.2.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2025 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.patch" -) -PATCH_NEEDS_AUTOGEN=1 - -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 ]] || [[ ${PATCH_NEEDS_AUTOGEN} == 1 ]] ; 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 - 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 README.lib.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 -}