gentoo auto-resync : 10:10:2023 - 06:08:39

4 files changed, 60 insertions, 1 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 3abc0151dfbd..d868d855e968 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/pokerth/Manifest b/games-board/pokerth/Manifest
index 5cb5438e3096..98bab0601590 100644
--- a/games-board/pokerth/Manifest
+++ b/games-board/pokerth/Manifest
@@ -2,8 +2,9 @@ AUX pokerth-1.1.1-boost-1.65-ambiguous-advance.patch 465 BLAKE2B 4b7cb201233754c
 AUX pokerth-1.1.2-boost-1.66.patch 1655 BLAKE2B 392d570f3d5f204f148f9d3544e339e47d268beb71d334f98448efed01b3dc12ecb62fc2d3dbfc727b28f4611e97e3dcbb9dac366a5b4168a5c4dffb6ba41f13 SHA512 1e7c2fe643f577f88b6aad3825f514fb6b6165c6e02fed29778d1e3483ffb9a29074d0504197ab16e822b375cb0ad923ab58a5742623ced1a5d706ce91733cfe
 AUX pokerth-1.1.2-boost-1.73.patch 2281 BLAKE2B 590eba328d373a9a539bf1d433ec4a0794a2489cc6562f5e301cd12916ba92422dfe7f9766db8cc13ccb6c2f81ec0f25325824957e37001e8f2f755767a48b5d SHA512 b68e116123edef753346c537112366cf2c35c06547ea828f3ab65294acabf3a85e8bdfffb305c1e8a142560a60b313014842e7f039a4c51bc5f5ee54ec81943c
 AUX pokerth-1.1.2-fix-includes.patch 3415 BLAKE2B 376286a1d125493804f894498d1f1ed4177b9abe4b1c5e3143a0d5d4da162fbe4f5e165c7abe38d58c374ab32e33baaf23df10f06ccb4c0fccc702a438c494d8 SHA512 fa3d67530ee52a00e63d73953f242b9201561b96b8ae73f26b27f3d54400719be65739e43377c5b2ae806d215fa9b5ba099838435948413e7581728d8ae9bef4
+AUX pokerth-1.1.2-protobuf-23.patch 1475 BLAKE2B 9dacf8f5785596e68677034d939b88aeb6ccc0c4d5a8ef950f8ec317b350674abcae0a90cc4c03b8d0008aae03eebe3a0a220ad2cc2011a44097deeeff2fb5ac SHA512 a8f6222fa7324f9aa7757df9e5ed03f339828e0cc4c904224fcf88d8523eb8ec408fbdc6576345eab9439d8fee8ef4608d744b114862f4cc1491978ba4793d09
 AUX pokerth-1.1.2-protobuf.patch 603 BLAKE2B 258ab192bf8c27266bc96103adfd52c0da9d719f07da674d31411f3248106fe919be741ab2829a250dba34e6eeaf023f9fbd6517581418c7f77b080ad47e34ab SHA512 ddb0ec7f60a0e494822e9c7abe9c9658c5df3b27e6be99624c5c959f0cc8db58ad13fb00ea947cfd3e81e48278ff27af8d09fec5e5c3acf31fe78ce70db89e1b
 AUX pokerth-1.1.2-system-websockets.patch 470 BLAKE2B ebf6e3f78917aac19c4bbae4b0ed34bde7613b9259aae5bd74fb6e2c820ff5f865265731e61e79b1a3d89a936ac8ebd4eb7f67a775389a956670e4a444cd263b SHA512 ad93bf9718375c0f04ee6a6a679d788ef404c02f980b0498e483363a9f96b6992951b0c9ac3710ce415f6dd985f1b25170842a7928d3552aba4c1a4fe45a7ed8
 DIST pokerth-1.1.2.tar.gz 21354306 BLAKE2B d8e1ecc46e61d9c16ae3949099f6e72271a5ab2def9799652b0c612980e0c5e96cb2ccf4d659c1a90b9ac6433af95587fa5d44af80c16fb6a34a272751c9fc4a SHA512 d54c84f199636eb5a53580213e5e4ccc828cf565bf4b055797daa82e2ad54d8c52c7a16a781b82c8cc89d184a2b3c4105922394d08c7d2e06383b96963c36b5a
-EBUILD pokerth-1.1.2-r1.ebuild 1727 BLAKE2B c79caed7a5f7ad8ab37a879d7f9e9aafaec8122553a8c83d8ca29d676bccf2eb0201ee1f51e778f909166dae4a7ee6486ed28ca3e1597ec5f6ee3c1b8b12b6e4 SHA512 7f54f8dcd624d86392469e89033b4980314f9ce6a29763cea1b1441d25c64112f96ad224cd2936b5aaf633b50e6a327c9acaba5e3f8ad3e8a0343919d971e3d6
+EBUILD pokerth-1.1.2-r1.ebuild 1772 BLAKE2B 0faa1ff859860a3e5edd5bc8adcc2159560c7afe5bc73e78598e404ee67262e45d24a39298bd0eb5f03615ebba8d0e4c85320c7e5f1ce847fbad959239b2fc5a SHA512 ba18f6f20d67e2d1347c6d2148343ea800d62a848780b2991d1fa98173f82640accc95fe865d286a3d229f8baa18508dc343db41b4261f913bcc9ec603656497
 MISC metadata.xml 341 BLAKE2B ef48df7fbe2a33161c02b41c2cd9a77f3475771fc4b45b1a77949efbb42550174af0813beead969af54b350019175262445b8f47b0b67889d525abac42288203 SHA512 315127e17a6bec8caa7a3cddf8583ae0e9262441a8561225c7509607071f0eb473eeac121fd13766b9c43db8f0708e578e09b65401a165435fafdf079bf182d8
diff --git a/games-board/pokerth/files/pokerth-1.1.2-protobuf-23.patch b/games-board/pokerth/files/pokerth-1.1.2-protobuf-23.patch
new file mode 100644
index 000000000000..4907b7541969
--- /dev/null
+++ b/games-board/pokerth/files/pokerth-1.1.2-protobuf-23.patch
@@ -0,0 +1,57 @@
+From da0855690cfec5129a60dfe33128ebd393389989 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan@steils.org>
+Date: Tue, 10 Oct 2023 00:30:29 +0000
+Subject: [PATCH] Fix linking with protobuf 23
+
+---
+ chatcleaner.pro    | 2 ++
+ pokerth_game.pro   | 4 +++-
+ pokerth_server.pro | 4 +++-
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/chatcleaner.pro b/chatcleaner.pro
+index 6d63b4a9..d9f50ab4 100644
+--- a/chatcleaner.pro
++++ b/chatcleaner.pro
+@@ -38,6 +38,8 @@ LIBPATH += lib
+ LIBS += -lpokerth_lib \
+ 	-lpokerth_protocol \
+ 	-lprotobuf \
++	-labsl_log_internal_check_op \
++	-labsl_log_internal_message \
+ 	-ltinyxml
+ 
+ win32 {
+diff --git a/pokerth_game.pro b/pokerth_game.pro
+index 2c188e44..9ef53666 100644
+--- a/pokerth_game.pro
++++ b/pokerth_game.pro
+@@ -524,7 +524,9 @@ unix:!mac {
+ 		kFreeBSD = $$find(UNAME, "kFreeBSD")
+ 		LIBS += -lsqlite3 \
+ 				-ltinyxml \
+-				-lprotobuf
++				-lprotobuf \
++				-labsl_log_internal_check_op \
++				-labsl_log_internal_message
+ 		LIBS += $$BOOST_LIBS
+ 		LIBS += -lSDL \
+ 				-lSDL_mixer \
+diff --git a/pokerth_server.pro b/pokerth_server.pro
+index ccaff69e..20cc3eca 100644
+--- a/pokerth_server.pro
++++ b/pokerth_server.pro
+@@ -285,7 +285,9 @@ unix : !mac {
+ 	LIBS += $$BOOST_LIBS
+ 	LIBS += -lsqlite3 \
+ 			-ltinyxml \
+-			-lprotobuf
++			-lprotobuf \
++			-labsl_log_internal_check_op \
++			-labsl_log_internal_message
+ 	LIBS += -lgsasl
+ 	!isEmpty( BSD ): isEmpty( kFreeBSD ){
+ 		LIBS += -lcrypto -liconv
+-- 
+2.42.0
+
diff --git a/games-board/pokerth/pokerth-1.1.2-r1.ebuild b/games-board/pokerth/pokerth-1.1.2-r1.ebuild
index 17063c8c8b00..76847f7d9fb7 100644
--- a/games-board/pokerth/pokerth-1.1.2-r1.ebuild
+++ b/games-board/pokerth/pokerth-1.1.2-r1.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
 	# unbundle dev-cpp/websocketpp
 	"${FILESDIR}"/${PN}-1.1.2-system-websockets.patch
 	"${FILESDIR}"/${PN}-1.1.2-boost-1.73.patch
+	"${FILESDIR}"/${PN}-1.1.2-protobuf-23.patch
 )
 
 src_prepare() {