gentoo auto-resync : 03:12:2024 - 02:07:18

11 files changed, 0 insertions, 987 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 92a16377b717..d641c46be243 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 1b9123d2c5a4..f9240e099523 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,21 +1,9 @@
 AUX README.gentoo-r1 565 BLAKE2B fdc48ee4956ca8fcd828cdf93b05032afbf603a8262aaa5b50a321fa25d04cccabc86975c887824422e126c500a347f6cffab9188bda15d88272f7215db64f92 SHA512 a270bec9637269d7660ed921e803cf464c5c7934894531f697d5e2d37ee4c176c389e1dbc3b9676ef29ca378c12fc7139d9a20d3654cc95f58fa85145f4f90c6
 AUX znc-1.7.1-inttest-dir.patch 2205 BLAKE2B f322f6884170c71ba537897d38c5ca2787937afdd2ac1fe0b0b4ab55ad7d453029bf4a8c748c5787fc4ed3b46e2b33c925cb962ec868f7a5c07356697a3039e2 SHA512 b74d136985546114604252be74e55e8f5e0740b678bdd224ea63cc3587d17d861c81c69b4bdea0aabc23e64097dda0097e97fbd80110c2c2a919b33d912d2dea
-AUX znc-1.8.2-add-libera.patch 2205 BLAKE2B 756ddf827d4f39ac52c031ccdc13e07eddbcc079e37248ca3fa82bab5f9b90a1cf6faffd8d9a0c81a2c6a3ef912bfb314f3e03f657fd15bdadb61b0c7887fa1a SHA512 06c1a9f6a2729ed557f89ec247d89a87bca70b8a36103dbb1e230e7816df5155950f08f39b1011a0925354c073d4c3570f7918e730d01ad2c6ed3cdbf4b6df6c
-AUX znc-1.8.2-fix-odr-violation.patch 1661 BLAKE2B 5ab47fe8bc3e7072f7c8107bb92a0d61702f3900101aef8fcde818640d1fe1683a236cfd287d4139f8ef1db597979b73ed5bb65d159af23d3b51b2ae5a772c58 SHA512 ab219b2faf6ad4d4e3aeb3da5f1362625fb9c16ce71366031f718d879120d57280e57ad5857e3f683af3f3678061e6bb77e00f2fdf925d177a4b7b8bd53ece93
-AUX znc-1.8.2-fix-python-3.10.patch 997 BLAKE2B b2be81e71483ea64912db8511dd9cb8ff92b2a7ea3b5d23f57fccd349c0e86d147d9245c5cbd54f99640e198b312847d6a14a256627f0f69d114f214f11dc6a8 SHA512 d39548a34ccf23a814f8b9b7b50fc87f470932e717db079bd3aea4f47e093cf10daa36f003dd1de33e0e493e43de8d5e2e354d5cc881326b249003870408c3aa
-AUX znc-1.8.2-fix-swig-2.patch 3911 BLAKE2B dcc0603cd89223b75116709fb3fa51f8d9804dd63268c917665e3d5950c71783481294ccf711603d6375b93bf66b900a6acb95667967b2bab797eeebf32a9763 SHA512 878657bcec24a1f2695096a38aeedbdf8ea1a6d4722d001765641c0920295935b7ecb460b05be0d46684d095c87d8b81e4410e5793a31b133a3b6f2686351344
-AUX znc-1.8.2-fix-swig.patch 1506 BLAKE2B 93055d76cd6ff429f3052b3774db209dd3acf48a2b599874aa2ac44f71cc218f8f8aaf030428c75272874ea156817fccaeb12ababb49ed59fb3433e251082fd3 SHA512 f2923a98467231ca97d7bdb937ad96a36a464a935319f482b03f857ade88b6402b0a16205eaadddca3750483a4dc36db3d2acb33074ca1883507d72b64d8b80c
-AUX znc-1.8.2-fix-systemd-datadir.patch 692 BLAKE2B d6585fc5c2087b51c8c2277eb1c8f70585cad3621fcaa0f746a918a1f5e9f5455a8ca8dcbc6e73c0200e723d2fd6e3f4080d3a1d185fc9cc2dd3b14dcd80908a SHA512 d54f36cd4da9bb2d67852e2d7f302538fd2807d95b3480b4416fbf1d7a4d010a03a06e8f20c3f8907ea8d33d1be4872a4433c3db30530327fcfb39f43ada0b23
-AUX znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch 6969 BLAKE2B ee937d2f949a7c43dea5573b92193cf924304ce6b0642b55f76afd7109e0d27349277d9122bf8f8de6b1b3239bcb830d6a40807b1288ab3a26fb9bee1bd6ac99 SHA512 12a2bed29e6d65efef27b2b975c8620a67b991bb8ca6e33280960cfc4dc64686a0172c3f54a15b168baff288f34c43dc399f6dfd69de3cb9c5bd21f79cdf0ca0
 AUX znc.confd-r1 720 BLAKE2B 4857a8bcd36ed1008a558ac7b067d6fad53b5d39c0df9130ca28d4ac3db3924a3a1200682c19c7e6f7869f22338b492f73bf6ccbc2b723d117c9eebc10a89838 SHA512 3ab102f64ea0572350c8595fd3739874da591c43a3dbc3a740c72c53bd7418fded721d478d1fb92de0c0d18131313ba6679e842a135dfe239ea3f42821d8e468
 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f
 DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c
-DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
-DIST znc-1.9.0.tar.gz 2221116 BLAKE2B 00bf472f0c223684c52a8c1a1a4b699346e58718161e6c40e3423591ef49aa13b6a530eb705e6f9e9cd6ce8937b4ee4e89de62d15aca7f2b19e1e8b603351d6e SHA512 22b8bd6fd7332643860f7a99ceaa0f6d0c9dd8ba9edac14b3f3731c9301eeb58e03e3af8d09e939e453aa980ff9f24afbe79e66d1106993f81d8779c97731a17
 DIST znc-1.9.1.tar.gz 2236498 BLAKE2B b811939d13e45f2731f35721776e5f849078e14e785ae852cfc8ff7b1864d4ac6cae5aeba5ae01e529ffd366981f5ac8bb04f2586e60ac82af06d7af71f639db SHA512 939eafbb2f20569d1b15b66e38b7da7a5210f2023e6fc98018566bd757d62d8ef2682d4b4e3b326a933a99cd7d9d65596ff0e2c43a2315c70e27c64f02d526a6
-EBUILD znc-1.8.2-r2.ebuild 5647 BLAKE2B 276b9611f95d3453a2e8359c364b2278e6710636379985043222991ce773250bbc42134e12c3c13f31d0ae93d54eb669b273be58507b836f84534c97e2b60c87 SHA512 99d46a73dc90c2eb9dd4e26803d6384a10b55f006de1640d149d2c35efabfb9a50cff6346620cb87876314ada41d16aa5fd579d9cfa4bc34132267fe61afe422
-EBUILD znc-1.9.0.ebuild 5692 BLAKE2B 77988047178096cf96758f3e7ba5bdc72e375ea1c4aa3e569a9211849eb6802b4c952dde18d4873eb95abee87f138e5311844905b512bbf4ae8e0502362e9b2a SHA512 8bb43e6aba4b3c027d82ce1c9468ad0fdcaa4e8e06da04dfd1eaf3e8122d1603981df9837f1cc75f652d4121479c9f0ce109efeff7b12ca4fde7eee2acd07697
 EBUILD znc-1.9.1.ebuild 5552 BLAKE2B c0b78263e283617f612167d71073b1c6c4138e6eb61b785cb5c0732638f32af0c0f04045b0b735842b6c0466f612685d6425d411c4fc630a44565fca6de1f220 SHA512 fa44befd5450189de9f594e2ef28ebe2e9b5714018a9652fb9240a83131c0d0ab5179ccd066a2923dd3def3ce8e6f0988f0419909ce333bc15018c0e41dacd97
 EBUILD znc-9999.ebuild 5556 BLAKE2B 34bbc2be1a4bdeed988e56e7082078b547c36727bd5f6c33be534585f12f220b58560e0fe7a9750f89dffa215bca9f5e349dfe9d597b5f19ed361cbeedd4dd93 SHA512 b64d674868f33fde6b4b88f01071ae568b6bdd284bd79547d717f91a4ea9292c34afa8cdf8e3ff9952b7cf91cb07b988b249ae2c304fceb39999db8a48efada7
 MISC metadata.xml 593 BLAKE2B 20191b1726221e530c845af505f81e2bb9770ee378ab6cf5854865d747803cc8704f29d739bc90abdd6562cb3a7c0e524591b922211a8382bf8f3981f4a2f2d4 SHA512 072679c68ecb3af85521ef6f0ed906721f595c6384d0832a2ad45078e9e9b84565123b114268a98f3cf4cbeb3706d04eea8dca66243aa3fd1664808a41890048
diff --git a/net-irc/znc/files/znc-1.8.2-add-libera.patch b/net-irc/znc/files/znc-1.8.2-add-libera.patch
deleted file mode 100644
index e7015754d8c1..000000000000
--- a/net-irc/znc/files/znc-1.8.2-add-libera.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 15e2351d40763acee5d246df7c725c3bd259c304 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <alexey+znc@asokolov.org>
-Date: Wed, 26 May 2021 10:10:20 +0100
-Subject: [PATCH] Switch --makeconf wizard from freenode to libera
-
----
- src/znc.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/znc.cpp b/src/znc.cpp
-index c5ad17dc69..365367545a 100644
---- a/src/znc.cpp
-+++ b/src/znc.cpp
-@@ -778,7 +778,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
-         CUtils::PrintMessage("");
- 
-         do {
--            CUtils::GetInput("Name", sNetwork, "freenode");
-+            CUtils::GetInput("Name", sNetwork, "libera");
-         } while (!CIRCNetwork::IsValidNetwork(sNetwork));
- 
-         vsLines.push_back("\t<Network " + sNetwork + ">");
-@@ -795,8 +795,8 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
-         bool bSSL = false;
-         unsigned int uServerPort = 0;
- 
--        if (sNetwork.Equals("freenode")) {
--            sHost = "chat.freenode.net";
-+        if (sNetwork.Equals("libera")) {
-+            sHost = "irc.libera.chat";
- #ifdef HAVE_LIBSSL
-             bSSL = true;
- #endif
-From 688645413c258f1fe42a39e42e5b5d1dead03d71 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <alexey+znc@asokolov.org>
-Date: Fri, 18 Jun 2021 21:20:53 +0100
-Subject: [PATCH] Fix integration test after switch to libera
-
----
- test/integration/framework/znctest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/integration/framework/znctest.cpp b/test/integration/framework/znctest.cpp
-index 195b6083a9..40dae85fc2 100644
---- a/test/integration/framework/znctest.cpp
-+++ b/test/integration/framework/znctest.cpp
-@@ -39,7 +39,7 @@ void WriteConfig(QString path) {
-     p.ReadUntil("Real name");               p.Write();
-     p.ReadUntil("Bind host");               p.Write();
-     p.ReadUntil("Set up a network?");       p.Write();
--    p.ReadUntil("Name [freenode]");         p.Write("test");
-+    p.ReadUntil("Name [libera]");           p.Write("test");
-     p.ReadUntil("Server host (host only)"); p.Write("127.0.0.1");
-     p.ReadUntil("Server uses SSL?");        p.Write();
-     p.ReadUntil("6667");                    p.Write();
diff --git a/net-irc/znc/files/znc-1.8.2-fix-odr-violation.patch b/net-irc/znc/files/znc-1.8.2-fix-odr-violation.patch
deleted file mode 100644
index 967d6e35c2ea..000000000000
--- a/net-irc/znc/files/znc-1.8.2-fix-odr-violation.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3e45b2f35f194100ec3293c7f3e36f95f48b0cb8 Mon Sep 17 00:00:00 2001
-From: Uli Schlachter <psychon@znc.in>
-Date: Fri, 5 Aug 2022 16:12:40 +0200
-Subject: [PATCH] Fix an ODR violation
-
-Building with CFLAGS="-flto -Werror=odr -Werror=lto-type-mismatch
--Werror=strict-aliasing" CXXFLAGS="-flto -Werror=odr
--Werror=lto-type-mismatch -Werror=strict-aliasing" LDFLAGS=-flto fails
-due to a violation of the one definition rule. There are two different
-definitions of TOption that are both linked into the znc binary.
-
-Fix this by putting them into anonymous namespaces.
-
-Fixes: https://github.com/znc/znc/issues/1834
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
- src/IRCNetwork.cpp | 2 ++
- src/User.cpp       | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp
-index 46a2481a49..99f9242907 100644
---- a/src/IRCNetwork.cpp
-+++ b/src/IRCNetwork.cpp
-@@ -363,11 +363,13 @@ CString CIRCNetwork::GetNetworkPath() const {
-     return sNetworkPath;
- }
- 
-+namespace {
- template <class T>
- struct TOption {
-     const char* name;
-     void (CIRCNetwork::*pSetter)(T);
- };
-+}
- 
- bool CIRCNetwork::ParseConfig(CConfig* pConfig, CString& sError,
-                               bool bUpgrade) {
-diff --git a/src/User.cpp b/src/User.cpp
-index 2ab5fac66f..16624adbbe 100644
---- a/src/User.cpp
-+++ b/src/User.cpp
-@@ -135,11 +135,13 @@ CUser::~CUser() {
-     CZNC::Get().AddBytesWritten(m_uBytesWritten);
- }
- 
-+namespace {
- template <class T>
- struct TOption {
-     const char* name;
-     void (CUser::*pSetter)(T);
- };
-+}
- 
- bool CUser::ParseConfig(CConfig* pConfig, CString& sError) {
-     TOption<const CString&> StringOptions[] = {
diff --git a/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch b/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch
deleted file mode 100644
index fe40d190d1ba..000000000000
--- a/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e8ff16123582eb9d5c321f5c7e652335abfba368 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <alexey+znc@asokolov.org>
-Date: Sat, 23 May 2020 13:28:13 +0100
-Subject: [PATCH] Fix PY_SSIZE_T_CLEAN python warning
-
----
- .travis.yml           | 2 +-
- modules/modpython.cpp | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/modules/modpython.cpp b/modules/modpython.cpp
-index dfe53b5b6b..7bc76fc5c1 100644
---- a/modules/modpython.cpp
-+++ b/modules/modpython.cpp
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- 
-+#define PY_SSIZE_T_CLEAN
- #include <Python.h>
- 
- #include <znc/Chan.h>
-@@ -455,7 +456,7 @@ CBSOCK(ConnectionRefused);
- void CPySocket::ReadData(const char* data, size_t len) {
-     PyObject* pyRes =
-         PyObject_CallMethod(m_pyObj, const_cast<char*>("OnReadData"),
--                            const_cast<char*>("y#"), data, (int)len);
-+                            const_cast<char*>("y#"), data, (Py_ssize_t)len);
-     CHECKCLEARSOCK("OnReadData");
- }
- 
diff --git a/net-irc/znc/files/znc-1.8.2-fix-swig-2.patch b/net-irc/znc/files/znc-1.8.2-fix-swig-2.patch
deleted file mode 100644
index 91d7f5657cbe..000000000000
--- a/net-irc/znc/files/znc-1.8.2-fix-swig-2.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 3f4c1cce77cbe1337e5642e9e0e9d048c9e07370 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <alexey+znc@asokolov.org>
-Date: Fri, 5 Jan 2024 02:19:55 +0000
-Subject: [PATCH] Fix build with SWIG 4.2.0
-
-https://bugs.gentoo.org/921230
----
- modules/modpython/codegen.pl | 88 ++++++++++++++++++++++++++----------
- 1 file changed, 65 insertions(+), 23 deletions(-)
-
-diff --git a/modules/modpython/codegen.pl b/modules/modpython/codegen.pl
-index 1bc09806e0..bbcb148bed 100755
---- a/modules/modpython/codegen.pl
-+++ b/modules/modpython/codegen.pl
-@@ -50,29 +50,6 @@
-  ***************************************************************************/
- 
- namespace {
--/*	template<class T>
--	struct pyobj_to_ptr {
--		CString m_sType;
--		SvToPtr(const CString& sType) {
--			m_sType = sType;
--		}
--		bool operator()(PyObject* py, T** result) {
--			T* x = nullptr;
--			int res = SWIG_ConvertPtr(sv, (void**)&x, SWIG_TypeQuery(m_sType.c_str()), 0);
--			if (SWIG_IsOK(res)) {
--				*result = x;
--				return true;
--			}
--			DEBUG("modpython: ");
--			return false;
--		}
--	};
--
--	CModule::EModRet SvToEModRet(PyObject* py, CModule::EModRet* result) {
--		long int x = PyLong_AsLong();
--		return static_cast<CModule::EModRet>(SvUV(sv));
--	}*/
--
- 	inline swig_type_info* SWIG_pchar_descriptor(void) {
- 		static int init = 0;
- 		static swig_type_info* info = 0;
-@@ -83,6 +60,70 @@
- 		return info;
- 	}
- 
-+// SWIG 4.2.0 replaced SWIG_Python_str_AsChar with SWIG_PyUnicode_AsUTF8AndSize.
-+// SWIG doesn't provide any good way to detect SWIG version (other than parsing
-+// `swig -version`), but it also introduced SWIG_NULLPTR.
-+// So let's abuse that define to do different code for new SWIG.
-+#ifdef SWIG_NULLPTR
-+	// This is copied from some SWIG 4.2.0 from pystrings.swg
-+	inline int SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) {
-+#if PY_VERSION_HEX>=0x03000000
-+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-+		if (PyBytes_Check(obj))
-+#else
-+		if (PyUnicode_Check(obj))
-+#endif
-+#else
-+		if (PyString_Check(obj))
-+#endif
-+		{
-+			char *cstr; Py_ssize_t len;
-+			PyObject *bytes = NULL;
-+			int ret = SWIG_OK;
-+			if (alloc)
-+				*alloc = SWIG_OLDOBJ;
-+#if PY_VERSION_HEX>=0x03000000 && defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-+			if (PyBytes_AsStringAndSize(obj, &cstr, &len) == -1)
-+				return SWIG_TypeError;
-+#else
-+			cstr = (char *)SWIG_PyUnicode_AsUTF8AndSize(obj, &len, &bytes);
-+			if (!cstr)
-+				return SWIG_TypeError;
-+			/* The returned string is only duplicated if the char * returned is not owned and memory managed by obj */
-+			if (bytes && cptr) {
-+				if (alloc) {
-+					//cstr = %new_copy_array(cstr, len + 1, char);
-+					cstr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
-+					*alloc = SWIG_NEWOBJ;
-+				} else {
-+					/* alloc must be set in order to clean up allocated memory */
-+					return SWIG_RuntimeError;
-+				}
-+			}
-+#endif
-+			if (cptr) *cptr = cstr;
-+			if (psize) *psize = len + 1;
-+			Py_XDECREF(bytes);
-+			return ret;
-+		} else {
-+			swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-+			if (pchar_descriptor) {
-+				void* vptr = 0;
-+				if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
-+					if (cptr) *cptr = (char *) vptr;
-+					if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
-+					if (alloc) *alloc = SWIG_OLDOBJ;
-+					return SWIG_OK;
-+				}
-+			}
-+		}
-+		return SWIG_TypeError;
-+	}
-+
-+#else
-+	// TODO: at some point drop support for SWIG<4.2.0 (drop this branch of ifdef)
-+
-+	// This is copied from some old SWIG version from pystrings.swg
- 	inline int SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) {
- #if PY_VERSION_HEX>=0x03000000
- 		if (PyUnicode_Check(obj))
-@@ -155,6 +196,7 @@
- 			}
- 		return SWIG_TypeError;
- 	}
-+#endif
- 
- 	inline int SWIG_AsPtr_CString (PyObject * obj, CString **val) {
- 		char* buf = 0 ; size_t size = 0; int alloc = SWIG_OLDOBJ;
diff --git a/net-irc/znc/files/znc-1.8.2-fix-swig.patch b/net-irc/znc/files/znc-1.8.2-fix-swig.patch
deleted file mode 100644
index d07d136c5940..000000000000
--- a/net-irc/znc/files/znc-1.8.2-fix-swig.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <alexey+znc@asokolov.org>
-Date: Sat, 5 Nov 2022 12:54:40 +0000
-Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1
-
-https://bugs.gentoo.org/878587
----
- CMakeLists.txt                   | 2 +-
- modules/modperl/CMakeLists.txt   | 1 -
- modules/modpython/CMakeLists.txt | 1 -
- 3 files changed, 1 insertion(+), 3 deletions(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS
- 	endif()
- endif()
- if(search_swig)
--	find_package(SWIG 3.0.0)
-+	find_package(SWIG 4.0.1)
- 	if(NOT SWIG_FOUND)
- 		message(FATAL_ERROR
- 			"Can't find SWIG, therefore Perl and Python aren't supported. "
---- a/modules/modperl/CMakeLists.txt
-+++ b/modules/modperl/CMakeLists.txt
-@@ -53,7 +53,6 @@ if(SWIG_FOUND)
- 		"-I${PROJECT_SOURCE_DIR}/include"
- 		"-I${CMAKE_CURRENT_SOURCE_DIR}/.."
- 		"-I${CMAKE_CURRENT_SOURCE_DIR}/include"
--		-DZNC_EXPORT_LIB_EXPORT
- 		-outdir "${CMAKE_CURRENT_BINARY_DIR}"
- 		-o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp"
- 		"${CMAKE_CURRENT_SOURCE_DIR}/modperl.i"
---- a/modules/modpython/CMakeLists.txt
-+++ b/modules/modpython/CMakeLists.txt
-@@ -50,7 +50,6 @@ if(SWIG_FOUND)
- 		"-I${PROJECT_BINARY_DIR}/include"
- 		"-I${PROJECT_SOURCE_DIR}/include"
- 		"-I${CMAKE_CURRENT_SOURCE_DIR}/.."
--		-DZNC_EXPORT_LIB_EXPORT
- 		-outdir "${CMAKE_CURRENT_BINARY_DIR}"
- 		-o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp"
- 		"${CMAKE_CURRENT_SOURCE_DIR}/modpython.i"
diff --git a/net-irc/znc/files/znc-1.8.2-fix-systemd-datadir.patch b/net-irc/znc/files/znc-1.8.2-fix-systemd-datadir.patch
deleted file mode 100644
index 06dd6991b4a4..000000000000
--- a/net-irc/znc/files/znc-1.8.2-fix-systemd-datadir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d4bfd143b4b12f6e6695878cc1b5168cc31c362c Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <alexey+znc@asokolov.org>
-Date: Tue, 22 Sep 2020 10:20:47 +0100
-Subject: [PATCH] Fix path in systemd service (which shouldn't be here at all)
-
-https://bugs.gentoo.org/743856
----
- znc.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/znc.service.in b/znc.service.in
-index a6c9e68df..7accad906 100644
---- a/znc.service.in
-+++ b/znc.service.in
-@@ -3,7 +3,7 @@ Description=ZNC, an advanced IRC bouncer
- After=network.target
- 
- [Service]
--ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/znc -f
-+ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/znc -f --datadir=/var/lib/znc
- User=znc
- 
- [Install]
diff --git a/net-irc/znc/files/znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch b/net-irc/znc/files/znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch
deleted file mode 100644
index fae99b5d6583..000000000000
--- a/net-irc/znc/files/znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-https://github.com/znc/znc/commit/f8552fc814ebe662a9fc16d6cafa1c0314498971
-
-From f8552fc814ebe662a9fc16d6cafa1c0314498971 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <alexey+znc@asokolov.org>
-Date: Sun, 25 Feb 2024 14:12:53 +0000
-Subject: [PATCH] Skip modperl/modpython tests cleaner
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -411,6 +411,8 @@ else()
- endif()
- 
- configure_file("include/znc/zncconfig.h.cmake.in" "include/znc/zncconfig.h")
-+configure_file("test/integration/znctestconfig.h.cmake.in"
-+	"test/integration/znctestconfig.h")
- add_subdirectory(include)
- add_subdirectory(src)
- add_subdirectory(modules)
---- a/test/integration/CMakeLists.txt
-+++ b/test/integration/CMakeLists.txt
-@@ -45,6 +45,7 @@ add_executable(inttest
- target_link_libraries(inttest Qt5::Network Threads::Threads)
- target_include_directories(inttest PUBLIC
- 	"${PROJECT_SOURCE_DIR}/framework"
-+	"${PROJECT_BINARY_DIR}"
- 	"${GTEST_ROOT}" "${GTEST_ROOT}/include"
- 	"${GMOCK_ROOT}" "${GMOCK_ROOT}/include")
- target_compile_definitions(inttest PRIVATE
---- a/test/integration/tests/core.cpp
-+++ b/test/integration/tests/core.cpp
-@@ -14,9 +14,11 @@
-  * limitations under the License.
-  */
- 
-+#include <gtest/gtest.h>
- #include <gmock/gmock.h>
- 
- #include "znctest.h"
-+#include "znctestconfig.h"
- 
- using testing::HasSubstr;
- using testing::ContainsRegex;
-@@ -584,10 +586,9 @@ TEST_P(AllLanguages, ServerDependentCapInModule) {
-             )");
-             break;
-         case 2:
--            if (QProcessEnvironment::systemEnvironment().value(
--                    "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--                return;
--            }
-+#ifndef WANT_PYTHON
-+            GTEST_SKIP() << "Modpython is disabled";
-+#endif
-             znc->CanLeak();
-             InstallModule("testmod.py", R"(
-                 import znc
-@@ -603,10 +604,9 @@ TEST_P(AllLanguages, ServerDependentCapInModule) {
-             client.Write("znc loadmod modpython");
-             break;
-         case 3:
--            if (QProcessEnvironment::systemEnvironment().value(
--                    "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--                return;
--            }
-+#ifndef WANT_PERL
-+            GTEST_SKIP() << "Modperl is disabled";
-+#endif
-             znc->CanLeak();
-             InstallModule("testmod.pm", R"(
-                 package testmod;
---- a/test/integration/tests/scripting.cpp
-+++ b/test/integration/tests/scripting.cpp
-@@ -15,15 +15,15 @@
-  */
- 
- #include "znctest.h"
-+#include "znctestconfig.h"
- 
- namespace znc_inttest {
- namespace {
- 
- TEST_F(ZNCTest, Modperl) {
--    if (QProcessEnvironment::systemEnvironment().value(
--            "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--        return;
--    }
-+#ifndef WANT_PERL
-+    GTEST_SKIP() << "Modperl is disabled";
-+#endif
-     auto znc = Run();
-     znc->CanLeak();
-     auto ircd = ConnectIRCd();
-@@ -37,10 +37,9 @@ TEST_F(ZNCTest, Modperl) {
- }
- 
- TEST_F(ZNCTest, Modpython) {
--    if (QProcessEnvironment::systemEnvironment().value(
--            "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--        return;
--    }
-+#ifndef WANT_PYTHON
-+    GTEST_SKIP() << "Modpython is disabled";
-+#endif
-     auto znc = Run();
-     znc->CanLeak();
-     auto ircd = ConnectIRCd();
-@@ -65,10 +64,9 @@ TEST_F(ZNCTest, Modpython) {
- }
- 
- TEST_F(ZNCTest, ModpythonSocket) {
--    if (QProcessEnvironment::systemEnvironment().value(
--            "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--        return;
--    }
-+#ifndef WANT_PYTHON
-+    GTEST_SKIP() << "Modpython is disabled";
-+#endif
-     auto znc = Run();
-     znc->CanLeak();
- 
-@@ -107,10 +105,9 @@ TEST_F(ZNCTest, ModpythonSocket) {
- }
- 
- TEST_F(ZNCTest, ModperlSocket) {
--    if (QProcessEnvironment::systemEnvironment().value(
--            "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--        return;
--    }
-+#ifndef WANT_PERL
-+    GTEST_SKIP() << "Modperl is disabled";
-+#endif
-     auto znc = Run();
-     znc->CanLeak();
- 
-@@ -160,10 +157,9 @@ TEST_F(ZNCTest, ModperlSocket) {
- }
- 
- TEST_F(ZNCTest, ModpythonVCString) {
--    if (QProcessEnvironment::systemEnvironment().value(
--            "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--        return;
--    }
-+#ifndef WANT_PYTHON
-+    GTEST_SKIP() << "Modpython is disabled";
-+#endif
-     auto znc = Run();
-     znc->CanLeak();
- 
-@@ -185,10 +181,9 @@ TEST_F(ZNCTest, ModpythonVCString) {
- }
- 
- TEST_F(ZNCTest, ModperlVCString) {
--    if (QProcessEnvironment::systemEnvironment().value(
--            "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--        return;
--    }
-+#ifndef WANT_PERL
-+    GTEST_SKIP() << "Modperl is disabled";
-+#endif
-     auto znc = Run();
-     znc->CanLeak();
- 
-@@ -214,10 +209,9 @@ TEST_F(ZNCTest, ModperlVCString) {
- }
- 
- TEST_F(ZNCTest, ModperlNV) {
--    if (QProcessEnvironment::systemEnvironment().value(
--            "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--        return;
--    }
-+#ifndef WANT_PERL
-+    GTEST_SKIP() << "Modperl is disabled";
-+#endif
-     auto znc = Run();
-     znc->CanLeak();
- 
-@@ -244,10 +238,9 @@ TEST_F(ZNCTest, ModperlNV) {
- }
- 
- TEST_F(ZNCTest, ModpythonPackage) {
--    if (QProcessEnvironment::systemEnvironment().value(
--            "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--        return;
--    }
-+#ifndef WANT_PYTHON
-+    GTEST_SKIP() << "Modpython is disabled";
-+#endif
-     auto znc = Run();
-     znc->CanLeak();
- 
-@@ -285,10 +278,12 @@ TEST_F(ZNCTest, ModpythonPackage) {
- }
- 
- TEST_F(ZNCTest, ModpythonModperl) {
--    if (QProcessEnvironment::systemEnvironment().value(
--            "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--        return;
--    }
-+#ifndef WANT_PYTHON
-+    GTEST_SKIP() << "Modpython is disabled";
-+#endif
-+#ifndef WANT_PERL
-+    GTEST_SKIP() << "Modperl is disabled";
-+#endif
-     auto znc = Run();
-     znc->CanLeak();
- 
-@@ -302,11 +297,9 @@ TEST_F(ZNCTest, ModpythonModperl) {
- }
- 
- TEST_F(ZNCTest, ModpythonCommand) {
--    if (QProcessEnvironment::systemEnvironment().value(
--            "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") {
--        return;
--    }
--
-+#ifndef WANT_PYTHON
-+    GTEST_SKIP() << "Modpython is disabled";
-+#endif
-     auto znc = Run();
-     znc->CanLeak();
- 
---- /dev/null
-+++ b/test/integration/znctestconfig.h.cmake.in
-@@ -0,0 +1,23 @@
-+/*
-+ * Copyright (C) 2004-2024 ZNC, see the NOTICE file for details.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *     http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+#ifndef ZNCTESTCONFIG_H
-+#define ZNCTESTCONFIG_H
-+
-+#cmakedefine WANT_PYTHON 1
-+#cmakedefine WANT_PERL 1
-+
-+#endif /* ZNCTESTCONFIG_H */
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
deleted file mode 100644
index 95ffdfe3d31e..000000000000
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-single-r1 readme.gentoo-r1 systemd
-
-GTEST_VER="1.8.1"
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/znc/znc.git"
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="
-		https://znc.in/releases/archive/${MY_P}.tar.gz
-		test? ( ${GTEST_URL} )
-	"
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-HOMEPAGE="https://znc.in"
-LICENSE="Apache-2.0"
-# "If you upgrade your ZNC version, you must recompile all your modules."
-# - https://wiki.znc.in/Compiling_modules
-SLOT="0/${PV}"
-IUSE="+icu nls perl python +ssl sasl tcl test +zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-
-# perl is a build-time dependency of modpython
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	perl? (
-		>=dev-lang/swig-4.0.1
-		>=dev-lang/perl-5.10
-	)
-	python? (
-		>=dev-lang/swig-4.0.1
-		>=dev-lang/perl-5.10
-	)
-	test? (
-		${PYTHON_DEPS}
-		dev-qt/qtnetwork:5
-	)
-"
-DEPEND="
-	icu? ( dev-libs/icu:= )
-	nls? ( dev-libs/boost:=[nls] )
-	perl? ( >=dev-lang/perl-5.10:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl:0= )
-	tcl? ( dev-lang/tcl:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-RDEPEND="
-	${DEPEND}
-	acct-user/znc
-	acct-group/znc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch
-	# All these are backports
-	"${FILESDIR}"/${P}-fix-systemd-datadir.patch
-	"${FILESDIR}"/${P}-add-libera.patch
-	"${FILESDIR}"/${P}-fix-python-3.10.patch
-	"${FILESDIR}"/${P}-fix-odr-violation.patch
-	"${FILESDIR}"/${P}-fix-swig.patch
-	"${FILESDIR}"/${P}-fix-swig-2.patch
-)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Let SWIG rebuild modperl/modpython to make user patching easier.
-	if [[ ${PV} != *9999* ]]; then
-		rm modules/modperl/generated.tar.gz || die
-		rm modules/modpython/generated.tar.gz || die
-	fi
-
-	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
-		test/CMakeLists.txt || die
-
-	sed -i "s|--datadir=|&${EPREFIX}|" znc.service.in || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_SYSTEMD=yes  # Causes -DSYSTEMD_DIR to be used.
-		-DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
-		-DWANT_ICU="$(usex icu)"
-		-DWANT_IPV6=yes
-		-DWANT_I18N="$(usex nls)"
-		-DWANT_PERL="$(usex perl)"
-		-DWANT_PYTHON="$(usex python)"
-		-DWANT_PYTHON_VERSION="${EPYTHON#python}"
-		-DWANT_CYRUS="$(usex sasl)"
-		-DWANT_OPENSSL="$(usex ssl)"
-		-DWANT_TCL="$(usex tcl)"
-		-DWANT_ZLIB="$(usex zlib)"
-	)
-
-	if [[ ${PV} != *9999* ]] && use test; then
-		export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
-		export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittest
-	DESTDIR="${T}/inttest" cmake_build install
-	local filter='-'
-	if ! use perl; then
-		filter="${filter}:ZNCTest.Modperl*"
-	fi
-	if ! use python; then
-		filter="${filter}:ZNCTest.Modpython*"
-	fi
-	# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
-	# invocations from inside the test
-	GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
-		CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
-		CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
-		cmake_build inttest
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc NOTICE
-	newinitd "${FILESDIR}"/znc.initd-r2 znc
-	newconfd "${FILESDIR}"/znc.confd-r1 znc
-
-	local DOC_CONTENTS
-	# "local" has its own return value which is not what we want to catch
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
-	local DISABLE_AUTOFORMATTING=1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -d "${EROOT}/var/lib/znc/.znc/" ]]; then
-		eerror "${EROOT}/var/lib/znc/.znc/ exists, please move your data to ${EROOT}/var/lib/znc/"
-		eerror ""
-		eerror "The systemd unit has changed and now expects data to be located"
-		eerror "at the root of ${EROOT}/var/lib/znc instead of its '.znc' subfolder."
-		eerror "The recommended procedure to move the data is the following:"
-		eerror "1. stop the service: systemctl stop znc.service"
-		eerror "2. move the data: cp -a '${EROOT}/var/lib/znc/.znc/.' '${EROOT}/var/lib/znc/'"
-		eerror "3. fix the config file: sed -i 's|${EROOT}/var/lib/znc/.znc|${EROOT}/var/lib/znc|g' '${EROOT}/var/lib/znc/configs/znc.conf'"
-		eerror "4. restart znc: systemctl start znc.service"
-		eerror "5. once everything works, remove the old data directory: rm -r '${EROOT}/var/lib/znc/.znc/'"
-		eerror "See https://bugs.gentoo.org/743856 for details."
-	fi
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		readme.gentoo_print_elog
-	fi
-}
-
-pkg_config() {
-	if [[ -d "${EROOT}/var/lib/znc/configs" ]]; then
-		ewarn "${EROOT}/var/lib/znc/configs/ already exists,"
-		ewarn "aborting to avoid damaging any existing configuration."
-		ewarn "If you are sure you want to generate a new configuration,"
-		ewarn "remove the folder and try again."
-	else
-		einfo "Press enter to interactively create a new configuration file for znc."
-		einfo "To abort, press Control-C"
-		read
-		su ${PN} -p -s /bin/sh -c 'ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
-			"${EROOT}"/usr/bin/znc --makeconf \
-			--datadir "${EROOT}/var/lib/znc"' || die "Config failed"
-		einfo
-		einfo "You can now start the znc service using the init system of your choice."
-		einfo "Don't forget to enable it if you want to use znc at boot."
-	fi
-}
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
deleted file mode 100644
index 66924afe2f6d..000000000000
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake python-single-r1 readme.gentoo-r1 systemd
-
-GTEST_VER="1.14.0"
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/znc/znc.git"
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="
-		https://znc.in/releases/archive/${MY_P}.tar.gz
-		test? ( ${GTEST_URL} )
-	"
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-HOMEPAGE="https://znc.in"
-LICENSE="Apache-2.0"
-# "If you upgrade your ZNC version, you must recompile all your modules."
-# - https://wiki.znc.in/Compiling_modules
-SLOT="0/${PV}"
-IUSE="+argon2 +icu nls perl python +ssl sasl tcl test +zlib"
-RESTRICT="!test? ( test )"
-
-# tests run znc-buildmod which is a Python script
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} icu )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# perl is a build-time dependency of modpython
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	perl? (
-		>=dev-lang/swig-4.0.1
-		>=dev-lang/perl-5.10
-	)
-	python? (
-		>=dev-lang/swig-4.0.1
-		>=dev-lang/perl-5.10
-	)
-	test? (
-		${PYTHON_DEPS}
-		dev-qt/qtnetwork:5
-	)
-"
-DEPEND="
-	dev-cpp/cctz:=
-	argon2? ( app-crypt/argon2:= )
-	icu? ( dev-libs/icu:= )
-	nls? ( dev-libs/boost:=[nls] )
-	perl? ( >=dev-lang/perl-5.10:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl:0= )
-	tcl? ( dev-lang/tcl:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-RDEPEND="
-	${DEPEND}
-	acct-user/znc
-	acct-group/znc
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.1-inttest-dir.patch"
-	# The following patch is a backport, it can be removed during the next bump
-	"${FILESDIR}/${P}-skip-modperl-modpython-tests-cleaner.patch"
-)
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Let SWIG rebuild modperl/modpython to make user patching easier.
-	if [[ ${PV} != *9999* ]]; then
-		rm modules/modperl/generated.tar.gz || die
-		rm modules/modpython/generated.tar.gz || die
-	fi
-
-	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
-		test/CMakeLists.txt || die
-
-	sed -i "s|--datadir=|&${EPREFIX}|" znc.service.in || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_SYSTEMD=yes  # Causes -DSYSTEMD_DIR to be used.
-		-DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
-		-DWANT_ICU="$(usex icu)"
-		-DWANT_ARGON="$(usex argon2)"
-		-DWANT_IPV6=yes
-		-DWANT_I18N="$(usex nls)"
-		-DWANT_PERL="$(usex perl)"
-		-DWANT_PYTHON="$(usex python)"
-		-DWANT_PYTHON_VERSION="${EPYTHON#python}"
-		-DWANT_CYRUS="$(usex sasl)"
-		-DWANT_OPENSSL="$(usex ssl)"
-		-DWANT_TCL="$(usex tcl)"
-		-DWANT_ZLIB="$(usex zlib)"
-	)
-
-	if [[ ${PV} != *9999* ]] && use test; then
-		export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest"
-		export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock"
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittest
-	DESTDIR="${T}/inttest" cmake_build install
-	local filter='-'
-	if ! use perl; then
-		filter="${filter}:ZNCTest.Modperl*"
-	fi
-	if ! use python; then
-		filter="${filter}:ZNCTest.Modpython*"
-	fi
-	# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
-	# invocations from inside the test
-	GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
-		CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
-		CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
-		cmake_build inttest
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc NOTICE
-	newinitd "${FILESDIR}"/znc.initd-r2 znc
-	newconfd "${FILESDIR}"/znc.confd-r1 znc
-
-	local DOC_CONTENTS
-	# "local" has its own return value which is not what we want to catch
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
-	local DISABLE_AUTOFORMATTING=1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -d "${EROOT}/var/lib/znc/.znc/" ]]; then
-		eerror "${EROOT}/var/lib/znc/.znc/ exists, please move your data to ${EROOT}/var/lib/znc/"
-		eerror ""
-		eerror "The systemd unit has changed and now expects data to be located"
-		eerror "at the root of ${EROOT}/var/lib/znc instead of its '.znc' subfolder."
-		eerror "The recommended procedure to move the data is the following:"
-		eerror "1. stop the service: systemctl stop znc.service"
-		eerror "2. move the data: cp -a '${EROOT}/var/lib/znc/.znc/.' '${EROOT}/var/lib/znc/'"
-		eerror "3. fix the config file: sed -i 's|${EROOT}/var/lib/znc/.znc|${EROOT}/var/lib/znc|g' '${EROOT}/var/lib/znc/configs/znc.conf'"
-		eerror "4. restart znc: systemctl start znc.service"
-		eerror "5. once everything works, remove the old data directory: rm -r '${EROOT}/var/lib/znc/.znc/'"
-		eerror "See https://bugs.gentoo.org/743856 for details."
-	fi
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		readme.gentoo_print_elog
-	fi
-}
-
-pkg_config() {
-	if [[ -d "${EROOT}/var/lib/znc/configs" ]]; then
-		ewarn "${EROOT}/var/lib/znc/configs/ already exists,"
-		ewarn "aborting to avoid damaging any existing configuration."
-		ewarn "If you are sure you want to generate a new configuration,"
-		ewarn "remove the folder and try again."
-	else
-		einfo "Press enter to interactively create a new configuration file for znc."
-		einfo "To abort, press Control-C"
-		read
-		su ${PN} -p -s /bin/sh -c 'ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
-			"${EROOT}"/usr/bin/znc --makeconf \
-			--datadir "${EROOT}/var/lib/znc"' || die "Config failed"
-		einfo
-		einfo "You can now start the znc service using the init system of your choice."
-		einfo "Don't forget to enable it if you want to use znc at boot."
-	fi
-}