gentoo resync : 11.08.2021

7 files changed, 156 insertions, 4 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 57fc0c023bd2..8a3a879d6b8f 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 37c70442e646..6081879d1bab 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -2,6 +2,8 @@ AUX anope-2.0.6-example.conf-pid-path.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707
 AUX anope-2.0.7-example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519fb3038bb71e45960cf000afa837a8a8a3f71458390bab1323ae85fc601f143725a45d3a0a7b9c9aca8b530805c459d70b39c SHA512 13f0eb0dfc5f18a4621e2812aad418cab1f5a0cb70ff2f915bd4df2ac896b441f24e64014e218d473c5be92d4be7a5f83e4804e92610c2ef35e46ded229bd6a4
 AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
+DIST anope-2.0.10.tar.gz 1809378 BLAKE2B d10323ace767aff19194f7cff353aecbced6122ef72d379d050c8dab3c7013adf6b3e649ffd95edc03bc8ca4873f60ad84991ef0f5c9c454b27ec0eda29edc6d SHA512 2a0e4f14a275a6b986fd224449dddd66584de92509770311262076bd659ba0bbd6e2726fc7a22a6edef57ade5268756ac0c56e6f220fb953ed83e72017d1c67b
 DIST anope-2.0.9.tar.gz 1808866 BLAKE2B db5755dbb88edb9fcc2f00c1dc324894f22b9e6bc97c9cf57b40d2296014341fe3ade8a8e1b64879b852aef6637e1bb89947deb7a41e009e25101a0a992515e7 SHA512 0ce2caa5ede2831215781a333d896f1169f90bbb515078912f32beaff1699b7957384974cca7c86f1d584d624cb43c76769299ce245ee1fb6836ce7f14ada3e0
+EBUILD anope-2.0.10.ebuild 4192 BLAKE2B 8f671a4adf8484efb63864dc5aa63ed72a3994fbdc553fa9887a2de2eddb223a599e11884717a71878abdd2cad1d385029f77940855e129ec07a41019f85a934 SHA512 6a72ea93935be5cd6e259a60ccbdf9856bfa18e2c55a196e22b6517bffc3e88b3f5a5140b8d3af41380c92ef0c82ba2c63bae97726ca363695ce03e652cf7c1e
 EBUILD anope-2.0.9.ebuild 4208 BLAKE2B 2151b5481c62b9e5f82c77e3bbc43311822769dfc669a8486c94bc653b344bf6254d6be6121c39202d83de9743a406be26780b0a1406a1bc8c8bea8c93172aec SHA512 d2a54a36e19fe66a8e0d67a223822c7a40c85ec60f95563f6674d0a03b65ee394a9ca63c9d0301ba5c3481e363dcc49e206688af493fff9bedd951843ba68af2
 MISC metadata.xml 901 BLAKE2B 0051a2f196c30f3fddfaae55dc660140a77d8b636454230473107af38f9e54cc059fa012516b07b86d1667bcfaf6fdeec6005de95c48b1b832ebd22826c03210 SHA512 f8271f6ece0d7f9488f317d8f4f8bdc8813521d15a603ea81445e109792ed5720319529f5c5527a902ff323151f4a58fbf62a83110104ce270ae5d96ec154ef6
diff --git a/net-irc/anope/anope-2.0.10.ebuild b/net-irc/anope/anope-2.0.10.ebuild
new file mode 100644
index 000000000000..b9938645cb92
--- /dev/null
+++ b/net-irc/anope/anope-2.0.10.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Anope IRC Services"
+HOMEPAGE="https://anope.org/ https://github.com/anope/anope/"
+SRC_URI="https://github.com/anope/anope/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
+REQUIRED_USE="sql? ( || ( mysql sqlite ) )"
+
+DEPEND="
+	acct-group/anope
+	acct-user/anope
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ssl? ( dev-libs/openssl:0= )
+	gnutls? (
+		net-libs/gnutls:0=
+		dev-libs/libgcrypt:0=
+	)
+	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
+	sqlite? ( dev-db/sqlite:3 )
+	tre? ( dev-libs/tre )
+	virtual/libintl
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch"
+	"${FILESDIR}/${PN}-2.0.7-example.conf-user.patch"
+)
+
+src_prepare() {
+	anope_enable_mod() {
+		local modulefile=${1}
+		ln -s "extra/${modulefile}" "modules/" || \
+			die "Failed to use ${modulefile}"
+	}
+
+	# These all require MySQL specifically
+	if use mysql ; then
+		anope_enable_mod "m_mysql.cpp"
+		anope_enable_mod "stats/irc2sql/irc2sql.cpp"
+		anope_enable_mod "stats/irc2sql/irc2sql.h"
+		anope_enable_mod "stats/irc2sql/tables.cpp"
+		anope_enable_mod "stats/irc2sql/utils.cpp"
+		anope_enable_mod "stats/m_chanstats.cpp"
+		anope_enable_mod "stats/cs_fantasy_top.cpp"
+		anope_enable_mod "stats/cs_fantasy_stats.cpp"
+		anope_enable_mod "m_sql_log.cpp"
+		anope_enable_mod "m_sql_oper.cpp"
+	fi
+
+	use sqlite && anope_enable_mod "m_sqlite.cpp"
+
+	# Any SQL implementation
+	if use sql ; then
+		anope_enable_mod "m_sql_authentication.cpp"
+	fi
+
+	if use ldap ; then
+		anope_enable_mod "m_ldap.cpp"
+		anope_enable_mod "m_ldap_authentication.cpp"
+		anope_enable_mod "m_ldap_oper.cpp"
+	fi
+
+	use gnutls && anope_enable_mod "m_ssl_gnutls.cpp"
+	use pcre && anope_enable_mod "m_regex_pcre.cpp"
+	use ssl && anope_enable_mod "m_ssl_openssl.cpp"
+	use tre && anope_enable_mod "m_regex_tre.cpp"
+
+	# Unconditional modules
+	anope_enable_mod "m_regex_posix.cpp"
+
+	# Avoid a silly sandbox error - tries to delete /usr/lib/modules
+	sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die
+
+	# Copy anope.conf for fixup to comply w/ prefix
+	cp "${FILESDIR}"/anope-conf.d-v2 "${T}" || die
+
+	# Look in the right place for modules
+	sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \
+		"${T}"/anope-conf.d-v2 || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBIN_DIR="libexec/anope"
+		-DDB_DIR="../var/lib/anope"
+		-DDOC_DIR="share/doc/${PF}"
+		-DLIB_DIR="$(get_libdir)/anope"
+		-DLOCALE_DIR="share/locale"
+		-DCONF_DIR="/etc/anope"
+		-DLOGS_DIR="../var/log/anope/"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/anope-init.d ${PN}
+	newconfd "${T}"/anope-conf.d-v2 ${PN}
+
+	dosym ../libexec/anope/services /usr/bin/services
+	dosym ../libexec/anope/anopesmtp /usr/bin/anopesmtp
+
+	keepdir /var/log/anope /var/lib/anope/backups
+	fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
+
+	dodoc -r docs/* data/example.conf
+
+	insinto /etc/anope
+	newins data/example.conf services.conf
+
+	fowners anope:anope /var/log/anope
+	fowners anope:anope /var/lib/anope/backups/
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# Only tell them about this on a fresh install.
+		ewarn "Anope won't run out of the box, you still have to configure it to match your IRCd's configuration."
+		ewarn "Edit /etc/anope/services.conf to configure Anope."
+	else
+		# We're replacing some versions. Find out which.
+		local ver
+		for ver in "${REPLACING_VERSIONS}" ; do
+			if ver_test ${ver} -lt 2.0.7 ; then
+				# In this version, we introduced correct FHS structure
+				# We need the users to make some changes to their services.conf
+				ewarn "Please modify your services.conf to include the following directive:"
+				ewarn "in options{}, please include user=\"anope\" and group=\"anope\""
+				ewarn "This is needed because Anope now starts as root and drops down."
+				ewarn "Reference: https://wiki.anope.org/index.php/2.0/Configuration#Services_Process_Options"
+			fi
+		done
+	fi
+}
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 749273080ddc..189ad6c4f959 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -2,5 +2,5 @@ AUX konversationrc 346 BLAKE2B 8d236be66f983b3670bbd49578c73a1a868be0b498f965e5f
 DIST konversation-20.12.3.tar.xz 4242136 BLAKE2B 2483b34dde69a73029d15e8d626c77ebc9f91aaca0dc7b83f4b92629bbf773873de52bf8fd1ead3d862fbb496f2dcc3823320d983ea0c0f2c0ba8ac831ce379f SHA512 022854edac9e2b834e9c6795cd02e9d9fe5ab54f4d3facaff9f60cac680e1b6df12ef3ac3281a07d4ce732f491fe2b49f47fd467751c9b87549e02df3ef27bae
 DIST konversation-21.04.3.tar.xz 4251844 BLAKE2B 0db25135752635392248288699ab6a28042fa5a5dbe73c5186d782fe5a68eb3b6396b87830f5ec91da00c434e0462ffae042332e9c82f1e342fd77a0762afe7f SHA512 af2e7d232412f316090be72cc2b412b19c8735be4e04c9286561ed3cf83b5858b83572f33ee70281610c7fe5e339683d33e9d1f9ddb57eb5198db91e82613869
 EBUILD konversation-20.12.3-r1.ebuild 1900 BLAKE2B 7d40422131f9c31abeda4c3d47b087bcd347cc94bd27c309c14d9df3c25e7c105d72ed1295710ef1450d4c6501a6ee87a18a5a39612bd544315a1e81a00a2c8c SHA512 aecec20212c5cdc90ebc7509f5865463a49dbbdb2113882fdf7e84bcef37a58a9f349335b2c4a4fc62de973851308b14b21ea892fa461d6c7280eb6e9e112236
-EBUILD konversation-21.04.3.ebuild 1890 BLAKE2B bb6c2f3100250708d015d22203e17a8a24775c3158f809fd5808ac6f5a5233fc5fd42be01b373725bdb7ae04d3d3851555d21bbea6ec6426a22ec3219d04e316 SHA512 bc6d1eeabf1162c6071748b7399c442015edd36dbdedec1c2128f9eef342500e95a333377655ae3cc8218f9e066b63074f32edcd8b01d81fad3bda66ba93e1e5
+EBUILD konversation-21.04.3.ebuild 1889 BLAKE2B 7586a70f020cc4c7a8cde2fd57ae31560166c5c6c89901a7609210eb562a7a20bee3f89cef75a06df9af9342802b9ce6b259b80b3d4fe81524fd9252233ae35e SHA512 eb7e13c31b80adae2e6c8091cff8216ec30b64789989d6eb0e087b78011c67d6bc6bea23e512d37927e2071a0623f27a9aaa7640aece63d46b7aca503c7ff82f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-21.04.3.ebuild b/net-irc/konversation/konversation-21.04.3.ebuild
index 76f3966b4db5..b1c8d2deb8d9 100644
--- a/net-irc/konversation/konversation-21.04.3.ebuild
+++ b/net-irc/konversation/konversation-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+crypt"
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 76c3d36df9ad..2938fda3601a 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -4,5 +4,5 @@ AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8d
 DIST unrealircd-5.0.8.tar.gz 5013231 BLAKE2B 57365a06b8108239ab10f6cff7d4553b08aa428acb5c635c4b9241c3f82459a5aac18c916a4534f3a8fc9ac1fd4c1d9418c7395233603e576eda40c56d81b110 SHA512 45fc0758a870dbb9c3ff55fc7029d1ecff9dcf65680f31ff331f012efbf9c9bffa60a6fe27b9bab69302d26b8293a1089cfaf1c550a3f2802a549f25e4644770
 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.2.1.1.ebuild 5266 BLAKE2B 6bf55f33f72def215650b40b413a1f9e977d9ef3debc4324d418dc739fef98d37cf3ee4080c5e5ada0dfdc391e3dae998e5d3d50b8efc68ea668a997fb7320cf SHA512 4fc21aa142a4f6fabf426014e56ba3152629f1b574a73ddbb2eb026bd98aca1cffd13da5e93418552c9e8d545bf1f3223849cc43659538131d05ceb7d17ba966
+EBUILD unrealircd-5.2.1.1.ebuild 5273 BLAKE2B 3b46eb801598502853c3f319628c8c369fb1cd95a4d4bd1bb74c18e37dd7813aaaabe25705b38cda12a4f9e50144572e6abf925eb512edbda3075e9c115fe8e2 SHA512 3fab9ea37e3b845f5a233ade061f271489ffa7546b03f33bc0297bdb381a0a105b97f021bb863cc63056485157b0705e728da49ef6a688a0eabe9bfac7a3a280
 MISC metadata.xml 859 BLAKE2B bea2149aa6ecf19297e79bbffe9d3d76cac8016324f40cd056ae34544cf9aacb9976b36f0090ab1bb60a21c40cd735d85cc6766cb741393e106326f61bb5b2e3 SHA512 7b35b9fa89319fc0c7743ce4b2af6244b9d56a715ecbc74a0385f93c66651153c7e8be0171a1e0642a90767a94e1b809b49741d26472e9e5f40809450b222237
diff --git a/net-irc/unrealircd/unrealircd-5.2.1.1.ebuild b/net-irc/unrealircd/unrealircd-5.2.1.1.ebuild
index 74c8cc72c471..cbe49ec07028 100644
--- a/net-irc/unrealircd/unrealircd-5.2.1.1.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes"
 
 RDEPEND="