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 41320138330 for ; Tue, 9 Jan 2018 02:03:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48485E0A5B; Tue, 9 Jan 2018 02:00:20 +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 040ABE09BC for ; Tue, 9 Jan 2018 02:00:20 +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 515DD34128F for ; Mon, 8 Jan 2018 19:58:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FAE9186 for ; Mon, 8 Jan 2018 19:58:06 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1515441476.07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/, dev-cpp/gsl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/gsl/Manifest dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch dev-cpp/gsl/gsl-0_pre20180108.ebuild dev-cpp/gsl/metadata.xml X-VCS-Directories: dev-cpp/gsl/ dev-cpp/gsl/files/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2 X-VCS-Branch: master Date: Mon, 8 Jan 2018 19:58:06 +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-Archives-Salt: 63a69d48-0c49-40d9-b9d0-3cd932f4428b X-Archives-Hash: 159e454793486272d40a608b6109f2ce commit: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2 Author: Jan Henke taujhe de> AuthorDate: Mon Jan 8 19:28:24 2018 +0000 Commit: Craig Andrews gentoo org> CommitDate: Mon Jan 8 19:57:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c63b0b dev-cpp/gsl: New git snapshot and correctly patch catch use This updates the ebuild to a more recent snapshot and also fixes the patching to use the system wide catch instead of downloading it during build. Closes: https://bugs.gentoo.org/643422 Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-cpp/gsl/Manifest | 1 + ...gsl-0_pre20180108-use_system_catch-636828.patch | 21 +++++++++++++++ dev-cpp/gsl/gsl-0_pre20180108.ebuild | 31 ++++++++++++++++++++++ dev-cpp/gsl/metadata.xml | 2 +- 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest index eb36ecd5112..601be068e06 100644 --- a/dev-cpp/gsl/Manifest +++ b/dev-cpp/gsl/Manifest @@ -1 +1,2 @@ DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657 SHA512 0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a +DIST gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640 diff --git a/dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch b/dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch new file mode 100644 index 00000000000..12d92605dda --- /dev/null +++ b/dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch @@ -0,0 +1,21 @@ +Add CMake option to disable upstream's catch download, we always want to use the +system wide installed version. Gentoo bug 636828. + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 86ce5a4..b36df56 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -10,7 +10,9 @@ list(APPEND CATCH_CMAKE_ARGS + "-DNO_SELFTEST=true" + ) + +-if(GIT_FOUND) ++option(FORCE_SYSTEM_CATCH "Force usage of system-wide catch install" OFF) ++ ++if(NOT ${FORCE_SYSTEM_CATCH} AND GIT_FOUND) + # add catch + ExternalProject_Add( + catch +-- +2.13.6 + diff --git a/dev-cpp/gsl/gsl-0_pre20180108.ebuild b/dev-cpp/gsl/gsl-0_pre20180108.ebuild new file mode 100644 index 00000000000..95ee05e9cd3 --- /dev/null +++ b/dev-cpp/gsl/gsl-0_pre20180108.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils vcs-snapshot + +DESCRIPTION="Guideline Support Library implementation by Microsoft" +HOMEPAGE="https://github.com/Microsoft/GSL" +SRC_URI="https://github.com/Microsoft/${PN}/tarball/9d65e74400976b3509833f49b16d401600c7317d -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +# header only library +RDEPEND="" +DEPEND="test? ( >=dev-cpp/catch-1.11.0 )" + +PATCHES=( + "${FILESDIR}/${P}-use_system_catch-636828.patch" +) + +src_configure() { + local mycmakeargs=( + -DGSL_TEST=$(usex test) + -DFORCE_SYSTEM_CATCH=ON + ) + cmake-utils_src_configure +} diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml index 57bf76b9210..b1f7b8de77f 100644 --- a/dev-cpp/gsl/metadata.xml +++ b/dev-cpp/gsl/metadata.xml @@ -3,7 +3,7 @@ gentoo@taujhe.de - Jan Henke + Jan Henke proxy-maint@gentoo.org