gentoo resync : 20.03.2022

3 files changed, 2 insertions, 127 deletions

diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index cf576864b3a6..817b6c781b6a 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,9 +1,6 @@
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
-DIST inspircd-3.11.0-fix-path-builds.patch.bz2 4564 BLAKE2B 5414c6bff651f179bb7f214198d13c08ce1e92b6946729d617a56a2dd451a239520bc946823603b2e3ab0a78577f077c1d566bfa6771d6c9866ef5249269653c SHA512 92feddfa23acac2f1813539f9fae0e1c6c7332565c5d63df02e6f800b4457ed1ac1eff4f3aee8fb155dbae5b6d1d16536b435734549f740ae294382330837d5c
-DIST inspircd-3.11.0.tar.gz 859767 BLAKE2B a0924d302577dcb471e22c0df21b7259c5b68b1ee2080233c31e84bc5cf8c32fbe134a359bf4d7f7541f512e078a9e75717df2dc7178670b3e3d7c7dfb2930b7 SHA512 59a277de041f1b0d44204c36190b6bd728f981997ba377f5bf9b7745fce122271e3df35223ff11d8d31d70f1f378977ea6603963ff2bb1a4fbaac958903b0da3
 DIST inspircd-3.12.0-fix-path-builds.patch.bz2 4570 BLAKE2B 2c2cea615f9e170c249868a60dcf698ba130b33e6e0553bb8c3070698332e643f3d58fc823fe92621e5498c8606b8334afe1536c9772a24f389010a93b72bc09 SHA512 e20171d6c94c163c414c0aa2a02a22ec2de02ec20a00542ada0181abc46e229f7e9d9108b88895a1ad6134b72e3fdab6e80b6c6b33e10b8be73f3a28130c0adb
 DIST inspircd-3.12.0.tar.gz 864630 BLAKE2B eb8fc009347777bdd1e1b119465a6e9f7b6f563c855607905ae256dd0f433d460872d185d2b17ca5033dad7fc07d1e049ce714bf92b91033e5157f796c1451ed SHA512 b8ad5bef5c4ea493bb77976cf75861efb445792696b536eab875c7c5e1a5fa679a5ad48c73a2bcb448871b4398f8370cde326abf389fc21db7e5fd24cfcdca59
-EBUILD inspircd-3.11.0.ebuild 3715 BLAKE2B 61f99c98cf1cd27bb97d637a3d1acde8947259ee6a961f8ae4a422580c4f4b1b7f3b6cc5a7bc6d1398f10304c6a41f924d8150938286e193eade456f22fea54d SHA512 0530c0f26cbe82327da62ea29c05511da5f4f7f5de1fc1a06eb429ba75beb9aaf1581127d22f88eb8e1c755e2c85095259bcfdc33cb606177bbf1217a00132c7
-EBUILD inspircd-3.12.0.ebuild 3461 BLAKE2B fdad5781365d62079f4ea146a2c3f842722f3d500a6e4a629bd174d9ef48fac2392d479978e0f28fdae7fecef8c9babf41664ee37c1bc7caf27927bbc6dce7bb SHA512 f0cde9ce0eb5e36e1fa7666c1767eb404d3869b64b800bbefe16276a6f5af81cd88e47ad3b438c820fea1e4741420e5bff719620055473f856dfd5d4a01ee5f2
+EBUILD inspircd-3.12.0.ebuild 3471 BLAKE2B 000bbb5767d2557023e12ae725185d10280eb50ed178d9d4e1b441450cf61676b3b3d772d74cd3db32b40067b561c2a02a058ea773d3b93a6c4a90d4b5994e13 SHA512 a2032e436fac827864e9a1a8ffae54d620fc5a3811ca6a4aa9981c12ec7e37862617d3f480d687c4a8d6c9e9270ed6393c893e627037b05ae0d03dc45d4de044
 MISC metadata.xml 1878 BLAKE2B 2c85eb9c5a0db82398ede6b597627d226b139b7758135777068bc9b84f4b2c8303243f9591fe12e0dfb3957b7d6abe638421dce936d58c7182fa3bccfa7ddf9c SHA512 25a287fd0ac8a18a751d6920395868eaf0c73e8bf13f28ffcc187f9a5ee04520677ffeb0506b5541436ac4a9ed0f493331a09ed24d7249376493cc626eecf857
diff --git a/net-irc/inspircd/inspircd-3.11.0.ebuild b/net-irc/inspircd/inspircd-3.11.0.ebuild
deleted file mode 100644
index b8aa1c3f23b4..000000000000
--- a/net-irc/inspircd/inspircd-3.11.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://www.inspircd.org/"
-SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-fix-path-builds.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
-
-RDEPEND="
-	acct-group/inspircd
-	acct-user/inspircd
-	dev-lang/perl
-	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
-	ldap? ( net-nds/openldap )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	re2? ( dev-libs/re2:= )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	ssl? ( dev-libs/openssl:= )
-	tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-DOCS=( docs/. )
-PATCHES=( "${WORKDIR}"/${PF}-fix-path-builds.patch )
-
-src_prepare() {
-	default
-
-	# Patch the inspircd launcher with the inspircd user
-	sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die
-}
-
-src_configure() {
-	local extras=""
-
-	use gnutls && extras+="m_ssl_gnutls.cpp,"
-	use ldap && extras+="m_ldap.cpp,"
-	use maxminddb && extras+="m_geo_maxmind.cpp,"
-	use mbedtls && extras+="m_ssl_mbedtls.cpp,"
-	use mysql && extras+="m_mysql.cpp,"
-	use pcre && extras+="m_regex_pcre.cpp,"
-	use postgres && extras+="m_pgsql.cpp,"
-	use re2 && extras+="m_regex_re2.cpp,"
-	use regex-posix && extras+="m_regex_posix.cpp,"
-	use regex-stdlib && extras+="m_regex_stdlib.cpp,"
-	use sqlite && extras+="m_sqlite3.cpp,"
-	use ssl && extras+="m_ssl_openssl.cpp,"
-	use sslrehashsignal && extras+="m_sslrehashsignal.cpp,"
-	use tre && extras+="m_regex_tre.cpp,"
-
-	# The first configuration run enables certain "extra" InspIRCd
-	# modules, the second run generates the actual makefile.
-	if [[ -n "${extras}" ]]; then
-		./configure --disable-interactive --enable-extras=${extras%,}
-	fi
-
-	local myconf=(
-		--disable-interactive
-		--disable-auto-extras
-		--prefix="/usr/$(get_libdir)/${PN}"
-		--config-dir="/etc/${PN}"
-		--data-dir="/var/lib/${PN}/data"
-		--log-dir="/var/log/${PN}"
-		--binary-dir="/usr/bin"
-		--module-dir="/usr/$(get_libdir)/${PN}/modules"
-		--manual-dir="/usr/share/man")
-	CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1
-}
-
-src_install() {
-	default
-
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	keepdir "/var/log/${PN}"
-
-	diropts -o"${PN}" -g"${PN}" -m0700
-	keepdir "/var/lib/${PN}/data"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You will find example configuration files under "
-		elog "/usr/share/doc/${PN}"
-		elog "Read the ${PN}.conf.example file carefully before "
-		elog "starting the service."
-	fi
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test "${pv}" -lt "2.0.24-r1"; then
-			elog "Starting with 2.0.24-r1 the daemon is no longer started"
-			elog "with the --logfile option and you are thus expected to define"
-			elog "logging in the InspIRCd configuration file if you want it."
-		fi
-		if ver_test "${pv}" -lt "3.0.0"; then
-			elog "Version 3.0 is a major upgrade which contains breaking"
-			elog "changes.  You will need to update your configuration files."
-			elog "See: https://docs.inspircd.org/3/configuration-changes"
-		fi
-	done
-}
diff --git a/net-irc/inspircd/inspircd-3.12.0.ebuild b/net-irc/inspircd/inspircd-3.12.0.ebuild
index ffef87177d73..6d81793c4524 100644
--- a/net-irc/inspircd/inspircd-3.12.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
 
 RDEPEND="