gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-irc
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
30 files changed, 217 insertions, 1015 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index a03033da3e59..eda4eef206c2 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 022422d4396d..737d09317758 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1,6 +1,9 @@
-AUX anope-conf.d-v2 352 BLAKE2B 38bacb495ff0be9e8f8cc635bdd9eb1927b6d120bcb65ddfbc436da2b0292ee1dc52c750094d8ee24c23d503050a176db309b5025a0f5b4655354e10aa089c19 SHA512 6e8af033c85a1e102b00934d1c2d0d01f25c6e3ed0c2775e9e3fa5f8e3ee33c8803eb49ded5a73501c7f3940ba234270009f69f89314f0dd77534ee3a5694d54
+AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
+AUX example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519fb3038bb71e45960cf000afa837a8a8a3f71458390bab1323ae85fc601f143725a45d3a0a7b9c9aca8b530805c459d70b39c SHA512 13f0eb0dfc5f18a4621e2812aad418cab1f5a0cb70ff2f915bd4df2ac896b441f24e64014e218d473c5be92d4be7a5f83e4804e92610c2ef35e46ded229bd6a4
 AUX pid-patch.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f
 DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
+DIST anope-2.0.7-source.tar.gz 1817484 BLAKE2B 13a4628db8cb885d4636ab1897aab322f7846740e4a3fccd02a417d84a8eb3c942aebf5e0a51f8ca1108f455b44b4e280e7386b42e03f640c9b0e68943252814 SHA512 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65
 EBUILD anope-2.0.6.ebuild 4979 BLAKE2B 171b9a4e79cc20788f2d60aca8d20c308bea3d8d08241365d02180c57344402efd9a8ef7a5abea257af5fe2fc494526bbf885cfe8d394441aa38454d4b2aafa5 SHA512 cd4a6e963604249d1ebcb6fd7faa28bd588253285bb39afa9ba8d6144782a59fcd5ac19761419cc28620d08dadd5009e5ab1bf9c6eabe9f1112cfdba2bdf62ad
-MISC metadata.xml 1205 BLAKE2B 2e7f5630a4f37d67f2b0657cba7822989625944c17a3ddef390107ef6c2b1979666a380c3b1316cfe9b16f295c248dc0ec79ce7a3bf5a0c48f970dfeb64a992c SHA512 45d98156923f6b4c1736ed2310deaff937d63ab4a4da10275cfc57fb966eba6e9581f47a89d9825e58606a651395cadafe6ae9b36f153ad9c189ca12a30888ce
+EBUILD anope-2.0.7.ebuild 4284 BLAKE2B b632b76b133bfaea5d75bb84e1a8027b42743dd3cba955f645ae98f0c23243f56379a6704b3f69b268f19119fec3c5e4198a466038c32c31f6152c8ffe24a712 SHA512 8c1b0cbf7ffe5aed6646db95a9dde91948e224e78465854aa3e106e4bdb49cff5aec76161af284a33b78a0ff1c18e749302334e91757c2081b7c275f58031abe
+MISC metadata.xml 1766 BLAKE2B 468c8eada20fc23455d92c612f3268876d812a7c7a87a593f896fe8fa7246dbb75441430a2e0cb4d6a1fa36b611553c0df43de2edda195a51b390c70712d7ab9 SHA512 b40ef7336a091b3211826a3b2b1e51c0586187b903b3aa34e4d9e3df0194ae3ce92964d490e77b5d679aaaa76eadf40af5b1d785d6540a23c2b832474f0a5a03
diff --git a/net-irc/anope/anope-2.0.7.ebuild b/net-irc/anope/anope-2.0.7.ebuild
new file mode 100644
index 000000000000..7761a88223ae
--- /dev/null
+++ b/net-irc/anope/anope-2.0.7.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 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/releases/download/${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
+REQUIRED_USE="
+	sql? ( || ( mysql sqlite ) )
+"
+
+BDEPEND="sys-devel/gettext"
+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}"
+
+PATCHES=(
+	"${FILESDIR}/pid-patch.patch"
+	"${FILESDIR}/example.conf-user.patch"
+)
+
+S="${WORKDIR}/${P}-source"
+
+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"
+	   anope_enable_mod "m_sql.cpp"
+	   anope_enable_mod "m_sql_live.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.
+		elog
+		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."
+		elog
+	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/anope/files/anope-conf.d-v2 b/net-irc/anope/files/anope-conf.d-v2
index fbe7c3c5017a..0eeabdbbb685 100644
--- a/net-irc/anope/files/anope-conf.d-v2
+++ b/net-irc/anope/files/anope-conf.d-v2
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# user to run ultimate-ircd as
+# user to run anope as
 ANOPE_USER="anope"
 
 # Additional commandline parameters
diff --git a/net-irc/anope/files/example.conf-user.patch b/net-irc/anope/files/example.conf-user.patch
new file mode 100644
index 000000000000..7f7a3826cb10
--- /dev/null
+++ b/net-irc/anope/files/example.conf-user.patch
@@ -0,0 +1,13 @@
+--- a/data/example.conf
++++ b/data/example.conf
+@@ -375,8 +375,8 @@
+ 	 * On Linux/UNIX systems Anope can setuid and setgid to this user and group
+ 	 * after starting up. This is useful if Anope has to bind to privileged ports
+ 	 */
+-	#user = "anope"
+-	#group = "anope"
++	user = "anope"
++	group = "anope"
+ 
+ 	/*
+ 	 * The case mapping used by services. This must be set to a valid locale name
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
index ddb7e3c5b209..0ca16f3bed07 100644
--- a/net-irc/anope/metadata.xml
+++ b/net-irc/anope/metadata.xml
@@ -1,16 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription>Anope IRC Services</longdescription>
+	<maintainer type="person">
+		<email>sam@cmpct.info</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Anope IRC Services provide user and channel management services for an
+		IRC server. It is a well-known package which continues to be actively
+		developed. It has support for multiple different IRCd linking protocols.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">anope</remote-id>
 		<remote-id type="github">anope/anope</remote-id>
 	</upstream>
 	<use>
+		<flag name="ldap">Build LDAP modules for e.g. opertypes</flag>
+		<flag name="ssl">Provide SSL services using OpenSSL</flag>
+		<flag name="sql">Build modules which require SQL</flag>
+		<flag name="tre">Use <pkg>dev-libs/tre</pkg> for regular expressions</flag>
+
+		<!-- pre 2.0.7 USE flags; deprecated -->
 		<flag name="chanstats">Channel Statistics</flag>
 		<flag name="cs-fantasy-stats">Enables the STATS and GSTATS commands</flag>
-		<flag name="cs-fantasy-top">Enables the (G)TOP and  (G)TOP10 commands</flag>
+		<flag name="cs-fantasy-top">Enables the (G)TOP and (G)TOP10 commands</flag>
 		<flag name="irc2sql">Stores channel statistics in a mysql database</flag>
 		<flag name="ldap-auth">Authorize through LDAP</flag>
 		<flag name="ldap-oper">Dynamically ties users to Anope opertypes via LDAP</flag>
@@ -18,7 +35,5 @@
 		<flag name="sql-auth">Authorize through SQL</flag>
 		<flag name="sql-log">Additional log target in SQL</flag>
 		<flag name="sql-oper">Allows granting users services operator privileges from SQL</flag>
-		<flag name="ssl">Provide SSL services using OpenSSL</flag>
-		<flag name="tre">Use <pkg>dev-libs/tre</pkg> for regular expressions</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 20922c8bb4bc..9566f4e0b578 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,6 +1,6 @@
 AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc46521521d92c1c3bb9f78fd2b32866c62fd0e67b360cfb32921ea900983e2892a9e37d3316364bdaabe26f SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715
 DIST eggdrop-1.8.3.tar.gz 1756536 BLAKE2B c2693bc383e1d857fe784d54f34479e73902064196021788ddf21f0bb2910977c643d820d2f6b640bb459b2acbfad8158fc0b29b4d76c588dfd76fee09a6fa25 SHA512 ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3
 DIST eggdrop-1.8.4.tar.gz 1784738 BLAKE2B a86cdc681ebd9c779b7da20f80ff312e4fc848e0cb0a0b9fa34941c91e1b89db1430126e3d0b94c7b4346c0bde099a6ddd343270943570744c46fc4ddd451540 SHA512 d08af09dc83045bf89eae957e7817591f16456f83ba3efe6b361fd421a3d4068348543275c26b27b006f09f06344c04cdf58ee4231f1aee0e7537ec39bc24b49
-EBUILD eggdrop-1.8.3.ebuild 1719 BLAKE2B d2092ea80b2bd46127626f9871e5c737b8466538270603e6c1ef0ccd97202467af5dc6e5980fc11230ffb477307e7b3c6836105cba9bfa7e48dfce5a7d4738d1 SHA512 9b60a72d564ed2378190d7942526211bc546984c4fb7f2dae7ed0f1d6936fb988f5302d8f49afde13b8eeaed65df41d81bcc849a76b0651bcd5cc2b64de33004
+EBUILD eggdrop-1.8.3.ebuild 1720 BLAKE2B c10f202e1ef55e875b1182d50240f2f1555e13d7d357202dd682d55866eabee4660695f5711139b11ada087dfb47e1367b7ddc55ff6bbee9f4a303b0b177e165 SHA512 8ebf2205e9bbd244a99bd3b9af23ec423bd773f77978d2cf9cf46e174cdd3a01868aad71781175e97d27d5fd5ce609d0aff872e217a4eeafc5acdd8ff70883ba
 EBUILD eggdrop-1.8.4.ebuild 1399 BLAKE2B f9815ed0c9b1fa803c0816ff4628af510623f9ca042b1ce76db6d197723c55a8ea96e681a0b2fb1dd175807f3c29925dcd814740d09791ed3d38039020dc3822 SHA512 bd6df9a7c19e318b210720a5669d142646ac18116a483509decf72468c47bfd81d3a024d4de92987fdd6218990d8a4efe02fb300c62edb0ac134802a1d57f61f
 MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708
diff --git a/net-irc/eggdrop/eggdrop-1.8.3.ebuild b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
index c0e753da2a76..89a942bbaebf 100644
--- a/net-irc/eggdrop/eggdrop-1.8.3.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="An IRC bot extensible with C or TCL"
 HOMEPAGE="https://www.eggheads.org/"
 SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 16f782259df3..83f0cdbf2a9d 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,12 +1,4 @@
-AUX hexchat-2.12.4-configure.ac.patch 9671 BLAKE2B 0e1391f6a07759167cc64829e8218f7912afd9dec3c3529a6eb021193f4825fbb5b2e5ef72a791f131054be4109e2ea01d3143a7777925c43c8c28da549be0ed SHA512 2fcac82d4074cc79f4e6c779664cae1a47287b78ba827187d8d669e6c522f7c3aeedabd4cac9172476971aa49e7ed6927078073b7b4828d5df6363bc0d8a2062
-AUX hexchat-2.12.4-libressl.patch 1040 BLAKE2B ee063f1ce4ea2d355959df5ec3b0271e66f4db0fd65645a72a6705bd8480f8e7b403b82d9c6eeb810e356e74c5a1d9903abc9f09a95a1de292fd045eb217758f SHA512 a309ce5e0bb25aa6c88c62bb5a5e1758e49d431cd51ef8186f29ac3c09af544ff75fd043ef8d9217c2779fb1c76fa27d392d9f7e9165a5772e401345bddce1ca
-DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d5e3cc3c12815faa7e515d00b803bde0bbf30e1ca5c0b69fe954dd30a6f69e5094dabe1dc641ae4f0742ad1965b4 SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40
-DIST hexchat-2.14.1.tar.xz 1281872 BLAKE2B e450fe7391b8b51a7aebeaeacdb5f1fb6c00184f668813920d98ed6a00dd4c0308863657467b7608987feb0739ac85256d93ca9ef8a220e6c7a5545d8386f25d SHA512 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd
-DIST hexchat-2.14.2.tar.xz 1288732 BLAKE2B 93001bf48516e0326c4df16945ff8a157e7a410ca202d1231657c9fb439ddd4a7515aacea0b0fff92365d477aa24c90d37aa61466495354dcdf5578d7accfa65 SHA512 488799700e439a137ad469f618cb1abf75d1f1ebf223c750d658004ef7b2c728543a5a9ae4e6317d6447428dc59e12dded619346a5d8bba12c92dab653512fca
 DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
-EBUILD hexchat-2.12.4-r2.ebuild 3388 BLAKE2B 999e485eb68ab62a3471065c5a97a64e88528fc1d5be4afbc7c2405fb1513139d7335ee8ae16a3e1b33c35b80455a8a689ac575dfc3e9bbb3c087243b0b79b7d SHA512 5c28e381e0c2d9a85788986978ede4a07cd76b15d1d2ba2fe0393a531c98be350fcfe2b18a83c0878ef7a3b234bb7ee82cd849b37f60c2a092e17e7e6e1af034
-EBUILD hexchat-2.14.1.ebuild 3428 BLAKE2B cbdb884528e0d618059d676f438dd2bfa8e30582640b8f7de41c76e2db535560f9cd97b315b2c62f75951d55593329e021934872ac3dfba0dbb0cfbf63367198 SHA512 1d0e7eaa0e2dfe8466673dd9fd3243d82146f547fb2379344e688dc42a4280617e350a017fc082c9126880b11ea013dbed2dc8e002141340b573c6a8802472bd
-EBUILD hexchat-2.14.2.ebuild 3497 BLAKE2B e3ad65500058c3115459628c6ad27d504c7b85d02719ad8febf58b4be5571d5d454ea7afd8fe3ccb85d9459a3fe3f4ce0ef3bd576dd7e4f8dc1622e06eac81d4 SHA512 d91c20a9595b120a22d1b1fc6be880428c98614f3569010cfd5c2976f5cb6794c0526742d80777a65680b0ce6d25bc76f4f64306475be46cf9a9720cc0c087d3
-EBUILD hexchat-2.14.3.ebuild 3305 BLAKE2B bc257f377203432fe4d387258f537469ce93a6352156064593bc4d90b7afa812ddccaac097e3be1e9876b46b41c8f81634c3de7567a501214c1655cd2edcf9f3 SHA512 1eabde97709ab477d3b5ff3a742feb069d04e0239927bae5cdda7c2b8e2642937dc4384ff94225bd5ab63dedf45e7e7783414c43742c13fb82031ba87a47af56
+EBUILD hexchat-2.14.3.ebuild 3299 BLAKE2B d5ac297ebb98b02019ea5f4bfa54d73dd20d522e62a6be31df6b7e821875b7fee98c01ba81310938f4d526adf6ed5e942ed512b3c5540a015e4d5984009c1d43 SHA512 82add37bfaeaf8f2251ad9577f0ca047c2be24932ea341d381687a7c8bd5241226b8a47ec16758d08cdeace9f6b32330d9b96a738e0c04acbe62612cb4511090
 EBUILD hexchat-9999.ebuild 3305 BLAKE2B bc257f377203432fe4d387258f537469ce93a6352156064593bc4d90b7afa812ddccaac097e3be1e9876b46b41c8f81634c3de7567a501214c1655cd2edcf9f3 SHA512 1eabde97709ab477d3b5ff3a742feb069d04e0239927bae5cdda7c2b8e2642937dc4384ff94225bd5ab63dedf45e7e7783414c43742c13fb82031ba87a47af56
 MISC metadata.xml 1042 BLAKE2B a8b2d37197b07fb76badeb4439d07f5b8acc0ab888f277050306ccf7b906de3bc4dc8b7a13af4b398494c350ea83eb373b107528055e6e502667b2a56e052133 SHA512 aac3a4017b0e64d98a71fcfffaec8a8245ccb7f691d40fc327599202831462e09eb7e382ed4230f5f3c584dfe0ebd9c0e3bd8f157103109cad037c9e597ef68d
diff --git a/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch b/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch
deleted file mode 100644
index c4288d2761d2..000000000000
--- a/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch
+++ /dev/null
@@ -1,319 +0,0 @@
---- hexchat-2.12.4/data/pkgconfig/Makefile.am
-+++ hexchat-2.12.4/data/pkgconfig/Makefile.am
-@@ -1,4 +1,7 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- pkgcfgdir = $(pkgconfigdir)
- pkgcfg_DATA = hexchat-plugin.pc
- 
- EXTRA_DIST = hexchat-plugin.pc.in
---- hexchat-2.12.4/data/Makefile.am
-+++ hexchat-2.12.4/data/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- SUBDIRS =
- 
- if DO_PLUGIN
- SUBDIRS += pkgconfig
- endif
---- hexchat-2.12.4/data/misc/Makefile.am
-+++ hexchat-2.12.4/data/misc/Makefile.am
-@@ -1,5 +1,7 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- appdatadir = $(datadir)/appdata
- appdata_in_files =
- 
- if DO_GTK
---- hexchat-2.12.4/data/icons/Makefile.am
-+++ hexchat-2.12.4/data/icons/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- icon_DATA = hexchat.png
- icondir = $(datadir)/icons/hicolor/48x48/apps
- 
- hicolor_DATA = hexchat.svg
- hicolordir = $(datadir)/icons/hicolor/scalable/apps
---- hexchat-2.12.4/data/man/Makefile.am
-+++ hexchat-2.12.4/data/man/Makefile.am
-@@ -1,3 +1,6 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- man_MANS = hexchat.1
- 
- EXTRA_DIST = hexchat.1.in
---- hexchat-2.12.4/Makefile.am
-+++ hexchat-2.12.4/Makefile.am
-@@ -1,6 +1,8 @@
- ## Process this file with automake to produce Makefile.in
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
- SUBDIRS = po src plugins data
- 
---- hexchat-2.12.4/configure.ac
-+++ hexchat-2.12.4/configure.ac
-@@ -621,23 +621,23 @@ AX_APPEND_COMPILE_FLAGS([\
- 	-Werror=declaration-after-statement \
- 	-Werror=missing-include-dirs \
- 	-Werror=date-time \
- 	-Werror=implicit-function-declaration \
- 	-Werror=pointer-arith \
--])
-+], hexchat_def_CFLAGS)
- 
- AS_IF([test "$stack_protector" = "yes"], [
- 	AX_APPEND_COMPILE_FLAGS([ \
- 		-fstack-protector-strong \
--	])
-+	], [hexchat_def_CFLAGS])
- ])
- 
- AX_APPEND_LINK_FLAGS([ \
- 	-pie \
- 	-Wl,-z,relro \
- 	-Wl,-z,now \
--])
-+], [hexchat_def_LDFLAGS])
- 
- dnl *********************************************************************
- dnl ** FUNCTIONS/LIBS/CFLAGS ********************************************
- dnl *********************************************************************
- 
-@@ -687,10 +687,12 @@ dnl freebsd needs this
- LIBS="$LIBS $INTLLIBS"
- 
- GUI_LIBS="$GUI_LIBS $COMMON_LIBS"
- 
- dnl make these visible to all Makefiles
-+AC_SUBST(hexchat_def_CFLAGS)
-+AC_SUBST(hexchat_def_LDFLAGS)
- AC_SUBST(GUI_LIBS)
- AC_SUBST(GUI_CFLAGS)
- AC_SUBST(COMMON_LIBS)
- AC_SUBST(COMMON_CFLAGS)
- AC_SUBST(PERL_CFLAGS)
---- hexchat-2.12.4/src/common/Makefile.am
-+++ hexchat-2.12.4/src/common/Makefile.am
-@@ -1,6 +1,8 @@
- ## Process this file with automake to produce Makefile.in
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- include $(top_srcdir)/m4/clang-analyze.am
- 
- noinst_LIBRARIES = libhexchatcommon.a
- 
-@@ -62,11 +64,11 @@ noinst_PROGRAMS = make-te
- 
- libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \
- 	history.c ignore.c inbound.c marshal.c modes.c network.c notify.c \
- 	outbound.c plugin.c plugin-identd.c plugin-timer.c proto-irc.c server.c servlist.c \
- 	$(ssl_c) text.c tree.c url.c userlist.c util.c
--libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS)
-+libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) $(hexchat_def_CFLAGS)
- 
- textenums.h: textevents.h
- 
- textevents.h: $(srcdir)/textevents.in make-te
- 	$(AM_V_GEN) ./make-te < $< > $@ 2> textenums.h
---- hexchat-2.12.4/src/common/dbus/Makefile.am
-+++ hexchat-2.12.4/src/common/dbus/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- noinst_LIBRARIES = libhexchatdbus.a
- libhexchatdbus_a_SOURCES =			\
- 	dbus-plugin.c				\
- 	dbus-plugin.h				\
- 	dbus-client.c				\
---- hexchat-2.12.4/src/Makefile.am
-+++ hexchat-2.12.4/src/Makefile.am
-@@ -1,6 +1,8 @@
- ## Process this file with automake to produce Makefile.in
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- EXTRA_DIST = version-script
- 
- if DO_TEXT
- text_fe = fe-text
---- hexchat-2.12.4/src/fe-text/Makefile.am
-+++ hexchat-2.12.4/src/fe-text/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- localedir = $(datadir)/locale
- 
- bin_PROGRAMS = hexchat-text
- 
- AM_CPPFLAGS = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
---- hexchat-2.12.4/src/fe-gtk/Makefile.am
-+++ hexchat-2.12.4/src/fe-gtk/Makefile.am
-@@ -1,5 +1,7 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- include $(top_srcdir)/m4/clang-analyze.am
- 
- localedir = $(datadir)/locale
- 
-@@ -31,11 +33,11 @@ endif
- if USE_LIBNOTIFY
- notify_c = notifications/notification-libnotify.c
- else
- if HAVE_GTK_MAC
- notify_c = notifications/notification-osx.m
--hexchat_LDFLAGS = -framework Foundation
-+hexchat_LDFLAGS = -framework Foundation @hexchat_def_LDFLAGS@
- else
- notify_c = notifications/notification-dummy.c
- endif
- endif
- 
---- hexchat-2.12.4/src/htm/Makefile.am
-+++ hexchat-2.12.4/src/htm/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- theme_SCRIPTS = thememan.exe thememan
- themedir = $(bindir)
- 
- mdtool_verbose = $(mdtool_verbose_$(V))
- mdtool_verbose_ = $(mdtool_verbose_$(AM_DEFAULT_VERBOSITY))
---- hexchat-2.12.4/plugins/fishlim/Makefile.am
-+++ hexchat-2.12.4/plugins/fishlim/Makefile.am
-@@ -1,10 +1,13 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- EXTRA_DIST = LICENSE fish.h irc.h keystore.h plugin_hexchat.h dh1080.h
- 
- libdir = $(hexchatlibdir)
- 
- lib_LTLIBRARIES = fishlim.la
- fishlim_la_SOURCES = fish.c irc.c keystore.c plugin_hexchat.c dh1080.c
--fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
-+fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
- fishlim_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
- fishlim_la_CPPFLAGS = -I$(top_srcdir)/src/common
--fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS)
-+fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS) @hexchat_def_CFLAGS@
---- hexchat-2.12.4/plugins/Makefile.am
-+++ hexchat-2.12.4/plugins/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- if DO_LUA
- lua = lua
- endif
- 
- if DO_PYTHON
---- hexchat-2.12.4/plugins/lua/Makefile.am
-+++ hexchat-2.12.4/plugins/lua/Makefile.am
-@@ -1,9 +1,12 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- libdir = $(hexchatlibdir)
- 
- lib_LTLIBRARIES = lua.la
- lua_la_SOURCES = lua.c
--lua_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
-+lua_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
- lua_la_LIBADD = $(LUA_LIBS) $(GLIB_LIBS)
- lua_la_CPPFLAGS = -I$(top_srcdir)/src/common
--lua_la_CFLAGS = $(GLIB_CFLAGS) $(LUA_CFLAGS)
-+lua_la_CFLAGS = $(GLIB_CFLAGS) $(LUA_CFLAGS) @hexchat_def_CFLAGS@
- 
---- hexchat-2.12.4/plugins/sysinfo/Makefile.am
-+++ hexchat-2.12.4/plugins/sysinfo/Makefile.am
-@@ -1,5 +1,8 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- libdir = $(hexchatlibdir)
- 
- sources = sysinfo.c format.c shared/df.c
- 
- if PLATFORM_OSX
-@@ -10,8 +13,8 @@ endif
- 
- EXTRA_DIST = osx unix win32 shared format.h sysinfo.h sysinfo-backend.h
- 
- lib_LTLIBRARIES = sysinfo.la
- sysinfo_la_SOURCES = $(sources)
--sysinfo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
-+sysinfo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
- sysinfo_la_LIBADD = $(LIBPCI_LIBS) $(GLIB_LIBS)
- AM_CPPFLAGS = -I$(top_srcdir)/src/common -I$(srcdir)/shared $(LIBPCI_CFLAGS) $(GLIB_CFLAGS)
---- hexchat-2.12.4/plugins/python/Makefile.am
-+++ hexchat-2.12.4/plugins/python/Makefile.am
-@@ -1,9 +1,12 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- libdir = $(hexchatlibdir)
- 
- lib_LTLIBRARIES = python.la
- python_la_SOURCES = python.c
- python_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
--python_la_LIBADD = $(PYTHON_LIBS) $(GLIB_LIBS)
-+python_la_LIBADD = $(PYTHON_LIBS) $(GLIB_LIBS) @hexchat_def_LDFLAGS@
- python_la_CPPFLAGS = -I$(top_srcdir)/src/common $(PYTHON_CPPFLAGS)
--python_la_CFLAGS = $(GLIB_CFLAGS)
-+python_la_CFLAGS = $(GLIB_CFLAGS) @hexchat_def_CFLAGS@
- 
---- hexchat-2.12.4/plugins/checksum/Makefile.am
-+++ hexchat-2.12.4/plugins/checksum/Makefile.am
-@@ -1,8 +1,11 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
-+
- libdir = $(hexchatlibdir)
- 
- lib_LTLIBRARIES = checksum.la
- checksum_la_SOURCES = checksum.c
--checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
-+checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
- checksum_la_LIBADD = $(GLIB_LIBS)
- checksum_la_CPPFLAGS = -I$(top_srcdir)/src/common
--checksum_la_CFLAGS = $(GLIB_CFLAGS)
-+checksum_la_CFLAGS = $(GLIB_CFLAGS) @hexchat_def_CFLAGS@
---- hexchat-2.12.4/plugins/perl/Makefile.am
-+++ hexchat-2.12.4/plugins/perl/Makefile.am
-@@ -1,17 +1,19 @@
-+AM_CFLAGS = @hexchat_def_CFLAGS@
-+AM_LDFLAGS = @hexchat_def_LDFLAGS@
- 
- EXTRA_DIST=generate_header lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm lib/HexChat/List/Network.pm \
- 	lib/HexChat/List/Network/Entry.pm lib/HexChat/List/Network/AutoJoin.pm lib/IRC.pm
- 
- libdir = $(hexchatlibdir)
- 
- lib_LTLIBRARIES = perl.la
- perl_la_SOURCES = perl.c
--perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module
-+perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
- perl_la_LIBADD = $(GLIB_LIBS)
- perl_la_CPPFLAGS = -I$(top_srcdir)/src/common
--perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS)
-+perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS) @hexchat_def_CFLAGS@
- 
- BUILT_SOURCES = hexchat.pm.h irc.pm.h
- CLEANFILES = $(BUILT_SOURCES)
- 
- hexchat.pm.h irc.pm.h: lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm \
diff --git a/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch b/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch
deleted file mode 100644
index 3b3adc09dd55..000000000000
--- a/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# diff -pU5 hexchat-2.12.4/src/common/ssl.c.old hexchat-2.12.4/src/common/ssl.c
---- hexchat-2.12.4/src/common/ssl.c
-+++ hexchat-2.12.4/src/common/ssl.c
-@@ -174,11 +174,11 @@ _SSL_get_cert_info (struct cert_info *ce
- 	key = X509_get_X509_PUBKEY(peer_cert);
- 	if (!X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key))
- 		return 1;
- 
- 	alg = OBJ_obj2nid (algor->algorithm);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
- 	sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
- #else
- 	sign_alg = X509_get_signature_nid (peer_cert);
- #endif
- 	ASN1_TIME_snprintf (notBefore, sizeof (notBefore),
-@@ -304,11 +304,11 @@ _SSL_socket (SSL_CTX *ctx, int sd)
- 		/* FATAL */
- 		__SSL_critical_error ("SSL_new");
- 
- 	SSL_set_fd (ssl, sd);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
- 	method = ctx->method;
- #else
- 	method = SSL_CTX_get_ssl_method (ctx);
- #endif
- 	if (method == SSLv23_client_method())
diff --git a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
deleted file mode 100644
index bd3dc882df4c..000000000000
--- a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit autotools fdo-mime flag-o-matic gnome2-utils python-single-r1
-
-DESCRIPTION="Graphical IRC client based on XChat"
-HOMEPAGE="https://hexchat.github.io/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
-fi
-
-LICENSE="GPL-2 plugin-fishlim? ( MIT )"
-SLOT="0"
-IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="dev-libs/glib:2
-	dbus? ( sys-apps/dbus )
-	gtk? ( x11-libs/gtk+:2 )
-	libcanberra? ( media-libs/libcanberra )
-	libproxy? ( net-libs/libproxy )
-	libnotify? ( x11-libs/libnotify )
-	lua? ( dev-lang/lua:= )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	plugin-sysinfo? ( sys-apps/pciutils )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/iso-codes )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	spell? ( app-text/enchant:0 )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/autoconf-archive"
-
-PATCHES=(
-	"${FILESDIR}/hexchat-2.12.4-configure.ac.patch"
-	"${FILESDIR}/hexchat-2.12.4-libressl.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	append-cflags \
-		$(test-flags-CC -Wno-error=format-security) \
-		$(test-flags-CC -Wno-error=init-self) \
-		$(test-flags-CC -Wno-error=declaration-after-statement) \
-		$(test-flags-CC -Wno-error=missing-include-dirs) \
-		$(test-flags-CC -Wno-error=date-time) \
-		$(test-flags-CC -Wno-error=implicit-function-declaration) \
-		$(test-flags-CC -Wno-error=pointer-arith)
-
-	econf \
-		--enable-plugin \
-		$(use_enable nls) \
-		$(use_enable ssl openssl) \
-		$(use_enable gtk gtkfe) \
-		$(use_enable !gtk textfe) \
-		$(use_enable python python "${EPYTHON}") \
-		$(use_enable perl) \
-		$(use_enable plugin-checksum checksum) \
-		$(use_enable plugin-fishlim fishlim) \
-		$(use_enable plugin-sysinfo sysinfo) \
-		$(use_enable dbus) \
-		$(use_enable lua) \
-		$(use_enable libnotify) \
-		$(use_enable libcanberra) \
-		$(use_enable libproxy) \
-		$(use_enable spell isocodes) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		UPDATE_ICON_CACHE=true \
-		UPDATE_MIME_DATABASE=true \
-		UPDATE_DESKTOP_DATABASE=true \
-		install
-	dodoc readme.md
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	if use gtk ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-	else
-		elog "You have disabled the gtk USE flag. This means you don't have"
-		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
-	fi
-
-	elog
-	elog "optional dependencies:"
-	elog "  media-sound/sox (sound playback if you don't have libcanberra"
-	elog "    enabled)"
-	elog "  x11-plugins/hexchat-javascript (javascript support)"
-	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
-	elog "    needs libcanberra enabled)"
-}
-
-pkg_postrm() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/net-irc/hexchat/hexchat-2.14.1.ebuild b/net-irc/hexchat/hexchat-2.14.1.ebuild
deleted file mode 100644
index fff912b65a12..000000000000
--- a/net-irc/hexchat/hexchat-2.14.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
-
-DESCRIPTION="Graphical IRC client based on XChat"
-HOMEPAGE="https://hexchat.github.io/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-fi
-
-LICENSE="GPL-2 plugin-fishlim? ( MIT )"
-SLOT="0"
-IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dbus? ( dev-libs/dbus-glib )
-	gtk? (
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	libcanberra? ( media-libs/libcanberra )
-	libproxy? ( net-libs/libproxy )
-	libnotify? ( x11-libs/libnotify )
-	lua? ( dev-lang/lua:= )
-	perl? ( dev-lang/perl:= )
-	plugin-sysinfo? ( sys-apps/pciutils )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	theme-manager? (
-		|| (
-			( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
-			dev-lang/mono[-minimal]
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/xz-utils
-	app-text/iso-codes
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	if use theme-manager ; then
-		mono-env_pkg_setup
-		export XDG_CACHE_HOME="${T}/.cache"
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dwith-gtk="$(usex gtk true false)"
-		-Dwith-text="$(usex gtk false true)"
-		-Dwith-ssl="$(usex ssl true false)"
-		-Dwith-plugin=true
-		-Dwith-dbus="$(usex dbus true false)"
-		-Dwith-libproxy="$(usex libproxy true false)"
-		-Dwith-libnotify="$(usex libnotify true false)"
-		-Dwith-libcanberra="$(usex libcanberra true false)"
-		-Dwith-theme-manager="$(usex theme-manager true false)"
-		-Ddbus-service-use-appid=false
-		-Dwith-checksum="$(usex plugin-checksum true false)"
-		-Dwith-fishlim="$(usex plugin-fishlim true false)"
-		-Dwith-lua="$(usex lua lua false)"
-		-Dwith-perl="$(usex perl true false)"
-		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
-		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dodoc readme.md
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	if use gtk ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	else
-		elog "You have disabled the gtk USE flag. This means you don't have"
-		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
-	fi
-
-	if use theme-manager ; then
-		elog "Themes are available at:"
-		elog "  https://hexchat.github.io/themes.html"
-	fi
-
-	elog
-	elog "optional dependencies:"
-	elog "  media-sound/sox (sound playback if you don't have libcanberra"
-	elog "    enabled)"
-	elog "  x11-plugins/hexchat-javascript (javascript support)"
-	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
-	elog "    needs libcanberra enabled)"
-}
-
-pkg_postrm() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/net-irc/hexchat/hexchat-2.14.2.ebuild b/net-irc/hexchat/hexchat-2.14.2.ebuild
deleted file mode 100644
index 468d7e687778..000000000000
--- a/net-irc/hexchat/hexchat-2.14.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
-
-DESCRIPTION="Graphical IRC client based on XChat"
-HOMEPAGE="https://hexchat.github.io/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-fi
-
-LICENSE="GPL-2 plugin-fishlim? ( MIT )"
-SLOT="0"
-IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dbus? ( dev-libs/dbus-glib )
-	gtk? (
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	libcanberra? ( media-libs/libcanberra )
-	libproxy? ( net-libs/libproxy )
-	libnotify? ( x11-libs/libnotify )
-	lua? ( dev-lang/lua:= )
-	perl? ( dev-lang/perl:= )
-	plugin-sysinfo? ( sys-apps/pciutils )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	theme-manager? (
-		|| (
-			( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
-			dev-lang/mono[-minimal]
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/glib-utils
-	app-arch/xz-utils
-	app-text/iso-codes
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	if use theme-manager ; then
-		mono-env_pkg_setup
-		export XDG_CACHE_HOME="${T}/.cache"
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dwith-gtk="$(usex gtk true false)"
-		-Dwith-text="$(usex gtk false true)"
-		-Dwith-ssl="$(usex ssl true false)"
-		-Dwith-plugin=true
-		-Dwith-dbus="$(usex dbus true false)"
-		-Dwith-libproxy="$(usex libproxy true false)"
-		-Dwith-libnotify="$(usex libnotify true false)"
-		-Dwith-libcanberra="$(usex libcanberra true false)"
-		-Dwith-theme-manager="$(usex theme-manager true false)"
-		-Ddbus-service-use-appid=false
-		-Dwith-checksum="$(usex plugin-checksum true false)"
-		-Dwith-fishlim="$(usex plugin-fishlim true false)"
-		-Dwith-lua="$(usex lua lua false)"
-		-Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
-		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
-		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
-		-Dwith-appdata=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dodoc readme.md
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	if use gtk ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	else
-		elog "You have disabled the gtk USE flag. This means you don't have"
-		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
-	fi
-
-	if use theme-manager ; then
-		elog "Themes are available at:"
-		elog "  https://hexchat.github.io/themes.html"
-	fi
-
-	elog
-	elog "optional dependencies:"
-	elog "  media-sound/sox (sound playback if you don't have libcanberra"
-	elog "    enabled)"
-	elog "  x11-plugins/hexchat-javascript (javascript support)"
-	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
-	elog "    needs libcanberra enabled)"
-}
-
-pkg_postrm() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/net-irc/hexchat/hexchat-2.14.3.ebuild b/net-irc/hexchat/hexchat-2.14.3.ebuild
index afa1fcb48980..823883d65b5b 100644
--- a/net-irc/hexchat/hexchat-2.14.3.ebuild
+++ b/net-irc/hexchat/hexchat-2.14.3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 9447f45d7109..0ff5c1d0b2f0 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,12 +1,12 @@
 AUX inspircd-2.0.27-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402
-AUX inspircd-3.4.0-fix-path-builds.patch 12943 BLAKE2B f6d5e862ed7b7cf53f0bf9fb79c7150e7fac86459a91c2e8bb7021e875bbe8514281686658f4c88155b492f1ac11fbb0f98d11c80da63687adf50a5f5ebe3756 SHA512 517ef1adbf59fa224c1a354400d4646b5aeb2ccd885c3d9bec75f91216e3e1bef385ae390607e88f5888a843e857e2cef63fd8f6a793b4ee9a20bdc3903ba3ee
-AUX inspircd-3.5.0-fix-path-builds.patch 16774 BLAKE2B 70281b1ee4aa98bcd2239c65c8f1ed66c98aaff253ae97e5d847df3ec53be9f72c969176eff3094d4060531d426d7395d885d693173de8897073d8ff3c04c00a SHA512 4077610541ab37669bb9abb64a736139863fed9c94aee9945deac8d29b49c4b92d22a6197d7d9a137839af04da9cd7c7e9c31e66e6db172050369bfabc5ad254
+AUX inspircd-3.4.0-fix-path-builds.patch 12942 BLAKE2B 7fe7bc904331f2cff3a27268af3a0bfe4db6fdec57ca3b846af43d8949aa047340cdc5c7d858fa96527aa3fa8af0774dbe2a8b3035f17962511b21ab94707b07 SHA512 54c773df0c4b48af2f83bcf6923c2679a9c46ac57232834cb1157b9d6528f39b2de1187e6b6989046509d434b3cfa427b77ff80b33b58b88c72d73087dc7a14b
+AUX inspircd-3.5.0-fix-path-builds.patch 16773 BLAKE2B 0cd63c080579fab035e44c965c56be5c57a738dad8cb2e118e96889a5e7413d7bf7a0a322132e6e47965aacd815e2b4b65fd17335f3baeaadf4bc0891391f597 SHA512 e45dffd981aa129d8628cd5272de4dd252763c4932b8b7d852eeab6f8590a046c173479b72f199604976d33a343d8055ae34c0354209c683b1aa6f56750a1f39
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
 DIST inspircd-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
 DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
 DIST inspircd-3.5.0.tar.gz 835283 BLAKE2B d070d8f299ea2460eb58062b345e9fdef04f1aa94cbedda15bc2ed9c32a7627af383a250359dc77ee6cf2c53dd1841c9a77ce0da236d0b9852c5e9d5a0964aae SHA512 64e7be4b013c418577362b33be73b8f7045f1071ccb2c4e83fdf1a96b98656a3541e20c005bc32532007da21d9ba963f534cd14d16c2e1cf8afcf34b22ffad8c
 EBUILD inspircd-2.0.28.ebuild 3142 BLAKE2B 6a7434a1bf5841638268931c4106c2ff684ba00a7c6887a5d665632bd97ac99f1a38210cd0217c4951ec7a4585397685a3effe3298f9902b020c872056964cf1 SHA512 b0c245ef1d277fd8b9d728a98cef25b30e593faa847b6d5032d606957f5c2b77157dd4878baa8c20bc48ade6a9d471b49b159d2f7d6f5759cd519b6d6fe2d4b8
-EBUILD inspircd-3.4.0.ebuild 3620 BLAKE2B b7e49e080ce8d5a7b418ec12462ebf53af247c494d9c299027d952eede5e9cce243f53ccbd90e000aac7e2a4c490fd6f54228a92943a0093a033e918f169afba SHA512 e0809008918e85cf50af088e13d1c09953fb88416bcb9d63f009ef339ab420329cb7a4eea9189bde9bad1eb51fe3ef7c97d49ce53d2b471e09962ccddafedf76
-EBUILD inspircd-3.5.0.ebuild 3622 BLAKE2B 4ed8b42b32fcdb354add43029533c45a5ae35300564d93699c5d114d167670593f6a23ae8bb212b8367ab611af7ca18c26ba547c410decf839d050aa7e401311 SHA512 2c940d423fd048d8857f07df0617071beb925bfc6d8684df41882ecb6d13f291d9435986f2c74a0fdd6c5b0fd49b910316a67b122e915f28b2ae66b2c2e062d7
+EBUILD inspircd-3.4.0-r1.ebuild 3620 BLAKE2B b7e49e080ce8d5a7b418ec12462ebf53af247c494d9c299027d952eede5e9cce243f53ccbd90e000aac7e2a4c490fd6f54228a92943a0093a033e918f169afba SHA512 e0809008918e85cf50af088e13d1c09953fb88416bcb9d63f009ef339ab420329cb7a4eea9189bde9bad1eb51fe3ef7c97d49ce53d2b471e09962ccddafedf76
+EBUILD inspircd-3.5.0-r1.ebuild 3622 BLAKE2B 4ed8b42b32fcdb354add43029533c45a5ae35300564d93699c5d114d167670593f6a23ae8bb212b8367ab611af7ca18c26ba547c410decf839d050aa7e401311 SHA512 2c940d423fd048d8857f07df0617071beb925bfc6d8684df41882ecb6d13f291d9435986f2c74a0fdd6c5b0fd49b910316a67b122e915f28b2ae66b2c2e062d7
 MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4
diff --git a/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
index 9b1e01b5be89..9bf99a6e74d9 100644
--- a/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
+++ b/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
@@ -10,7 +10,7 @@ diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
 similarity index 99%
 rename from docs/conf/inspircd.conf.example
 rename to docs/conf/inspircd.conf
-index dbd56d2fe..4a7aab514 100644
+index dbd56d2fe..9cda4baa7 100644
 --- a/docs/conf/inspircd.conf.example
 +++ b/docs/conf/inspircd.conf
 @@ -494,11 +494,11 @@
@@ -41,7 +41,7 @@ index dbd56d2fe..4a7aab514 100644
  #                                                                     #
  
 -#<pid file="/path/to/inspircd.pid">
-+#<pid file="/var/run/inspircd/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
  
  #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
  #                                                                     #
diff --git a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch
index 6f156d0cce11..578453934c8f 100644
--- a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch
+++ b/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch
@@ -35,7 +35,7 @@ diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
 similarity index 98%
 rename from docs/conf/inspircd.conf.example
 rename to docs/conf/inspircd.conf
-index dbd56d2fe..55535b1a0 100644
+index dbd56d2fe..665d4dfb5 100644
 --- a/docs/conf/inspircd.conf.example
 +++ b/docs/conf/inspircd.conf
 @@ -247,10 +247,10 @@
@@ -79,7 +79,7 @@ index dbd56d2fe..55535b1a0 100644
  #                                                                     #
  
 -#<pid file="/path/to/inspircd.pid">
-+#<pid file="/var/run/inspircd/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
  
  #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
  #                                                                     #
diff --git a/net-irc/inspircd/inspircd-3.4.0.ebuild b/net-irc/inspircd/inspircd-3.4.0-r1.ebuild
index 174cabeb02b4..174cabeb02b4 100644
--- a/net-irc/inspircd/inspircd-3.4.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.4.0-r1.ebuild
diff --git a/net-irc/inspircd/inspircd-3.5.0.ebuild b/net-irc/inspircd/inspircd-3.5.0-r1.ebuild
index 92c0dfe18f1a..92c0dfe18f1a 100644
--- a/net-irc/inspircd/inspircd-3.5.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.5.0-r1.ebuild
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index ff390ee4a5ef..03d570462023 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,4 +1,4 @@
 DIST irssi-1.2.2.tar.xz 1140844 BLAKE2B c1758828285c3f3210d6920455382e52279587280ecdc4ba7d73562c164ebd6618b1bb32d387439be2696f948044f66eb73b78ed2b0635286f8c3d93530167f2 SHA512 5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610
-EBUILD irssi-1.2.2.ebuild 1523 BLAKE2B d154f5d9dcfe0fa019793e1aff1d8a0989048621db9bd17f66a65680c991def317684701677de1c5a730acef582163e8c7ff54ed7c7e844001e65b15b7145419 SHA512 ecb2bdddf18de501f3cfb2417f381ade5e40e8de0e0b1f2458b6356259510aa8b6473beca842f583a190c984fbfaebc0bba735163d25e8167ce3b192fd1fef1f
+EBUILD irssi-1.2.2.ebuild 1520 BLAKE2B 499004bc99e0a16269facfb2933882c8aa1fdfd912b55c5b263173ae5aa7cdfea148ed08b842d4a1c6d5eb538fa87328e55e6fbfb1575d34145866f0043eabed SHA512 255691b426cbe5d24a5d0abad6209ad4572320d474289ece4a2627ffe777808aff231784e37f314ad88ea78367b539f382a64076443225e70fbe60b906507e22
 EBUILD irssi-9999.ebuild 1452 BLAKE2B 36bdbe74877e969849b92cc653c21eb7d41d03b0b03ae3656b3d25b5bd63e37a7c65c47cb3ea7fad0f110a51f99384b66b9a4215a8940c2105e126054ed51dd6 SHA512 c9e57d39473c2f3a9fda1b331f8f8232c758e0fdb803b4472c68491e78b74432eea75577be9cfddfbd500643eb85a051cf986c00b472181f37bd1986c5cbcf64
 MISC metadata.xml 700 BLAKE2B 9d12cb98cc2a5204d423141bcb42222cb5aca53888eac4158927a40f2b5b8a28eb0fa4171f1a4467aa795df45673f21dec09ddbf9c22f897c131d137a10a1d98 SHA512 9d510764f9f5dbfaaa2c027ac79ccbcfc92552d48de3bb3491b6e9b1abdb8be7dcd4e59be4fdf82b9ba4c240a8bc63e5f18548b3c3da4e77eff0b87a457db470
diff --git a/net-irc/irssi/irssi-1.2.2.ebuild b/net-irc/irssi/irssi-1.2.2.ebuild
index e7cbf3211e77..7874c1eee7d0 100644
--- a/net-irc/irssi/irssi-1.2.2.ebuild
+++ b/net-irc/irssi/irssi-1.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="otr +perl selinux socks5 +proxy libressl"
 
 COMMON_DEPEND="
diff --git a/net-irc/redirbot/Manifest b/net-irc/redirbot/Manifest
index 38dd8fe232af..00be89c6b015 100644
--- a/net-irc/redirbot/Manifest
+++ b/net-irc/redirbot/Manifest
@@ -1,3 +1,3 @@
 DIST redirbot-0.0.5.tar.gz 4549 BLAKE2B 6ff099fd2126bebaf48799a37475320faf627efaea4363476b783747c41dc13c28893cf035888c83260466b85b71a07f1d6d3ba5b80bd04f11fc309e8719c182 SHA512 7cbd7e8dc792527f26f20ec9953ddafd5fef8dbca457a00198c8bb3e34b660be7e0fadf25d755375e5a40acf64bf4191bf6725a077616a8bdbe120200ec198c7
-EBUILD redirbot-0.0.5-r1.ebuild 667 BLAKE2B 285e2afed004328749675da36b677125872a0685f5fa44a7a94bd3129080bdae2155e6248cf3f29841925c1bf6c8f3ad51812a1ed280cf949af06841d595a613 SHA512 f1bb1f69c45b731bf86e2f3c4e7c902a25844d4468858e094b17009977691191d114bff6a028622ecfb494a08087048aa48b26bd670533f457adcb277d7bc9ba
+EBUILD redirbot-0.0.5-r1.ebuild 548 BLAKE2B 6add5e9aa4386e54f4647f7ad05cb96da0cbf3f6b7b72b582bc0d4e4cf7a2dd6afaf13d99bb7880c6145c35c030c1f144430e14129fefbe421a4df26f3202ca2 SHA512 49af367b7ef1c4c904b55043dfe693bf08481060ef0cb4c2f380c8b2ad5b9bd8ecddc2e595861099b7e7ad4022bb9c3235412d0d64e6fda2da7f7739c18a2314
 MISC metadata.xml 299 BLAKE2B c8606fcc742a743d235cdf6ebd2af8f45ca4dc25cdbe31f5d00f82655fe88651693a01356e2e847e643fbc0cadf2e7ae7de637cd1b83696677e9d497a48a6b04 SHA512 83d9c0efb67343154d8dcae73314507a11ed50d896c8c25e518b3ad1d445733bc46b6ae673794409eb604d25559fc43642bc482c417cb382c85753d8a68173b4
diff --git a/net-irc/redirbot/redirbot-0.0.5-r1.ebuild b/net-irc/redirbot/redirbot-0.0.5-r1.ebuild
index 614b3605678a..f65c44bb6c62 100644
--- a/net-irc/redirbot/redirbot-0.0.5-r1.ebuild
+++ b/net-irc/redirbot/redirbot-0.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,11 +18,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		( >=dev-python/twisted-core-11.1.0[${PYTHON_USEDEP}]
-		  dev-python/twisted-words[${PYTHON_USEDEP}]
-		)
-	)
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 1fc464a344b8..24ba294ee98a 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,9 +1,7 @@
 AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
-DIST unrealircd-5.0.1.tar.gz 4892906 BLAKE2B bf3515dc962ead462b32dd3a2dd44b292306ea4c64f1405c54e89d835565506394b5dab9d244a9df316afc150808baddcb53c500ef026db50c570024295cc4e1 SHA512 5ca8a05f985d07ad9e676c39a8ba5e1409797a155a9df505f685ab4d6616af30ad3946b933df75bdea66ab3984578af77144f67bea7fd65b16ba6da250c09eed
-DIST unrealircd-5.0.3.tar.gz 4902148 BLAKE2B 954ee5a6953378809b0bfe793a698c3dd0f243af0dea651391fa953a13f4ea8b71925bfeecbf9cff4098d51bb6cb154559d6ea8608bfb0e98790c137bb4ac20b SHA512 7fdee09cecebc1c2ceb9456c1d49bef566f240ca03827aa35a16c875f7aa8e1fc1e520a5f922303de56bfe828e4fdb6bf9fc6513b4defe24f3b77678603f7a56
+DIST unrealircd-5.0.3.1.tar.gz 4902967 BLAKE2B d3c2e2399091b3aa9906583231d5ba42534234c4c40ce7412609fe8866438848bb69a4fc3cd378e0ed9ab13970ba2a7b27ba9fccdaaaea3585ec0a05aa5f89c2 SHA512 1bf3e2aab2f14d68a02ae6925d9e91135a92cf08886f703be0cd203c8b4b323bfc3930254d2bda381e60b3991f379115c954fa1fd262e28d7a27172a25bb172a
 EBUILD unrealircd-4.2.4.1.ebuild 5452 BLAKE2B 356dfc371b2c8757cd710ba93401f4a34e069b545cc77573b9942ac1672e0a4367be3fb1a47fdf9ef7cdee3a1ba40bc57d0ae0366c16262665a03cdc63fae242 SHA512 b875c731c0712ab570b1d18fe0ca30abe5ed235d24a3beafa169f98d94cc6f52130d935d21ba732bbf74b368adfd9754283e61688339b1a2599523fd3e3d3d98
-EBUILD unrealircd-5.0.1.ebuild 5008 BLAKE2B ada6fca3216c0cbffcab8de82791d605bed4754e6bea55b9e8d1866ec771c987a019600ad073d9178c0e87265b55d45ad8143254bf710d520805f6e7d25285c9 SHA512 21c19a57e4cbf63f046d9bbeeee00e0400a63291329bd9d7765f9d790b3d065f8bae492c5703b927e9779f0481295153875a1655613b6c1445582d7adc0f176d
-EBUILD unrealircd-5.0.3.ebuild 5008 BLAKE2B ada6fca3216c0cbffcab8de82791d605bed4754e6bea55b9e8d1866ec771c987a019600ad073d9178c0e87265b55d45ad8143254bf710d520805f6e7d25285c9 SHA512 21c19a57e4cbf63f046d9bbeeee00e0400a63291329bd9d7765f9d790b3d065f8bae492c5703b927e9779f0481295153875a1655613b6c1445582d7adc0f176d
+EBUILD unrealircd-5.0.3.1.ebuild 5008 BLAKE2B ada6fca3216c0cbffcab8de82791d605bed4754e6bea55b9e8d1866ec771c987a019600ad073d9178c0e87265b55d45ad8143254bf710d520805f6e7d25285c9 SHA512 21c19a57e4cbf63f046d9bbeeee00e0400a63291329bd9d7765f9d790b3d065f8bae492c5703b927e9779f0481295153875a1655613b6c1445582d7adc0f176d
 MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
diff --git a/net-irc/unrealircd/unrealircd-5.0.1.ebuild b/net-irc/unrealircd/unrealircd-5.0.3.1.ebuild
index 10fd8b753269..10fd8b753269 100644
--- a/net-irc/unrealircd/unrealircd-5.0.1.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.0.3.1.ebuild
diff --git a/net-irc/unrealircd/unrealircd-5.0.3.ebuild b/net-irc/unrealircd/unrealircd-5.0.3.ebuild
deleted file mode 100644
index 10fd8b753269..000000000000
--- a/net-irc/unrealircd/unrealircd-5.0.3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SSL_CERT_MANDATORY=1
-inherit ssl-cert
-
-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 libressl +operoverride operoverride-verify +prefixaq showlistmodes"
-
-RDEPEND="
-	acct-group/unrealircd
-	acct-user/unrealircd
-	>=app-crypt/argon2-20171227-r1:=
-	dev-libs/libpcre2
-	>=net-dns/c-ares-1.7:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	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
-
-	if use class-nofakelag; then
-		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
-	fi
-
-	eapply_user
-}
-
-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
-}
-
-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/weechat/Manifest b/net-irc/weechat/Manifest
index e543069db050..59cfaeb65ecf 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,7 +1,6 @@
-AUX 2.7-CVE-2020-8955.patch 1924 BLAKE2B ba379cd994f45ba6a7944e9d16c0d98d4646b8c263e23fdd221bad54e942bfee9957df0205755cd3ea0a9fb6c374d32a8067b02f0985bdb3af9af21cc813e0d2 SHA512 181d0332dd724d12d734c697dec80c4451896d24b26de19642a8c773c17bf53e920ba283dec2cd5eda1ba158b764ac27596e58486c9fc4cad3ed81468a3da3c2
 DIST weechat-2.7.1.tar.xz 2226768 BLAKE2B 0ce14646c8d383c3338a52bacbb9cac036c2611cc8aae2c790af73df5aab25e49f8bc2addcf4527884774925a9b222c15a7a696d93ad57197052a746a0da95f6 SHA512 eb0cc4c7e0f2cf18d522b49429fe2d77b1cee3225686d0bc09f80a69b17362af0923df4cd5f4859207d84acb762d4042cd5b57799705d0b7e4759eade6c660e0
-DIST weechat-2.7.tar.xz 2226876 BLAKE2B accb97f018c5405850df5ba7d1d8ad0b23ccfd478cedf29ebbd1f468f364efcfce7a7a34ef557ce7f64c2157392c1b281f8f74e57782ed69b4e0ada9f1b67b37 SHA512 5377cf9c37520cb2b7d1ba43251df3f33d814783ea4bd20d28cb08a2106c8db0e44a392a61929987b807a7d5e69a3c0ed1f3fec122a014b7ea7068e159341075
-EBUILD weechat-2.7-r2.ebuild 4085 BLAKE2B c46368e6e1b4c938547f9b4d82fea46a4e1a24179b08ffbdeacbcadda140ac3fec5971002e890cc4e63e96a136329859d1cec0994e7849ff40a96c97fb697e85 SHA512 e8dac0642ba99faa003d59b1c67f7213b7afb2ab4338979df1051e85b59a5e01c577b907e62a691e4f7cd31e66bcaa59cf63fc309a75b0e5f24720ef28224d9e
+DIST weechat-2.8.tar.xz 2248868 BLAKE2B 756ce1719ecaa351a2780641758bb7587b45b8e6b16e5a82833009ddb27f71783a461cf89662e04118c75e2d372103eda5a11c98feb62d624b330b223bf22ede SHA512 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df
 EBUILD weechat-2.7.1.ebuild 4031 BLAKE2B bb3030970a66c9c4438f646467c57e7aeaa657de7a6753b94b0f36755c8538ecdbc875de06c3bbcf61a5c36afe982632f7d96e133a567d988dce36ec47047bf4 SHA512 48f7522555d69a4d389798202f98661436b46463937973a08ecb876b435161098c663c542ae618797e474b6ab0a845555e7250eba785a473589aed39abe3e762
+EBUILD weechat-2.8.ebuild 4034 BLAKE2B 267b0cc758bc9fc891efa337371aad866dafe7b6199fb8470c203ec4d7ce1053da1077d89fb3aa7b75ecb0704d5bf66b1785365949065f834f0b52d011f8a221 SHA512 33070e95c038ee15e1bb2cbeb72c66edcbe10f1e563fa62013532bdf686085dba38952de7fb506eb2dc1c8a48eaad0cf561d47972ddbf68e1e30e827d89fc3b0
 EBUILD weechat-9999.ebuild 4034 BLAKE2B 267b0cc758bc9fc891efa337371aad866dafe7b6199fb8470c203ec4d7ce1053da1077d89fb3aa7b75ecb0704d5bf66b1785365949065f834f0b52d011f8a221 SHA512 33070e95c038ee15e1bb2cbeb72c66edcbe10f1e563fa62013532bdf686085dba38952de7fb506eb2dc1c8a48eaad0cf561d47972ddbf68e1e30e827d89fc3b0
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/files/2.7-CVE-2020-8955.patch b/net-irc/weechat/files/2.7-CVE-2020-8955.patch
deleted file mode 100644
index 0bad821f9130..000000000000
--- a/net-irc/weechat/files/2.7-CVE-2020-8955.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6f4f147d8e86adf9ad34a8ffd7e7f1f23a7e74da Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
-Date: Sat, 8 Feb 2020 20:24:50 +0100
-Subject: [PATCH] irc: fix crash when receiving a malformed message 324
- (channel mode)
-
-Thanks to Stuart Nevans Locke for reporting the issue.
----
- ChangeLog.adoc             |  1 +
- src/plugins/irc/irc-mode.c | 21 ++++++++++++---------
- 2 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/src/plugins/irc/irc-mode.c b/src/plugins/irc/irc-mode.c
-index 2237a344b..e79f0deb7 100644
---- a/src/plugins/irc/irc-mode.c
-+++ b/src/plugins/irc/irc-mode.c
-@@ -224,17 +224,20 @@ irc_mode_channel_update (struct t_irc_server *server,
-                     current_arg++;
-                 if (pos[0] == chanmode)
-                 {
--                    chanmode_found = 1;
--                    if (set_flag == '+')
-+                    if (!chanmode_found)
-                     {
--                        str_mode[0] = pos[0];
--                        str_mode[1] = '\0';
--                        strcat (new_modes, str_mode);
--                        if (argument)
-+                        chanmode_found = 1;
-+                        if (set_flag == '+')
-                         {
--                            if (new_args[0])
--                                strcat (new_args, " ");
--                            strcat (new_args, argument);
-+                            str_mode[0] = pos[0];
-+                            str_mode[1] = '\0';
-+                            strcat (new_modes, str_mode);
-+                            if (argument)
-+                            {
-+                                if (new_args[0])
-+                                    strcat (new_args, " ");
-+                                strcat (new_args, argument);
-+                            }
-                         }
-                     }
-                 }
diff --git a/net-irc/weechat/weechat-2.7-r2.ebuild b/net-irc/weechat/weechat-2.8.ebuild
index 36e757471243..37b7a1e45182 100644
--- a/net-irc/weechat/weechat-2.7-r2.ebuild
+++ b/net-irc/weechat/weechat-2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
@@ -62,8 +62,6 @@ DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.ado
 # tests need to be fixed to not use system plugins if weechat is already installed
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PV}-CVE-2020-8955.patch" )
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-irc
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)