[gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/files/
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/files/, net-irc/ergo/
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/files/, net-irc/ergo/
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/files/
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/files/, net-irc/ergo/
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/
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
+}
