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 1AC4F138334 for ; Sun, 9 Jun 2019 19:36:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AC18E086E; Sun, 9 Jun 2019 19:36:54 +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 09603E086E for ; Sun, 9 Jun 2019 19:36:53 +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 83C8D345AE6 for ; Sun, 9 Jun 2019 19:36:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 280FE2A5 for ; Sun, 9 Jun 2019 19:36:50 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1560108964.9e3ec79f3e89bc1a83dd03bc95cf2f6f5361105a.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/3.2.2_p20160518/, media-video/aegisub/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch X-VCS-Directories: media-video/aegisub/ media-video/aegisub/files/3.2.2_p20160518/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 9e3ec79f3e89bc1a83dd03bc95cf2f6f5361105a X-VCS-Branch: master Date: Sun, 9 Jun 2019 19:36:50 +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: b5867985-b58c-4155-b066-4fbcd99563bb X-Archives-Hash: d74d2ec77d19f25069d082e47d036a97 commit: 9e3ec79f3e89bc1a83dd03bc95cf2f6f5361105a Author: Peter Levine gmail com> AuthorDate: Sun Jun 9 17:23:47 2019 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sun Jun 9 19:36:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e3ec79f media-video/aegisub: Enable testing with >=dev-cpp/gtest-1.8.1 Updates the gtest dependency. Tests build, run, and pass without issue. Closes: https://github.com/gentoo/gentoo/pull/12230 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Peter Levine gmail.com> Signed-off-by: Nick Sarnie gentoo.org> media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild | 4 ++-- .../aegisub-3.2.2_p20160518-support-system-gtest.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild index d5b623eb234..bef93fffa85 100644 --- a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild +++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -46,7 +46,7 @@ DEPEND="${RDEPEND} sys-devel/gettext virtual/pkgconfig test? ( - ~dev-cpp/gtest-1.7.0 + >=dev-cpp/gtest-1.8.1 dev-lua/busted dev-lua/luarocks ) diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch index 8209ac5ec7c..7e3fac2acd8 100644 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch +++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch @@ -24,13 +24,13 @@ index 8c30c1d..c5bf049 100644 GTEST_ROOT ?= $(TOP)vendor/googletest GTEST_FILE := ${GTEST_ROOT}/src/gtest-all +GTEST_CPPFLAGS := -I$(GTEST_ROOT) -I$(GTEST_ROOT)/include -+GTEST_CXXFLAGS := $(CFLAGS_PTHREAD) +GTEST_LIBS := $(LIBS_PTHREAD) +else -+GTEST_CPPFLAGS := $(shell gtest-config --cppflags) -+GTEST_CXXFLAGS := $(shell gtest-config --cxxflags) -+GTEST_LIBS := $(shell gtest-config --libs) ++GTEST_CPPFLAGS := $(shell pkg-config --cflags-only-I gtest) ++GTEST_LIBS := $(shell pkg-config --libs gtest) +endif ++ ++GTEST_CXXFLAGS := $(CFLAGS_PTHREAD) run_PCH := $(d)support/tests_pre.h run_CPPFLAGS := -I$(TOP)libaegisub/include -I$(TOP) -I$(d)support \