gentoo auto-resync : 17:07:2024 - 12:28:31

7 files changed, 86 insertions, 70 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index da31c24dfcce..f5beda219035 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index ae759f78689e..68eb5309506c 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,5 +1,7 @@
-DIST ergo-2.12.0.tar.gz 3461568 BLAKE2B 8710ebae2cf840f8ea730fc4c9910d738702dfc55e2f68433e6ffdd7d9647ba081cb5d47ee7fd1e76d8a06017cfd73c377ea10510f37817c6ca63bdc81a33832 SHA512 932179ec05b0c7e5868bb41ebbfa9cc57b8eb8f6e9a0aceaf12081b4b42c6cfa996142d1f9e52c39d2b674d92b409ef8d3792f164281e6bf3f3a5b97def1d3ac
 DIST ergo-2.13.0.tar.gz 3668775 BLAKE2B 81f1f75e359a7796a434e1f556d563223ac892ac190e90b50b8d81367f6c1d2bf73139a8b29f974195d882dba7f569a963dde28a30bd10e55fe018ae524be70f SHA512 870e852e1d4a9bbeb9485de33bcf027bfbf92f7fffa125640cbb28798441e52c334a5e14b3a5ba009094eb8f31d24f664601394b1d22fe30828116c55da28826
-EBUILD ergo-2.12.0.ebuild 1743 BLAKE2B 13f4795f20d6e1e6ad184e1bafbaf703941ea25df51746006876c03180d929477b6fab4694bdac4d9c5d0138db51c44089ff1ed24644b0da15e7ba4e4b9aa920 SHA512 c1385d0cd53e53a7a0e79dcdf176b332a9c422c0ca255015e98a7e2f24ece57350ef017d8bbdef474ec7acc00e936a6185cee0365ae148b5c1d8087296149e90
-EBUILD ergo-2.13.0.ebuild 1743 BLAKE2B 3e9a533bca7bb3d4ae6f360ff70f7a9503117aaf47a7c8f50e06db1c6794d49a0de8b633cd3ac7998f748a1bfd6aaa01ff7d71c5014a1cbfda959779a3d45717 SHA512 2f9db70e1fb7e1574bdf27893743561fbeb1399841a5df05862c7700ac6e689ab492b1fca6d6739d6c91844ccffff5a02290af5c1177bde9c4dd3496312b1220
+DIST ergo-2.13.1.tar.gz 3668644 BLAKE2B b22d56b3425b57c987d87240e1a6b5dcb409ab2177d3553f3fd2d7ddf615dc49ea78d35402bbe20f6f97aa24acd81fae88bea3f99f3f377c243ef7e992ecd511 SHA512 dcaec6e9c9f8871633862740980eca7e07f92b0d41c1d8becad09fe20f3ab9c5920a966286b577523e6fdc683018bec1938ed5237eacbe922b70cbfb19ed2bca
+DIST ergo-2.14.0.tar.gz 3691946 BLAKE2B f3396dbfa28b575cf280178ecc819f9ee1766ca350894e5d4807b788618258ed1f1547e20adb09e8b9bcbf3852e8cb61b86833f6cebdc490c4a424e59f6eb1af SHA512 b0f2518085c85ed8a5e558535b55d5444010f47bec4f050b980e4c45b3469b84616cdbb26e46148ac72d94f8acbf73c0bc157c5f1a5af99c5e6ff375ffe1dbdf
+EBUILD ergo-2.13.0.ebuild 1743 BLAKE2B d88d9ed23158a6a6bdcaf3e67d31de3f92770e6214c51606f8b3baaec63877731a33baf7122bd261a10b7947736d303924d1f0fa1e31bf19e43ca651f3649c06 SHA512 bd8cf685dc1ec91b3ce7e3edf1c8dab20306d00bba9835fabe8c786f6126e90118bc0dc214c6123dc8bbc7bd1fdea23640420bebe7c7e2a07f8964133e98a192
+EBUILD ergo-2.13.1.ebuild 1743 BLAKE2B d88d9ed23158a6a6bdcaf3e67d31de3f92770e6214c51606f8b3baaec63877731a33baf7122bd261a10b7947736d303924d1f0fa1e31bf19e43ca651f3649c06 SHA512 bd8cf685dc1ec91b3ce7e3edf1c8dab20306d00bba9835fabe8c786f6126e90118bc0dc214c6123dc8bbc7bd1fdea23640420bebe7c7e2a07f8964133e98a192
+EBUILD ergo-2.14.0.ebuild 1744 BLAKE2B bcda03adcd5ac376fa8901d29d7525e2fd541353dc652a9e425d974c0f97787f2c041c6e67f42327424aa1f4f9aefd0ed7c6bdf4c82761aaaf11383bf3389d84 SHA512 b090cf86354352a5ee7d93d9e07f9af98ba4ca0fe6e2d0ba82dfb9ef122e9cb79596460e67d11d93a9e10aff555c4e7c784c5ad8b62418cc2665fbe021836ef1
 MISC metadata.xml 318 BLAKE2B 0786e819497052f6b91fcb122aa3698c099393a810079109371d5cb6b68bfcb6c66152d54f0edd6c4ed3e4240d4bd4ca6fbf3bb641918154398f7c19656c8c4f SHA512 fa3ead814e941e12832cebb5dc2835edfc8f71a309c0b44f337065f788c2e92268378f647bac47344546bed7eea953d2dc601614b727744d71e382ee18626f93
diff --git a/net-irc/ergo/ergo-2.13.0.ebuild b/net-irc/ergo/ergo-2.13.0.ebuild
index 8364e9398e17..9ee896dc26a1 100644
--- a/net-irc/ergo/ergo-2.13.0.ebuild
+++ b/net-irc/ergo/ergo-2.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit go-module python-any-r1 systemd
 
 DESCRIPTION="A modern IRC server written in Go"
diff --git a/net-irc/ergo/ergo-2.12.0.ebuild b/net-irc/ergo/ergo-2.13.1.ebuild
index a75a5ad80b57..9ee896dc26a1 100644
--- a/net-irc/ergo/ergo-2.12.0.ebuild
+++ b/net-irc/ergo/ergo-2.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit go-module python-any-r1 systemd
 
 DESCRIPTION="A modern IRC server written in Go"
diff --git a/net-irc/ergo/ergo-2.14.0.ebuild b/net-irc/ergo/ergo-2.14.0.ebuild
new file mode 100644
index 000000000000..95f83d85f0ca
--- /dev/null
+++ b/net-irc/ergo/ergo-2.14.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit go-module python-any-r1 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
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# We may even want to package irctest in future?
+RDEPEND="
+	acct-user/oragono
+	acct-group/oragono
+"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+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 cea4fe79d080..217d8af23315 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,8 +1,6 @@
 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.23.tar.gz 45889 BLAKE2B 5e0039f83783f994083321da8a5f65aace8769a7aaa45d4d9111c604b563f997b17bfe80e30e123559beaab9147de2e2ff3f98588632151af4d1ab0f1cdfa71e SHA512 f812ed81906c13d8b1b2e3cd86b36fdd8a8d6961eb2bc163b2c309908b8469409e087b4fa36637eb9588773f494ff309e2540b1f8ddfc3eec37aa2e3443357a3
 DIST irker-2.24.tar.gz 45728 BLAKE2B e1db85ea21163eb831cdfc9c9961bd77377890caef5af60d979c6fdc523c7b3680af6b1ce2e36bfda620e1785067381e1ac4ffb96e47314cac68be6014885f78 SHA512 a4f686c05c8018be8caf480d6e0d368042f82905cd4d67ede4a6cb0ff65a067d25116f68c3d3ea849db6f15a8f88c48ef2a314fa92a96bce38796a2b236b4a43
-EBUILD irker-2.23.ebuild 1578 BLAKE2B 1fff0f146595aaabdfad24b50738ee250c2f990e4799ccc5c615df1185ef2bc0106c70e84101202f1d8466304d98e136fff76e22c7dcc6582cf6c687338b3ac8 SHA512 7489e857b73655f241dd1f707fc9c596a477f9ffb83824a1f92730da24de98eead5a168838d5987509c47cbcd76b6c6a15573a539a8516161f342a69d568a304
 EBUILD irker-2.24.ebuild 1578 BLAKE2B 6666ffeaa42fe1ab9973858e36970d32721b4b003e0bd4e2cae4361b327a238c5a1f9883289a2fdf374de04b253a1ac0d8ebca467f51a92e39a1baf714da118c SHA512 cb1c16a97645b93940fbdfa3f2b67395325c6b6e0ca8e89bd5463dacbef9bf94265ebf1db0366ab2917b964c1cedf55fb7b3995b170906b3267709593a914394
 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
deleted file mode 100644
index 2bd4516b8c36..000000000000
--- a/net-irc/irker/irker-2.23.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 hppa ~ia64 ppc ppc64 ~s390 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
-}