diff options
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/Manifest.gz | bin | 9682 -> 9679 bytes | |||
| -rw-r--r-- | dev-cpp/gsl/Manifest | 8 | ||||
| -rw-r--r-- | dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch | 31 | ||||
| -rw-r--r-- | dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch | 21 | ||||
| -rw-r--r-- | dev-cpp/gsl/gsl-0_pre20180108.ebuild (renamed from dev-cpp/gsl/gsl-0_pre20171105.ebuild) | 9 | ||||
| -rw-r--r-- | dev-cpp/gsl/metadata.xml | 2 |
6 files changed, 32 insertions, 39 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz Binary files differindex 63cd75a94794..cc6aa5fb1ae8 100644 --- a/dev-cpp/Manifest.gz +++ b/dev-cpp/Manifest.gz diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest index 24262ae525cf..54f49c530a46 100644 --- a/dev-cpp/gsl/Manifest +++ b/dev-cpp/gsl/Manifest @@ -1,4 +1,4 @@ -AUX gsl-0_pre20171105-use_system_catch-636828.patch 921 BLAKE2B e2dcbb1b8ccfd7047565f70c0e487b1da699d832a8dc66c7f7824fbfa3d9f12bcecd82dca4d23af02efb467577cd0e3c23bab0eb99778e755504b3569e863668 SHA512 4581e4c3a6408458936b7b49a269bb62d46c8d313f7bf10ba7c7eae642d62baaa2e8ddca5e46e54591fe91e65389e0d4b0fc272c90bdf94c6b08acb3d3160a5f -DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657 SHA512 0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a -EBUILD gsl-0_pre20171105.ebuild 664 BLAKE2B abac9ab8164c01875455be1af6fe5b03d32a6a09deb7a6498ccbc5d9321d24f274234680aa15f94e5e41e92a1a9c3b8cae3e34a5ce6b25ed013dd9faa0c17449 SHA512 7c36e3b41c5fba6f0293326e6132791bad4a465756836ae4e03d008d68686979ea6bade47b26d6c65b39cf59cdfd723a663728a42c9beb5689ef83b076407681 -MISC metadata.xml 546 BLAKE2B 8ed1288cb4f89f8e15554171875541dd0d100b2d6608d5093e5be319a08e5a03334865548bd8c42337723961af42a75d2ad160acf58f259b4107c790e032ab12 SHA512 e5aa4be86c8c44e14384ec27e0a7a14f246ee60a1b789d97bd67ef5d00553f09449aa6ec0eb51fd4a6b17d25e8ccffe6b9a7921056bc406acf758ae2de6bd958 +AUX gsl-0_pre20180108-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc +DIST gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640 +EBUILD gsl-0_pre20180108.ebuild 693 BLAKE2B c4bd89221cf43635a9531cc42537a18258aa1013ca14914de6442534543c04c74e82ea99a75cfe300dead36bc48cfff53e9e51cc2171bf893070c8e06df94680 SHA512 5be04db011e6cf768f1922846a8594d0179678b8155be68560065bde96e028ce5dea1235d175b9b327f72252b8a8f9df0c56a5bf5d394281cae5987d74420686 +MISC metadata.xml 532 BLAKE2B ed7921df36553a0104d453583f96796d9b0c4cf1d45364fa0e9a8a7054e847f32056e3726b0f7c9e036cff0f31d53015d37219049a45547e0787722c4be65fdb SHA512 7a1971470483fe40c26cf6576db01ee90af3fd0818d6605b0b1b6ac9f09e1379382bccdcc37ab351fbeae3b6e7760dd06af21341ceaa212025fc58162b75c1c1 diff --git a/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch deleted file mode 100644 index e72eae02311e..000000000000 --- a/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch +++ /dev/null @@ -1,31 +0,0 @@ -# Disable upstreams catch download, we always want to use the system installed -# version. Gentoo bug 636828. - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 86ce5a4..9b7d4f7 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -10,21 +10,8 @@ list(APPEND CATCH_CMAKE_ARGS - "-DNO_SELFTEST=true" - ) - --if(GIT_FOUND) -- # add catch -- ExternalProject_Add( -- catch -- PREFIX ${CMAKE_BINARY_DIR}/catch -- GIT_REPOSITORY https://github.com/catchorg/Catch2.git -- GIT_TAG v2.0.1 -- CMAKE_ARGS ${CATCH_CMAKE_ARGS} -- LOG_DOWNLOAD 1 -- UPDATE_DISCONNECTED 1 -- ) --else() -- # assume catch is installed in a system directory -- add_custom_target(catch) --endif() -+# assume catch is installed in a system directory -+add_custom_target(catch) - - # this interface adds compile options to how the tests are run - # please try to keep entries ordered =) 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 000000000000..12d92605dda8 --- /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_pre20171105.ebuild b/dev-cpp/gsl/gsl-0_pre20180108.ebuild index ae775ff3f8c0..95ee05e9cd36 100644 --- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild +++ b/dev-cpp/gsl/gsl-0_pre20180108.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ 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/d10ebc6555b627c9d1196076a78467e7be505987 -> ${P}.tar.gz" +SRC_URI="https://github.com/Microsoft/${PN}/tarball/9d65e74400976b3509833f49b16d401600c7317d -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" @@ -23,6 +23,9 @@ PATCHES=( ) src_configure() { - local mycmakeargs=( -DGSL_TEST=$(usex test) ) + 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 57bf76b92106..b1f7b8de77fb 100644 --- a/dev-cpp/gsl/metadata.xml +++ b/dev-cpp/gsl/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <maintainer type="person"> <email>gentoo@taujhe.de</email> - <description>Jan Henke</description> + <name>Jan Henke</name> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> |