gentoo resync : 23.09.2020

4 files changed, 100 insertions, 3 deletions

diff --git a/net-misc/mcproxy/Manifest b/net-misc/mcproxy/Manifest
index 9145acd1e614..dcea9753027b 100644
--- a/net-misc/mcproxy/Manifest
+++ b/net-misc/mcproxy/Manifest
@@ -1,7 +1,8 @@
-AUX fix_checksum_calculation.patch 1154 BLAKE2B adb80fa3b87106c8953675205cc580d13f1d5e4e9d93bfd05b87d9aa4843086ff7682c4ea47ec573654e39cc3ab2961d9daa69f8335043f63e8e623ad331ec0b SHA512 8b31c6758054d250fbbe91eef62d5a6df93ca0fa700730308c34a7402868644d7ed709c642a84a5f296217c6f3cf8132fba7a8506f54c951a2381cc1bf288cd8
+AUX mcproxy-1.1.1-clang.patch 2940 BLAKE2B e6f3845ac49e6a3ee1c31e5ff131d24d9c409c88b422162c90215a93ce24442cb8f506d075c5debf8e11dc2890495f7ce5588c2ac09442897d6630f5d05db3d9 SHA512 2aba42fd92cc9a2237d51013337e4054d8ce4e077a6e7221851e0720f740d921175e5816b94fa17fa63204a0003fa19cecae5b7287875e3704704841052a60c9
+AUX mcproxy-1.1.1-fix-checksum-calculation.patch 1154 BLAKE2B adb80fa3b87106c8953675205cc580d13f1d5e4e9d93bfd05b87d9aa4843086ff7682c4ea47ec573654e39cc3ab2961d9daa69f8335043f63e8e623ad331ec0b SHA512 8b31c6758054d250fbbe91eef62d5a6df93ca0fa700730308c34a7402868644d7ed709c642a84a5f296217c6f3cf8132fba7a8506f54c951a2381cc1bf288cd8
 AUX mcproxy.confd 160 BLAKE2B 5c2e387bbcb5de69412b1b08b63bedab8346363c4d303336c504a5166396f4d09f18a5e203d5fd73abec5f55666742af26a6baa28d8e51fbcc1f7c3b35310965 SHA512 c7096d15afe94002197ee696ea94b88bb85d646c67bb3a2debf8d07098565d35399232610c7bccc0a13a390f6f6be8aad4295f2bf575e7940fb617651a945414
 AUX mcproxy.initd 580 BLAKE2B aff88e8962c7861140f4a11568cab5aaa17df153bcd88b6057f3f17cbad2ee46693db681f1307daa569d4c67e258ab7ab8123c18bffd39fc924b34dd483ab2af SHA512 9f5eaeb39ef5a5cbd8af70f23f17e609f783204ee2dc458128f41a4327eb9f5b8f7f77ae1d642121e7a4af4f6778e65bc97bf0c0b800606c0ce2d6ec79c18f95
 AUX mcproxy.service 161 BLAKE2B c218284289627ae733746263662c16579a617b740825e8b6e0032e9531e17c4c4f0d6bc88d6db2fd6ebbc4a9dcb6bb3dc181fea859e152eef8c53978944a6c0c SHA512 a8298d9278ee934289832d360e502268739e415681c8ecf1c69b93d80ec75094ef32e7f9618ed243a6c05a8facd7aee0b5be591aa6dfce0fcf4658bed845b830
 DIST mcproxy-1.1.1.tar.gz 3373209 BLAKE2B 0b54f7c20b9d6d66c5b88daeaa00901918057b449b932656355303a83c4e4f1feb370de0c55e55484b9bafc63bfd82b8ef8179144529f3074e3d94e147cc8ff5 SHA512 408bc27169c9c90080c7842aaeaf260d5349b735e017d1750118f190124f48743fbf15fc05eee16290e38cc2f752e27b28548714a3d0cd2366dfc53dafcda0bb
-EBUILD mcproxy-1.1.1-r1.ebuild 1064 BLAKE2B 2ea2e0fda806e7b9473a52eac381488d37a2bed631da4f20f43d8258c66f79738a438e93dfc6433cef6999c702a09410ef3b34693394d9c569ee5bbc9a58f0b2 SHA512 e33e7a701893fa3d5738b859d27bf4ecd8c4476ca22d08c3d9b98fffd9df3f99dc1778318b91d486c7b53ad9bc67d930601014949b5799af0e90c2e88bdfb35c
+EBUILD mcproxy-1.1.1-r1.ebuild 1102 BLAKE2B 74acb2772b94c138b1b1f2a9b2f3f252465830a5f99786a654e366e7b3a84db89f8963ecc0943b2daea460056f9f64ab138ee6b4f2454d317073f782ea013587 SHA512 eda0a3c1622319d7a0a5ea01b7af3c367c7efd9427a08cba345b2df9e268e825fd400ee2c7c73d237ba135923f6b1ee36e323e302255b4857158701c8bfeff6f
 MISC metadata.xml 1263 BLAKE2B e3df52a90f366a1c7f6f754908f31455322c8b0da826ee1f121925a231c4f8cb74961ba9ca49607336310e5f7176ad8ff0610220a4888f2dcd004f2bce44ecfe SHA512 48e7b7051b9172bae3816e1e2737371a9253cff443a03953b373becc9bcaf152e63a341f7a97a00adae283aeab003cd0765514ba30988994a59570314ab00df0
diff --git a/net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch b/net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch
new file mode 100644
index 000000000000..e3db8f754093
--- /dev/null
+++ b/net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch
@@ -0,0 +1,93 @@
+From 842e2859669f8a721c10c4f8d019f78f37e29e48 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sun, 20 Sep 2020 16:28:39 +0200
+Subject: [PATCH] mcproxy/mcproxy.pro: fix compilation with clang
+
+If -L/usr/lib is being included, this will break compiling on 64-bit with clang.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ mcproxy/mcproxy.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mcproxy.pro b/mcproxy.pro
+index 5216198..b576b3c 100644
+--- a/mcproxy.pro
++++ b/mcproxy.pro
+@@ -15,7 +15,7 @@ tester {
+     HEADERS += include/tester/config_map.hpp \
+            include/tester/tester.hpp
+ 
+-    LIBS += -L/usr/lib -lboost_regex
++    LIBS += -lboost_regex
+ }
+ 
+ mcproxy { #default mode
+@@ -123,7 +123,7 @@ HEADERS += include/hamcast_logging.h \
+            include/parser/parser.hpp \
+            include/parser/interface.hpp
+ 
+-LIBS += -L/usr/lib -lpthread 
++LIBS += -lpthread
+ 
+ QMAKE_CLEAN += thread* 
+   
+From 5b2f3e3e2ea23c3bb8e72a90e18177f69e350d37 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sun, 20 Sep 2020 16:38:03 +0200
+Subject: [PATCH] include/proxy/message_queue.hpp: fix compilation with clang
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ mcproxy/include/proxy/message_queue.hpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/include/proxy/message_queue.hpp b/include/proxy/message_queue.hpp
+index 347a616..ede35ab 100644
+--- a/include/proxy/message_queue.hpp
++++ b/include/proxy/message_queue.hpp
+@@ -101,7 +101,7 @@ bool message_queue<T, Compare>::is_empty() const
+ {
+     HC_LOG_TRACE("");
+ 
+-    std::lock_guard<std::mutex> lock(m_global_lock);
++    std::lock_guard<std::mutex> lock(this->m_global_lock);
+ 
+     return m_q.empty();
+ }
+@@ -111,7 +111,7 @@ unsigned int message_queue<T, Compare>::size() const
+ {
+     HC_LOG_TRACE("");
+ 
+-    std::lock_guard<std::mutex> lock(m_global_lock);
++    std::lock_guard<std::mutex> lock(this->m_global_lock);
+ 
+     return m_q.size();
+ }
+@@ -130,7 +130,7 @@ bool message_queue<T, Compare>::enqueue_loseable(const T& t)
+     HC_LOG_TRACE("");
+ 
+     {
+-        std::unique_lock<std::mutex> lock(m_global_lock);
++        std::unique_lock<std::mutex> lock(this->m_global_lock);
+         if (m_q.size() < m_size) {
+             m_q.push(t);
+         } else {
+@@ -148,7 +148,7 @@ void message_queue<T, Compare>::enqueue(const T& t)
+     HC_LOG_TRACE("");
+ 
+     {
+-        std::unique_lock<std::mutex> lock(m_global_lock);
++        std::unique_lock<std::mutex> lock(this->m_global_lock);
+         m_q.push(t);
+     }
+     cond_empty.notify_one();
+@@ -162,7 +162,7 @@ T message_queue<T, Compare>::dequeue(void)
+ 
+     T t;
+     {
+-        std::unique_lock<std::mutex> lock(m_global_lock);
++        std::unique_lock<std::mutex> lock(this->m_global_lock);
+         cond_empty.wait(lock, [&]() {
+             return m_q.size() != 0;
+         });
diff --git a/net-misc/mcproxy/files/fix_checksum_calculation.patch b/net-misc/mcproxy/files/mcproxy-1.1.1-fix-checksum-calculation.patch
index 2cbfb6590b72..2cbfb6590b72 100644
--- a/net-misc/mcproxy/files/fix_checksum_calculation.patch
+++ b/net-misc/mcproxy/files/mcproxy-1.1.1-fix-checksum-calculation.patch
diff --git a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
index 77232c3d9926..b264a8937f8f 100644
--- a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
+++ b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
@@ -21,7 +21,10 @@ DEPEND="
 
 S="${WORKDIR}/${P}/${PN}"
 
-PATCHES=( "${FILESDIR}/fix_checksum_calculation.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-clang.patch"
+	"${FILESDIR}/${P}-fix-checksum-calculation.patch"
+)
 
 CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"