[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2024-03-14 Thread Arthur Zamarin 
commit: d6875ce0ebb5061321535bfbe6c86a6cc7215329
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Mar 14 07:53:54 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Mar 14 07:53:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6875ce0

net-irc/ergo: Stabilize 2.13.0 amd64, #926974

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-irc/ergo/ergo-2.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/ergo/ergo-2.13.0.ebuild b/net-irc/ergo/ergo-2.13.0.ebuild
index a565a261e243..8364e9398e17 100644
--- a/net-irc/ergo/ergo-2.13.0.ebuild
+++ b/net-irc/ergo/ergo-2.13.0.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="amd64 ~arm ~arm64"
 fi
 IUSE="test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2024-02-01 Thread Sam James 
commit: 38ac9ea66ae56b969eb9cd3581ec01ed1f916c58
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  2 01:33:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  2 01:51:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ac9ea6

net-irc/ergo: add 2.13.0

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest   |  1 +
 net-irc/ergo/ergo-2.13.0.ebuild | 78 +
 2 files changed, 79 insertions(+)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 3a4dbd7b30b3..927598cbc9ad 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1 +1,2 @@
 DIST ergo-2.12.0.tar.gz 3461568 BLAKE2B 
8710ebae2cf840f8ea730fc4c9910d738702dfc55e2f68433e6ffdd7d9647ba081cb5d47ee7fd1e76d8a06017cfd73c377ea10510f37817c6ca63bdc81a33832
 SHA512 
932179ec05b0c7e5868bb41ebbfa9cc57b8eb8f6e9a0aceaf12081b4b42c6cfa996142d1f9e52c39d2b674d92b409ef8d3792f164281e6bf3f3a5b97def1d3ac
+DIST ergo-2.13.0.tar.gz 3668775 BLAKE2B 
81f1f75e359a7796a434e1f556d563223ac892ac190e90b50b8d81367f6c1d2bf73139a8b29f974195d882dba7f569a963dde28a30bd10e55fe018ae524be70f
 SHA512 
870e852e1d4a9bbeb9485de33bcf027bfbf92f7fffa125640cbb28798441e52c334a5e14b3a5ba009094eb8f31d24f664601394b1d22fe30828116c55da28826

diff --git a/net-irc/ergo/ergo-2.13.0.ebuild b/net-irc/ergo/ergo-2.13.0.ebuild
new file mode 100644
index ..a565a261e243
--- /dev/null
+++ b/net-irc/ergo/ergo-2.13.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..12} )
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2023-12-28 Thread Sam James 
commit: 81e799517a5c8f34203c01b7f9c53cafeae5844d
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 06:22:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 14:57:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e79951

net-irc/ergo: update upstream metadata

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/ergo/metadata.xml b/net-irc/ergo/metadata.xml
index d326aa7b7876..2e8df544a305 100644
--- a/net-irc/ergo/metadata.xml
+++ b/net-irc/ergo/metadata.xml
@@ -6,6 +6,6 @@
Sam James


-   oragono/oragono
+   ergochat/ergo

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2023-12-28 Thread Sam James 
commit: 2d3f1883c80faa207a5b973beaea2b1ed3262584
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 06:21:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 14:57:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3f1883

net-irc/ergo: drop 2.11.1

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest   |  1 -
 net-irc/ergo/ergo-2.11.1.ebuild | 69 -
 2 files changed, 70 deletions(-)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index eff1a98b7659..3a4dbd7b30b3 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,2 +1 @@
-DIST ergo-2.11.1.tar.gz 3264192 BLAKE2B 
9a207fc808277275c43c4c70aec748efe0a5d3a21f4be195885b7058798df8b0d47b52a6b52708f3e04c5aa79faec2fd3f41a0da625fd55fff45a3b12cdb90ba
 SHA512 
9808ecc28dc25e60b942bc74f8fbe4f07b7fda0641c3dd6fc681214e7e2b5fed7fa61f85e2ac0de3c08dc91a54f571e2741ab1b2f6597a2b53405211f327ad81
 DIST ergo-2.12.0.tar.gz 3461568 BLAKE2B 
8710ebae2cf840f8ea730fc4c9910d738702dfc55e2f68433e6ffdd7d9647ba081cb5d47ee7fd1e76d8a06017cfd73c377ea10510f37817c6ca63bdc81a33832
 SHA512 
932179ec05b0c7e5868bb41ebbfa9cc57b8eb8f6e9a0aceaf12081b4b42c6cfa996142d1f9e52c39d2b674d92b409ef8d3792f164281e6bf3f3a5b97def1d3ac

diff --git a/net-irc/ergo/ergo-2.11.1.ebuild b/net-irc/ergo/ergo-2.11.1.ebuild
deleted file mode 100644
index 4fcae2f0e0fb..
--- a/net-irc/ergo/ergo-2.11.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 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
-}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2023-10-11 Thread Sam James 
commit: 73e6464f6d1fb14a850737d455bee6e3666ae4a7
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 12 05:47:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 12 05:47:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73e6464f

net-irc/ergo: add 2.12.0

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest   |  1 +
 net-irc/ergo/ergo-2.12.0.ebuild | 78 +
 2 files changed, 79 insertions(+)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 9bd5bab4cab7..eff1a98b7659 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1 +1,2 @@
 DIST ergo-2.11.1.tar.gz 3264192 BLAKE2B 
9a207fc808277275c43c4c70aec748efe0a5d3a21f4be195885b7058798df8b0d47b52a6b52708f3e04c5aa79faec2fd3f41a0da625fd55fff45a3b12cdb90ba
 SHA512 
9808ecc28dc25e60b942bc74f8fbe4f07b7fda0641c3dd6fc681214e7e2b5fed7fa61f85e2ac0de3c08dc91a54f571e2741ab1b2f6597a2b53405211f327ad81
+DIST ergo-2.12.0.tar.gz 3461568 BLAKE2B 
8710ebae2cf840f8ea730fc4c9910d738702dfc55e2f68433e6ffdd7d9647ba081cb5d47ee7fd1e76d8a06017cfd73c377ea10510f37817c6ca63bdc81a33832
 SHA512 
932179ec05b0c7e5868bb41ebbfa9cc57b8eb8f6e9a0aceaf12081b4b42c6cfa996142d1f9e52c39d2b674d92b409ef8d3792f164281e6bf3f3a5b97def1d3ac

diff --git a/net-irc/ergo/ergo-2.12.0.ebuild b/net-irc/ergo/ergo-2.12.0.ebuild
new file mode 100644
index ..749773f6dd84
--- /dev/null
+++ b/net-irc/ergo/ergo-2.12.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2023-02-03 Thread Sam James 
commit: d95a8d3beae82e11273968ca53b2ff1620a57707
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 12:19:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 12:19:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d95a8d3b

net-irc/ergo: drop 2.10.0-r1, 2.11.0

Bug: https://bugs.gentoo.org/891803
Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest  |  2 --
 net-irc/ergo/ergo-2.10.0-r1.ebuild | 66 
 net-irc/ergo/ergo-2.11.0.ebuild| 69 --
 3 files changed, 137 deletions(-)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 7c915cbb97a6..9bd5bab4cab7 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,3 +1 @@
-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

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..
--- 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..
--- 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

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2023-01-26 Thread Sam James 
commit: 66a048cf8882f581c5e6028b23a529ef68d34048
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 27 06:24:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 27 06:24:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a048cf

net-irc/ergo: Stabilize 2.11.1 amd64, #892155

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/ergo-2.11.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/ergo/ergo-2.11.1.ebuild b/net-irc/ergo/ergo-2.11.1.ebuild
index 39327ace6602..4fcae2f0e0fb 100644
--- a/net-irc/ergo/ergo-2.11.1.ebuild
+++ b/net-irc/ergo/ergo-2.11.1.ebuild
@@ -13,7 +13,7 @@ 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"
+   KEYWORDS="amd64 ~arm ~arm64"
 fi
 
 # We may even want to package irctest in future?

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2023-01-22 Thread Sam James 
commit: 8b7d8f73227358965f743bfaccd12a13457128de
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 23 03:16:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 23 03:16:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7d8f73

net-irc/ergo: add 2.11.1

Bug: https://bugs.gentoo.org/891803
Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest   |  1 +
 net-irc/ergo/ergo-2.11.1.ebuild | 69 +
 2 files changed, 70 insertions(+)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 36d06d8c10b1..7c915cbb97a6 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,2 +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

diff --git a/net-irc/ergo/ergo-2.11.1.ebuild b/net-irc/ergo/ergo-2.11.1.ebuild
new file mode 100644
index ..39327ace6602
--- /dev/null
+++ b/net-irc/ergo/ergo-2.11.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 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
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-12-25 Thread Sam James 
commit: 2d67be159550bf6d48dc7b0a69307af43ca71480
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 25 17:16:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 25 17:19:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d67be15

net-irc/ergo: add 2.11.0, drop 2.11.0_rc1

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest   | 2 +-
 net-irc/ergo/{ergo-2.11.0_rc1.ebuild => ergo-2.11.0.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 2c6357982980..36d06d8c10b1 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,2 +1,2 @@
 DIST ergo-2.10.0.tar.gz 3256716 BLAKE2B 
72f1d6464ee434508b9944a9923435cda01e97c8b542c7c77c74562309a6b9ed727b5ae7c444f6e95517482fd87f34623d477e14c1dfbe323a7d81ace5c3e111
 SHA512 
952ef22b28d8de0814f04ece55b8ff88f405f184d8ecfce45c4af63e8c53153786d0b685f9bfff7cdb53ad369914f07069436f43b5ab65816bb7410b02f34bf8
-DIST ergo-2.11.0_rc1.tar.gz 3267317 BLAKE2B 
a8dff743a691d425f78420043c8b5b32efce6a5e606784c4110e64ff8b2fa99772ced42d0981a0c6f9f7669f3d0ef9d110915917e4ec4b072eecf449eaf4b046
 SHA512 
74cbececd9bf5e9e4701900ca8d720bcb2c689c545fadad70215bdf4844685c59c46e4ad758fc46eeb6735b812807e81125822ac5219b11b9b76ddf306a14869
+DIST ergo-2.11.0.tar.gz 3264162 BLAKE2B 
af5020469b7a7d7194cdf4e3f82ded906b811d754fac08bdfc0f8379b907069b92260701dd2e919a196b2ab655a32f9b9e3a21bfc8d363790d49cf32473a6c60
 SHA512 
ccdbc391e280ab25efd45752b84223213aceb3f3045307209da7a02b3b09df571242ad92d11786693fc208427a2d1ca0a3d6d470404cfb83b0acf40ca343441d

diff --git a/net-irc/ergo/ergo-2.11.0_rc1.ebuild 
b/net-irc/ergo/ergo-2.11.0.ebuild
similarity index 100%
rename from net-irc/ergo/ergo-2.11.0_rc1.ebuild
rename to net-irc/ergo/ergo-2.11.0.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-12-17 Thread Sam James 
commit: cc76c7f847c050aa95b093da90eaf0d003ac19c2
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 06:10:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 06:10:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc76c7f8

net-irc/ergo: add 2.11.0_rc1 (unkeyworded)

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest   |  1 +
 net-irc/ergo/ergo-2.11.0_rc1.ebuild | 69 +
 2 files changed, 70 insertions(+)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 6a7eff9494a6..2c6357982980 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1 +1,2 @@
 DIST ergo-2.10.0.tar.gz 3256716 BLAKE2B 
72f1d6464ee434508b9944a9923435cda01e97c8b542c7c77c74562309a6b9ed727b5ae7c444f6e95517482fd87f34623d477e14c1dfbe323a7d81ace5c3e111
 SHA512 
952ef22b28d8de0814f04ece55b8ff88f405f184d8ecfce45c4af63e8c53153786d0b685f9bfff7cdb53ad369914f07069436f43b5ab65816bb7410b02f34bf8
+DIST ergo-2.11.0_rc1.tar.gz 3267317 BLAKE2B 
a8dff743a691d425f78420043c8b5b32efce6a5e606784c4110e64ff8b2fa99772ced42d0981a0c6f9f7669f3d0ef9d110915917e4ec4b072eecf449eaf4b046
 SHA512 
74cbececd9bf5e9e4701900ca8d720bcb2c689c545fadad70215bdf4844685c59c46e4ad758fc46eeb6735b812807e81125822ac5219b11b9b76ddf306a14869

diff --git a/net-irc/ergo/ergo-2.11.0_rc1.ebuild 
b/net-irc/ergo/ergo-2.11.0_rc1.ebuild
new file mode 100644
index ..975e100d40f3
--- /dev/null
+++ b/net-irc/ergo/ergo-2.11.0_rc1.ebuild
@@ -0,0 +1,69 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-11-21 Thread Sam James 
commit: d40335b4046654b9e3c3afbd7e362c2e3626760a
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 21 08:11:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 21 08:11:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40335b4

net-irc/ergo: fix username in OpenRC init script

We should probably rename the user somehow but feels like a waste.

Closes: https://bugs.gentoo.org/881489
Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/{ergo-2.10.0.ebuild => ergo-2.10.0-r1.ebuild} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-irc/ergo/ergo-2.10.0.ebuild 
b/net-irc/ergo/ergo-2.10.0-r1.ebuild
similarity index 92%
rename from net-irc/ergo/ergo-2.10.0.ebuild
rename to net-irc/ergo/ergo-2.10.0-r1.ebuild
index 4a3df207138a..f166270d10d2 100644
--- a/net-irc/ergo/ergo-2.10.0.ebuild
+++ b/net-irc/ergo/ergo-2.10.0-r1.ebuild
@@ -23,6 +23,8 @@ 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:' \
@@ -33,7 +35,7 @@ src_prepare() {
 }
 
 src_compile() {
-   go build . || die
+   ego build .
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/files/

2022-09-24 Thread Sam James 
commit: 1713da16b0193618d701d405d0ae109022f7ac3d
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Sep 24 09:58:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 25 01:19:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1713da16

net-irc/ergo: remove unused files

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Portage 3.0.37 / pkgdev 0.2.2 / pkgcheck 0.10.15
Closes: https://github.com/gentoo/gentoo/pull/27427
Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/files/ergo.confd-r1 |  3 ---
 net-irc/ergo/files/ergo.initd-r1 | 32 
 2 files changed, 35 deletions(-)

diff --git a/net-irc/ergo/files/ergo.confd-r1 b/net-irc/ergo/files/ergo.confd-r1
deleted file mode 100644
index 71f4585060e5..
--- a/net-irc/ergo/files/ergo.confd-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/conf.d/ergo: config file for /etc/init.d/ergo
-ERGO_CONFIGFILE="/etc/ergo/ircd.yaml"
-ERGO_USERNAME="oragono"

diff --git a/net-irc/ergo/files/ergo.initd-r1 b/net-irc/ergo/files/ergo.initd-r1
deleted file mode 100644
index 8bd1aba2b230..
--- a/net-irc/ergo/files/ergo.initd-r1
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-name=${RC_SVCNAME}
-description="ergo IRC daemon"
-
-command=/usr/bin/ergo
-command_args="run --conf ${ERGO_CONFIGFILE:-'/etc/ergo/ircd.yaml'}"
-command_user=${ERGO_USERNAME:-ergo}
-command_background=true
-
-pidfile=/var/run/${RC_SVCNAME}.pid
-
-output_log="/var/log/${RC_SVCNAME}.out"
-error_log="/var/log/${RC_SVCNAME}.err"
-# --wait: to wait 1 second after launching to see if it survived startup
-start_stop_daemon_args="--wait 1000"
-
-extra_started_commands="reload"
-
-depend() {
-   use dns
-   provide ircd
-}
-
-start_pre() {
-   checkpath --owner ${command_user}:${command_user} --mode 0640 --file 
/var/log/${RC_SVCNAME}.out /var/log/${RC_SVCNAME}.err
-}
-
-reload() {
-   ebegin "Reloading ${RC_SVCNAME}"
-   start-stop-daemon --signal HUP --pidfile "${pidfile}"
-   eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-09-22 Thread Sam James 
commit: 943169fa39e7546ab69cf956ecf4d9c29cc7b9d7
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 23 01:35:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 23 01:35:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943169fa

net-irc/ergo: drop 2.9.1-r1

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest |  1 -
 net-irc/ergo/ergo-2.9.1-r1.ebuild | 69 ---
 2 files changed, 70 deletions(-)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 584717998122..6a7eff9494a6 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,2 +1 @@
 DIST ergo-2.10.0.tar.gz 3256716 BLAKE2B 
72f1d6464ee434508b9944a9923435cda01e97c8b542c7c77c74562309a6b9ed727b5ae7c444f6e95517482fd87f34623d477e14c1dfbe323a7d81ace5c3e111
 SHA512 
952ef22b28d8de0814f04ece55b8ff88f405f184d8ecfce45c4af63e8c53153786d0b685f9bfff7cdb53ad369914f07069436f43b5ab65816bb7410b02f34bf8
-DIST ergo-2.9.1.tar.gz 3249107 BLAKE2B 
6d8f98ab868ef10323a40583e2ddb2e1854b967265f789ec176caae40675ef5a9a6a9e54c1b60d8e3f281dcb5ad18e964624ccf673e146ee7044f3454a3e2349
 SHA512 
5aa8f1afc55c432acf6763aa95cffdb3447b7d53a759d04c303675852b240b0fe26030a94ea12954a453d4f8e4f7db7ffbca8faeb6a1b20b17a44ac27b80d66a

diff --git a/net-irc/ergo/ergo-2.9.1-r1.ebuild 
b/net-irc/ergo/ergo-2.9.1-r1.ebuild
deleted file mode 100644
index 1b189203c307..
--- a/net-irc/ergo/ergo-2.9.1-r1.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"
-
-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
-
-   # 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() {
-   go build . || die
-}
-
-src_install() {
-   einstalldocs
-
-   dobin ergo
-
-   insinto /etc/ergo
-   doins default.yaml
-
-   # Swap back in next release?
-   # Forked locally for https://github.com/ergochat/ergo/issues/1914 
changes
-   #newinitd distrib/openrc/ergo.initd ergo
-   #newconfd distrib/openrc/ergo.confd ergo
-
-   newinitd "${FILESDIR}"/ergo.initd-r1 ergo
-   newconfd "${FILESDIR}"/ergo.confd-r1 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
-}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-07-03 Thread Agostino Sarubbo 
commit: 89a4ebd766058681b70b654aa5f57df94c0502c1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jul  3 10:46:42 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jul  3 10:48:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89a4ebd7

net-irc/ergo: amd64 stable wrt bug #856025

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-irc/ergo/ergo-2.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/ergo/ergo-2.10.0.ebuild b/net-irc/ergo/ergo-2.10.0.ebuild
index 7766ec2ce07f..4a3df207138a 100644
--- a/net-irc/ergo/ergo-2.10.0.ebuild
+++ b/net-irc/ergo/ergo-2.10.0.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="amd64 ~arm ~arm64"
 
 # We may even want to package irctest in future?

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-05-31 Thread Sam James 
commit: 7edbb8b61c744c12e1e2b9fa12364022fa04a10b
Author: Sam James  gentoo  org>
AuthorDate: Tue May 31 08:31:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 31 08:42:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edbb8b6

net-irc/ergo: add 2.10.0

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest   |  1 +
 net-irc/ergo/ergo-2.10.0.ebuild | 64 +
 2 files changed, 65 insertions(+)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 40831ce0cded..584717998122 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1 +1,2 @@
+DIST ergo-2.10.0.tar.gz 3256716 BLAKE2B 
72f1d6464ee434508b9944a9923435cda01e97c8b542c7c77c74562309a6b9ed727b5ae7c444f6e95517482fd87f34623d477e14c1dfbe323a7d81ace5c3e111
 SHA512 
952ef22b28d8de0814f04ece55b8ff88f405f184d8ecfce45c4af63e8c53153786d0b685f9bfff7cdb53ad369914f07069436f43b5ab65816bb7410b02f34bf8
 DIST ergo-2.9.1.tar.gz 3249107 BLAKE2B 
6d8f98ab868ef10323a40583e2ddb2e1854b967265f789ec176caae40675ef5a9a6a9e54c1b60d8e3f281dcb5ad18e964624ccf673e146ee7044f3454a3e2349
 SHA512 
5aa8f1afc55c432acf6763aa95cffdb3447b7d53a759d04c303675852b240b0fe26030a94ea12954a453d4f8e4f7db7ffbca8faeb6a1b20b17a44ac27b80d66a

diff --git a/net-irc/ergo/ergo-2.10.0.ebuild b/net-irc/ergo/ergo-2.10.0.ebuild
new file mode 100644
index ..7766ec2ce07f
--- /dev/null
+++ b/net-irc/ergo/ergo-2.10.0.ebuild
@@ -0,0 +1,64 @@
+# 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
+
+   # 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() {
+   go build . || die
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/files/, net-irc/ergo/

2022-04-17 Thread Sam James 
commit: 3dea7adc7b30bcc775fbd7dda37bc169e40d50e7
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 16:40:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 16:40:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dea7adc

net-irc/ergo: drop 2.9.1

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/ergo-2.9.1.ebuild | 69 --
 net-irc/ergo/files/ergo.confd  |  3 --
 net-irc/ergo/files/ergo.initd  | 19 
 3 files changed, 91 deletions(-)

diff --git a/net-irc/ergo/ergo-2.9.1.ebuild b/net-irc/ergo/ergo-2.9.1.ebuild
deleted file mode 100644
index b68c0cb2089c..
--- a/net-irc/ergo/ergo-2.9.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-# No test files are included in release tarballs
-# We may even want to package irctest
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.14"
-RDEPEND="
-   acct-user/oragono
-   acct-group/oragono
-"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-   default
-
-   # 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() {
-   go build -mod=vendor . || die
-}
-
-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/files/ergo.confd b/net-irc/ergo/files/ergo.confd
deleted file mode 100644
index 336ca1de7ab0..
--- a/net-irc/ergo/files/ergo.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/conf.d/ergo: config file for /etc/init.d/ergo
-ERGO_CONFIGFILE="/etc/ergo/ircd.yaml"
-

diff --git a/net-irc/ergo/files/ergo.initd b/net-irc/ergo/files/ergo.initd
deleted file mode 100644
index 025d6951862b..
--- a/net-irc/ergo/files/ergo.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-command=/usr/bin/ergo
-command_args="run --conf ${ERGO_CONFIGFILE:-"/etc/ergo/ircd.yaml"}"
-command_background=true
-extra_started_commands="reload"
-pidfile=/var/run/ergo.pid
-name="ergo"
-description="ergo IRC daemon"
-
-depend() {
-   use dns
-   provide ircd
-}
-
-reload() {
-   ebegin "Reloading ${RC_SVCNAME}"
-   start-stop-daemon --signal HUP --pidfile "${pidfile}"
-   eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-03-12 Thread Jakov Smolić 
commit: 81a48803234128cc606909303b52757435dea423
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Mar 12 12:08:06 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Mar 12 12:08:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a48803

net-irc/ergo: Stabilize 2.9.1-r1 amd64, #834929

Signed-off-by: Jakov Smolić  gentoo.org>

 net-irc/ergo/ergo-2.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/ergo/ergo-2.9.1-r1.ebuild 
b/net-irc/ergo/ergo-2.9.1-r1.ebuild
index 4fe2135adcb4..1b189203c307 100644
--- a/net-irc/ergo/ergo-2.9.1-r1.ebuild
+++ b/net-irc/ergo/ergo-2.9.1-r1.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="amd64 ~arm ~arm64"
 
 # We may even want to package irctest in future?

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-03-12 Thread Arthur Zamarin 
commit: 1e14763bc515863c601bdfeb67928b951b08a5b9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 12 12:00:58 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 12 12:00:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e14763b

net-irc/ergo: Keyword 2.9.1-r1 arm, #834930

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-irc/ergo/ergo-2.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/ergo/ergo-2.9.1-r1.ebuild 
b/net-irc/ergo/ergo-2.9.1-r1.ebuild
index 98c9c7e9af05..4fe2135adcb4 100644
--- a/net-irc/ergo/ergo-2.9.1-r1.ebuild
+++ b/net-irc/ergo/ergo-2.9.1-r1.ebuild
@@ -11,7 +11,7 @@ 
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 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 # We may even want to package irctest in future?

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-03-12 Thread Arthur Zamarin 
commit: e539dceac2c2967b6fc39300e8fbba9a08604b81
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 12 10:35:28 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 12 10:35:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e539dcea

net-irc/ergo: Keyword 2.9.1-r1 arm64, #834930

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-irc/ergo/ergo-2.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/ergo/ergo-2.9.1-r1.ebuild 
b/net-irc/ergo/ergo-2.9.1-r1.ebuild
index a836c2571de1..98c9c7e9af05 100644
--- a/net-irc/ergo/ergo-2.9.1-r1.ebuild
+++ b/net-irc/ergo/ergo-2.9.1-r1.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="~amd64 ~arm64"
 
 # We may even want to package irctest in future?

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-02-19 Thread Sam James 
commit: acf06891e30f5fb0fe4214371cb53b3c1cb535e0
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 20 05:45:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 20 05:45:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf06891

net-irc/ergo: drop 2.8.0

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest  |  1 -
 net-irc/ergo/ergo-2.8.0.ebuild | 69 --
 2 files changed, 70 deletions(-)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index fc7d2ada4c65..40831ce0cded 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,2 +1 @@
-DIST ergo-2.8.0.tar.gz 3150109 BLAKE2B 
07b725e9db49f101544a7f7cbbb197c77187f35c59e07055ff46a6ffb0a62cb250915c36209fce453e3158000f8b0eeb16189303b5dc78fda3daf6c2e8a35b28
 SHA512 
4f3c33286be91cf12cf6cc6b56598bf6adf60c88cd22290d3221457e4d08d7957b1922a18b151726a341825a65168daf1174c622c54268c5aa744ed9c9a0326b
 DIST ergo-2.9.1.tar.gz 3249107 BLAKE2B 
6d8f98ab868ef10323a40583e2ddb2e1854b967265f789ec176caae40675ef5a9a6a9e54c1b60d8e3f281dcb5ad18e964624ccf673e146ee7044f3454a3e2349
 SHA512 
5aa8f1afc55c432acf6763aa95cffdb3447b7d53a759d04c303675852b240b0fe26030a94ea12954a453d4f8e4f7db7ffbca8faeb6a1b20b17a44ac27b80d66a

diff --git a/net-irc/ergo/ergo-2.8.0.ebuild b/net-irc/ergo/ergo-2.8.0.ebuild
deleted file mode 100644
index edff5c53fda6..
--- a/net-irc/ergo/ergo-2.8.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-# No test files are included in release tarballs
-# We may even want to package irctest
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.14"
-RDEPEND="
-   acct-user/oragono
-   acct-group/oragono
-"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-   default
-
-   # 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() {
-   go build -mod=vendor . || die
-}
-
-src_install() {
-   einstalldocs
-
-   dobin ergo
-
-   insinto /etc/ergo
-   doins default.yaml
-
-   newinitd "${FILESDIR}"/ergo.initd ergo
-   newconfd "${FILESDIR}"/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
-}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/files/, net-irc/ergo/

2022-02-19 Thread Sam James 
commit: 56a649b1ba943cfa82538fdc9eeb40164d8346eb
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 19 22:33:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 19 22:37:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a649b1

net-irc/ergo: update EAPI 7 -> 8; init script fixes

- Mostly init script fixes:
-- Add logging to init script
-- Add delay so OpenRC realises if we crashed quickly b/c of e.g. bad config
   file
-- General cleanups (like supporting multiple instances, style changes)

- Enable tests (yay! the needed files are included in tarballs now)
- Drop obsolete BDEPEND (go-module lower bound is higher)
- Drop obsolete src_compile arg to go (default in min Go in eclass)
- EAPI 8

Bug: https://github.com/ergochat/ergo/issues/1914
Thanks-to: Douglas Freed  mtu.edu>
Thanks-to: William Hubbs  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/ergo-2.9.1-r1.ebuild | 69 +++
 net-irc/ergo/files/ergo.confd-r1  |  3 ++
 net-irc/ergo/files/ergo.initd-r1  | 32 ++
 3 files changed, 104 insertions(+)

diff --git a/net-irc/ergo/ergo-2.9.1-r1.ebuild 
b/net-irc/ergo/ergo-2.9.1-r1.ebuild
new file mode 100644
index ..a836c2571de1
--- /dev/null
+++ b/net-irc/ergo/ergo-2.9.1-r1.ebuild
@@ -0,0 +1,69 @@
+# 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"
+
+# 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
+
+   # 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() {
+   go build . || die
+}
+
+src_install() {
+   einstalldocs
+
+   dobin ergo
+
+   insinto /etc/ergo
+   doins default.yaml
+
+   # Swap back in next release?
+   # Forked locally for https://github.com/ergochat/ergo/issues/1914 
changes
+   #newinitd distrib/openrc/ergo.initd ergo
+   #newconfd distrib/openrc/ergo.confd ergo
+
+   newinitd "${FILESDIR}"/ergo.initd-r1 ergo
+   newconfd "${FILESDIR}"/ergo.confd-r1 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/files/ergo.confd-r1 b/net-irc/ergo/files/ergo.confd-r1
new file mode 100644
index ..71f4585060e5
--- /dev/null
+++ b/net-irc/ergo/files/ergo.confd-r1
@@ -0,0 +1,3 @@
+# /etc/conf.d/ergo: config file for /etc/init.d/ergo
+ERGO_CONFIGFILE="/etc/ergo/ircd.yaml"
+ERGO_USERNAME="oragono"

diff --git a/net-irc/ergo/files/ergo.initd-r1 b/net-irc/ergo/files/ergo.initd-r1
new file mode 100644
index ..8bd1aba2b230
--- /dev/null
+++ b/net-irc/ergo/files/ergo.initd-r1
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+name=${RC_SVCNAME}
+description="ergo IRC daemon"
+
+command=/usr/bin/ergo
+command_args="run --conf ${ERGO_CONFIGFILE:-'/etc/ergo/ircd.yaml'}"
+command_user=${ERGO_USERNAME:-ergo}
+command_background=true
+
+pidfile=/var/run/${RC_SVCNAME}.pid
+
+output_log="/var/log/${RC_SVCNAME}.out"
+error_log="/var/log/${RC_SVCNAME}.err"
+# --wait: to wait 1 second after launching to see if it survived startup
+start_stop_daemon_args="--wait 1000"
+
+extra_started_commands="reload"
+
+depend() {
+   use dns
+   provide ircd
+}
+
+start_pre() {
+   checkpath --owner ${command_user}:${command_user} --mode 0640 --file 
/var/log/${RC_SVCNAME}.out /var/log/${RC_SVCNAME}.err
+}
+
+reload() {
+   ebegin "Reloading ${RC_SVCNAME}"
+   start-stop-daemon --signal HUP --pidfile "${pidfile}"
+   eend $?
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-01-10 Thread Sam James 
commit: a9e0ce199c8442a0171785ad9aa0ff909e2d0f7d
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 10 13:19:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 10 13:19:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e0ce19

net-irc/ergo: add 2.9.1

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest  |  1 +
 net-irc/ergo/ergo-2.9.1.ebuild | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 6868565b86f0..e57a309055a2 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,3 +1,4 @@
 DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 
13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7
 SHA512 
ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c
 DIST ergo-2.8.0.tar.gz 3150109 BLAKE2B 
07b725e9db49f101544a7f7cbbb197c77187f35c59e07055ff46a6ffb0a62cb250915c36209fce453e3158000f8b0eeb16189303b5dc78fda3daf6c2e8a35b28
 SHA512 
4f3c33286be91cf12cf6cc6b56598bf6adf60c88cd22290d3221457e4d08d7957b1922a18b151726a341825a65168daf1174c622c54268c5aa744ed9c9a0326b
 DIST ergo-2.9.0.tar.gz 3248868 BLAKE2B 
5834a0708be1bd595f1c089dcb6d3fae2ca6b7315266cc9296ee28ad5524b0ecc8f8943fcbe3ff1c134cb94fe9a215aa05a13808f1db16e13b443442cdcc31cb
 SHA512 
802bac210987e8671965537511db76bb8ed0f12b38d244c187030c380467f345ce72666c86a6c7c2b98a0b9fb99db3c66a7af31176d90e1dd7b9e9b52a27b59d
+DIST ergo-2.9.1.tar.gz 3249107 BLAKE2B 
6d8f98ab868ef10323a40583e2ddb2e1854b967265f789ec176caae40675ef5a9a6a9e54c1b60d8e3f281dcb5ad18e964624ccf673e146ee7044f3454a3e2349
 SHA512 
5aa8f1afc55c432acf6763aa95cffdb3447b7d53a759d04c303675852b240b0fe26030a94ea12954a453d4f8e4f7db7ffbca8faeb6a1b20b17a44ac27b80d66a

diff --git a/net-irc/ergo/ergo-2.9.1.ebuild b/net-irc/ergo/ergo-2.9.1.ebuild
new file mode 100644
index ..b68c0cb2089c
--- /dev/null
+++ b/net-irc/ergo/ergo-2.9.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+# No test files are included in release tarballs
+# We may even want to package irctest
+RESTRICT="test"
+
+BDEPEND=">=dev-lang/go-1.14"
+RDEPEND="
+   acct-user/oragono
+   acct-group/oragono
+"
+
+DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
+
+src_prepare() {
+   default
+
+   # 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() {
+   go build -mod=vendor . || die
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-01-10 Thread Sam James 
commit: a7c8443645c85d11da291b67086c3db13e59f986
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 10 13:19:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 10 13:19:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c84436

net-irc/ergo: drop 2.7.0-r1, 2.9.0

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest |  2 --
 net-irc/ergo/ergo-2.7.0-r1.ebuild | 69 ---
 net-irc/ergo/ergo-2.9.0.ebuild| 69 ---
 3 files changed, 140 deletions(-)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index e57a309055a2..fc7d2ada4c65 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,4 +1,2 @@
-DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 
13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7
 SHA512 
ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c
 DIST ergo-2.8.0.tar.gz 3150109 BLAKE2B 
07b725e9db49f101544a7f7cbbb197c77187f35c59e07055ff46a6ffb0a62cb250915c36209fce453e3158000f8b0eeb16189303b5dc78fda3daf6c2e8a35b28
 SHA512 
4f3c33286be91cf12cf6cc6b56598bf6adf60c88cd22290d3221457e4d08d7957b1922a18b151726a341825a65168daf1174c622c54268c5aa744ed9c9a0326b
-DIST ergo-2.9.0.tar.gz 3248868 BLAKE2B 
5834a0708be1bd595f1c089dcb6d3fae2ca6b7315266cc9296ee28ad5524b0ecc8f8943fcbe3ff1c134cb94fe9a215aa05a13808f1db16e13b443442cdcc31cb
 SHA512 
802bac210987e8671965537511db76bb8ed0f12b38d244c187030c380467f345ce72666c86a6c7c2b98a0b9fb99db3c66a7af31176d90e1dd7b9e9b52a27b59d
 DIST ergo-2.9.1.tar.gz 3249107 BLAKE2B 
6d8f98ab868ef10323a40583e2ddb2e1854b967265f789ec176caae40675ef5a9a6a9e54c1b60d8e3f281dcb5ad18e964624ccf673e146ee7044f3454a3e2349
 SHA512 
5aa8f1afc55c432acf6763aa95cffdb3447b7d53a759d04c303675852b240b0fe26030a94ea12954a453d4f8e4f7db7ffbca8faeb6a1b20b17a44ac27b80d66a

diff --git a/net-irc/ergo/ergo-2.7.0-r1.ebuild 
b/net-irc/ergo/ergo-2.7.0-r1.ebuild
deleted file mode 100644
index edff5c53fda6..
--- a/net-irc/ergo/ergo-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-# No test files are included in release tarballs
-# We may even want to package irctest
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.14"
-RDEPEND="
-   acct-user/oragono
-   acct-group/oragono
-"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-   default
-
-   # 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() {
-   go build -mod=vendor . || die
-}
-
-src_install() {
-   einstalldocs
-
-   dobin ergo
-
-   insinto /etc/ergo
-   doins default.yaml
-
-   newinitd "${FILESDIR}"/ergo.initd ergo
-   newconfd "${FILESDIR}"/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.9.0.ebuild b/net-irc/ergo/ergo-2.9.0.ebuild
deleted file mode 100644
index f6c97f4a9b0c..
--- a/net-irc/ergo/ergo-2.9.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=7
-
-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"
-
-# No test files are included in release tarballs
-# We may even want to package irctest
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.14"
-RDEPEND="
-   acct-user/oragono
-   acct-group/oragono
-"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-   default
-
-   # Minor fiddling with paths
-   sed -i \
-   -e

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2022-01-08 Thread Sam James 
commit: 5fc2acbd30ec0188a7c794a031dfcb74d54fd8ac
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  9 07:33:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  9 07:34:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc2acbd

net-irc/ergo: add 2.9.0

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest  |  1 +
 net-irc/ergo/ergo-2.9.0.ebuild | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 5fd16b1a9a7b..6868565b86f0 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,2 +1,3 @@
 DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 
13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7
 SHA512 
ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c
 DIST ergo-2.8.0.tar.gz 3150109 BLAKE2B 
07b725e9db49f101544a7f7cbbb197c77187f35c59e07055ff46a6ffb0a62cb250915c36209fce453e3158000f8b0eeb16189303b5dc78fda3daf6c2e8a35b28
 SHA512 
4f3c33286be91cf12cf6cc6b56598bf6adf60c88cd22290d3221457e4d08d7957b1922a18b151726a341825a65168daf1174c622c54268c5aa744ed9c9a0326b
+DIST ergo-2.9.0.tar.gz 3248868 BLAKE2B 
5834a0708be1bd595f1c089dcb6d3fae2ca6b7315266cc9296ee28ad5524b0ecc8f8943fcbe3ff1c134cb94fe9a215aa05a13808f1db16e13b443442cdcc31cb
 SHA512 
802bac210987e8671965537511db76bb8ed0f12b38d244c187030c380467f345ce72666c86a6c7c2b98a0b9fb99db3c66a7af31176d90e1dd7b9e9b52a27b59d

diff --git a/net-irc/ergo/ergo-2.9.0.ebuild b/net-irc/ergo/ergo-2.9.0.ebuild
new file mode 100644
index ..f6c97f4a9b0c
--- /dev/null
+++ b/net-irc/ergo/ergo-2.9.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+# No test files are included in release tarballs
+# We may even want to package irctest
+RESTRICT="test"
+
+BDEPEND=">=dev-lang/go-1.14"
+RDEPEND="
+   acct-user/oragono
+   acct-group/oragono
+"
+
+DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
+
+src_prepare() {
+   default
+
+   # 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() {
+   go build -mod=vendor . || die
+}
+
+src_install() {
+   einstalldocs
+
+   dobin ergo
+
+   insinto /etc/ergo
+   doins default.yaml
+
+   newinitd "${FILESDIR}"/ergo.initd ergo
+   newconfd "${FILESDIR}"/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
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2021-11-20 Thread Sam James 
commit: 7dcbafbf5f167e973a0ffe74632b2ca99732de77
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 20 08:38:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 20 08:38:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dcbafbf

net-irc/ergo: add 2.8.0

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest  |  1 +
 net-irc/ergo/ergo-2.8.0.ebuild | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index a11d6eaa2601..5fd16b1a9a7b 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1 +1,2 @@
 DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 
13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7
 SHA512 
ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c
+DIST ergo-2.8.0.tar.gz 3150109 BLAKE2B 
07b725e9db49f101544a7f7cbbb197c77187f35c59e07055ff46a6ffb0a62cb250915c36209fce453e3158000f8b0eeb16189303b5dc78fda3daf6c2e8a35b28
 SHA512 
4f3c33286be91cf12cf6cc6b56598bf6adf60c88cd22290d3221457e4d08d7957b1922a18b151726a341825a65168daf1174c622c54268c5aa744ed9c9a0326b

diff --git a/net-irc/ergo/ergo-2.8.0.ebuild b/net-irc/ergo/ergo-2.8.0.ebuild
new file mode 100644
index ..edff5c53fda6
--- /dev/null
+++ b/net-irc/ergo/ergo-2.8.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+# No test files are included in release tarballs
+# We may even want to package irctest
+RESTRICT="test"
+
+BDEPEND=">=dev-lang/go-1.14"
+RDEPEND="
+   acct-user/oragono
+   acct-group/oragono
+"
+
+DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
+
+src_prepare() {
+   default
+
+   # 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() {
+   go build -mod=vendor . || die
+}
+
+src_install() {
+   einstalldocs
+
+   dobin ergo
+
+   insinto /etc/ergo
+   doins default.yaml
+
+   newinitd "${FILESDIR}"/ergo.initd ergo
+   newconfd "${FILESDIR}"/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
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/files/

2021-07-12 Thread Sam James 
commit: 3055ac7258518df758f72bf0055d50cfc366a3c0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Jul 12 18:17:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 13 04:22:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3055ac72

net-irc/ergo: remove unused files

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/21617
Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/files/oragono.confd |  3 ---
 net-irc/ergo/files/oragono.initd | 11 ---
 2 files changed, 14 deletions(-)

diff --git a/net-irc/ergo/files/oragono.confd b/net-irc/ergo/files/oragono.confd
deleted file mode 100644
index 3e694bb9703..000
--- a/net-irc/ergo/files/oragono.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/conf.d/oragono: config file for /etc/init.d/oragono
-ORAGONO_CONFIGFILE="/etc/oragono/ircd.yaml"
-

diff --git a/net-irc/ergo/files/oragono.initd b/net-irc/ergo/files/oragono.initd
deleted file mode 100644
index 2379aaea301..000
--- a/net-irc/ergo/files/oragono.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-command=/usr/bin/oragono
-command_args="--conf ${ORAGONO_CONFIGFILE:-"/etc/oragono/ircd.yaml"}"
-pidfile=/var/run/oraogno.pid
-name="Oragono"
-description="Oragono IRC daemon"
-
-depend() {
-   use dns
-   provide ircd
-}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/

2021-06-28 Thread Sam James 
commit: 24150368453a1d3fef16fc23d5cc5f902a27b84b
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 29 04:52:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 29 04:52:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24150368

net-irc/ergo: drop 2.6.1

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest  |  1 -
 net-irc/ergo/ergo-2.6.1.ebuild | 68 --
 2 files changed, 69 deletions(-)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 8ee102413f9..a11d6eaa260 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,2 +1 @@
-DIST ergo-2.6.1.tar.gz 3099502 BLAKE2B 
2d9aea062f1f0f827febe704a1148bf0c559ad905d709f530fceeb5bbd85297402a076d62bd53315b7c48556a9aba94f968758b26c9a31f970daf93b6cbe5807
 SHA512 
c9b7d14394bb0ed4425c6c8fb24c6fb73cb312ed8224887a52acb0776a5ec6c4cf2cfd73e92cbfb6385bf467bdcd443f751966fc6671d9d6446f6efd2b5d4d80
 DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 
13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7
 SHA512 
ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c

diff --git a/net-irc/ergo/ergo-2.6.1.ebuild b/net-irc/ergo/ergo-2.6.1.ebuild
deleted file mode 100644
index f434edca6b5..000
--- a/net-irc/ergo/ergo-2.6.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module systemd
-
-DESCRIPTION="A modern IRC server written in Go"
-HOMEPAGE="https://oragono.io/ https://github.com/oragono/oragono;
-SRC_URI="https://github.com/oragono/oragono/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# No test files are included in release tarballs
-# We may even want to package irctest
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.14"
-RDEPEND="
-   acct-user/oragono
-   acct-group/oragono
-"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-   default
-
-   # Minor fiddling with paths
-   sed -i \
-   -e 's:/home/oragono/oragono:/usr/bin/oragono:' \
-   -e 's:/home/oragono:/var/lib/oragono:' \
-   -e 's:/var/lib/oragono/ircd.yaml:/etc/oragono/ircd.yaml:' \
-   distrib/systemd/oragono.service || die
-}
-
-src_compile() {
-   go build -mod=vendor . || die
-}
-
-src_install() {
-   einstalldocs
-
-   dobin oragono
-
-   insinto /etc/oragono
-   doins default.yaml
-
-   newinitd "${FILESDIR}"/oragono.initd oragono
-   newconfd "${FILESDIR}"/oragono.confd oragono
-
-   keepdir /var/lib/oragono
-   fowners oragono:oragono /var/lib/oragono
-
-   insinto /var/lib/oragono
-   doins -r languages/
-
-   systemd_dounit distrib/systemd/oragono.service
-}
-
-pkg_postinst() {
-   if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-   elog "Please copy the example config in ${EROOT}/etc/oragono:"
-   elog "e.g. cp ${EROOT}/etc/oragono/default.yaml 
${EROOT}/etc/oragono/ircd.yaml"
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/files/, net-irc/ergo/

2021-06-28 Thread Sam James 
commit: 289aa33277dcba453d0c2519c49ad947f4ea504a
Author: Jonathan Davies  protonmail  com>
AuthorDate: Fri Jun 25 15:00:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 29 04:52:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289aa332

net-irc/ergo: Fixed OpenRC init script to handle backgrounding correctly and 
added reload function.

Signed-off-by: Jonathan Davies  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21425
Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/{ergo-2.7.0.ebuild => ergo-2.7.0-r1.ebuild} |  0
 net-irc/ergo/files/ergo.initd| 10 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/net-irc/ergo/ergo-2.7.0.ebuild b/net-irc/ergo/ergo-2.7.0-r1.ebuild
similarity index 100%
rename from net-irc/ergo/ergo-2.7.0.ebuild
rename to net-irc/ergo/ergo-2.7.0-r1.ebuild

diff --git a/net-irc/ergo/files/ergo.initd b/net-irc/ergo/files/ergo.initd
index bc2b7dd064d..025d6951862 100644
--- a/net-irc/ergo/files/ergo.initd
+++ b/net-irc/ergo/files/ergo.initd
@@ -1,6 +1,8 @@
 #!/sbin/openrc-run
 command=/usr/bin/ergo
-command_args="--conf ${ERGO_CONFIGFILE:-"/etc/ergo/ircd.yaml"}"
+command_args="run --conf ${ERGO_CONFIGFILE:-"/etc/ergo/ircd.yaml"}"
+command_background=true
+extra_started_commands="reload"
 pidfile=/var/run/ergo.pid
 name="ergo"
 description="ergo IRC daemon"
@@ -9,3 +11,9 @@ depend() {
use dns
provide ircd
 }
+
+reload() {
+   ebegin "Reloading ${RC_SVCNAME}"
+   start-stop-daemon --signal HUP --pidfile "${pidfile}"
+   eend $?
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/files/, net-irc/ergo/

2021-06-07 Thread Sam James 
commit: 4ceaaa0925e45548369c6aea04e84cf0eb025084
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  8 05:10:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  8 05:11:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ceaaa09

net-irc/ergo: add 2.7.0

Signed-off-by: Sam James  gentoo.org>

 net-irc/ergo/Manifest  |  3 +-
 net-irc/ergo/ergo-2.7.0.ebuild | 69 ++
 net-irc/ergo/files/ergo.confd  |  3 ++
 net-irc/ergo/files/ergo.initd  | 11 +++
 4 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 9c822e6f318..8ee102413f9 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1 +1,2 @@
-DIST oragono-2.6.1.tar.gz 3099750 BLAKE2B 
d07a699fd2330e270f623cd452fa5cd6833ad541f4be76bdea0fed85ca6947f35a93876f684cd611f40d1482192cd3fcc4d8ac22f5c08dce5098ca2ad6a913fd
 SHA512 
ce7e28f71dbd99fd304cfbf343aa3a494ceef8b3680691982f1caa16b0c1162f354eceacc3deab6d8c1a9b9d6d5fa009953f2735ab87991801ec2e6958b8fb9b
+DIST ergo-2.6.1.tar.gz 3099502 BLAKE2B 
2d9aea062f1f0f827febe704a1148bf0c559ad905d709f530fceeb5bbd85297402a076d62bd53315b7c48556a9aba94f968758b26c9a31f970daf93b6cbe5807
 SHA512 
c9b7d14394bb0ed4425c6c8fb24c6fb73cb312ed8224887a52acb0776a5ec6c4cf2cfd73e92cbfb6385bf467bdcd443f751966fc6671d9d6446f6efd2b5d4d80
+DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 
13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7
 SHA512 
ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c

diff --git a/net-irc/ergo/ergo-2.7.0.ebuild b/net-irc/ergo/ergo-2.7.0.ebuild
new file mode 100644
index 000..edff5c53fda
--- /dev/null
+++ b/net-irc/ergo/ergo-2.7.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+# No test files are included in release tarballs
+# We may even want to package irctest
+RESTRICT="test"
+
+BDEPEND=">=dev-lang/go-1.14"
+RDEPEND="
+   acct-user/oragono
+   acct-group/oragono
+"
+
+DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
+
+src_prepare() {
+   default
+
+   # 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() {
+   go build -mod=vendor . || die
+}
+
+src_install() {
+   einstalldocs
+
+   dobin ergo
+
+   insinto /etc/ergo
+   doins default.yaml
+
+   newinitd "${FILESDIR}"/ergo.initd ergo
+   newconfd "${FILESDIR}"/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/files/ergo.confd b/net-irc/ergo/files/ergo.confd
new file mode 100644
index 000..336ca1de7ab
--- /dev/null
+++ b/net-irc/ergo/files/ergo.confd
@@ -0,0 +1,3 @@
+# /etc/conf.d/ergo: config file for /etc/init.d/ergo
+ERGO_CONFIGFILE="/etc/ergo/ircd.yaml"
+

diff --git a/net-irc/ergo/files/ergo.initd b/net-irc/ergo/files/ergo.initd
new file mode 100644
index 000..bc2b7dd064d
--- /dev/null
+++ b/net-irc/ergo/files/ergo.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+command=/usr/bin/ergo
+command_args="--conf ${ERGO_CONFIGFILE:-"/etc/ergo/ircd.yaml"}"
+pidfile=/var/run/ergo.pid
+name="ergo"
+description="ergo IRC daemon"
+
+depend() {
+   use dns
+   provide ircd
+}