gentoo resync : 07.08.2021

11 files changed, 132 insertions, 5 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a4384a6a5585..d87c9dbd7dca 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/gstreamermm/Manifest b/dev-cpp/gstreamermm/Manifest
index b239f1457553..c43bfee7955b 100644
--- a/dev-cpp/gstreamermm/Manifest
+++ b/dev-cpp/gstreamermm/Manifest
@@ -1,3 +1,4 @@
+AUX gstreamermm-1.10.0-no-volatile.patch 856 BLAKE2B 40e2735424873d2dedda0a8ee2fcac848362741a08acb291ffe532e3b6a1d9af8967345f535148692b7322ecc74fb94a244c0841a57f571e6d6a37eda095c1fe SHA512 6babe0b607646c77850512df029be989256403e86010bcc198f782a04f357fbb3580c1015924b46af0ec2f3b9bb3c5b2f96b8a21befba8ee24c877dc32f59660
 DIST gstreamermm-1.10.0.tar.xz 3529640 BLAKE2B 29b99928cd1b21fd295683b4a1ad0a1b0f8ae959237fcbfef7d5a9296a70a140a04fa390fbbcb8d3151d28239f281e72feb30a0466478e38dfb4e172beaf21f1 SHA512 34eeb9eec5958c96acf7c7791eef80138e5d55fea6ddf1bf9ace6b1ec7f052da2abf04d87089e4c9ead51c631ef7afceaf9fceb946ec3d105da522187c69e429
-EBUILD gstreamermm-1.10.0.ebuild 1459 BLAKE2B a3863c41352bac5560958f6077dcbf86824f5fd82c60f022598a05dcfcfd2042d74f37acfb8a0a827e47853a53b598dc94cc267f5122f7004293717d4d288f6f SHA512 2f6e6f1c1554d4d46358e35d3ed6ae69413c70d82212e4674f5c97e8b8464dfe0fb1ab23ea988f09cce485c2fbbe9f9d5df390d764c7036ce4c264cd85228c5e
+EBUILD gstreamermm-1.10.0.ebuild 1510 BLAKE2B 6c6e75c2c7653ede07d0b169fbfe2e55adb638dc446a08d5b5aae35f5c18d7bb622da2ff95ce931e75434e2b2c7dc46e9ccdf9cb646d6859105ad702e3b33533 SHA512 c47f97f245c78b7a9660c44dbc7bf0e6109765439ed332b951d94e1500d1ba596d96784a7be5454f93cb1036412ad30280bc7f095e80f7cfa7ad17ba416ee698
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-cpp/gstreamermm/files/gstreamermm-1.10.0-no-volatile.patch b/dev-cpp/gstreamermm/files/gstreamermm-1.10.0-no-volatile.patch
new file mode 100644
index 000000000000..ede9f910ae14
--- /dev/null
+++ b/dev-cpp/gstreamermm/files/gstreamermm-1.10.0-no-volatile.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/786444
+
+g_once_init_enter(void*) should NOT be passed a volatile argument:
+https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter
+"While location has a volatile qualifier, this is a historical
+artifact and the pointer passed to it should not be volatile."
+--- gstreamermm-1.10.0/gstreamer/gstreamermm/register.h.orig	2017-10-20 12:26:46.000000000 +0300
++++ gstreamermm-1.10.0/gstreamer/gstreamermm/register.h	2021-05-25 17:52:13.031337753 +0300
+@@ -110,7 +110,7 @@
+     /* The typedef for GType may be gulong or gsize, depending on the
+      * system and whether the compiler is c++ or not. The g_once_init_*
+      * functions always take a gsize * though ... */
+-    static volatile gsize gonce_data = 0;
++    static gsize gonce_data = 0;
+     if (g_once_init_enter (&gonce_data)) {
+         GTypeInfo info;
+ 
diff --git a/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild b/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
index 6fdef7109be2..fced073bba0a 100644
--- a/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 # Installs reference docs into /usr/share/doc/gstreamermm-1.0/
 # but that's okay, because the rest of dev-cpp/*mm stuff does the same
 
+PATCHES=(
+	"${FILESDIR}"/${P}-no-volatile.patch
+)
+
 src_prepare() {
 	if ! use examples; then
 		# don't waste time building examples
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
index a111cd72a9c4..59e6e400eb9c 100644
--- a/dev-cpp/robin-hood-hashing/Manifest
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -1,3 +1,3 @@
 DIST robin-hood-hashing-3.11.2.tar.gz 170488 BLAKE2B 5fb688f5e21f989456e139b64447393816593ad2a1c3537d067d8ea1717aceaa879e27616657354f62e1466ca491f9d302448a73cddb53c7156a623eb375016b SHA512 5d55f054e29ae34d410eb0103f9f0aa1faf47e313b9f089c73b9c26fd9bedf132f6bb13b4bcd2664309c32fe7e859e346d0a6e7ab7f46b294f9b8db207577795
-EBUILD robin-hood-hashing-3.11.2.ebuild 498 BLAKE2B 7d0f434430a99db4409d5293b1d72a733b50079a99cd2c87ecddafec5713cc41214ee3f71cb1ae03c4f9f25a2112f824527fdaee1d80c880e5970dfc3e6d5fae SHA512 5ce4a95bcb3f6823f83a5900502cfaed705ba84bc8137946e64e8d31d54934ed7aa79676765b588f951c266b784a0e2f62cac11ef7d291fddf9a435c0d084074
+EBUILD robin-hood-hashing-3.11.2.ebuild 492 BLAKE2B 18958ad16e59d345e69cdd24f4fa2c31a870b90a16241ae252dd9b8973f668b0db46e139ebcaff5be559b524a504267a99b3ea1e202d80c9fc8f99e036b70bd4 SHA512 54c7c9921bb594cfb46c4b5bb7b5233ede6438f0734678f753236faf98e040d3a1a68e4e87c0da2f1ad473d975195f0efefeb34c4d17c24112cc4c67051723bd
 MISC metadata.xml 431 BLAKE2B 301a6f1026a18fd6d6322f95833f515247111fb9bb88d915724c263e167ea93bbc7f72a734c1aa4fffb5e2068a43f42a104446e7dddaf56334c73eb29541481a SHA512 80aac4cd60e6768675f5cf8619b99d7e4d95b3c691dd4cd7400040610abfdc5f9182e166f5b1c301a14380a3216fca87613dd7e4098fe2e1e2330e49f0660654
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
index 40abc80f6978..1a32ac192607 100644
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 2aad5b407296..6732f7ea6805 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -1,6 +1,10 @@
 AUX websocketpp-0.7.0-cmake-install.patch 970 BLAKE2B 2099c37b65d3f685f8b9745d92b481bb6a0434e6305e974c6f613ae44e70e1fa9d7bd577f875ef12228e506361409666099ce024578c5c524cc8fc5fbdef4b70 SHA512 c8b34b80890d8dc828d64e391e9541f7ebd6a18c79d3a5b91c72835745a11bafff110d04e8d75a2df2dba8b65ca1856050009a4eab3871cc2470066f9ad82f44
 AUX websocketpp-0.8.1-boost-1.70.patch 5976 BLAKE2B f3bccde47637c8938b1a0acf95d855692256434be130fafc34311bbbb337c655022b77a301f4524029dc2841e2a47d9975f7fbed3ed004b9bd1ba65d87c6bf30 SHA512 34df3fc78415e0fac8d73a2afb2faa2e1e2bfd6e2ae6458e48a89354dfaeb7f3a8d95c5e5e0ffa2f8d096508e5a9636184b403def95501d027f2c68f5e096052
 AUX websocketpp-0.8.1-disable-test_transport-test_transport_asio_timers.patch 1227 BLAKE2B 26ac496842e4e23d254ba908679399ff8907253434430c887290cbd3b3beb14aaf69834cfc0b8f326f13c0f63ec7da535f0c8b438d20d7c1d2d4b5d5d2afb5cc SHA512 1ef7f2b71dcbeb386cd27bbf97f599f0c056b014423090ceb28e336c0f1527c6f8d6b04931144823c1d1deb14781508a0a6e869f69a9a232978851634f35fa0c
+AUX websocketpp-0.8.2-fix-boost_find_component.patch 950 BLAKE2B 16e80dcdf6a0af95fb7ac8b1c52fd9205379da13787dbd3d023a79a2c6e611ca093f49acc4618d7db0c2397126e4e6ec2cb1633116be658347f2403faee16d7f SHA512 192fd716040e91a6912407778a1c7a208a29ceaaa48aacb0fefddcd622d2ecde68093aff837b0cf4c3d8dc40cd9a5f4714040aa2264a1f8a01190b174a2a12b1
+AUX websocketpp-0.8.2-fix-clang.patch 1042 BLAKE2B 8d453efb82fea72a0a4b2ed5ab7ec44975ee963cbb99cf0c69bcd3ef2eb4482334981c711e9f0780c1f59353b74cf8543528d9889d2cac51ad746a59eae28ab1 SHA512 7c7fdbe70627cd39a4936fb0118a3d347753a1c6150c8801544b753ba4b5cd8c653043035fa164e31f2a41d09662d4abb4429140c14e42e2a195094e06574766
 DIST websocketpp-0.8.1.tar.gz 699468 BLAKE2B e5769229b400d2f42e69541b07cfba17dcc82cdad20685a52ac1130c2fc4e94764a38d2e4f7c36101b11705e10c67eb149ba2c30750e7a6f63696d52c272fed2 SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c
-EBUILD websocketpp-0.8.1-r1.ebuild 1048 BLAKE2B bab31dca0ca2553b82e8065de7058cded1f4a218c11f839dab3f63a0ea7e97e16796c35382658bc4423234b8a0064c05b98d92bcd882d9e1fc319d2a67c7aa25 SHA512 86802c3b45293d8618e879346153328dac604f7c253d080f1188d1242f2180275fadb4c8781101c8440215f9c4cfb08265c51ba04ced011c8ee31c795213cca3
+DIST websocketpp-0.8.2.tar.gz 701364 BLAKE2B dacee33832f493d465afe208f9edea1393414a22c8db8f8c86b8f913521d0d8d68b95673a2e82b7479acfbab1ac541eda2d713a55d5de387b3879461d5884df7 SHA512 b2afc63edb69ce81a3a6c06b3d857b3e8820f0e22300ac32bb20ab30ff07bd58bd5ada3e526ed8ab52de934e0e3a26cad2118b0e68ecf3e5e9e8d7101348fd06
+EBUILD websocketpp-0.8.1-r1.ebuild 1329 BLAKE2B 919d70e8449abeb707221c044f05b05a3bbd8d233e6b04af34c9739a088edc766db533d5ad8b391303f5e5f8ffa26f7523709ac80cec4b3b566715160cc19937 SHA512 786aeaa8da44e43d286ae5cb11aab13e338818568aa20a3fb3a3fade51f4e69b1b88355e7e9a05f13100724efa44d3eee975fdfc0089ae0924be6af226784613
+EBUILD websocketpp-0.8.2.ebuild 1271 BLAKE2B 1f7411b49bf296e3c67e336d94c3f0be5abc4b78a3efbedc19e8fb4551926d0865c9d9339819fd19d7dbaaef2293274e7be843a611209322d6824b4f674bbba0 SHA512 f783b260c9c592bce423117ae53821d6d565f531c00a3154bd021c4aea8797baf14e41f2e90ea66dd58013d82f816ffdf91909f447998baa37d4afece6d98e49
 MISC metadata.xml 329 BLAKE2B bec1c49134f4f6cfd9c8487c0e607d609ed376853bd4022c3dbbee3f3932fb1925af6ec89c9ced2bafba9e3c2db67d3659e12e072e831ea0d3c95c5ae4ae621d SHA512 1cf8076fec3d5f414bc22c1eb74a1ebdb1f5c1711fd0b103c9da5cc8fc8f8fa30367c737d4b97bf22419cda1e327858817ef4b7109d703264ff6df3dd30a843c
diff --git a/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost_find_component.patch b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost_find_component.patch
new file mode 100644
index 000000000000..28f4361f35c1
--- /dev/null
+++ b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost_find_component.patch
@@ -0,0 +1,24 @@
+From 36b73da8958927f975b3d01a062aa6c0e149d97f Mon Sep 17 00:00:00 2001
+From: Peter Thorson <git@zaphoyd.com>
+Date: Mon, 27 Apr 2020 10:34:06 -0500
+Subject: [PATCH] [cmake] Remove quotes that was making it hard for cmake to
+ find newer boost versions. fixes #855
+
+---
+ CMakeLists.txt | 2 +-
+ changelog.md   | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e9c80e84..ffcd8583b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -215,7 +215,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
+     set (Boost_USE_MULTITHREADED TRUE)
+     set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
+ 
+-    find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
++    find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS})
+ 
+     if (Boost_FOUND)
+         # Boost is a project wide global dependency.
diff --git a/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-clang.patch b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-clang.patch
new file mode 100644
index 000000000000..2937ba71aced
--- /dev/null
+++ b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-clang.patch
@@ -0,0 +1,25 @@
+From 2c355d9ef0f3ed73fa96d0c6c31293086df36d74 Mon Sep 17 00:00:00 2001
+From: Peter Thorson <git@zaphoyd.com>
+Date: Sun, 19 Apr 2020 22:33:24 -0500
+Subject: [PATCH] Fix typo in CMakeLists.txt that caused CXX_FLAGS to be
+ improperly quoted. Removed unnecessary hardcoded dependency on libc++ for
+ clang. fixes #859
+
+---
+ CMakeLists.txt | 2 +-
+ changelog.md   | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dcf90d1c8..3e9c80e84 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,7 +152,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
+         endif()
+         set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
+         set (WEBSOCKETPP_BOOST_LIBS system thread)
+-        set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
++        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+         if (NOT APPLE)
+             add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?
+         endif ()
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
index 051e22e7eeb3..df98a5ee6164 100644
--- a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
+++ b/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,10 @@ PATCHES=(
 	# disable tests that are timing sensitive
 	# https://bugzilla.redhat.com/show_bug.cgi?id=1461069
 	"${FILESDIR}"/${PN}-0.8.1-disable-test_transport-test_transport_asio_timers.patch
+	# https://github.com/zaphoyd/websocketpp/commit/36b73da8958927f975b3d01a062aa6c0e149d97f
+	"${FILESDIR}"/${PN}-0.8.2-fix-boost_find_component.patch
+	# https://github.com/zaphoyd/websocketpp/commit/2c355d9ef0f3ed73fa96d0c6c31293086df36d74
+	"${FILESDIR}"/${PN}-0.8.2-fix-clang.patch
 )
 
 src_configure() {
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
new file mode 100644
index 000000000000..3e9339f27dba
--- /dev/null
+++ b/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++/Boost Asio based websocket client/server library"
+HOMEPAGE="https://www.zaphoyd.com/websocketpp"
+SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost )"
+RDEPEND="dev-libs/boost"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-cmake-install.patch
+	# disable tests that are timing sensitive
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1461069
+	"${FILESDIR}"/${PN}-0.8.1-disable-test_transport-test_transport_asio_timers.patch
+	# https://github.com/zaphoyd/websocketpp/commit/36b73da8958927f975b3d01a062aa6c0e149d97f
+	"${FILESDIR}"/${P}-fix-boost_find_component.patch
+	# https://github.com/zaphoyd/websocketpp/commit/2c355d9ef0f3ed73fa96d0c6c31293086df36d74
+	"${FILESDIR}"/${P}-fix-clang.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CPP11=ON
+		-DBUILD_TESTS="$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}