gentoo resync : 25.08.2020

5 files changed, 61 insertions, 305 deletions

diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 4d6429067599..895f94bf13a2 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -7,9 +7,9 @@ AUX nut-2.6.5-init.d-upslog 573 BLAKE2B 2a0e04f83990035beb12eee33cfe7ce4fdcd1f31
 AUX nut-2.6.5-init.d-upsmon 557 BLAKE2B a48b215181d6b40691db244d38b5868e69844f5a1ee6f91cb8815c4386ae801f957b2fbaf53fbe5dd98925be42036dbd54dd5d13c0077c8884e018fac24d101a SHA512 9ccf947b2c5e7a73e96148edb7684f21ae84c4212b980f2ba7b88006dc1e3400b1b9017202b87648f928a3e19f4898094622a6683e0995b72f355ccb394280c3
 AUX nut-2.7.1-snmpusb-order.patch 1417 BLAKE2B 20c3150559d3810c8bf15a9560ccf950ad1bb26bd58b4f2bcf3736871f4599bc3ad948e5f008b1549184f78d0fa3b417bbc8728660fbb110f4537fce83231bad SHA512 df3701821bc4ef45a5089e4d4439c3367fb23cefce7d06168bd422a8c32a1b373ae9fb3456bd5f90a51a672edf9ce29254a08c2045efe210a11b82399793ec19
 AUX nut-2.7.2-no-libdummy.patch 535 BLAKE2B f18f65ca92e834b5e085358a09c7363cf156b4a156c6c99d4f7cc34a17d25cf1518f342c072791eb37db613a6dafc32aeed364b88063c4d92d20e21e34a5d807 SHA512 a402a70a4cfc922d31203560627ace87f82795aef072d333cb1bfb91a6b67fbc10769e5d68a8d2741ca512b81b5754e9141b68dcb197dbe558ed5556e2de37a1
+AUX nut-2.7.4-py3.patch 1940 BLAKE2B 5bb77bca18ad40a1ba4e579098accb0135c0f4b24436425de3983204554ddb0aeceb473a7a6729048dbfb6175e015129a8bfcce26b169b3e21c905f9f08f079e SHA512 2a4f12954bdf2e50cbfb7a7dd09ed83be27ed2a6d0a2e4244ca8b309614515599c81541b5cfb4c81244b739cf3a47d56cb2746db3fae9e8861c5115c0287041b
 AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1
 AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee
 DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
-EBUILD nut-2.7.4-r4.ebuild 9808 BLAKE2B a95ead540d77690135d4d4127bc0271ba32ec98306101f201cc2d52607fd7d0e2b0f88bca8ebfd8c223362c11bcebf8cc6e59a379760bb30ee9048f5edde8d32 SHA512 7279d23da8aad9d567fb04ff467cc356ceea33dfafce971b31ef60a9fed871f91fd93628518373d7774fbeceb0ab5edcfdd728e00ae99430e6646d815e7d0897
-EBUILD nut-2.7.4-r5.ebuild 8967 BLAKE2B ed8112841bcc9e00e1a43afd5772a3ed962341b911b405456557bee80a4ce7cc7427edd8e5009c4ddd19a47edf4408c6de21257dbe14f8e51743f03aca900f64 SHA512 df8ae043ab75494ae483004fd812813f8bf7a59628384957d89aa6ff73768bd5c5204ba8e218187907e0a2629986cd20492c6f879890940fc1b5db96407577eb
-MISC metadata.xml 5329 BLAKE2B a97167cdd654c0a1cfc035fbab98a8c94150522b77651186f8c706ac2ebadac6b3e38c8c563a6fa16ac91fc8da760efd204ce3d3ce8e3e0c5239a9dd8c1adf4e SHA512 e57d635a530b16627fbc4807a07a227900189a8796285f309b710c4acb951c990b4f613dc9b3cbab71c480641d8ebfd942520a13e5712527d0058ca07c16b67d
+EBUILD nut-2.7.4-r6.ebuild 8999 BLAKE2B a94ea04ff35787debeb39c22f93f8576d9c1d37cd0ef4356562ab03091944715593a00c8ac2bdd3ae975117183e60f179442adc0ad7c1902549ee7d069992457 SHA512 bc39684b03642d4fd9fdd8d898cabcdc1b57d1a7f44e49d343c5a6ba3e3f2ec351861017f39ec10d3d0ccca2be3a6c23fdb38f72836739b658d054bceb370bf6
+MISC metadata.xml 5272 BLAKE2B cc580840e8c437fb37cd8c2132d2daf6751097374ccf11c5a7519756adc6b5d3654e3c40cfe7a66cee8ee5b016c09f65f4f425e4edbd503aed88da5f0eedc1a9 SHA512 f3133fcd673344452904f95d5898fdca3988970bf6526f50191cfa1741fb222468dc00652e968ba305a21851e6a070478627d181c26f6a1d152a215399f469ee
diff --git a/sys-power/nut/files/nut-2.7.4-py3.patch b/sys-power/nut/files/nut-2.7.4-py3.patch
new file mode 100644
index 000000000000..dbe661982eb1
--- /dev/null
+++ b/sys-power/nut/files/nut-2.7.4-py3.patch
@@ -0,0 +1,56 @@
+From eea0c5e9e5566c36a8b1e364ed4909231901a8f5 Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <git@the-compiler.org>
+Date: Tue, 29 Nov 2016 10:45:04 +0100
+Subject: [PATCH 1/2] Make gen-nutupsconf-aug.py work with Python 3
+
+This makes the script work with Python 2.6+.
+Fixes #345.
+---
+ scripts/augeas/gen-nutupsconf-aug.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/augeas/gen-nutupsconf-aug.py b/scripts/augeas/gen-nutupsconf-aug.py
+index 55db17a73..4bb201602 100755
+--- a/scripts/augeas/gen-nutupsconf-aug.py
++++ b/scripts/augeas/gen-nutupsconf-aug.py
+@@ -18,6 +18,8 @@
+ # This program extracts all drivers specific variables, declared
+ # using 'addvar()' and output a complete ups.conf lens for Augeas
+ 
++from __future__ import print_function
++
+ import sys
+ import re
+ import glob
+@@ -69,7 +71,7 @@ def grep(string,list):
+ 
+ 	if (len(sys.argv) == 2):
+ 		dirPrefix = sys.argv[1]
+-		print dirPrefix
++		print(dirPrefix)
+ 
+ 	# 1/ Extract all specific drivers parameters, in a sorted list with unique entries
+ 	# 1.1/ List all drivers implementation files
+
+From 7bf209a5deef1ec1f05cf89c25c8399590d4e4e8 Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <git@the-compiler.org>
+Date: Tue, 29 Nov 2016 17:37:01 +0100
+Subject: [PATCH 2/2] Fix gitlog2changelog.py on python 3
+
+---
+ tools/gitlog2changelog.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/gitlog2changelog.py b/tools/gitlog2changelog.py
+index d8c089187..f0bea4af6 100755
+--- a/tools/gitlog2changelog.py
++++ b/tools/gitlog2changelog.py
+@@ -80,7 +80,7 @@
+             else:
+                 message = message + " " + line.strip()
+     # If this line is hit all of the files have been stored for this commit
+-    elif re.search('files? changed', line) >= 0:
++    elif re.search('files? changed', line):
+         filesFound = True
+         continue
+     # Collect the files for this commit. FIXME: Still need to add +/- to files
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index bde98d03e531..384bfbd43fce 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 38d45641885d..000000000000
--- 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-r6.ebuild
index 3570688276d7..79cbbe8f3dc3 100644
--- a/sys-power/nut/nut-2.7.4-r5.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"
 
@@ -79,6 +79,7 @@ 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
 )
 
 pkg_setup() {