gentoo resync : 16.01.2021

3 files changed, 38 insertions, 1 deletions

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)