gentoo resync : 22.05.2021

10 files changed, 13 insertions, 124 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 12fd339c86b9..b4dec6c87958 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index c87509d5dd99..9b1a5684d075 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -9,5 +9,5 @@ DIST iroffer-dinoex-3.31.tar.gz 527712 BLAKE2B 8e57058af9aad9537d29a15140ab59c92
 DIST iroffer-dinoex-3.32.tar.gz 1321125 BLAKE2B 3a124d16911d97d0ec937b86c9e0ad513ebdcea5e09e4cb1a53753c03d5e13347d0bf1116bf9abe0137fb7a05bbc7a8e31c2c0da5c15cc4e0b55e067d62b1461 SHA512 03d662cf7eb3093b1f050eda8777011d6e7a833dc2fcf65d29ef0294a0d6ce4e2cea273e2d4e6ee6ba2364c088890ac6338a3aa8e6477d5e2a1a990a6e4e9603
 EBUILD iroffer-dinoex-3.30-r1.ebuild 2667 BLAKE2B f771115e1b1771efb1f7a5edb74a188a89714efe2ddd45f257b3ccb670b516d08e38a545aa04e8f4e1e233d7df4170e6dae7920df30794ab1c152e182ced94ef SHA512 f884b72be1dc570c8faef33d328c0a4574ea31795febc07a1ff1db2764f2765f84a12d86842a8ca1b5ae53988655572a70b55089a288f1a5755468ab5ad78f1a
 EBUILD iroffer-dinoex-3.31.ebuild 2660 BLAKE2B 6d7398ffe8a3227650505116f57e918627e6a7e79d06b2b78a08e4daea4b391bfbd9244ef6e3668446b50e7588abf9234d7a803665ba307a58505487d700f4a1 SHA512 df5cd09c89b9d4ab6a1a098c77c3bba623bda69c1f3b1abaff983900b67ab7a029ebd6871bac25d852fc65c01387ba94be8992a15284f16127e7cf6b7322f445
-EBUILD iroffer-dinoex-3.32.ebuild 2671 BLAKE2B 9e8ff24df1b379b83ca154ad23c08eda4ef2e9822276e44501c24603df5f89567a7f56adbc96e879e52a0c4e87567973c56683363fb329f400972f4328a2b9a8 SHA512 743dc0b77c43262e0312e6582c3d34e2feec116683ed47dc96c840a1a0f22cc049aba1e1934ed13f167b60798e4bf5610842a18f73c7b66e5f4dca76aa1e032c
+EBUILD iroffer-dinoex-3.32-r1.ebuild 2614 BLAKE2B 5906f0915d54ff97f493ec247c4e876d6e32a2ef3530d029bb81b7e669bb5f8da2e7b2b0c19fc429bd4f195e2dc5bf784289e41536813f6707f33a0347df0247 SHA512 939b12d2b73b4d328aae40756602c1def1617d62188dd066b7f63b8f1e8c96fff6b22e4235db5f73fc4bddbf6cdb79353b2e696ad860c6c920efa94d258c008f
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.32.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r1.ebuild
index a1293eaa5bbf..8de5d34ef91b 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.32.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="de en fr it"
 PLOCALE_BACKUP="en"
 
-inherit l10n toolchain-funcs user
+inherit l10n toolchain-funcs
 
 DESCRIPTION="IRC fileserver using DCC"
 HOMEPAGE="http://iroffer.dinoex.net/"
@@ -23,7 +23,8 @@ REQUIRED_USE="
 	gnutls? ( ssl )
 "
 
-RDEPEND="chroot? ( dev-libs/nss )
+RDEPEND="acct-user/iroffer
+	chroot? ( dev-libs/nss )
 	curl? (
 		net-misc/curl[ssl?]
 		gnutls? ( net-misc/curl[curl_ssl_gnutls] )
@@ -36,11 +37,6 @@ RDEPEND="chroot? ( dev-libs/nss )
 
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	enewgroup iroffer
-	enewuser iroffer -1 -1 -1 iroffer
-}
-
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-3.31-config.patch"
 	eapply "${FILESDIR}/${PN}-Werror.patch"
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 4fc7935d3492..a90495509416 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,7 +1,4 @@
-AUX irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch 1498 BLAKE2B 79878990c10616a4bc54cc768cf87d2932aba7f75018f9887a75200a3ed38fa829958e3a5f0e137c6052dad1fce7a1d612f85d4c58bf6ed37c71f91f4a2b9099 SHA512 bfcdbfb1c06a13412594d5d14f4441ba06c3db3a4260aaa1c8bbfa1c68841ad1efc1c8af07f3fe4d12bb2e4c9fa7f067ace2b439745293082de6427a30242547
-DIST irssi-1.2.2.tar.xz 1140844 BLAKE2B c1758828285c3f3210d6920455382e52279587280ecdc4ba7d73562c164ebd6618b1bb32d387439be2696f948044f66eb73b78ed2b0635286f8c3d93530167f2 SHA512 5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610
 DIST irssi-1.2.3.tar.xz 1145292 BLAKE2B 7b2b7cb8d1533a06ad3cd5e0b2e45bba636cf19d26c69e19fc7e9408313f80d80a26ff2bf5f21a8763d8adec722bb33f6b076a863e6a55e178a814a3e79c9db7 SHA512 826b7bfd86a54647f2d344b6c461e1118b7382fb1637cf33c395af41a9a4ca5d8a794a415f0f0737178968cf2463bb46a0e7b7fd7014c968668b16183e0644bc
-EBUILD irssi-1.2.2-r1.ebuild 1530 BLAKE2B e750235eb19f4079036c99f2b6e4dd936e9c74b134575eb48f7330b2eb3897c95a1850b8b9409f56536b7da9578f519c5ac4c1fcc25c737c9f12623a18fedf21 SHA512 e4e12301fa0b181babb70f082432e590433532f881b0533dd40c95c4c1f0d865ec64c56bcd3c53f6e984cb2a121e652bd430465886d05f1553120eb95d4f26db
-EBUILD irssi-1.2.3.ebuild 1456 BLAKE2B 97f119f613bc99d1d3876c85f86e52917edc946591c17b88a6d6a40f5c3dd3e7732fc6f82165f3fd9ba761a582b5a744b55be03e64592d3dbdb0000bce79fcef SHA512 ffc81486b2c1022856b03d661da1477b5c89c64d6422ab40c77a29f213b57512a38a0fab5ad27fa02243cd0ece072a83c0019a327b1fc061b89918cd67f5e8f4
+EBUILD irssi-1.2.3.ebuild 1450 BLAKE2B f412328c6d6ff15b95d281e9ed62284de468570bd132509bd0436a78f5f01b663b7508a02f071c321207a0a8e4aefa84bdab288be098f15feae773f7d2535d45 SHA512 b593b701bbc9ad660e83e154c3577e5daa402ebe984a256a1c978fd5640b002d0b5b9c84c7ad6965a19bb484d230bfabeb908a7a3f972ebbe71464548d2f3c41
 EBUILD irssi-9999.ebuild 1393 BLAKE2B 4b9591b2ba11e38df59d713a7977ad78fc6f810a770313cc11d90eb717c00e7814f4e2025c6ede5e08f373ccc7d71721598d9bd5c92fd1699c99f8b2af8284f3 SHA512 dd4ae6574e4571b21403aa8b85c38b8a3eef67968e7f04570c3a52001c751a12ae39fa16c56a1db3aca46d098c462a50423b09b54e4984d3a951d15ea90a1030
 MISC metadata.xml 700 BLAKE2B 6dd761c206e402091a7847899f6d117a1110cbd12cc3263860470fdc3d2286f902d7949c1b36054508915eaf81622050a8ba734621781fa2bd1c167ff561a971 SHA512 bb8ce4cfafc1bb65ccc5fdfcd95d5aca47a958820eb55f3130967083256a495c4d8bf33e1bddf03394c4bd7b6afba70a838add6815e1e9ac86711ed405451601
diff --git a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
deleted file mode 100644
index 63d26958b7bf..000000000000
--- a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
-From: ailin-nemui <ailin-nemui@users.noreply.github.com>
-Date: Thu, 23 Apr 2020 21:45:15 +0200
-Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
-
-A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
-NUL / U+0000 is a valid Unicode character. This would occur when the
-user types Ctrl+Space. As a result, the input loop never manages to
-process the NUL-byte (and any other user input that follows, ever).
-
-This patch adds a manual check that properly advances the input loop if
-GLib returns -2 (incomplete character) despite the length being positive
-and a NUL is in first position.
-
-Fixes #1180
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
-https://gitlab.gnome.org/GNOME/glib/-/issues/2093
----
- src/fe-text/term-terminfo.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
-index 5235f72d2..78496a64f 100644
---- a/src/fe-text/term-terminfo.c
-+++ b/src/fe-text/term-terminfo.c
-@@ -672,7 +672,11 @@ void term_stop(void)
- 
- static int input_utf8(const unsigned char *buffer, int size, unichar *result)
- {
--	unichar c = g_utf8_get_char_validated((char *)buffer, size);
-+	unichar c = g_utf8_get_char_validated((char *) buffer, size);
-+
-+	/* GLib >= 2.63 do not accept Unicode NUL anymore */
-+	if (c == (unichar) -2 && *buffer == 0 && size > 0)
-+		c = 0;
- 
- 	switch (c) {
- 	case (unichar)-1:
diff --git a/net-irc/irssi/irssi-1.2.2-r1.ebuild b/net-irc/irssi/irssi-1.2.2-r1.ebuild
deleted file mode 100644
index 53254a9175ca..000000000000
--- a/net-irc/irssi/irssi-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="otr +perl selinux socks5 +proxy"
-
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	dev-libs/openssl:=
-	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
-		>=net-libs/libotr-4.1.0 )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-irc )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.2-glib-2.63_NUL_unicode_fix.patch" #746704
-)
-
-src_configure() {
-	# Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
-	export ac_cv_lib_utf8proc_utf8proc_version=no
-
-	local myeconfargs=(
-		--with-perl-lib=vendor
-		--enable-true-color
-		$(use_with otr)
-		$(use_with proxy)
-		$(use_with perl)
-		$(use_with socks5 socks)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	use perl && perl_delete_localpod
-	rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die
-}
diff --git a/net-irc/irssi/irssi-1.2.3.ebuild b/net-irc/irssi/irssi-1.2.3.ebuild
index cdf0c7045616..6f91a50bf054 100644
--- a/net-irc/irssi/irssi-1.2.3.ebuild
+++ b/net-irc/irssi/irssi-1.2.3.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="otr +perl selinux socks5 +proxy"
 
 COMMON_DEPEND="
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 02a72be85d17..851447fc313a 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,6 +1,6 @@
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-20.12.3.tar.xz 4242136 BLAKE2B 2483b34dde69a73029d15e8d626c77ebc9f91aaca0dc7b83f4b92629bbf773873de52bf8fd1ead3d862fbb496f2dcc3823320d983ea0c0f2c0ba8ac831ce379f SHA512 022854edac9e2b834e9c6795cd02e9d9fe5ab54f4d3facaff9f60cac680e1b6df12ef3ac3281a07d4ce732f491fe2b49f47fd467751c9b87549e02df3ef27bae
-DIST konversation-21.04.0.tar.xz 4230300 BLAKE2B f5f1ece730b9b1f849e9dd990b94a4760dc660c643fbf5e26f7d6568cae2f5ab005ccb6e6d6dc64f0268531b3c1b79b312a9eef69aa4e99a11e7a784c7161e25 SHA512 1b0355d9ad2fdb5f62aced44c92d312115fe58153a1f52278aeb699f78e8b48eabf2f816190943f5fc583356885486ea7e04aefab1712f7627bb70d405d4ff47
-EBUILD konversation-20.12.3.ebuild 1902 BLAKE2B 65a9eb42c8b5922fbaa78935813bc9efb52d405141e9cd89fd47b80f51aae23e0b50a4240092c39a7d91011a82e258a6f705c342e44d11f0ed5583b9873e956b SHA512 8c8d3683660cce99b2902f66c866a78739e9d1e539c62f9f0c44d92422405f2a7fbd10d084c2f849ea6792cc5e96e780f232eb2881f790c6b61487de1442cdf4
-EBUILD konversation-21.04.0.ebuild 1894 BLAKE2B f4cef411a30ec8dce3a836d69ff72926ab105f78d991eaa09ee7fbc815abe97972210965a3d1047422657ef47ab44f185e8be583b8936dfe2bcab7795a02d5c7 SHA512 62f463191aa4a40d1f945c1636e1dabe1e47bdde86b60d41b24cfeaaf170c6d08361997a0e7c2ceff96d73f704504a37e571e3cf7c3d181cb47c4dcf42e2d4f8
+DIST konversation-21.04.1.tar.xz 4230632 BLAKE2B b0415b9d3e740e6c4d6cfb33abe6b68e41d2e748a84c851615b9bd931be03988aa15d0396121660a964577bdeb257b0a93b498235cb2e1c40f9bde94548b824e SHA512 78b2964cb2beb2e2a7e4ad86398e5a78606f4558492e77417ded604cce19f00534bca99899ac8ff59105e9004a012fdf36d47f490fe9b53c751702d038edac4e
+EBUILD konversation-20.12.3.ebuild 1900 BLAKE2B 7d40422131f9c31abeda4c3d47b087bcd347cc94bd27c309c14d9df3c25e7c105d72ed1295710ef1450d4c6501a6ee87a18a5a39612bd544315a1e81a00a2c8c SHA512 aecec20212c5cdc90ebc7509f5865463a49dbbdb2113882fdf7e84bcef37a58a9f349335b2c4a4fc62de973851308b14b21ea892fa461d6c7280eb6e9e112236
+EBUILD konversation-21.04.1.ebuild 1892 BLAKE2B ccf0502196052468c5ae2cc654c2d4a84d3510583a9f0275c904b95d6859192fd868e862ea361328ee7b7c4fbb4b0aae4c1349c26bfecf326bf47ba01193b744 SHA512 01ecd6b2e19274f36847f57317b09d272080aa06d6fabbb671464846acdc529eadee70721b2b5e392d6842ffb7f3b1ae9cbae4614e91bca61034aab4a76ca21e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-20.12.3.ebuild b/net-irc/konversation/konversation-20.12.3.ebuild
index 8712bc63e0eb..a6501b54999e 100644
--- a/net-irc/konversation/konversation-20.12.3.ebuild
+++ b/net-irc/konversation/konversation-20.12.3.ebuild
@@ -10,7 +10,7 @@ QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org https://apps.kde.org/en/konversation"
+HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
 
 LICENSE="GPL-2"
 SLOT="5"
diff --git a/net-irc/konversation/konversation-21.04.0.ebuild b/net-irc/konversation/konversation-21.04.1.ebuild
index 81b41083e5b3..73a3fb36feee 100644
--- a/net-irc/konversation/konversation-21.04.0.ebuild
+++ b/net-irc/konversation/konversation-21.04.1.ebuild
@@ -10,7 +10,7 @@ QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org https://apps.kde.org/en/konversation"
+HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
 
 LICENSE="GPL-2"
 SLOT="5"