gentoo resync : 12.07.2021

6 files changed, 5 insertions, 183 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 6e88f86806d0..0fd6efd9da89 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index cf17fa75d30f..7c96559993e9 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,5 +1,5 @@
 AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e145903b69e16ce46169a2dde19e03af38228ed9ede0473a828aa8cd123ab4a2b043fde448bb180954 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158
 DIST ngircd-26.1.tar.gz 562938 BLAKE2B a1a4ca8b6e12a02cb4ba2e07d777cf77051b5330464c91634cfac0b385157ab7c648e3b71151247bc8ee6cc847e84755fdca3d9b4a25205bbb57b8296995dd17 SHA512 4a3ee379dd8d8655a71134c745f750359ceb0512e184db555f65f2bcab68087480365a35680a9ec75b1e6eb0fef23e1cbe0a0e13c3c58d211e5a520a8eeaa71c
 DIST ngircd-26.1.tar.gz.sig 310 BLAKE2B 108daa66aeccd51468aa0c6ab2de18c3ce476e812145902186ac4b3b8b29b0da32057c5a6f44133cfa4507310a9a76a001301ebe2d37ca809e1b7d8502aaa492 SHA512 e0b6b28c65f1363c0e8043378d52bccc0a634d7c17018edbc33130c9dbc4c2896f3b3a3ab758746707b37e3e527abbd61e5af8c1455d5fcc5b1b202758c82576
-EBUILD ngircd-26.1.ebuild 2222 BLAKE2B 6d7b2a5a13b6b96a3f274f5c145f7e4ed144c03786e6dc0265e31a755f7737c9287a37016eac6be38cb59e149cbf5436ebd876d148bcccaa50dc72d41bf19bf0 SHA512 8d0299646ac41e45519e66c49c560e3f0a52dd376a3e4092a19a67c0bd23490be90ac710602edceb191d9cb54210f138452b513503a4e9edcf15c71a0d1f55ae
+EBUILD ngircd-26.1-r1.ebuild 2224 BLAKE2B 28c7d3c23b46b67de978c857a4ea694ebd95be927a534589a30501cd127ff8a6c655fecb1165c8162d144cea6a3d9bfd419fe47ea7c5ffd3e9ce3cc42ef47c97 SHA512 4ccc4d187ccd312309723069890e73342d829b3704bc8ec3c66156dd28b64b1420bfc1c5add18d6e6ba3b0f943cfaec0d4d9e2f609260de18fbdb4ad59b196ce
 MISC metadata.xml 650 BLAKE2B dd80efa442d59f04e26bb338e371ffa8380a4cdbb630db30e25adbaa930d9f0e4a486bbd05321b8185c23558ad4e29023153a69d1214294c345b46685eb7de86 SHA512 9b8879892c2edc6c7792c22a684f87ae559a43b034ee66f6242e73075012e1f53a33a63fc3ffa62c41f5fd620a4be6c1ffc57a1b62cf42ffa3c032cec4ff743b
diff --git a/net-irc/ngircd/ngircd-26.1.ebuild b/net-irc/ngircd/ngircd-26.1-r1.ebuild
index 213f2c993db4..b85654fa0929 100644
--- a/net-irc/ngircd/ngircd-26.1.ebuild
+++ b/net-irc/ngircd/ngircd-26.1-r1.ebuild
@@ -76,11 +76,11 @@ src_configure() {
 
 	if use ssl ; then
 		if use gnutls ; then
-			myconf+=(
+			myeconf+=(
 				$( use_with gnutls )
 			)
 		else
-			myconf+=(
+			myeconf+=(
 				$( use_with !gnutls openssl )
 			)
 		fi
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index b8e08f9561e5..7304c0735fb8 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -2,9 +2,7 @@ AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f45
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8dfc3e9eab968008ad681a8b9f353bff4951bba8023d5c04affda6b58fde5db8232d0f1f9ae3e470424f0 SHA512 99163776104f2f27a585332004221fac16a9fbf9c8930b0603b5f33aca4c5ac13bdded4d5917143796b3893a19d2f709b0c4d4d635d85bd681f643b3b59131f5
 DIST unrealircd-5.0.8.tar.gz 5013231 BLAKE2B 57365a06b8108239ab10f6cff7d4553b08aa428acb5c635c4b9241c3f82459a5aac18c916a4534f3a8fc9ac1fd4c1d9418c7395233603e576eda40c56d81b110 SHA512 45fc0758a870dbb9c3ff55fc7029d1ecff9dcf65680f31ff331f012efbf9c9bffa60a6fe27b9bab69302d26b8293a1089cfaf1c550a3f2802a549f25e4644770
-DIST unrealircd-5.0.9.1.tar.gz 5210836 BLAKE2B 1b71c54106a038501782004b183bfc4b148c381150cd293bdbf74f33dd8a244083e7ce55adcf16aee5cd344707d6b1d1843bbf3d83fea0749532f68a954da950 SHA512 1d45be1904c415a60bd5b7e279ee528e0f559207fe763ea8b10a9809a253b0e10d781b8624c85600206a8484bde0ba162c62dc96e12d581d904d483b0b89193a
-DIST unrealircd-5.2.0.2.tar.gz 7169870 BLAKE2B 205435fe9b00e5c16432c79fa20562402276fc51a8e2173d9d46a25911cfeff7973520014ccb819370400628d0abe3663a1ea87dce621f275c587e983387da42 SHA512 78ef0637fc7e7d1b6a6f047e6922b61ec7da5173df6a768e0832f02922a0054e1ad23dc8bcd476d64124f5f7956b199d00f98d4c61af2d7e4800cefc5b56ccf1
+DIST unrealircd-5.2.1.1.tar.gz 7174342 BLAKE2B 0d149807bcacd0604195948f3c5a7f538426741b38238bd00df76e7c2fa4b8603f86f325c2ba6f8f87bc72621e38fc5642b86aa081cf1f4f74cabc5cbdc89eb7 SHA512 d49a5fd9b02d6e43ec13f9195d226c10c4f2a7a7f0ac41c51b02a13fc287fea14c8fd73203fea773e57eb2e969cc4248abfdc24bd643a4f727222de7e4f726fa
 EBUILD unrealircd-5.0.8-r1.ebuild 5103 BLAKE2B e2cce9448e9b294a146307cd779c961f33a14e08569a2c3e205ecbea36029a8d5042f0e5e51469e064579bcff709cad4d71b51090ea5e4ede9611f7a675858d7 SHA512 207ab5044c645d1165e9f94d2d166377c54efb224ee8ad76df32b26cd9a6bc39297a4882f81e59110fa9da0e2547f381fcc718daa90e1f415584e3e6303ddcc7
-EBUILD unrealircd-5.0.9.1-r1.ebuild 5232 BLAKE2B de63ae083c9f5f1ba8159d6b7e66b7e2cd94e8654210dfb8cb171d61846d928cc12461a92e5c2cf33927b3cc893ac1fa877661ed8deb195fb1df76df39d2b639 SHA512 6a977e3e710e4832ba5d5ef0810620eb14d0f1962b943b2cdafad02fbe123c9591468d75d0446142114b350a0fac0d8de74db158954d9233553345b0ceeb3277
-EBUILD unrealircd-5.2.0.2-r1.ebuild 5254 BLAKE2B ac6e634ff7c444ee5b21128b87585cb991298d12adc06f82ac7826862c40793936951c671161aaaf8c9b84b195fa7795c8afa666f317fcb8a646f87b7940f26b SHA512 1b34ab84465516e45cbcc7c2d35c5b88dc33c06c3328bd10b3ab8fe53c95fe00e880c5568c057a7df00ebff45848be2a4cbf0d0b3f73c2d9d46cb57c8d217a09
+EBUILD unrealircd-5.2.1.1.ebuild 5254 BLAKE2B ac6e634ff7c444ee5b21128b87585cb991298d12adc06f82ac7826862c40793936951c671161aaaf8c9b84b195fa7795c8afa666f317fcb8a646f87b7940f26b SHA512 1b34ab84465516e45cbcc7c2d35c5b88dc33c06c3328bd10b3ab8fe53c95fe00e880c5568c057a7df00ebff45848be2a4cbf0d0b3f73c2d9d46cb57c8d217a09
 MISC metadata.xml 859 BLAKE2B bea2149aa6ecf19297e79bbffe9d3d76cac8016324f40cd056ae34544cf9aacb9976b36f0090ab1bb60a21c40cd735d85cc6766cb741393e106326f61bb5b2e3 SHA512 7b35b9fa89319fc0c7743ce4b2af6244b9d56a715ecbc74a0385f93c66651153c7e8be0171a1e0642a90767a94e1b809b49741d26472e9e5f40809450b222237
diff --git a/net-irc/unrealircd/unrealircd-5.0.9.1-r1.ebuild b/net-irc/unrealircd/unrealircd-5.0.9.1-r1.ebuild
deleted file mode 100644
index 4dc1c176bdc0..000000000000
--- a/net-irc/unrealircd/unrealircd-5.0.9.1-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SSL_CERT_MANDATORY=1
-inherit autotools ssl-cert systemd
-
-DESCRIPTION="An advanced Internet Relay Chat daemon"
-HOMEPAGE="https://www.unrealircd.org/"
-SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE="class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes"
-
-RDEPEND="
-	acct-group/unrealircd
-	acct-user/unrealircd
-	>=app-crypt/argon2-20171227-r1:=
-	dev-libs/libpcre2
-	dev-libs/openssl:0=
-	>=net-dns/c-ares-1.7:=
-	virtual/libcrypt:=
-	curl? ( net-misc/curl[adns] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
-
-src_prepare() {
-	# QA check against bundled pkgs
-	rm -r extras || die
-
-	# building third-party modules (which we don't do) cause a sandbox violation
-	# bug 704444
-	echo "" > src/buildmod || die
-
-	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
-
-	if use class-nofakelag; then
-		sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
-	fi
-
-	# File is missing from the 5.0.9.1 tarball
-	sed -i -e '/unrealircd-upgrade-script/d' configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Default value for privatelibdir adds a build path to -Wl,-rpath.
-	econf \
-		--with-bindir="${EPREFIX}"/usr/bin \
-		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
-		--with-confdir="${EPREFIX}"/etc/${PN} \
-		--with-datadir="${EPREFIX}"/var/lib/${PN} \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-logdir="${EPREFIX}"/var/log/${PN} \
-		--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
-		--without-privatelibdir \
-		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
-		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
-		--with-maxconnections=1024 \
-		--with-nick-history=2000 \
-		--with-permissions=0640 \
-		--with-system-argon2 \
-		--with-system-cares \
-		--with-system-pcre2 \
-		--enable-dynamic-linking \
-		--enable-ssl="${EPREFIX}"/usr \
-		$(use_enable curl libcurl "${EPREFIX}"/usr) \
-		$(use_enable prefixaq) \
-		$(use_with showlistmodes) \
-		$(use_with !operoverride no-operoverride) \
-		$(use_with operoverride-verify)
-}
-
-src_install() {
-	keepdir /var/log/${PN}
-	keepdir /var/lib/${PN}/tmp
-
-	newbin src/ircd ${PN}
-
-	(
-		cd src/modules || die
-		for subdir in $(find . -type d -print); do
-			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
-				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
-				doexe "${subdir}"/*.so
-			fi
-		done
-	)
-
-	insinto /etc/${PN}
-	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
-	# is redundant with app-misc/ca-certificates and examples will all
-	# be in docs anyway.
-	doins -r doc/conf/{aliases,help}
-	doins doc/conf/*.conf
-	newins doc/conf/examples/example.conf ${PN}.conf
-	keepdir /etc/${PN}/tls
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
-
-	# config should be read-only
-	fperms -R 0640 /etc/${PN}
-	fperms 0750 /etc/${PN}{,/aliases,/help}
-	fperms 0750 /etc/${PN}/tls
-	# state is editable but not owned by unrealircd directly
-	fperms 0770 /var/log/${PN}
-	fperms 0770 /var/lib/${PN}{,/tmp}
-	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
-
-	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
-	# that to look for ca-certificates-provided file instead. %s is
-	# CONFDIR. #618066
-	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	# Move docert call from src_install() to install_cert in pkg_postinst for
-	# bug #201682
-	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
-		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
-			ewarn "The location ${PN} looks for SSL certificates has changed"
-			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
-			ewarn "Please move your existing certificates."
-		else
-			(
-				umask 0037
-				install_cert /etc/${PN}/tls/server.cert
-				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
-				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
-			)
-		fi
-	fi
-
-	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
-	# Fix up the default cloak keys.
-	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
-		ebegin "Generating cloak-keys"
-		local keys=(
-			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
-		)
-		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
-		eend $?
-
-		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
-		sed -i \
-			-e '/cloak-keys/ {
-n
-s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
-n
-s/"and another one";/"'"${keys[1]}"'";/
-n
-s/"and another one";/"'"${keys[2]}"'";/
-}' \
-			"${unrealircd_conf}"
-		eend $?
-	fi
-
-	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
-	elog
-	elog "You can also configure ${PN} start at boot with rc-update(1)."
-	elog "It is recommended to run unrealircd as an unprivileged user."
-	elog "The provided init.d script does this for you."
-}
diff --git a/net-irc/unrealircd/unrealircd-5.2.0.2-r1.ebuild b/net-irc/unrealircd/unrealircd-5.2.1.1.ebuild
index 9b28edcdac42..9b28edcdac42 100644
--- a/net-irc/unrealircd/unrealircd-5.2.0.2-r1.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.2.1.1.ebuild