gentoo auto-resync : 13:07:2024 - 12:26:41

3 files changed, 252 insertions, 1 deletions

diff --git a/games-board/pokerth/Manifest b/games-board/pokerth/Manifest
index dcd80d6be8df..7fce0ffccdee 100644
--- a/games-board/pokerth/Manifest
+++ b/games-board/pokerth/Manifest
@@ -1,10 +1,11 @@
 AUX pokerth-1.1.1-boost-1.65-ambiguous-advance.patch 465 BLAKE2B 4b7cb201233754ce5bc57338e7bcc8c03baebf3c021a34f01cfe221fba9062b6d2a51a5ee4c5644f0535de7a7bdccb27b6ae488a94fbcbcc2863b763a3b5103a SHA512 af91b98c04f844504c46b01c76a360d00bfe3993d6acdbc9800f2466833da42ad5e76a0ca3e197cb63aca10e4cb1eae73996b67691587eae2f2ee3975a33410e
 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-boost-1.85.patch 10725 BLAKE2B 0866b1492532b55a6a856b29d666e1554498793e5d28753b878e247a265238157790087bb2a1dd9870bd348733d92c55d7904c532d06d3ee372129d45cc45aea SHA512 90c5e4a3b8306e5ab2f4db48dd8fe692399fd697a3cac8fbea2829ae0f261cc00e80f29c542184f329dcc7b8e7b6d7fedbbb5842b7e58938479b4ee10283797f
 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 1785 BLAKE2B ccbd892270ab03cd3065643c19a20c0f564622f5097bb88355512aed6d623cbb103649ac5455c39de3cc65af0772ab5b70dcf0d8c50850a140fbeb054f062a79 SHA512 483d204bd94c2ddcbc60fd1f4b5bde3be69995332e386da5d8df6bbba2a67a21ea6fd4a9499152ab318cd2220a4df9dde00671e25b2d48b5100439d4d8d88b60
+EBUILD pokerth-1.1.2-r1.ebuild 1829 BLAKE2B 9bdb92cb6e92ca0b78a206e34bb53fca45eec1c40cfd96acaba08d48a2240e1e98f9dd5f17b12fa94e639410d5414615448266a15b339f71655452271e0d2baf SHA512 45db1ba1e952f11a407996c9e243a03b04d3dbb80ee1f36616df293475d0f0a8dea9117aadd18cc1cfd23d1b8fec45853ae9d9df7ffe93e1596ecc77ac45c2ab
 MISC metadata.xml 341 BLAKE2B ef48df7fbe2a33161c02b41c2cd9a77f3475771fc4b45b1a77949efbb42550174af0813beead969af54b350019175262445b8f47b0b67889d525abac42288203 SHA512 315127e17a6bec8caa7a3cddf8583ae0e9262441a8561225c7509607071f0eb473eeac121fd13766b9c43db8f0708e578e09b65401a165435fafdf079bf182d8
diff --git a/games-board/pokerth/files/pokerth-1.1.2-boost-1.85.patch b/games-board/pokerth/files/pokerth-1.1.2-boost-1.85.patch
new file mode 100644
index 000000000000..c928afa4f136
--- /dev/null
+++ b/games-board/pokerth/files/pokerth-1.1.2-boost-1.85.patch
@@ -0,0 +1,249 @@
+https://bugs.gentoo.org/933265
+--- a/src/core/common/avatarmanager.cpp
++++ b/src/core/common/avatarmanager.cpp
+@@ -87,20 +87,20 @@ AvatarManager::Init(const string &dataDir, const string &cacheDir)
+ 	path tmpDataPath(dataDir);
+ 	{
+ 		boost::mutex::scoped_lock lock(m_cacheDirMutex);
+-		m_cacheDir = tmpCachePath.directory_string();
++		m_cacheDir = tmpCachePath.string();
+ 	}
+ 	{
+ 		boost::mutex::scoped_lock lock(m_avatarsMutex);
+-		tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").directory_string(), m_avatars);
++		tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").string(), m_avatars);
+ 		retVal = retVal && tmpRet;
+-		tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").directory_string(), m_avatars);
++		tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").string(), m_avatars);
+ 		retVal = retVal && tmpRet;
+ 	}
+ 	if (cacheDir.empty() || tmpCachePath.empty())
+ 		LOG_ERROR("Cache directory was not set!");
+ 	else {
+ 		boost::mutex::scoped_lock lock(m_cachedAvatarsMutex);
+-		tmpRet = InternalReadDirectory(tmpCachePath.directory_string(), m_cachedAvatars);
++		tmpRet = InternalReadDirectory(tmpCachePath.string(), m_cachedAvatars);
+ 		retVal = retVal && tmpRet;
+ 	}
+ 
+@@ -113,7 +113,7 @@ AvatarManager::AddSingleAvatar(const std::string &fileName)
+ {
+ 	bool retVal = false;
+ 	path filePath(fileName);
+-	string tmpFileName(filePath.file_string());
++	string tmpFileName(filePath.string());
+ 
+ 	if (!fileName.empty() && !tmpFileName.empty()) {
+ 		unsigned outFileSize = 0;
+@@ -240,7 +240,7 @@ AvatarManager::GetAvatarFileType(const string &fileName)
+ 	AvatarFileType fileType;
+ 
+ 	path filePath(fileName);
+-	string ext(extension(filePath));
++	string ext(filePath.extension().string());
+ 	if (boost::algorithm::iequals(ext, ".png"))
+ 		fileType = AVATAR_FILE_TYPE_PNG;
+ 	else if (boost::algorithm::iequals(ext, ".jpg") || boost::algorithm::iequals(ext, ".jpeg"))
+@@ -362,7 +362,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil
+ 			if (IsValidAvatarFileType(avatarFileType, data, size)) {
+ 				path tmpPath(cacheDir);
+ 				tmpPath /= (md5buf.ToString() + ext);
+-				string fileName(tmpPath.file_string());
++				string fileName(tmpPath.string());
+ 				std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc);
+ 				if (!o.fail()) {
+ 					o.write((const char *)data, size);
+@@ -426,7 +426,7 @@ AvatarManager::RemoveOldAvatarCacheEntries()
+ 	}
+ 	try {
+ 		path cachePath(cacheDir);
+-		cacheDir = cachePath.directory_string();
++		cacheDir = cachePath.string();
+ 		// Never delete anything if we do not have a special cache dir set.
+ 		if (!cacheDir.empty()) {
+ 			boost::mutex::scoped_lock lock(m_cachedAvatarsMutex);
+@@ -441,12 +441,12 @@ AvatarManager::RemoveOldAvatarCacheEntries()
+ 				while (i != end) {
+ 					bool keepFile = false;
+ 					path filePath(i->second);
+-					string fileString(filePath.file_string());
++					string fileString(filePath.string());
+ 					// Only consider files which are definitely in the cache dir.
+ 					if (fileString.size() > cacheDir.size() && fileString.substr(0, cacheDir.size()) == cacheDir) {
+ 						// Only consider files with MD5 as file name.
+ 						MD5Buf tmpBuf;
+-						if (exists(filePath) && tmpBuf.FromString(basename(filePath))) {
++						if (exists(filePath) && tmpBuf.FromString(filePath.stem().string())) {
+ 							timeMap.insert(TimeAvatarMap::value_type(last_write_time(filePath), i->first));
+ 							keepFile = true;
+ 						}
+@@ -520,10 +520,10 @@ AvatarManager::InternalReadDirectory(const std::string &dir, AvatarMap &avatars)
+ 			directory_iterator end;
+ 
+ 			while (i != end) {
+-				if (is_regular(i->status())) {
+-					string md5sum(basename(i->path()));
++				if (is_regular_file(i->status())) {
++					string md5sum(i->path().stem().string());
+ 					MD5Buf md5buf;
+-					string fileName(i->path().file_string());
++					string fileName(i->path().string());
+ 					if (md5buf.FromString(md5sum)) {
+ 						// Only consider files with md5sum as name.
+ 						avatars.insert(AvatarMap::value_type(md5buf, fileName));
+--- a/src/core/common/loghelper_server.cpp
++++ b/src/core/common/loghelper_server.cpp
+@@ -59,7 +59,7 @@ loghelper_init(const string &logDir, int logLevel)
+ 	path tmpLogFile(logDir);
+ 	tmpLogFile /= SERVER_MSG_LOG_FILE_NAME;
+ 
+-	g_logFile = tmpLogFile.directory_string();
++	g_logFile = tmpLogFile.string();
+ 	g_logLevel = logLevel;
+ }
+ 
+--- a/src/engine/log.cpp
++++ b/src/engine/log.cpp
+@@ -84,7 +84,7 @@ Log::init()
+ 				mySqliteLogFileName /= string("pokerth-log-") + curDateTime + ".pdb";
+ 
+ 				// open sqlite-db
+-				sqlite3_open(mySqliteLogFileName.directory_string().c_str(), &mySqliteLogDb);
++				sqlite3_open(mySqliteLogFileName.string().c_str(), &mySqliteLogDb);
+ 				if( mySqliteLogDb != 0 ) {
+ 
+ 					int i;
+--- a/src/engine/log.h
++++ b/src/engine/log.h
+@@ -73,7 +73,7 @@ public:
+ 
+ 	std::string getMySqliteLogFileName()
+ 	{
+-		return mySqliteLogFileName.directory_string();
++		return mySqliteLogFileName.string();
+ 	}
+ 
+ private:
+--- a/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp
++++ b/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp
+@@ -65,7 +65,7 @@ std::string
+ NonQtHelper::getDataPathStdString(const char *argv0)
+ {
+ 	boost::filesystem::path startPath(argv0);
+-	startPath = startPath.remove_leaf();
++	startPath = startPath.remove_filename();
+ 	startPath /= "data";
+-	return stringToUtf8(startPath.directory_string());
++	return stringToUtf8(startPath.string());
+ }
+--- a/src/net/common/clientstate.cpp
++++ b/src/net/common/clientstate.cpp
+@@ -211,7 +211,7 @@ ClientStateStartServerListDownload::Enter(boost::shared_ptr<ClientThread> client
+ 	} else {
+ 		// Download the server list.
+ 		boost::shared_ptr<DownloadHelper> downloader(new DownloadHelper);
+-		downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.directory_string());
++		downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.string());
+ 		ClientStateDownloadingServerList::Instance().SetDownloadHelper(downloader);
+ 		client->SetState(ClientStateDownloadingServerList::Instance());
+ 	}
+@@ -303,13 +303,13 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client)
+ 	path zippedServerListPath(context.GetCacheDir());
+ 	zippedServerListPath /= context.GetServerListUrl().substr(context.GetServerListUrl().find_last_of('/') + 1);
+ 	path xmlServerListPath;
+-	if (extension(zippedServerListPath) == ".z") {
+-		xmlServerListPath = change_extension(zippedServerListPath, "");
++	if (zippedServerListPath.extension().string() == ".z") {
++		xmlServerListPath = zippedServerListPath.replace_extension("");
+ 
+ 		// Unzip the file using zlib.
+ 		try {
+-			std::ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary);
+-			std::ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc);
++			std::ifstream inFile(zippedServerListPath.string().c_str(), ios_base::in | ios_base::binary);
++			std::ofstream outFile(xmlServerListPath.string().c_str(), ios_base::out | ios_base::trunc);
+ 			boost::iostreams::filtering_streambuf<boost::iostreams::input> in;
+ 			in.push(boost::iostreams::zlib_decompressor());
+ 			in.push(inFile);
+@@ -321,7 +321,7 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client)
+ 		xmlServerListPath = zippedServerListPath;
+ 
+ 	// Parse the server address.
+-	TiXmlDocument doc(xmlServerListPath.directory_string());
++	TiXmlDocument doc(xmlServerListPath.string());
+ 
+ 	if (doc.LoadFile()) {
+ 		client->ClearServerInfoMap();
+--- a/src/net/common/clientthread.cpp
++++ b/src/net/common/clientthread.cpp
+@@ -977,7 +977,7 @@ ClientThread::GetCacheServerListFileName()
+ 	size_t pos = serverListUrl.find_last_of('/');
+ 	if (!GetContext().GetCacheDir().empty() && !serverListUrl.empty() && pos != string::npos && ++pos < serverListUrl.length()) {
+ 		tmpServerListPath /= serverListUrl.substr(pos);
+-		fileName = tmpServerListPath.directory_string();
++		fileName = tmpServerListPath.string();
+ 	}
+ 	return fileName;
+ }
+--- a/src/net/common/downloaderthread.cpp
++++ b/src/net/common/downloaderthread.cpp
+@@ -96,7 +96,7 @@ DownloaderThread::Main()
+ 				// Previous download was finished.
+ 				if (m_curDownloadData) {
+ 					path filepath(m_curDownloadData->filename);
+-					std::ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary);
++					std::ifstream instream(filepath.string().c_str(), ios_base::in | ios_base::binary);
+ 					// Find out file size.
+ 					// Not fully portable, but works on win/linux/mac.
+ 					instream.seekg(0, ios_base::beg);
+@@ -132,7 +132,7 @@ DownloaderThread::Main()
+ 				}
+ 				if (m_curDownloadData && !m_curDownloadData->filename.empty()) {
+ 					path filepath(m_curDownloadData->filename);
+-					m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string());
++					m_downloadHelper->Init(m_curDownloadData->address, filepath.string());
+ 					m_downloadInProgress = true;
+ 				}
+ 			}
+--- a/src/net/common/serverlobbythread.cpp
++++ b/src/net/common/serverlobbythread.cpp
+@@ -275,7 +275,7 @@ ServerLobbyThread::Init(const string &logDir)
+ 		boost::filesystem::path logPath(logDir);
+ 		if (!logDir.empty()) {
+ 			logPath /= SERVER_STATISTICS_FILE_NAME;
+-			m_statisticsFileName = logPath.directory_string();
++			m_statisticsFileName = logPath.string();
+ 			ReadStatisticsFile();
+ 		}
+ 	}
+@@ -1261,7 +1261,7 @@ ServerLobbyThread::HandleNetPacketAvatarEnd(boost::shared_ptr<SessionData> sessi
+ 				// Init finished - start session.
+ 				EstablishSession(session);
+ 				LOG_MSG("Client \"" << session->GetClientAddr() << "\" uploaded avatar \""
+-						<< boost::filesystem::path(avatarFileName).file_string() << "\".");
++						<< boost::filesystem::path(avatarFileName).string() << "\".");
+ 			} else
+ 				SessionError(session, ERR_NET_WRONG_AVATAR_SIZE);
+ 		}
+--- a/src/net/common/uploaderthread.cpp
++++ b/src/net/common/uploaderthread.cpp
+@@ -94,7 +94,7 @@ UploaderThread::Main()
+ 						url += filepath.filename().string();
+ #endif
+ 					}
+-					m_uploadHelper->Init(url, filepath.file_string(), data.user, data.pwd, data.filesize, data.httpPost);
++					m_uploadHelper->Init(url, filepath.string(), data.user, data.pwd, data.filesize, data.httpPost);
+ 					m_uploadInProgress = true;
+ 				}
+ 			}
+--- a/src/pokerth_server.cpp
++++ b/src/pokerth_server.cpp
+@@ -158,7 +158,7 @@ main(int argc, char *argv[])
+ 	if (pidFile.empty()) {
+ 		path tmpPidPath(myConfig->readConfigString("LogDir"));
+ 		tmpPidPath /= "pokerth.pid";
+-		pidFile = tmpPidPath.directory_string();
++		pidFile = tmpPidPath.string();
+ 	}
+ 	{
+ 		std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc);
diff --git a/games-board/pokerth/pokerth-1.1.2-r1.ebuild b/games-board/pokerth/pokerth-1.1.2-r1.ebuild
index a5ec7b42c8e1..70d57e0843f2 100644
--- a/games-board/pokerth/pokerth-1.1.2-r1.ebuild
+++ b/games-board/pokerth/pokerth-1.1.2-r1.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${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
+	"${FILESDIR}"/${PN}-1.1.2-boost-1.85.patch
 )
 
 src_prepare() {