gentoo auto-resync : 25:09:2022 - 05:33:00

6 files changed, 6 insertions, 49 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index e46ae0394068..d9c09b78a77e 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 25a5bee61545..6d41e32bcbb8 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,5 +1,3 @@
-AUX ergo.confd-r1 115 BLAKE2B 3a01f49ee095b213507774a40aeee26f4a9b3b875fc00edd466b4fcace701a84fe941313ceabe2c58e4d2da08caa86f3e38a330a90091bc76279d34ed759c467 SHA512 8895c2f87cdbff207cbdf17f93140c97df23bea3f3b0759ddd2dc9fc582ecea26852e5ad3b71fa59c3182592ff2cf49edc8f8029014c22f1a42ceda0369f8bf7
-AUX ergo.initd-r1 768 BLAKE2B 2d14e467e05131b7e17d8ba03d9ed0c19c3dbf291b9175ad1964ce58611661ed27c7dbcf2bb218b4844c1f871b47d9dfe52df53ba9376a3ee69b584fa9a5647f SHA512 4ab75831cdb58b56afc94f1e9ed9ca23d6f23b650141d54c08be2ee26516e010ab9aef47b891150df465962fd9728bfdf34ec0b9b9b4fb32b9a0a47f1df18576
 DIST ergo-2.10.0.tar.gz 3256716 BLAKE2B 72f1d6464ee434508b9944a9923435cda01e97c8b542c7c77c74562309a6b9ed727b5ae7c444f6e95517482fd87f34623d477e14c1dfbe323a7d81ace5c3e111 SHA512 952ef22b28d8de0814f04ece55b8ff88f405f184d8ecfce45c4af63e8c53153786d0b685f9bfff7cdb53ad369914f07069436f43b5ab65816bb7410b02f34bf8
 EBUILD ergo-2.10.0.ebuild 1412 BLAKE2B 99871c7097f276df3aa4baf259b8e7d86356a8506157e460838c8d2d13fc8acfcabd9e7eb75c9883522295cb1be625b062dc8bc484cf29eb72501d97f374bad1 SHA512 20a5987e2eafc389d4fee3219ed3f14a4f3928b9fc3dd7dd121e5a2886f52b4416c35f59d43a8a39fe025ebefe4b2b6c84a609b1857f88c2d567e4bcfb0a0133
 MISC metadata.xml 320 BLAKE2B 3bff5defc5150caa0cae2776e69f9070d1896c9cab8e5e0fc1afb94606a1c0e0d3ab951b4ea1076929221bcfd0576540f1b1768c1f9d3ad68161d9540c6785e3 SHA512 b634cbc9628c66cfc5b2983a6da5b2322bfb5c755893e1c15aab203f6e94b15ea5be2494b0370e8b7fd4950d0d1059e60939bd945620aa0548ef665263a5672a
diff --git a/net-irc/ergo/files/ergo.confd-r1 b/net-irc/ergo/files/ergo.confd-r1
deleted file mode 100644
index 71f4585060e5..000000000000
--- 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..000000000000
--- 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 $?
-}
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index acfb8e2d2f46..f81baeccfacc 100644
--- a/net-irc/ii/Manifest
+++ b/net-irc/ii/Manifest
@@ -2,5 +2,5 @@ DIST ii-1.8.tar.gz 12326 BLAKE2B 7ae90d788aaec0a359ce46370f27c0ce62c6f77e8cda61d
 DIST ii-1.9.tar.gz 12672 BLAKE2B 95da596de00fb311a69b907ab25c0089aafa512085b25fe5753206cdeaa0fec3d9a16eb38d60c68542f7002efd1052e69e1f5542f535363d38760cab508b3d99 SHA512 a665a6d1e1ffe56e370da2d703e677436ef4e18e763bb3cadbbf55e01812454ce4b79e8a20eda23846fdbe5a441ec8c534c9394995b3441472ce8a74c9035279
 EBUILD ii-1.8.ebuild 681 BLAKE2B b91c1438d2126cd64e484fb3bdbbfe2f0733615a234f7a4f4e37767b5eb17568a08f5d95e594dbd5cc3e2d489bca0114e1deb54e1ce24248ec49d3f2708c9084 SHA512 a673a6739c66535c39b458de7816cf3b7eadee202dacf9468fb22d1fae81c6887c260b2347da28d17ffe157d2c4b836945e8f9c2d091c1457d6fdb54ff213aa1
 EBUILD ii-1.9.ebuild 734 BLAKE2B 07b4d993c55de92a6e9a94b1804142b7e04480df26204ae248a6e9f9bd09785471caae67e94a3a35adfc61adf54f9edb98efda3603c8f1372edd5bf7d9acc442 SHA512 f22508148e1509b9acebbeef8abd725154623d521e26c3612e27d10df767c9d3596ae01b9e5ab141975e5c01badb8532d63b595f5f24cca522f49dc0009ee727
-EBUILD ii-9999.ebuild 626 BLAKE2B 2aed56b684403351e4cc87e8dea2869a62ea3bdb0bbb6596a3a36edca3a341fc2a9b71482f626f9bf02bae88bd32b3cab6425f03887a918f4560cbe7970169f1 SHA512 80f87b524ce3ec34f0b6bb85f30ee0f9c5093442b094fc3feb76d2ea21a3e2267113646ee1ee4c9bd1af4b356a3b324bd752ecf9b97ffd9c48bd07488c7bd961
+EBUILD ii-9999.ebuild 494 BLAKE2B fefdff75afb882164b47c19f9da9deeb1a2e0f6d8842e661dc4f2021ab65d89fb32f9c1bc80babfb4b6a0eb0f67722c916be12e73ee9dca7dbcde684174877b9 SHA512 6aeeaa27a87772da8879f575616ad2d933dcf508801c5013aa32014df0c873d61e5221268577445dad39aad10d296e28c7ee179829b5d91418f9150fe37147bf
 MISC metadata.xml 399 BLAKE2B befed27e539720bd0181729b2bad9ae3d2a08455842ffc8ffc74e221c0bcce28b9081821d9c4d8963159c729af972ac7719b51f37991964770f60116ba129fce SHA512 783203ecd1b1934c4a52d9588bd449e340d9cfadcc35316e7986a2a144494e0a508a6a91daa9e0551e5b96483a1050fc97ff24cac75e045bd3e70d8011038be3
diff --git a/net-irc/ii/ii-9999.ebuild b/net-irc/ii/ii-9999.ebuild
index 265a788ad43b..2241af190778 100644
--- a/net-irc/ii/ii-9999.ebuild
+++ b/net-irc/ii/ii-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit git-r3 toolchain-funcs
 
 DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
@@ -11,13 +12,6 @@ EGIT_REPO_URI="https://git.suckless.org/ii"
 LICENSE="MIT"
 SLOT="0"
 
-src_prepare() {
-	default
-
-	sed -i -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
-		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' config.mk || die
-}
-
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
@@ -25,7 +19,7 @@ src_compile() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}"/usr \
-		DOCPREFIX="${EPREFIX}"/usr/share/doc/${PF} \
+		PREFIX="${EPREFIX}/usr" \
+		DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" \
 		install
 }