gentoo auto-resync : 03:02:2023 - 15:10:30

6 files changed, 64 insertions, 139 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 7f59602a2174..ce4db0512ffc 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index d5949e55c9bb..7a7f2253e23a 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,7 +1,3 @@
-DIST ergo-2.10.0.tar.gz 3256716 BLAKE2B 72f1d6464ee434508b9944a9923435cda01e97c8b542c7c77c74562309a6b9ed727b5ae7c444f6e95517482fd87f34623d477e14c1dfbe323a7d81ace5c3e111 SHA512 952ef22b28d8de0814f04ece55b8ff88f405f184d8ecfce45c4af63e8c53153786d0b685f9bfff7cdb53ad369914f07069436f43b5ab65816bb7410b02f34bf8
-DIST ergo-2.11.0.tar.gz 3264162 BLAKE2B af5020469b7a7d7194cdf4e3f82ded906b811d754fac08bdfc0f8379b907069b92260701dd2e919a196b2ab655a32f9b9e3a21bfc8d363790d49cf32473a6c60 SHA512 ccdbc391e280ab25efd45752b84223213aceb3f3045307209da7a02b3b09df571242ad92d11786693fc208427a2d1ca0a3d6d470404cfb83b0acf40ca343441d
 DIST ergo-2.11.1.tar.gz 3264192 BLAKE2B 9a207fc808277275c43c4c70aec748efe0a5d3a21f4be195885b7058798df8b0d47b52a6b52708f3e04c5aa79faec2fd3f41a0da625fd55fff45a3b12cdb90ba SHA512 9808ecc28dc25e60b942bc74f8fbe4f07b7fda0641c3dd6fc681214e7e2b5fed7fa61f85e2ac0de3c08dc91a54f571e2741ab1b2f6597a2b53405211f327ad81
-EBUILD ergo-2.10.0-r1.ebuild 1501 BLAKE2B 28049bdd16691767da3476ab136e98d98652a1cc5658b70853a2815ead9157e122a14ee1834a206f27b076d4d760ac62a6417202848de06bb6913dadb084287d SHA512 d482a6994db06fa9375dbe2dc5ccdd426624073a3925632329abb498464c4c7d3b48948d9e4848dd91e819d24e4712edb662a27435754e053ec7e28c98af4f4b
-EBUILD ergo-2.11.0.ebuild 1565 BLAKE2B a82affb7986894a7429e06881dfcf2331b7d938d968272d331e082b79460d3f7762ebe30f686225fc891c687fc552f3d7982b80be41a2efaccbf60e999976b7d SHA512 af8844c6990271dde6f9c050fe790f67bbcdb4ed0727437352ce246826c2bf91bfbf84514de72b33f44546524cd7b2cf99af2f260ab71eb8d09e3a35c9399522
 EBUILD ergo-2.11.1.ebuild 1564 BLAKE2B 61870557a004f25d957d9aed7d284d1103c7d1097e89c9564d7961c7d2c9d5f2ddf098868878adb6859819d34c57d381ac4750c098d9b8489bf3f97d1edf9d05 SHA512 88eff6bcdb7b830fc5214b7c4f1717791fe1b441335d689c9b73601abef3075ac22b2c1afc77742f9bd821571c7b0affab8c78695b93ff7a4e4121fdd65a3a61
 MISC metadata.xml 320 BLAKE2B 3bff5defc5150caa0cae2776e69f9070d1896c9cab8e5e0fc1afb94606a1c0e0d3ab951b4ea1076929221bcfd0576540f1b1768c1f9d3ad68161d9540c6785e3 SHA512 b634cbc9628c66cfc5b2983a6da5b2322bfb5c755893e1c15aab203f6e94b15ea5be2494b0370e8b7fd4950d0d1059e60939bd945620aa0548ef665263a5672a
diff --git a/net-irc/ergo/ergo-2.10.0-r1.ebuild b/net-irc/ergo/ergo-2.10.0-r1.ebuild
deleted file mode 100644
index f166270d10d2..000000000000
--- a/net-irc/ergo/ergo-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="A modern IRC server written in Go"
-HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo"
-SRC_URI="https://github.com/ergochat/ergo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-
-# We may even want to package irctest in future?
-
-RDEPEND="acct-user/oragono
-	acct-group/oragono"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:ERGO_USERNAME="ergo":ERGO_USERNAME="oragono":' distrib/openrc/ergo.confd || die
-
-	# Minor fiddling with paths
-	sed -i \
-		-e 's:/home/ergo/ergo:/usr/bin/ergo:' \
-		-e 's:/home/ergo:/var/lib/ergo:' \
-		-e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \
-		-e 's:User=ergo:User=oragono:' \
-		distrib/systemd/ergo.service || die
-}
-
-src_compile() {
-	ego build .
-}
-
-src_install() {
-	einstalldocs
-
-	dobin ergo
-
-	insinto /etc/ergo
-	doins default.yaml
-
-	newinitd distrib/openrc/ergo.initd ergo
-	newconfd distrib/openrc/ergo.confd ergo
-
-	keepdir /var/lib/ergo
-	fowners oragono:oragono /var/lib/ergo
-
-	insinto /var/lib/ergo
-	doins -r languages/
-
-	systemd_dounit distrib/systemd/ergo.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "Please copy the example config in ${EROOT}/etc/ergo:"
-		elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml"
-	fi
-}
diff --git a/net-irc/ergo/ergo-2.11.0.ebuild b/net-irc/ergo/ergo-2.11.0.ebuild
deleted file mode 100644
index 975e100d40f3..000000000000
--- a/net-irc/ergo/ergo-2.11.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="A modern IRC server written in Go"
-HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo"
-SRC_URI="https://github.com/ergochat/ergo/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P/_/-}
-
-LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
-SLOT="0"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-# We may even want to package irctest in future?
-
-RDEPEND="acct-user/oragono
-	acct-group/oragono"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:ERGO_USERNAME="ergo":ERGO_USERNAME="oragono":' distrib/openrc/ergo.confd || die
-
-	# Minor fiddling with paths
-	sed -i \
-		-e 's:/home/ergo/ergo:/usr/bin/ergo:' \
-		-e 's:/home/ergo:/var/lib/ergo:' \
-		-e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \
-		-e 's:User=ergo:User=oragono:' \
-		distrib/systemd/ergo.service || die
-}
-
-src_compile() {
-	ego build .
-}
-
-src_install() {
-	einstalldocs
-
-	dobin ergo
-
-	insinto /etc/ergo
-	doins default.yaml
-
-	newinitd distrib/openrc/ergo.initd ergo
-	newconfd distrib/openrc/ergo.confd ergo
-
-	keepdir /var/lib/ergo
-	fowners oragono:oragono /var/lib/ergo
-
-	insinto /var/lib/ergo
-	doins -r languages/
-
-	systemd_dounit distrib/systemd/ergo.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "Please copy the example config in ${EROOT}/etc/ergo:"
-		elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml"
-	fi
-}
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index d9bb5253d29c..7e45e783c50e 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -3,5 +3,7 @@ AUX irkerd.confd 535 BLAKE2B fe8484cee8e5d443c3019c9915553e503164a2e5e965b44e892
 AUX irkerd.initd 963 BLAKE2B 33e4b654eb908d5d2b5c086d821f81d959bcb71ec93b80c7aa38ffaf75f011d41f43b9369115d0ac463ecdc3781ee7360d06fa8afe9c7e66a79fc55e8340d338 SHA512 fa9247c207f4a21611e51477c31556114d83899ea7adcc8bf8f3bb3edafaa8db84b4764ac5704dfe7abff2e5f9727610b71609a620432dc939a81d2ab7fcf818
 AUX irkerd.service 517 BLAKE2B de89f8ff4d98928b8d4035e545a2c0628b849246ce5eae393341cf894a89ec1b33087da6c756d8b3b17784175541bd366dbf0b17c38e1e36cacd2b0da48a2391 SHA512 d31699cef084bfeb2272e49c7eeb050148e942286cd9cb2cd6491a97210628f08f05c04ddd052a8ee9cccba33ecd3e460f99aeb52dd1c1ae1ef65ef8754ddf49
 DIST irker-2.22.tar.gz 46037 BLAKE2B fbd9deaaa5cc509989b15d16d733bec351b7b2ab9d3bedd8b20713ba110755a43ccb91b1482a6deb0f71497b3b1d6f8ed5faae395c06c33ac4c9ea7da30d2726 SHA512 a3f2ebe113e4fcb4589c31a44c157bc0f91e8792fd7819e9f350fd25847669d2cb3fcd51cc0e09ef352952c5175f8b4eb56ac9969f0bff1544e28268728f0595
+DIST irker-2.23.tar.gz 45889 BLAKE2B 5e0039f83783f994083321da8a5f65aace8769a7aaa45d4d9111c604b563f997b17bfe80e30e123559beaab9147de2e2ff3f98588632151af4d1ab0f1cdfa71e SHA512 f812ed81906c13d8b1b2e3cd86b36fdd8a8d6961eb2bc163b2c309908b8469409e087b4fa36637eb9588773f494ff309e2540b1f8ddfc3eec37aa2e3443357a3
 EBUILD irker-2.22-r2.ebuild 1619 BLAKE2B 04f1f6a9b9af8e96b75949af399f969744b33f627804ac5fef33599858134611c5b32caf3b74f14681364defc9608b7c9cfa1f6320d3d6e043895ec3085ad6ff SHA512 21013a8f32da541cae1aaa421d6371b11155734b0a108dd9a0781f3799cd52235b222c1173a12a98dc3610feaa77c8326fd2b1d00738aac68542b8af29ddd150
+EBUILD irker-2.23.ebuild 1567 BLAKE2B 04ca816a742352ffac80261012bf26c228298988e5d852425e80a28f9db9c689a7827d5ed237eb703e933cbaa49ddaff37066d4cb1f60d4b7e9539002fab5973 SHA512 0626559c1f0dc08b706d57de6d0d32f22ebbfded78a944d9215812bde193b2ae5613f16df87c3a854ce6029bf738769971cca47b7618091a1ed78c1d3051c0d3
 MISC metadata.xml 338 BLAKE2B 75e1de187c8161e49dcc6ab3c7ee3020455f09f842d798404398d195495e9e5b58cc6252c092a3f411ff848acbb258a10cd6120470bd907f5daa9459b6d719a1 SHA512 f804005b7aa3039b1400eb323d254b40ddace228a638fc37901e60b95c7b10f428df40b5afbf5f4b2facf05a2f91020f001c8d58d258efee0732dbc7935ac066
diff --git a/net-irc/irker/irker-2.23.ebuild b/net-irc/irker/irker-2.23.ebuild
new file mode 100644
index 000000000000..cdf11156b821
--- /dev/null
+++ b/net-irc/irker/irker-2.23.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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.
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	${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 -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
+}