gentoo resync : 09.07.2022

6 files changed, 180 insertions, 2 deletions

diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index cab41561cd62..0f319078666b 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,5 +1,10 @@
+AUX irker-2.22-fix-tcpserver.patch 1068 BLAKE2B e2aaef99a33f5464194feb4dc61e99325ae0012dfd7065049e54351b192bd46cbfc86a5c4b7ebcc42213dbfa3dd5177eb17dbc0ba8499ac482ae6f6ce9e0fd25 SHA512 220ebc5376ba0e4be95d21816147bf871f233dd23de24d3b52a0215d91015d83d2d4678c1725331151725f187fe465d49f81f9f8ae9539feccde710c5773a5be
 AUX irkerd.confd 535 BLAKE2B fe8484cee8e5d443c3019c9915553e503164a2e5e965b44e89200fd71c8a2152bf5ca0dc43e5e93b46dfff6e683d8fc2d364dd27048d16642c4043a4f936d3af SHA512 00656916acb9fa2cbee57442a7a90bfbc7213c03ad3ee38b01314679b66177fa6152400ad3401e87be3711e6e38e09b084ea90cb71ae5774c8eba5cf9ab8e070
 AUX irkerd.initd 963 BLAKE2B 33e4b654eb908d5d2b5c086d821f81d959bcb71ec93b80c7aa38ffaf75f011d41f43b9369115d0ac463ecdc3781ee7360d06fa8afe9c7e66a79fc55e8340d338 SHA512 fa9247c207f4a21611e51477c31556114d83899ea7adcc8bf8f3bb3edafaa8db84b4764ac5704dfe7abff2e5f9727610b71609a620432dc939a81d2ab7fcf818
+AUX irkerd.service 517 BLAKE2B de89f8ff4d98928b8d4035e545a2c0628b849246ce5eae393341cf894a89ec1b33087da6c756d8b3b17784175541bd366dbf0b17c38e1e36cacd2b0da48a2391 SHA512 d31699cef084bfeb2272e49c7eeb050148e942286cd9cb2cd6491a97210628f08f05c04ddd052a8ee9cccba33ecd3e460f99aeb52dd1c1ae1ef65ef8754ddf49
+DIST irker-2.21.tar.gz 45563 BLAKE2B d2bb9ee1c33640c049919a0d0ec92cd01dbd9fd086120123b5344f44180dbd94d6b0beb56387968f6feaf526b8a11300d415d87b3243bcd2d5c1fa5c8d4aaa5d SHA512 d90922abd61fef13d8030ce666a32fd79e17812f06517796c933d62a9b7cd814bdbeb3de11357ca1766bbffafb0379f0a8b2f288a2be58fa6be82cc764e0b225
 DIST irker-2.22.tar.gz 46037 BLAKE2B fbd9deaaa5cc509989b15d16d733bec351b7b2ab9d3bedd8b20713ba110755a43ccb91b1482a6deb0f71497b3b1d6f8ed5faae395c06c33ac4c9ea7da30d2726 SHA512 a3f2ebe113e4fcb4589c31a44c157bc0f91e8792fd7819e9f350fd25847669d2cb3fcd51cc0e09ef352952c5175f8b4eb56ac9969f0bff1544e28268728f0595
-EBUILD irker-2.22.ebuild 1523 BLAKE2B 935cece1754910b3d89b33c286315afc03e3286cdecb650e0cba7b2d87b646835d11ab936ee6cab649809d4e61ec25c9d7041829dba1ae7439505b4c058d554a SHA512 2fa7fe78eb5be29c306391e1a0016758e86b39b97ee3bc08785c1b93b867944d86bd5b7d8f9746808fe6d3a23708664d1df93534874d43a42c765cde1781db38
+EBUILD irker-2.21.ebuild 1523 BLAKE2B 935cece1754910b3d89b33c286315afc03e3286cdecb650e0cba7b2d87b646835d11ab936ee6cab649809d4e61ec25c9d7041829dba1ae7439505b4c058d554a SHA512 2fa7fe78eb5be29c306391e1a0016758e86b39b97ee3bc08785c1b93b867944d86bd5b7d8f9746808fe6d3a23708664d1df93534874d43a42c765cde1781db38
+EBUILD irker-2.22-r2.ebuild 1626 BLAKE2B 763a942fba5d3acf7ea659c651f5cb3385d6c9ddba3aea8115077de3c76a0aa7d2dc9ddf4bde1bd1e7bb1d7c7be3e30137445b3c062bb108efdf405b4675a00b SHA512 9b094c0fed3d59a633dc391b23c50f6f2993eec97fae36237154d096bec3f0c1c09b13f345807db698a1052c4c70f31d8ed4793e38e0177453722dacd3e5714c
+EBUILD irker-2.22.ebuild 1530 BLAKE2B ef33718b10796cb669b8c613d64c70998cc68b23ddfc82a8e20c34bca988c6251c93910b74e5cd9d6c39a4ff37ab7fdbf251582fbcaee747440ba8415af9d0e7 SHA512 8317033a447fe910f4120459ceaebf587d2f204f7451f7a9419ce028be2e76e24cfc4233f4400bfc9ef61c2bca135b889c94f5da96e4485cc19e900e33853064
 MISC metadata.xml 338 BLAKE2B 75e1de187c8161e49dcc6ab3c7ee3020455f09f842d798404398d195495e9e5b58cc6252c092a3f411ff848acbb258a10cd6120470bd907f5daa9459b6d719a1 SHA512 f804005b7aa3039b1400eb323d254b40ddace228a638fc37901e60b95c7b10f428df40b5afbf5f4b2facf05a2f91020f001c8d58d258efee0732dbc7935ac066
diff --git a/net-irc/irker/files/irker-2.22-fix-tcpserver.patch b/net-irc/irker/files/irker-2.22-fix-tcpserver.patch
new file mode 100644
index 000000000000..1848a4430cc7
--- /dev/null
+++ b/net-irc/irker/files/irker-2.22-fix-tcpserver.patch
@@ -0,0 +1,22 @@
+https://gitlab.com/esr/irker/-/merge_requests/29
+
+From da933d5188d88ef0557bda59f02188f164ad427c Mon Sep 17 00:00:00 2001
+From: "Frank Ch. Eigler" <fche@elastic.org>
+Date: Mon, 11 Apr 2022 15:43:22 +0000
+Subject: [PATCH] irkerd: correct typo to our internal TCP/UDP ipv6 server
+ classes
+
+--- a/irkerd
++++ b/irkerd
+@@ -1131,8 +1131,8 @@ if __name__ == '__main__':
+             tcpserver = socketserver.TCPServer((args.host, PORT), IrkerTCPHandler)
+             udpserver = socketserver.UDPServer((args.host, PORT), IrkerUDPHandler)
+             # pylint: disable=undefined-variable
+-            tcp6server = TCPServer((args.host6, PORT), IrkerTCPHandler)
+-            udp6server = UDPServer((args.host6, PORT), IrkerUDPHandler)
++            tcp6server = TCP6Server((args.host6, PORT), IrkerTCPHandler)
++            udp6server = UDP6Server((args.host6, PORT), IrkerUDPHandler)
+             for server in [tcpserver, udpserver, tcp6server, udp6server]:
+                 server = threading.Thread(target=server.serve_forever)
+                 server.setDaemon(True)
+GitLab
diff --git a/net-irc/irker/files/irkerd.service b/net-irc/irker/files/irkerd.service
new file mode 100644
index 000000000000..232a8d5811a5
--- /dev/null
+++ b/net-irc/irker/files/irkerd.service
@@ -0,0 +1,21 @@
+# Copyright 2012 Wulf C. Krueger <philantrop@exherbo.org>
+# Copyright 2022 Arthur Zamarin <arthurzam@gentoo.org>
+# Distributed under the terms of the BSD LICENSE
+
+[Unit]
+Description=Internet Relay Chat (IRC) notification daemon
+Requires=network.target
+Documentation=man:irkerd(8) man:irkerhook(1) man:irk(1)
+
+[Service]
+ExecStart=@EPREFIX@/usr/bin/irkerd
+User=irker
+DynamicUser=yes
+NoNewPrivileges=yes
+CapabilityBoundingSet=
+PrivateDevices=yes
+ProtectHome=yes
+
+[Install]
+WantedBy=multi-user.target
+Alias=irker.service
diff --git a/net-irc/irker/irker-2.21.ebuild b/net-irc/irker/irker-2.21.ebuild
new file mode 100644
index 000000000000..87717d39727a
--- /dev/null
+++ b/net-irc/irker/irker-2.21.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ssl"
+
+inherit optfeature python-single-r1 systemd
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Dependency notes:
+# NOTE: No pkgconfig dep here because of the systemd sed below
+# NOTE: No need for asciidoc here as it's only used for the
+# 'release' makefile target.
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	${PYTHON_DEPS}
+"
+RDEPEND="${PYTHON_DEPS}"
+
+DOCS=( NEWS README hacking.adoc security.adoc )
+HTML_DOCS=( irkerd.html irkerhook.html )
+
+src_prepare() {
+	default
+
+	# Rely on systemd eclass for systemd service install
+	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
+		|| die "sed failed"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}/:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	default
+
+	python_doscript "${ED}"/usr/bin/irkerd
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}"/irkerd.initd irkerd
+	newconfd "${FILESDIR}"/irkerd.confd irkerd
+
+	systemd_dounit irkerd.service
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
+
+pkg_postinst() {
+	optfeature "SOCKS5 proxy support" dev-python/PySocks
+}
diff --git a/net-irc/irker/irker-2.22-r2.ebuild b/net-irc/irker/irker-2.22-r2.ebuild
new file mode 100644
index 000000000000..085be79ae727
--- /dev/null
+++ b/net-irc/irker/irker-2.22-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ssl"
+
+inherit optfeature python-single-r1 systemd
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Dependency notes:
+# NOTE: No pkgconfig dep here because of the systemd sed below
+# NOTE: No need for asciidoc here as it's only used for the
+# 'release' makefile target.
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	${PYTHON_DEPS}
+"
+RDEPEND="${PYTHON_DEPS}"
+
+DOCS=( NEWS README hacking.adoc security.adoc )
+HTML_DOCS=( irkerd.html irkerhook.html )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.22-fix-tcpserver.patch
+)
+
+src_prepare() {
+	default
+
+	# Rely on systemd eclass for systemd service install
+	sed -e "/^SYSTEMDSYSTEMUNITDIR/d" -i Makefile || die "sed failed"
+
+	# Prefix support
+	sed -e "s|@EPREFIX@|${EPREFIX}|" "${FILESDIR}"/irkerd.service > "${WORKDIR}"/irkerd.service || die "sed failed"
+}
+
+src_install() {
+	default
+
+	python_doscript "${ED}"/usr/bin/irkerd
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}"/irkerd.initd irkerd
+	newconfd "${FILESDIR}"/irkerd.confd irkerd
+
+	systemd_dounit "${WORKDIR}"/irkerd.service
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
+
+pkg_postinst() {
+	optfeature "SOCKS5 proxy support" dev-python/PySocks
+}
diff --git a/net-irc/irker/irker-2.22.ebuild b/net-irc/irker/irker-2.22.ebuild
index 87717d39727a..5227a14bc99d 100644
--- a/net-irc/irker/irker-2.22.ebuild
+++ b/net-irc/irker/irker-2.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Dependency notes: