gentoo resync : 07.07.2018

5 files changed, 153 insertions, 11 deletions

diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 3d1a6eb9c02d..660f62433bc6 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -2,16 +2,18 @@ AUX README.gentoo 768 BLAKE2B 83e7cdf538b89a8ef6ab242c9f1d5b01dd5a57aa4dc5b4f1b9
 AUX README.gentoo-r1 530 BLAKE2B 5feab666142884c67c3c1a51322bb614bbdbaa453a4b6a4eb17b9fe774e4a4b188471a449f2cb5a1d07845a02a5eb15f2fad08958a839306d2029f56e8306543 SHA512 d5be4c0fc0069e6e8c6bf92f281034a603d6041f2b9a54d4fa97cae662225095d4473f54c4573141396ecccf369158f6c0986cafb9c39837edf9ab15200c8e18
 AUX znc-1.6.1-create-pidfile-per-default.patch 650 BLAKE2B 1316a818971396db3f2fea706afe57435a176db0f47e0e05fd5c53eeff9c5dfb2ffed201b75cd0bc9edbc521a962cb28ac1b8ac11d69729a41a1d01e3b7cd6ae SHA512 2e2342c8f87a58cd1703f19d3d76f58ac4c92a049de5b342dd46c2476a1344cbb9f85743fe387713a2465006f71f1379951d7f3770019f1867544b6705e0e8ec
 AUX znc-1.6.1-systemwideconfig.patch 8079 BLAKE2B f0ae13248ba1f49a8f4c7e49ea06c1107ebefdb916d09f8e45f21368f194daa33e0edd005595c9eb36014dab20e3a40e4fba13ec531fe40a3a18d71cc6183ebf SHA512 295a08dd5ce43b217e816148e272b722dff1a956ccdb5e58b0d337b7929a2bdae4e017ec686e820f89e53b310dd86ea8668095134d9618e5552ec323b83e624d
+AUX znc-1.7.0-inttest-dir.patch 1868 BLAKE2B be859b4aeb0c0d052a72780518c85e7b2bcdc4c9fd871a1584d31bf6f01296bd8dcbdf53980dc794689e82fdebaa495c8da5ad65d736efb858f38237d56a3d8a SHA512 5f6b57f1d3c26028f06841f1e7c5db065cb8c6475dc4f6ca75f46603ad25041b6be03ae9ca5e45961812ce358092203e9fe82e0eee8d1a8e2a845a2940dcd74f
+AUX znc-1.7.0-inttest-fix-make-warning.patch 1112 BLAKE2B 5404deec32a7126e10f1472681ea0b52785c2946a62eda4369cae39ec2e847bea3375f9118bdab9e98b21fc6291dbb9081cb8eef4864798203ddb9eb39676836 SHA512 6d3aef103e2f5b16bc6107ff69b38ff1814d692a46fca36e42df2c95dd94334a239b3576daaf2b49a3b56cea287e289a55f1ec6ddbf976bf80ebc8049cfb9a01
 AUX znc.confd-r1 720 BLAKE2B 4857a8bcd36ed1008a558ac7b067d6fad53b5d39c0df9130ca28d4ac3db3924a3a1200682c19c7e6f7869f22338b492f73bf6ccbc2b723d117c9eebc10a89838 SHA512 3ab102f64ea0572350c8595fd3739874da591c43a3dbc3a740c72c53bd7418fded721d478d1fb92de0c0d18131313ba6679e842a135dfe239ea3f42821d8e468
 AUX znc.initd-r1 914 BLAKE2B df6854929c0dbddc2fa75dec0b5b4103ffc9c6a6d9de05c9f04c0d36a4ffff28e834e42b22c363e24be03435088b2fa4428486c08adedb12ff3b484445545b0c SHA512 01f44ab51f6fa29383b4a4bc6e5f19928ebac6b32f73fb96906113596a904324dd53ef9dbb895a8dd29028f3523e6f7285d2d5b2ee43058fc017f0b47ae788c1
 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f
 DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B 8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4 SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
-DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
+DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
 DIST znc-1.6.5.tar.gz 1470681 BLAKE2B 9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
 DIST znc-1.6.6.tar.gz 1471612 BLAKE2B 8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516 SHA512 cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
 DIST znc-1.7.0.tar.gz 1853666 BLAKE2B 3e519d4005a10a9a5329f22ab6abbd19dfa2c7cecb949c138bc72909eae8883576fc0352e3ac46b852b8c58f038150419720aa48791a1339b004206f3afc20e9 SHA512 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b
 EBUILD znc-1.6.5.ebuild 3474 BLAKE2B fb127e5cb20f375da773dc5bf628ba6c4a4d45b408fe5f975768999c82a93844b2091511a90d694438743a0f165fb4afd1c774358fec09561be3fae64085715c SHA512 7a4c7f7d30eb63273fa75f6b925f11b2f426afea29de82dd1b33fdfcdaba911cf5172a564e230fc50d0a97c769389b963609c59169783f7a5354bf71ced2d0e4
 EBUILD znc-1.6.6.ebuild 3473 BLAKE2B 612f02114d9a058e109ee6f7185774bdc382e26abac72ff6b912997f1a8020ab67cbdd559739ffa5e7f121730d868ba54894fc333b63e41ae99706dca522d103 SHA512 06fc0f3897e7b2946f258cd48bc0a7ad689df339c2413cdddd7872a92774f17034d9d5f62e4d64222b62d07f1e321859428a05936f00775c63fa92805498456c
-EBUILD znc-1.7.0.ebuild 4121 BLAKE2B 3a9610b2ba4ef4f74691ead7e156e66e74c7b0f8a30605dab3a9ef81ecba709aeb23631a415bc89a3373d44b04d3749f8591afa70c0415cb87590675abf8a8b3 SHA512 58cccf6867a76bf08a67bb724397d9b1c0be7c0522dfb2b170fef6156c63af5138eef90e2037b721c5cc6bccd9fcce7c85758b846c7a4acef44df814e5075875
-EBUILD znc-9999.ebuild 4121 BLAKE2B 3a9610b2ba4ef4f74691ead7e156e66e74c7b0f8a30605dab3a9ef81ecba709aeb23631a415bc89a3373d44b04d3749f8591afa70c0415cb87590675abf8a8b3 SHA512 58cccf6867a76bf08a67bb724397d9b1c0be7c0522dfb2b170fef6156c63af5138eef90e2037b721c5cc6bccd9fcce7c85758b846c7a4acef44df814e5075875
+EBUILD znc-1.7.0.ebuild 5207 BLAKE2B 0e17aa348cb278d47df83da152646ec10b4d3ab9bdc1714b1cd86936b07c6acfc483640911fcde0badf1493455d42a7c6dcef38071d54108e55c2d8bc137d0e3 SHA512 9f3b4ceef80bafa6666d50e285f659a948a2a11493bac4f8a96e40d3d3e853e997d2efa691cc0e35a9fb91857555d773a8ddc07ea6e75622b8d9a67e546f5c5b
+EBUILD znc-9999.ebuild 5149 BLAKE2B 31067d50828a946fec99fbe2f89ba6290ea9401ffb8ccf9eb9bd0f2dcb1c2cd3f2af9ce5931a89384d3ed347a3a4c35dc00d8ce20ad19e271ab98e0d1ac6dfd1 SHA512 843e39790b2d8687109a321d380dd3fc9ba3a2815badd24893cec9fdd996f5b43c0b61c6972dcd5c82aeb24eb5cabbb213f8183c7ea10a409fa85e67435d7c10
 MISC metadata.xml 633 BLAKE2B 506bc5b769694797c07165febefd08354b744a28644148d86901442a8d437cee7ec2552382eaa280cd99fe3c00cd2ae3adfded62980fe2fce31e550f00f4fc25 SHA512 58c2f6174c32c3b2bc52d5589844305cdac275d38bff7ec959d8a7e1eb14991789ba218f3dab2a993ab98ff0af7f7a574c3bfefdf7c9fd495043892732cb2502
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-dir.patch b/net-irc/znc/files/znc-1.7.0-inttest-dir.patch
new file mode 100644
index 000000000000..250eccc53fb6
--- /dev/null
+++ b/net-irc/znc/files/znc-1.7.0-inttest-dir.patch
@@ -0,0 +1,55 @@
+diff --git a/include/znc/znc.h b/include/znc/znc.h
+index ecb2b41a..a791a648 100644
+--- a/include/znc/znc.h
++++ b/include/znc/znc.h
+@@ -251,6 +251,7 @@ class CZNC : private CCoreTranslationMixin {
+     void DisableConfigTimer();
+ 
+     static void DumpConfig(const CConfig* Config);
++    static CString UnusualRoot();
+ 
+   private:
+     static CString FormatBindError();
+diff --git a/src/Modules.cpp b/src/Modules.cpp
+index 5aec7805..6f9c34ae 100644
+--- a/src/Modules.cpp
++++ b/src/Modules.cpp
+@@ -1899,9 +1899,10 @@ CModules::ModDirList CModules::GetModDirs() {
+     sDir = CZNC::Get().GetModPath() + "/";
+     ret.push(std::make_pair(sDir, sDir));
+ 
++    CString sUnusualRoot = CZNC::UnusualRoot();
+     // <moduledir> and <datadir> (<prefix>/lib/znc)
+-    ret.push(std::make_pair(_MODDIR_ + CString("/"),
+-                            _DATADIR_ + CString("/modules/")));
++    ret.push(std::make_pair(sUnusualRoot + _MODDIR_ + CString("/"),
++                            sUnusualRoot + _DATADIR_ + CString("/modules/")));
+ 
+     return ret;
+ }
+diff --git a/src/WebModules.cpp b/src/WebModules.cpp
+index 19ece50a..8ea4d9fa 100644
+--- a/src/WebModules.cpp
++++ b/src/WebModules.cpp
+@@ -563,7 +563,7 @@ CString CWebSock::GetSkinPath(const CString& sSkinName) {
+         sRet = CZNC::Get().GetCurPath() + "/webskins/" + sSkinName;
+ 
+         if (!CFile::IsDir(sRet)) {
+-            sRet = CString(_SKINDIR_) + "/" + sSkinName;
++            sRet = CZNC::UnusualRoot() + CString(_SKINDIR_) + "/" + sSkinName;
+         }
+     }
+ 
+diff --git a/src/znc.cpp b/src/znc.cpp
+index 4e7216ee..dd901497 100644
+--- a/src/znc.cpp
++++ b/src/znc.cpp
+@@ -2130,3 +2130,8 @@ void CZNC::DisableConfigTimer() {
+         m_pConfigTimer = nullptr;
+     }
+ }
++
++CString CZNC::UnusualRoot() {
++    char* szUnusualRoot = getenv("ZNC_UNUSUAL_ROOT");
++    return szUnusualRoot ? szUnusualRoot : "";
++}
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch b/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch
new file mode 100644
index 000000000000..0be20e4c08d0
--- /dev/null
+++ b/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch
@@ -0,0 +1,26 @@
+From abee9f9bfc8c9ca9d4616238fdd812c4200b17d5 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <alexey+znc@asokolov.org>
+Date: Thu, 28 Jun 2018 23:57:29 +0100
+Subject: [PATCH] Fix a warning in integration test / gmake / znc-buildmod
+ interaction.
+
+It was requested on https://github.com/gentoo/gentoo/pull/8901
+---
+ test/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index b19c22fab..296cb0de7 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -85,5 +85,10 @@ externalproject_add(inttest_bin
+ 	"-DZNC_BIN_DIR:path=${CMAKE_INSTALL_FULL_BINDIR}"
+ 	"-DQt5_HINTS:path=${brew_qt5}")
+ add_custom_target(inttest COMMAND
++	# Prevent a warning from test of znc-buildmod, when inner make
++	# discovers that there is an outer make and tries to use it:
++	# gmake[4]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
++	# This option doesn't affect ninja, which doesn't show that warning anyway.
++	${CMAKE_COMMAND} -E env MAKEFLAGS=
+ 	"${CMAKE_CURRENT_BINARY_DIR}/integration/inttest")
+ add_dependencies(inttest inttest_bin)
diff --git a/net-irc/znc/znc-1.7.0.ebuild b/net-irc/znc/znc-1.7.0.ebuild
index b27016716af6..7cd8c8865979 100644
--- a/net-irc/znc/znc-1.7.0.ebuild
+++ b/net-irc/znc/znc-1.7.0.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
 
-GTEST_VER="1.8.0"
-GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
+GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but newer version not released yet
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
 DESCRIPTION="An advanced IRC Bouncer"
 
 if [[ ${PV} == *9999* ]]; then
@@ -49,8 +49,14 @@ DEPEND="
 	nls? ( sys-devel/gettext )
 	perl? ( >=dev-lang/swig-3.0.0 )
 	python? ( >=dev-lang/swig-3.0.0 )
+	test? ( dev-qt/qtnetwork:5 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-inttest-fix-make-warning.patch
+	"${FILESDIR}"/${PN}-1.7.0-inttest-dir.patch
+)
+
 pkg_setup() {
 	if use python; then
 		python-single-r1_pkg_setup
@@ -71,6 +77,9 @@ src_prepare() {
 		rm modules/modpython/generated.tar.gz || die
 	fi
 
+	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
+		test/CMakeLists.txt || die
+
 	cmake-utils_src_prepare
 }
 
@@ -90,8 +99,8 @@ src_configure() {
 	)
 
 	if [[ ${PV} != *9999* ]] && use test; then
-		export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
-		export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
+		export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest"
+		export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock"
 	fi
 
 	cmake-utils_src_configure
@@ -99,6 +108,27 @@ src_configure() {
 
 src_test() {
 	cmake-utils_src_make unittest
+	if has network-sandbox ${FEATURES}; then
+		cmake-utils_src_make install DESTDIR="${T}/inttest"
+		local filter='-'
+		if ! use perl; then
+			filter="${filter}:ZNCTest.Modperl*"
+		fi
+		if ! use python; then
+			filter="${filter}:ZNCTest.Modpython*"
+		fi
+		# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
+		# invocations from inside the test
+		GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
+			CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
+			CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
+			cmake-utils_src_make inttest
+	else
+		# TODO: don't require sandbox after
+		# https://github.com/znc/znc/pull/1363 is implemented
+		ewarn "FEATURES=-network-sandbox; skipping integration tests which"
+		ewarn "temporary open local ports."
+	fi
 }
 
 src_install() {
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index b27016716af6..ec9c6196f378 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
 
-GTEST_VER="1.8.0"
-GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
+GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but newer version not released yet
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
 DESCRIPTION="An advanced IRC Bouncer"
 
 if [[ ${PV} == *9999* ]]; then
@@ -49,8 +49,13 @@ DEPEND="
 	nls? ( sys-devel/gettext )
 	perl? ( >=dev-lang/swig-3.0.0 )
 	python? ( >=dev-lang/swig-3.0.0 )
+	test? ( dev-qt/qtnetwork:5 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-inttest-dir.patch
+)
+
 pkg_setup() {
 	if use python; then
 		python-single-r1_pkg_setup
@@ -71,6 +76,9 @@ src_prepare() {
 		rm modules/modpython/generated.tar.gz || die
 	fi
 
+	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
+		test/CMakeLists.txt || die
+
 	cmake-utils_src_prepare
 }
 
@@ -90,8 +98,8 @@ src_configure() {
 	)
 
 	if [[ ${PV} != *9999* ]] && use test; then
-		export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
-		export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
+		export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest"
+		export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock"
 	fi
 
 	cmake-utils_src_configure
@@ -99,6 +107,27 @@ src_configure() {
 
 src_test() {
 	cmake-utils_src_make unittest
+	if has network-sandbox ${FEATURES}; then
+		cmake-utils_src_make install DESTDIR="${T}/inttest"
+		local filter='-'
+		if ! use perl; then
+			filter="${filter}:ZNCTest.Modperl*"
+		fi
+		if ! use python; then
+			filter="${filter}:ZNCTest.Modpython*"
+		fi
+		# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
+		# invocations from inside the test
+		GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
+			CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
+			CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
+			cmake-utils_src_make inttest
+	else
+		# TODO: don't require sandbox after
+		# https://github.com/znc/znc/pull/1363 is implemented
+		ewarn "FEATURES=-network-sandbox; skipping integration tests which"
+		ewarn "temporary open local ports."
+	fi
 }
 
 src_install() {