gentoo resync : 18.08.2019

5 files changed, 179 insertions, 11 deletions

diff --git a/games-board/pokerth/Manifest b/games-board/pokerth/Manifest
index 68feac3f8ed5..cb44070afca2 100644
--- a/games-board/pokerth/Manifest
+++ b/games-board/pokerth/Manifest
@@ -1,5 +1,8 @@
 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-fix-includes.patch 3415 BLAKE2B 376286a1d125493804f894498d1f1ed4177b9abe4b1c5e3143a0d5d4da162fbe4f5e165c7abe38d58c374ab32e33baaf23df10f06ccb4c0fccc702a438c494d8 SHA512 fa3d67530ee52a00e63d73953f242b9201561b96b8ae73f26b27f3d54400719be65739e43377c5b2ae806d215fa9b5ba099838435948413e7581728d8ae9bef4
 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.ebuild 1529 BLAKE2B b70fb4c0b45415fd6ccfc5647e294fa5ad411727b0efc92069489d3ede86d5b5384538d00128b1a8bbc088f6566e3a1288c1e2e19155f64cd59df361713c6884 SHA512 f0fdb0ff044e8e7a378a223c773b82c040af400fda4eda7b26ddab6694dbc776de97c27f11249ec407dcd107766df221cff946612207f24e4caa49ffb6001bef
+EBUILD pokerth-1.1.2.ebuild 1688 BLAKE2B 915bf164b1022fbd3862b9fd0be7d34507c720d5332f22758459abcc922ad0468f6240515b9ac4d277f2be3f5e839dc2a68296fd45c94bd2c011a43b91f607c7 SHA512 13bdebfddf8f2f0b851f49eb90383f82ac534d6ee0f00c67e266bda04ef621c7a03d18f7ed2fa5ea7b6c8e86c3fdba88f9acb56e45e27878bf14cc0e6ff554df
 MISC metadata.xml 340 BLAKE2B e271d172e85302ebcaf0ad3f355035e16056764ae73b01faf494659f0b82c9b0060448e518732e56b13c25ad676156124b11b28ebfdff4697eddc4524ddaf278 SHA512 640db7890ea68059399c50c0ab24c337e0a4cd1c977c2b87198ee9af25e39547fadd3fd83f081da6afa62ae9a9ae2fa450b45a83519d66b036e357ecc3e9b705
diff --git a/games-board/pokerth/files/pokerth-1.1.2-boost-1.66.patch b/games-board/pokerth/files/pokerth-1.1.2-boost-1.66.patch
new file mode 100644
index 000000000000..94eb5b2c5701
--- /dev/null
+++ b/games-board/pokerth/files/pokerth-1.1.2-boost-1.66.patch
@@ -0,0 +1,38 @@
+Description: Fix build failure with deprecated io_control in boost 1.66
+Origin: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224123
+Last-Update: 2018-09-11
+
+Index: pokerth-1.1.2/src/net/common/clientthread.cpp
+===================================================================
+--- pokerth-1.1.2.orig/src/net/common/clientthread.cpp
++++ pokerth-1.1.2/src/net/common/clientthread.cpp
+@@ -993,8 +993,12 @@
+ 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6()));
+ 		else
+ 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4()));
++#if BOOST_VERSION < 106600
+ 		boost::asio::socket_base::non_blocking_io command(true);
+ 		newSock->io_control(command);
++#else
++		newSock->non_blocking(true);
++#endif
+ 		newSock->set_option(tcp::no_delay(true));
+ 		newSock->set_option(boost::asio::socket_base::keep_alive(true));
+ 
+Index: pokerth-1.1.2/src/net/serveraccepthelper.h
+===================================================================
+--- pokerth-1.1.2.orig/src/net/serveraccepthelper.h
++++ pokerth-1.1.2/src/net/serveraccepthelper.h
+@@ -122,8 +122,12 @@
+ 					  const boost::system::error_code &error)
+ 	{
+ 		if (!error) {
++#if BOOST_VERSION < 106600
+ 			boost::asio::socket_base::non_blocking_io command(true);
+ 			acceptedSocket->io_control(command);
++#else
++			acceptedSocket->non_blocking(true);
++#endif
+ 			acceptedSocket->set_option(typename P::no_delay(true));
+ 			acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true));
+ 			boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));
diff --git a/games-board/pokerth/files/pokerth-1.1.2-fix-includes.patch b/games-board/pokerth/files/pokerth-1.1.2-fix-includes.patch
new file mode 100644
index 000000000000..f03ff0dae4db
--- /dev/null
+++ b/games-board/pokerth/files/pokerth-1.1.2-fix-includes.patch
@@ -0,0 +1,106 @@
+Description: fix build failure due to including -isystem /usr/include before everything else
+ (usr/include is already included by the compiler itself)
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Last-Update: 2018-10-02
+
+--- a/chatcleaner.pro
++++ b/chatcleaner.pro
+@@ -49,7 +49,6 @@
+ !win32{
+ 	##### My release static build options
+ 	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+-	INCLUDEPATH += $${PREFIX}/include
+ }
+ mac {
+ 	# make it x86_64 only
+--- a/connectivity.pro
++++ b/connectivity.pro
+@@ -40,7 +40,6 @@
+ 	#QMAKE_LFLAGS += -Wl,--gc-sections
+ 
+ 	QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
+-	INCLUDEPATH += $${PREFIX}/include
+ 	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
+ 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
+ 	BOOST_SYS = boost_system boost_system-mt
+--- a/load.pro
++++ b/load.pro
+@@ -41,7 +41,6 @@
+ 	#QMAKE_LFLAGS += -Wl,--gc-sections
+ 
+ 	QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
+-	INCLUDEPATH += $${PREFIX}/include
+ 	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
+ 	BOOST_THREAD = boost_thread boost_thread-mt
+ 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
+--- a/pokerth_dbofficial.pro
++++ b/pokerth_dbofficial.pro
+@@ -73,7 +73,7 @@
+ !win32 { 
+     # #### My release static build options
+     # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+-    INCLUDEPATH += /usr/include \
++    INCLUDEPATH += \
+         /usr/include/mysql \
+         /usr/include/mysql++
+     INCLUDEPATH += /opt/boost/include
+--- a/pokerth_db.pro
++++ b/pokerth_db.pro
+@@ -52,7 +52,6 @@
+ !win32{

+ 	##### My release static build options

+ 	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections

+-	INCLUDEPATH += $${PREFIX}/include

+ }

+ 

+ mac{

+--- a/pokerth_game.pro
++++ b/pokerth_game.pro
+@@ -405,7 +405,6 @@
+ 	# #### My release static build options
+ 	# QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+ 	# QMAKE_LFLAGS += -Wl,--gc-sections
+-	INCLUDEPATH += $${PREFIX}/include
+ 	QMAKE_LIBDIR += lib
+ 	!android{
+ 		LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
+--- a/pokerth_lib.pro
++++ b/pokerth_lib.pro
+@@ -269,7 +269,7 @@
+ 		src/dbofficial/asyncdbadminplayers.cpp \
+ 		src/dbofficial/asyncdbblockplayer.cpp \
+ 		src/dbofficial/dbidmanager.cpp
+-    INCLUDEPATH += /usr/include \
++    INCLUDEPATH += \
+         /usr/include/mysql \
+         /usr/include/mysql++
+ }
+@@ -286,7 +286,7 @@
+ !win32{
+ 	##### My release static build options
+ 	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+-	INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include
++	INCLUDEPATH += opt/gsasl/include
+ }
+ 
+ mac{
+--- a/pokerth_protocol.pro
++++ b/pokerth_protocol.pro
+@@ -40,7 +40,6 @@
+ 	system(protoc pokerth.proto --java_out=tests/src)
+ }
+ unix : !mac {
+-        INCLUDEPATH += $${PREFIX}/include
+ 	system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
+ 	system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf)
+ 	system(protoc pokerth.proto --java_out=tests/src)
+--- a/pokerth_server.pro
++++ b/pokerth_server.pro
+@@ -177,7 +177,6 @@
+ 	#QMAKE_LFLAGS += -Wl,--gc-sections
+ 
+ 	LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
+-	INCLUDEPATH += $${PREFIX}/include
+ 	# see issue https://github.com/pokerth/pokerth/issues/282
+ 	INCLUDEPATH += $${PREFIX}/include/libircclient
+ 	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
diff --git a/games-board/pokerth/files/pokerth-1.1.2-system-websockets.patch b/games-board/pokerth/files/pokerth-1.1.2-system-websockets.patch
new file mode 100644
index 000000000000..25c757bc9052
--- /dev/null
+++ b/games-board/pokerth/files/pokerth-1.1.2-system-websockets.patch
@@ -0,0 +1,17 @@
+Description: force use of system websocketpp library
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+
+Index: pokerth-1.1.2/pokerth_lib.pro
+===================================================================
+--- pokerth-1.1.2.orig/pokerth_lib.pro
++++ pokerth-1.1.2/pokerth_lib.pro
+@@ -30,8 +30,7 @@
+ 		src/engine/local_engine \
+ 		src/engine/network_engine \
+ 		src/config \
+-		src/core \
+-		src/third_party/websocketpp
++		src/core
+ 
+ DEPENDPATH += . \
+ 		src \
diff --git a/games-board/pokerth/pokerth-1.1.2.ebuild b/games-board/pokerth/pokerth-1.1.2.ebuild
index 5aa49bfc497a..08afd16fde19 100644
--- a/games-board/pokerth/pokerth-1.1.2.ebuild
+++ b/games-board/pokerth/pokerth-1.1.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils qmake-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Texas Hold'em poker game"
 HOMEPAGE="https://www.pokerth.net/"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="dedicated"
 
 RDEPEND="dev-db/sqlite:3
-	<dev-libs/boost-1.70:0=[threads(+)]
+	dev-libs/boost:0=[threads(+)]
 	dev-libs/libgcrypt:0
 	dev-libs/protobuf:0=
 	dev-libs/tinyxml[stl]
@@ -31,19 +31,27 @@ RDEPEND="dev-db/sqlite:3
 		media-libs/sdl-mixer[mod,vorbis]
 	)"
 DEPEND="${RDEPEND}
-	!dedicated? ( dev-qt/qtsql:5 )
-	virtual/pkgconfig"
+	dev-cpp/websocketpp
+	!dedicated? ( dev-qt/qtsql:5 )"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${P}-rc"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.1-boost-1.65-ambiguous-advance.patch
 	"${FILESDIR}"/${PN}-1.1.2-protobuf.patch
+	"${FILESDIR}"/${PN}-1.1.2-boost-1.66.patch
+	"${FILESDIR}"/${PN}-1.1.2-fix-includes.patch
+	# unbundle dev-cpp/websocketpp
+	"${FILESDIR}"/${PN}-1.1.2-system-websockets.patch
 )
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	sed -i 's/!client//' *.pro || die
+
+	# delete bundled dev-cpp/websocketpp to be safe
+	rm -r src/third_party/websocketpp || die
 }
 
 src_configure() {
@@ -65,7 +73,3 @@ src_install() {
 		doicon -s 128 ${PN}.png
 	fi
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }