gentoo resync : 29.06.2021

4 files changed, 11 insertions, 73 deletions

diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 689af2e2b83c..29c5236da7c9 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,9 +1,7 @@
 AUX ergo.confd 92 BLAKE2B 02dd8cc089593bb207268c1f91e106b2e78b5aba92774cf7b0ee0b38a09c55db409fce72517965f1929d26bdafbe1b9d781708500b286c05f7e161819c177c86 SHA512 3908e273045e5d94f358913e669bf2802a82306ce8eabffa6b7b6e5f022f2fe069a577c69c4070ddf61ec85287b2bca362a02585ecdb779cba4435750de5c5b2
-AUX ergo.initd 210 BLAKE2B 9e0931e6ac4e8850d20fd4a5395dbf7313b6b5b45a9311e8b55883ab527be21d82beaff8492bc4f347f36e688efcd0453f5f74fab02096e6ed14cdd82fb87690 SHA512 3fed0a766b08919dee8d0a7efc64ccf0fe06d6ee7f6058d22a415bf16102743c5e73ba9677be7fc7266e9f2e2ffca2a200d3aa792015cba35b24a1104c43855c
+AUX ergo.initd 382 BLAKE2B 916ef2bc1371e4f62328b22f4072d5c2a39249bfa53e59d6e8877d2ad8a92ed333dae806d65269a343351a93f5d995383c01f65291cc2f24db0ebba0e4fb24f1 SHA512 0b2c1cc5e12458e02efd7e5a6e80f301ce96163c68f1e7e5311dded5c6c99b5ea4a9d707c2f549b56ee77fa4b5758a4d66ce78602011bc30a8ef48d762bd5de4
 AUX oragono.confd 104 BLAKE2B 8e1f9372d43f979a768b516f0b7c4e00540a1547592bae12b576e8b182b94eefadfda09208e14a7f3fe1c8480d447e487a1df86807041bca33a53b87f208822a SHA512 7b54c8ad9ed552fd91bda17605118599a8f3853156c0d8b9d1c64630b984095096c74dcd38000b2d13ab0e3015ee81e994ea5d90b20edbc6b5c174f6efbdb307
 AUX oragono.initd 228 BLAKE2B 5ccdbc0762223f0311ea80f104cb814bd1990720bc35befbb3b19d4e71226e773ea60a2a37ab249fa18f01ca680d6c2f5b86d8cf283a0eef8a08a28f438dd458 SHA512 428c1a350d3720434a727f1f68463519941e6e27f985be51417001bbfb55b7a68fc874977dec6d63bd1fb1dff496e88b9bccb2a6e079f34b726ce78d76a8f53b
-DIST ergo-2.6.1.tar.gz 3099502 BLAKE2B 2d9aea062f1f0f827febe704a1148bf0c559ad905d709f530fceeb5bbd85297402a076d62bd53315b7c48556a9aba94f968758b26c9a31f970daf93b6cbe5807 SHA512 c9b7d14394bb0ed4425c6c8fb24c6fb73cb312ed8224887a52acb0776a5ec6c4cf2cfd73e92cbfb6385bf467bdcd443f751966fc6671d9d6446f6efd2b5d4d80
 DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7 SHA512 ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c
-EBUILD ergo-2.6.1.ebuild 1530 BLAKE2B 28252d49b8133d926da8e5da8256631fb7308273cbffb2d09a01efaaf9ba75a02a9713367597ef99a98147b4b2afc1153ce648415b8f146e053163921ffac57c SHA512 ceb0a6f6433a1b03a451ac5ca7bb04255735f1c1cab805fd575ac93f40c0f3f89d1c769b7582fa22c92628fb3e7d20e7feb1fad55a343d1f6d3c07b37d119746
-EBUILD ergo-2.7.0.ebuild 1497 BLAKE2B 76a7e0043b50b1d9d7504eb560164bfb77193aa903db01bb9bd8ba90e82ac78e1091ca942e167cfacb88b11365ba0e1f37d649143b205e5e5c98ad21ea0f1204 SHA512 f545f00d43e7548f6696764592267120d2e7ceb5dc24dbdb4f9bb060f290256b61a4ec7415f1477c68102bf5babf1cd1bc497172d4d1107b5fc1b16e04ffce5b
+EBUILD ergo-2.7.0-r1.ebuild 1497 BLAKE2B 76a7e0043b50b1d9d7504eb560164bfb77193aa903db01bb9bd8ba90e82ac78e1091ca942e167cfacb88b11365ba0e1f37d649143b205e5e5c98ad21ea0f1204 SHA512 f545f00d43e7548f6696764592267120d2e7ceb5dc24dbdb4f9bb060f290256b61a4ec7415f1477c68102bf5babf1cd1bc497172d4d1107b5fc1b16e04ffce5b
 MISC metadata.xml 319 BLAKE2B d82fdd20f65f3c9c6d544701fd4542c7ea14a10869210f24a966e6c512127c132d9a8e58e116196999159cbcff6017b20ec5c5f4b918471a32cb91e81e84fdf2 SHA512 721af15195dda9a790c7cd38bd36792a0411bb45a34e5b0a2b5e9d3343a1c41d7aa583e8be8ea97a639cafafe70c8a5e0219d6b5f175e5eeb166d6afca2e464b
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 f434edca6b5f..000000000000
--- 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
-}
diff --git a/net-irc/ergo/ergo-2.7.0.ebuild b/net-irc/ergo/ergo-2.7.0-r1.ebuild
index edff5c53fda6..edff5c53fda6 100644
--- a/net-irc/ergo/ergo-2.7.0.ebuild
+++ b/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 bc2b7dd064d1..025d6951862b 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 $?
+}