gentoo resync : 16.01.2021

8 files changed, 45 insertions, 8 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index f4b0e8dc8838..488e532432f6 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index bf0c1e88f5ff..f55325c3d9c4 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,7 +1,7 @@
 AUX ergo.confd 92 BLAKE2B 02dd8cc089593bb207268c1f91e106b2e78b5aba92774cf7b0ee0b38a09c55db409fce72517965f1929d26bdafbe1b9d781708500b286c05f7e161819c177c86 SHA512 3908e273045e5d94f358913e669bf2802a82306ce8eabffa6b7b6e5f022f2fe069a577c69c4070ddf61ec85287b2bca362a02585ecdb779cba4435750de5c5b2
 AUX ergo.initd 382 BLAKE2B 916ef2bc1371e4f62328b22f4072d5c2a39249bfa53e59d6e8877d2ad8a92ed333dae806d65269a343351a93f5d995383c01f65291cc2f24db0ebba0e4fb24f1 SHA512 0b2c1cc5e12458e02efd7e5a6e80f301ce96163c68f1e7e5311dded5c6c99b5ea4a9d707c2f549b56ee77fa4b5758a4d66ce78602011bc30a8ef48d762bd5de4
-DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7 SHA512 ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c
 DIST ergo-2.8.0.tar.gz 3150109 BLAKE2B 07b725e9db49f101544a7f7cbbb197c77187f35c59e07055ff46a6ffb0a62cb250915c36209fce453e3158000f8b0eeb16189303b5dc78fda3daf6c2e8a35b28 SHA512 4f3c33286be91cf12cf6cc6b56598bf6adf60c88cd22290d3221457e4d08d7957b1922a18b151726a341825a65168daf1174c622c54268c5aa744ed9c9a0326b
-EBUILD ergo-2.7.0-r1.ebuild 1497 BLAKE2B 76a7e0043b50b1d9d7504eb560164bfb77193aa903db01bb9bd8ba90e82ac78e1091ca942e167cfacb88b11365ba0e1f37d649143b205e5e5c98ad21ea0f1204 SHA512 f545f00d43e7548f6696764592267120d2e7ceb5dc24dbdb4f9bb060f290256b61a4ec7415f1477c68102bf5babf1cd1bc497172d4d1107b5fc1b16e04ffce5b
+DIST ergo-2.9.1.tar.gz 3249107 BLAKE2B 6d8f98ab868ef10323a40583e2ddb2e1854b967265f789ec176caae40675ef5a9a6a9e54c1b60d8e3f281dcb5ad18e964624ccf673e146ee7044f3454a3e2349 SHA512 5aa8f1afc55c432acf6763aa95cffdb3447b7d53a759d04c303675852b240b0fe26030a94ea12954a453d4f8e4f7db7ffbca8faeb6a1b20b17a44ac27b80d66a
 EBUILD ergo-2.8.0.ebuild 1497 BLAKE2B 76a7e0043b50b1d9d7504eb560164bfb77193aa903db01bb9bd8ba90e82ac78e1091ca942e167cfacb88b11365ba0e1f37d649143b205e5e5c98ad21ea0f1204 SHA512 f545f00d43e7548f6696764592267120d2e7ceb5dc24dbdb4f9bb060f290256b61a4ec7415f1477c68102bf5babf1cd1bc497172d4d1107b5fc1b16e04ffce5b
+EBUILD ergo-2.9.1.ebuild 1499 BLAKE2B ae51cc22d1a6f2c9996ec8e17e2c5a624764cdaaecbf7413257f39b52ac0ff8e91a929ee93f81889ee8ccd87afb500a3d6915543ce4e72014fb01511ce81517a SHA512 67034caddae3e7b84ed44700a0cc4d47d2307a35f5aa73a7f7b63d872c93e1652a4e3321830d4b392394b43f577c4e3e44a88ec068bb8b6df80813a9b9f736c8
 MISC metadata.xml 320 BLAKE2B 3bff5defc5150caa0cae2776e69f9070d1896c9cab8e5e0fc1afb94606a1c0e0d3ab951b4ea1076929221bcfd0576540f1b1768c1f9d3ad68161d9540c6785e3 SHA512 b634cbc9628c66cfc5b2983a6da5b2322bfb5c755893e1c15aab203f6e94b15ea5be2494b0370e8b7fd4950d0d1059e60939bd945620aa0548ef665263a5672a
diff --git a/net-irc/ergo/ergo-2.7.0-r1.ebuild b/net-irc/ergo/ergo-2.9.1.ebuild
index edff5c53fda6..b68c0cb2089c 100644
--- a/net-irc/ergo/ergo-2.7.0-r1.ebuild
+++ b/net-irc/ergo/ergo-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,8 +49,8 @@ src_install() {
 	insinto /etc/ergo
 	doins default.yaml
 
-	newinitd "${FILESDIR}"/ergo.initd ergo
-	newconfd "${FILESDIR}"/ergo.confd ergo
+	newinitd distrib/openrc/ergo.initd ergo
+	newconfd distrib/openrc/ergo.confd ergo
 
 	keepdir /var/lib/ergo
 	fowners oragono:oragono /var/lib/ergo
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index db83e7e0acb7..23d595132726 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,4 +1,5 @@
 AUX quassel-0.13.1-qt5.14.patch 4250 BLAKE2B 11e07632b771d205a4f1ce87ebe82f80d0353b455dc275e71adcda43519f50c134a23a2c01fe085b315ac5d2c4ae89e1eec168c5eb91fb24af1155587d28775e SHA512 4be9792b0398a229102d5cef2b3931e1e9d9851ea99e647f0896c0cf9683db95ea559d7f5fb075388baea0af68cb4a30090ff95732469ecb64c439d7b8cabea0
+AUX quassel-0.14.0-cxxflags.patch 1305 BLAKE2B 241a51092d5f6528bb781cf83de0cb5efbfae3beee2118291b87fad39f58a12a1ab6f2bff25b138641192673b18b79ec663eb6aca1803d15ed4b8a939c71023d SHA512 7a6dd1097694de25c51ff2f93b8b57597a234859516ff93154d74ae70c4593cef5e779a4b80943ceb2945c097711f29a7d9b6d6219023a95c9224d8d63b56843
 AUX quassel.logrotate 105 BLAKE2B 16a8b32885a77817d39f14deb7d1cf2cb7788c9ecd6d179efc10d72bae688537fd063930b24f570b18f4312d600b1810f1b262c6b36f6b5990f20c1ebb699d72 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780
 AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a501c5048904867382ac8bbc133ab3c7fd84751f8b8b5c9a0037dba0d862209515004773241bd546cd6ff SHA512 7d3f320b5d5c9cc27db399a5460ea37f33688d523340d4509ebd2fcf20620b43d4b1a05cdb91fa07931798b18a2bdcee9f4f29c75e867bd4b5a7f170cd02ba90
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
@@ -6,6 +7,6 @@ AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617f
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
 DIST quassel-0.14.0.tar.bz2 4774297 BLAKE2B c17c64a2ed6c414c94c12b2fa0b8abf40810608e3e4f35df19db597444e09594efc9569c65855c3df5e2c211c2d65a46482f20c3d912c87140c66fa4f022b3b8 SHA512 ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f
 EBUILD quassel-0.13.1-r2.ebuild 4785 BLAKE2B 3c2d242ff3e5ce027de2165c58ea857078e74c9db97f8def4411843968cddf534dc42088844e9ae70e59f16a3ce5b601c2e5f85ec3f8113491eedf4b5039bcae SHA512 c60bc5868a0d205fccd47a27e74a1eb6c526a1d933a4b6dc18fa9449aa9fbe1ecfa7a6850606cf0bcfeae1404cfbf553e6126ed638da800a8c162050a995c827
-EBUILD quassel-0.14.0.ebuild 5050 BLAKE2B 5bfa8acc453a22dad63f1b3230e5ddf2cd21f0fb7d5d3e584b059dbe3dbb3c10bc06f7effd892bde0e84172b80f6e61766fa75467af8e9b6c63461dc44076e10 SHA512 7ae4e6395b3eed4dd970c94008c10a321625e8f38ff24d870a1968967227de4c103d074c321e541aff2e651e4de6551d8620e59ebcd528bad309eb8378184699
+EBUILD quassel-0.14.0.ebuild 5108 BLAKE2B ab6c0b01ad9dce6d280f91bafe69ce85cabc16f8548341be3d8330ea114e5582cdf3787ef87c101dc59603c9713ff7062613db42322cd8aff4f91f2d59661118 SHA512 69a742b6c21042eacdf0bffa83e0a2dc74fc3cac4170475a1dfc6f8e1146e71219fec95ed4888d88703435eb59f66d92b0f2b99e1582054bc91a197216ab622f
 EBUILD quassel-9999.ebuild 5050 BLAKE2B 5bfa8acc453a22dad63f1b3230e5ddf2cd21f0fb7d5d3e584b059dbe3dbb3c10bc06f7effd892bde0e84172b80f6e61766fa75467af8e9b6c63461dc44076e10 SHA512 7ae4e6395b3eed4dd970c94008c10a321625e8f38ff24d870a1968967227de4c103d074c321e541aff2e651e4de6551d8620e59ebcd528bad309eb8378184699
 MISC metadata.xml 1727 BLAKE2B 6c24bd6b8689db443c7e1838cd427c54fae128001704570f2a9756d6cc27770ba54f4fd237fe64c4134d21e5ee409dacb4f3e3ebb0a7a38eed9fbb465d64b8c2 SHA512 743c8e1c4b5ad3100ed71142033ad0eb7102bd275dbb3e616845059cebdc90f76a370dd99043e46a34807b1d80db175212748585895af3f5a8fba05e9515d678
diff --git a/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch
new file mode 100644
index 000000000000..119261f789af
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch
@@ -0,0 +1,32 @@
+From b1eff3d32b2a18c52a8f30632746956a17089204 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 8 Jan 2022 13:26:05 -0500
+Subject: [PATCH] cmake: avoid de-duplication of user's CXXFLAGS
+
+Use the "SHELL:" prefix behavior introduced in cmake 3.12 to avoid the
+option de-duplication behavior of add_compile_options().
+
+Bug: https://bugs.gentoo.org/830738
+---
+ cmake/QuasselMacros.cmake | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
+index 3f9f09269..9ba0003a8 100644
+--- a/cmake/QuasselMacros.cmake
++++ b/cmake/QuasselMacros.cmake
+@@ -410,8 +410,12 @@ endfunction()
+ function(process_cmake_cxx_flags)
+     string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type)
+     set(cxx_flags "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${upper_build_type}}")
+-    separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags})
+-    add_compile_options(${sep_cxx_flags})
++    if(CMAKE_VERSION VERSION_LESS 3.12)
++        separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags})
++        add_compile_options(${sep_cxx_flags})
++    else()
++        add_compile_options("SHELL:${cxx_flags}")
++    endif()
+     set(CMAKE_CXX_FLAGS "" PARENT_SCOPE)
+     set(CMAKE_CXX_FLAGS_${upper_build_type} "" PARENT_SCOPE)
+ endfunction()
diff --git a/net-irc/quassel/quassel-0.14.0.ebuild b/net-irc/quassel/quassel-0.14.0.ebuild
index 4508c79fbeb9..ad984f995d66 100644
--- a/net-irc/quassel/quassel-0.14.0.ebuild
+++ b/net-irc/quassel/quassel-0.14.0.ebuild
@@ -87,6 +87,10 @@ REQUIRED_USE="|| ( X server monolithic )
 	spell? ( || ( X monolithic ) )
 	syslog? ( || ( server monolithic ) )"
 
+PATCHES=(
+	"${FILESDIR}/quassel-0.14.0-cxxflags.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 942a6ecd061b..6ecab5b112ea 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,4 +1,4 @@
-AUX README.gentoo-r1 557 BLAKE2B c947f5f343723fed637dd3c63f9cdb532d8997e9c225f2caaca510d728f5dc15b6c202b56f31411cc213c78a1ec93fbea7f9a6a74afe22a9979c7c452c47ac96 SHA512 84098676656d3c03ddde8e09f96d332e403c179cc77de5db08f1262635e78d4badc902870d4621ec4b2a13f7d92aed1f076659e10ef0e8d6b977d04d8f6b1dc6
+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-python-3.10.patch 997 BLAKE2B b2be81e71483ea64912db8511dd9cb8ff92b2a7ea3b5d23f57fccd349c0e86d147d9245c5cbd54f99640e198b312847d6a14a256627f0f69d114f214f11dc6a8 SHA512 d39548a34ccf23a814f8b9b7b50fc87f470932e717db079bd3aea4f47e093cf10daa36f003dd1de33e0e493e43de8d5e2e354d5cc881326b249003870408c3aa
diff --git a/net-irc/znc/files/README.gentoo-r1 b/net-irc/znc/files/README.gentoo-r1
index 1812383beb29..8fa94e2f0775 100644
--- a/net-irc/znc/files/README.gentoo-r1
+++ b/net-irc/znc/files/README.gentoo-r1
@@ -1,6 +1,6 @@
 To run znc as a user, run 'znc --makeconf' to create a configuration file.
 
-To configure the system-wide daemon, you may run 'emerge --config znc'.
+To configure the system-wide daemon, you may run 'emerge --config net-irc/znc'.
 
 If migrating from a user-based install, you can copy the existing
 configuration files: