From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57464138334 for ; Sun, 13 Oct 2019 11:41:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4183E085A; Sun, 13 Oct 2019 11:41:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C9C9E085A for ; Sun, 13 Oct 2019 11:41:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C2C034BCC7 for ; Sun, 13 Oct 2019 11:41:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 039FE896 for ; Sun, 13 Oct 2019 11:40:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1570966822.23949ce99d48bdd95a22ad7905a3a8d4a6d4ab1c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/gnucash/gnucash-3.6.ebuild X-VCS-Directories: app-office/gnucash/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 23949ce99d48bdd95a22ad7905a3a8d4a6d4ab1c X-VCS-Branch: master Date: Sun, 13 Oct 2019 11:40:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 57d8e7d6-33ab-471b-9d04-02a81559350b X-Archives-Hash: 7f98cbe9885fb0f832727061f1e37082 commit: 23949ce99d48bdd95a22ad7905a3a8d4a6d4ab1c Author: Peter Levine gmail com> AuthorDate: Sun Aug 25 23:16:45 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 13 11:40:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23949ce9 app-office/gnucash: Don't build gtest from source With gnucash-3.6, the build now looks for gtest headers and libraries and uses them if found. Closes: https://bugs.gentoo.org/691276 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Peter Levine gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12792 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/gnucash/gnucash-3.6.ebuild | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app-office/gnucash/gnucash-3.6.ebuild b/app-office/gnucash/gnucash-3.6.ebuild index 9999712e8bf..00c0d0fd915 100644 --- a/app-office/gnucash/gnucash-3.6.ebuild +++ b/app-office/gnucash/gnucash-3.6.ebuild @@ -3,23 +3,20 @@ EAPI=6 -# google{test,mock} version -GV="1.8.0" PYTHON_COMPAT=( python3_{4,5,6} ) inherit cmake-utils gnome2-utils python-single-r1 xdg-utils DESCRIPTION="A personal finance manager" HOMEPAGE="http://www.gnucash.org/" -SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2 - https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz" +SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2" SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx - postgres python quotes -register2 sqlite" + postgres python quotes -register2 sqlite test" REQUIRED_USE=" chipcard? ( aqbanking ) @@ -70,12 +67,12 @@ RDEPEND=" " DEPEND="${RDEPEND} - ~dev-cpp/gtest-${GV} >=sys-devel/gettext-0.19.6 dev-lang/perl dev-perl/XML-Parser sys-devel/libtool virtual/pkgconfig + test? ( >=dev-cpp/gtest-1.8.0 ) " PDEPEND="doc? ( @@ -104,8 +101,6 @@ src_configure() { fi local mycmakeargs=( - -DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock - -DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest # Disable fallback to guile-2.0 -DCMAKE_DISABLE_FIND_PACKAGE_GUILE2=ON -DCOMPILE_GSCHEMAS=OFF