[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/

[Thomas Deutschmann]

commit:     68c6dd181f51fd8f5be1bed47e1e412fe61b927e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 15:54:51 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 15:55:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c6dd18

net-irc/znc: Update live ebuild

Use gtest from source.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-irc/znc/znc-9999.ebuild | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 642a974..03a69e4 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -9,6 +9,8 @@ PLOCALES="ru"
 
 inherit cmake-utils l10n 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"
 DESCRIPTION="An advanced IRC Bouncer"
 
 if [[ ${PV} == *9999* ]]; then
@@ -16,7 +18,10 @@ if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
        SRC_URI=""
 else
-       SRC_URI="http://znc.in/releases/archive/${P}.tar.gz";
+       SRC_URI="
+               http://znc.in/releases/archive/${P}.tar.gz
+               test? ( ${GTEST_URL} )
+       "
        KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -46,7 +51,6 @@ DEPEND="
        virtual/pkgconfig
        perl? ( >=dev-lang/swig-3.0.0 )
        python? ( >=dev-lang/swig-3.0.0 )
-       test? ( dev-cpp/gtest )
 "
 
 pkg_setup() {
@@ -95,6 +99,11 @@ src_configure() {
                -DWANT_ZLIB="$(usex zlib)"
        )
 
+       if [[ ${PV} != *9999* ]] && use test; then
+               export 
GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
+               export 
GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
+       fi
+
        cmake-utils_src_configure
 }