[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 100eae3223595fdc8cf82a66f593bed85aac93bf
Author: Jan Henke taujhe de>
AuthorDate: Sun Nov 5 21:53:56 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Nov 7 09:01:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100eae32
dev-cpp/gsl: Initial addition
Closes: https://github.com/gentoo/gentoo/pull/6135
dev-cpp/gsl/Manifest | 1 +
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 24
dev-cpp/gsl/metadata.xml | 16
3 files changed, 41 insertions(+)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
new file mode 100644
index 000..3b53acf9b7e
--- /dev/null
+++ b/dev-cpp/gsl/Manifest
@@ -0,0 +1 @@
+DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
new file mode 100644
index 000..78ac010145e
--- /dev/null
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+src_configure() {
+ local mycmakeargs=( -DGSL_TEST=$(usex test) )
+ cmake-utils_src_configure
+}
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml
new file mode 100644
index 000..57bf76b9210
--- /dev/null
+++ b/dev-cpp/gsl/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ gen...@taujhe.de
+ Jan Henke
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+ Microsoft's implmentation of the Guideline Support
Library.
+
+ Microsoft/GSL
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 54afb9aad4f99e358d75019fb16aef9c622a8acb
Author: Jan Henke taujhe de>
AuthorDate: Tue Dec 19 21:26:36 2017 +
Commit: Craig Andrews gentoo org>
CommitDate: Sat Dec 23 15:14:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54afb9aa
dev-cpp/gsl: Fix tests
Actually apply the patch as well.
Closes: https://bugs.gentoo.org/636828
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
index 78ac010145e..ae775ff3f8c 100644
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -18,6 +18,10 @@ IUSE="test"
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) )
cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 100eae3223595fdc8cf82a66f593bed85aac93bf
Author: Jan Henke taujhe de>
AuthorDate: Sun Nov 5 21:53:56 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Nov 7 09:01:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100eae32
dev-cpp/gsl: Initial addition
Closes: https://github.com/gentoo/gentoo/pull/6135
dev-cpp/gsl/Manifest | 1 +
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 24
dev-cpp/gsl/metadata.xml | 16
3 files changed, 41 insertions(+)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
new file mode 100644
index 000..3b53acf9b7e
--- /dev/null
+++ b/dev-cpp/gsl/Manifest
@@ -0,0 +1 @@
+DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
new file mode 100644
index 000..78ac010145e
--- /dev/null
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+src_configure() {
+ local mycmakeargs=( -DGSL_TEST=$(usex test) )
+ cmake-utils_src_configure
+}
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml
new file mode 100644
index 000..57bf76b9210
--- /dev/null
+++ b/dev-cpp/gsl/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ gen...@taujhe.de
+ Jan Henke
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+ Microsoft's implmentation of the Guideline Support
Library.
+
+ Microsoft/GSL
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 54afb9aad4f99e358d75019fb16aef9c622a8acb
Author: Jan Henke taujhe de>
AuthorDate: Tue Dec 19 21:26:36 2017 +
Commit: Craig Andrews gentoo org>
CommitDate: Sat Dec 23 15:14:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54afb9aa
dev-cpp/gsl: Fix tests
Actually apply the patch as well.
Closes: https://bugs.gentoo.org/636828
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
index 78ac010145e..ae775ff3f8c 100644
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -18,6 +18,10 @@ IUSE="test"
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) )
cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 100eae3223595fdc8cf82a66f593bed85aac93bf
Author: Jan Henke taujhe de>
AuthorDate: Sun Nov 5 21:53:56 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Nov 7 09:01:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100eae32
dev-cpp/gsl: Initial addition
Closes: https://github.com/gentoo/gentoo/pull/6135
dev-cpp/gsl/Manifest | 1 +
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 24
dev-cpp/gsl/metadata.xml | 16
3 files changed, 41 insertions(+)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
new file mode 100644
index 000..3b53acf9b7e
--- /dev/null
+++ b/dev-cpp/gsl/Manifest
@@ -0,0 +1 @@
+DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
new file mode 100644
index 000..78ac010145e
--- /dev/null
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+src_configure() {
+ local mycmakeargs=( -DGSL_TEST=$(usex test) )
+ cmake-utils_src_configure
+}
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml
new file mode 100644
index 000..57bf76b9210
--- /dev/null
+++ b/dev-cpp/gsl/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ gen...@taujhe.de
+ Jan Henke
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+ Microsoft's implmentation of the Guideline Support
Library.
+
+ Microsoft/GSL
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 54afb9aad4f99e358d75019fb16aef9c622a8acb
Author: Jan Henke taujhe de>
AuthorDate: Tue Dec 19 21:26:36 2017 +
Commit: Craig Andrews gentoo org>
CommitDate: Sat Dec 23 15:14:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54afb9aa
dev-cpp/gsl: Fix tests
Actually apply the patch as well.
Closes: https://bugs.gentoo.org/636828
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
index 78ac010145e..ae775ff3f8c 100644
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -18,6 +18,10 @@ IUSE="test"
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) )
cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 100eae3223595fdc8cf82a66f593bed85aac93bf
Author: Jan Henke taujhe de>
AuthorDate: Sun Nov 5 21:53:56 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Nov 7 09:01:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100eae32
dev-cpp/gsl: Initial addition
Closes: https://github.com/gentoo/gentoo/pull/6135
dev-cpp/gsl/Manifest | 1 +
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 24
dev-cpp/gsl/metadata.xml | 16
3 files changed, 41 insertions(+)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
new file mode 100644
index 000..3b53acf9b7e
--- /dev/null
+++ b/dev-cpp/gsl/Manifest
@@ -0,0 +1 @@
+DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
new file mode 100644
index 000..78ac010145e
--- /dev/null
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+src_configure() {
+ local mycmakeargs=( -DGSL_TEST=$(usex test) )
+ cmake-utils_src_configure
+}
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml
new file mode 100644
index 000..57bf76b9210
--- /dev/null
+++ b/dev-cpp/gsl/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ gen...@taujhe.de
+ Jan Henke
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+ Microsoft's implmentation of the Guideline Support
Library.
+
+ Microsoft/GSL
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 54afb9aad4f99e358d75019fb16aef9c622a8acb
Author: Jan Henke taujhe de>
AuthorDate: Tue Dec 19 21:26:36 2017 +
Commit: Craig Andrews gentoo org>
CommitDate: Sat Dec 23 15:14:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54afb9aa
dev-cpp/gsl: Fix tests
Actually apply the patch as well.
Closes: https://bugs.gentoo.org/636828
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
index 78ac010145e..ae775ff3f8c 100644
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -18,6 +18,10 @@ IUSE="test"
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) )
cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 100eae3223595fdc8cf82a66f593bed85aac93bf
Author: Jan Henke taujhe de>
AuthorDate: Sun Nov 5 21:53:56 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Nov 7 09:01:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100eae32
dev-cpp/gsl: Initial addition
Closes: https://github.com/gentoo/gentoo/pull/6135
dev-cpp/gsl/Manifest | 1 +
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 24
dev-cpp/gsl/metadata.xml | 16
3 files changed, 41 insertions(+)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
new file mode 100644
index 000..3b53acf9b7e
--- /dev/null
+++ b/dev-cpp/gsl/Manifest
@@ -0,0 +1 @@
+DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
new file mode 100644
index 000..78ac010145e
--- /dev/null
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+src_configure() {
+ local mycmakeargs=( -DGSL_TEST=$(usex test) )
+ cmake-utils_src_configure
+}
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml
new file mode 100644
index 000..57bf76b9210
--- /dev/null
+++ b/dev-cpp/gsl/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ gen...@taujhe.de
+ Jan Henke
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+ Microsoft's implmentation of the Guideline Support
Library.
+
+ Microsoft/GSL
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 54afb9aad4f99e358d75019fb16aef9c622a8acb
Author: Jan Henke taujhe de>
AuthorDate: Tue Dec 19 21:26:36 2017 +
Commit: Craig Andrews gentoo org>
CommitDate: Sat Dec 23 15:14:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54afb9aa
dev-cpp/gsl: Fix tests
Actually apply the patch as well.
Closes: https://bugs.gentoo.org/636828
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
index 78ac010145e..ae775ff3f8c 100644
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -18,6 +18,10 @@ IUSE="test"
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) )
cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 100eae3223595fdc8cf82a66f593bed85aac93bf
Author: Jan Henke taujhe de>
AuthorDate: Sun Nov 5 21:53:56 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Nov 7 09:01:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100eae32
dev-cpp/gsl: Initial addition
Closes: https://github.com/gentoo/gentoo/pull/6135
dev-cpp/gsl/Manifest | 1 +
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 24
dev-cpp/gsl/metadata.xml | 16
3 files changed, 41 insertions(+)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
new file mode 100644
index 000..3b53acf9b7e
--- /dev/null
+++ b/dev-cpp/gsl/Manifest
@@ -0,0 +1 @@
+DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
new file mode 100644
index 000..78ac010145e
--- /dev/null
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+src_configure() {
+ local mycmakeargs=( -DGSL_TEST=$(usex test) )
+ cmake-utils_src_configure
+}
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml
new file mode 100644
index 000..57bf76b9210
--- /dev/null
+++ b/dev-cpp/gsl/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ gen...@taujhe.de
+ Jan Henke
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+ Microsoft's implmentation of the Guideline Support
Library.
+
+ Microsoft/GSL
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 54afb9aad4f99e358d75019fb16aef9c622a8acb
Author: Jan Henke taujhe de>
AuthorDate: Tue Dec 19 21:26:36 2017 +
Commit: Craig Andrews gentoo org>
CommitDate: Sat Dec 23 15:14:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54afb9aa
dev-cpp/gsl: Fix tests
Actually apply the patch as well.
Closes: https://bugs.gentoo.org/636828
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
index 78ac010145e..ae775ff3f8c 100644
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -18,6 +18,10 @@ IUSE="test"
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) )
cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 100eae3223595fdc8cf82a66f593bed85aac93bf
Author: Jan Henke taujhe de>
AuthorDate: Sun Nov 5 21:53:56 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Nov 7 09:01:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100eae32
dev-cpp/gsl: Initial addition
Closes: https://github.com/gentoo/gentoo/pull/6135
dev-cpp/gsl/Manifest | 1 +
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 24
dev-cpp/gsl/metadata.xml | 16
3 files changed, 41 insertions(+)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
new file mode 100644
index 000..3b53acf9b7e
--- /dev/null
+++ b/dev-cpp/gsl/Manifest
@@ -0,0 +1 @@
+DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
new file mode 100644
index 000..78ac010145e
--- /dev/null
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+src_configure() {
+ local mycmakeargs=( -DGSL_TEST=$(usex test) )
+ cmake-utils_src_configure
+}
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml
new file mode 100644
index 000..57bf76b9210
--- /dev/null
+++ b/dev-cpp/gsl/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ gen...@taujhe.de
+ Jan Henke
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+ Microsoft's implmentation of the Guideline Support
Library.
+
+ Microsoft/GSL
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 54afb9aad4f99e358d75019fb16aef9c622a8acb
Author: Jan Henke taujhe de>
AuthorDate: Tue Dec 19 21:26:36 2017 +
Commit: Craig Andrews gentoo org>
CommitDate: Sat Dec 23 15:14:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54afb9aa
dev-cpp/gsl: Fix tests
Actually apply the patch as well.
Closes: https://bugs.gentoo.org/636828
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
index 78ac010145e..ae775ff3f8c 100644
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -18,6 +18,10 @@ IUSE="test"
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) )
cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 100eae3223595fdc8cf82a66f593bed85aac93bf
Author: Jan Henke taujhe de>
AuthorDate: Sun Nov 5 21:53:56 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Nov 7 09:01:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100eae32
dev-cpp/gsl: Initial addition
Closes: https://github.com/gentoo/gentoo/pull/6135
dev-cpp/gsl/Manifest | 1 +
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 24
dev-cpp/gsl/metadata.xml | 16
3 files changed, 41 insertions(+)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
new file mode 100644
index 000..3b53acf9b7e
--- /dev/null
+++ b/dev-cpp/gsl/Manifest
@@ -0,0 +1 @@
+DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
new file mode 100644
index 000..78ac010145e
--- /dev/null
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+src_configure() {
+ local mycmakeargs=( -DGSL_TEST=$(usex test) )
+ cmake-utils_src_configure
+}
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml
new file mode 100644
index 000..57bf76b9210
--- /dev/null
+++ b/dev-cpp/gsl/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ gen...@taujhe.de
+ Jan Henke
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+ Microsoft's implmentation of the Guideline Support
Library.
+
+ Microsoft/GSL
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/
commit: 54afb9aad4f99e358d75019fb16aef9c622a8acb
Author: Jan Henke taujhe de>
AuthorDate: Tue Dec 19 21:26:36 2017 +
Commit: Craig Andrews gentoo org>
CommitDate: Sat Dec 23 15:14:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54afb9aa
dev-cpp/gsl: Fix tests
Actually apply the patch as well.
Closes: https://bugs.gentoo.org/636828
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
index 78ac010145e..ae775ff3f8c 100644
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -18,6 +18,10 @@ IUSE="test"
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) )
cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: a344988b3992f7703680aba89b3cf7332f88a443
Author: Jan Henke taujhe de>
AuthorDate: Sun Dec 3 21:48:16 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Dec 3 22:50:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a344988b
dev-cpp/gsl: use system catch for USE="test".
Closes: https://bugs.gentoo.org/636828
Closes: https://github.com/gentoo/gentoo/pull/6431
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 2 +-
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 3b53acf9b7e..eb36ecd5112 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1 +1 @@
-DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
+DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B
cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657
SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
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
new file mode 100644
index 000..e72eae02311
--- /dev/null
+++ b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
@@ -0,0 +1,31 @@
+# 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 =)
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/, dev-cpp/gsl/files/
commit: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:28:24 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:56 2018 +
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 000..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 000..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 @@
gen...@taujhe.de
- Jan Henke
+ Jan Henke
proxy-ma...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: 6a3f3e4a26efba4dede7603d9afc0eed7bc3120b
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:29:09 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f3e4a
dev-cpp/gsl: Drop old snapshot
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 1 -
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 --
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 28 ---
3 files changed, 60 deletions(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 601be068e06..5840dfcbf02 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1,2 +1 @@
-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_pre20171105-use_system_catch-636828.patch
b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
deleted file mode 100644
index e72eae02311..000
--- 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/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
deleted file mode 100644
index ae775ff3f8c..000
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${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) )
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/, dev-cpp/gsl/files/
commit: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:28:24 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:56 2018 +
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 000..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 000..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 @@
gen...@taujhe.de
- Jan Henke
+ Jan Henke
proxy-ma...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: 6a3f3e4a26efba4dede7603d9afc0eed7bc3120b
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:29:09 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f3e4a
dev-cpp/gsl: Drop old snapshot
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 1 -
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 --
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 28 ---
3 files changed, 60 deletions(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 601be068e06..5840dfcbf02 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1,2 +1 @@
-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_pre20171105-use_system_catch-636828.patch
b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
deleted file mode 100644
index e72eae02311..000
--- 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/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
deleted file mode 100644
index ae775ff3f8c..000
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${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) )
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: a344988b3992f7703680aba89b3cf7332f88a443
Author: Jan Henke taujhe de>
AuthorDate: Sun Dec 3 21:48:16 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Dec 3 22:50:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a344988b
dev-cpp/gsl: use system catch for USE="test".
Closes: https://bugs.gentoo.org/636828
Closes: https://github.com/gentoo/gentoo/pull/6431
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 2 +-
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 3b53acf9b7e..eb36ecd5112 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1 +1 @@
-DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
+DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B
cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657
SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
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
new file mode 100644
index 000..e72eae02311
--- /dev/null
+++ b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
@@ -0,0 +1,31 @@
+# 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 =)
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: a344988b3992f7703680aba89b3cf7332f88a443
Author: Jan Henke taujhe de>
AuthorDate: Sun Dec 3 21:48:16 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Dec 3 22:50:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a344988b
dev-cpp/gsl: use system catch for USE="test".
Closes: https://bugs.gentoo.org/636828
Closes: https://github.com/gentoo/gentoo/pull/6431
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 2 +-
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 3b53acf9b7e..eb36ecd5112 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1 +1 @@
-DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
+DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B
cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657
SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
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
new file mode 100644
index 000..e72eae02311
--- /dev/null
+++ b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
@@ -0,0 +1,31 @@
+# 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 =)
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/, dev-cpp/gsl/files/
commit: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:28:24 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:56 2018 +
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 000..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 000..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 @@
gen...@taujhe.de
- Jan Henke
+ Jan Henke
proxy-ma...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: 6a3f3e4a26efba4dede7603d9afc0eed7bc3120b
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:29:09 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f3e4a
dev-cpp/gsl: Drop old snapshot
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 1 -
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 --
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 28 ---
3 files changed, 60 deletions(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 601be068e06..5840dfcbf02 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1,2 +1 @@
-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_pre20171105-use_system_catch-636828.patch
b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
deleted file mode 100644
index e72eae02311..000
--- 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/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
deleted file mode 100644
index ae775ff3f8c..000
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${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) )
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: a344988b3992f7703680aba89b3cf7332f88a443
Author: Jan Henke taujhe de>
AuthorDate: Sun Dec 3 21:48:16 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Dec 3 22:50:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a344988b
dev-cpp/gsl: use system catch for USE="test".
Closes: https://bugs.gentoo.org/636828
Closes: https://github.com/gentoo/gentoo/pull/6431
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 2 +-
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 3b53acf9b7e..eb36ecd5112 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1 +1 @@
-DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
+DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B
cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657
SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
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
new file mode 100644
index 000..e72eae02311
--- /dev/null
+++ b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
@@ -0,0 +1,31 @@
+# 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 =)
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/, dev-cpp/gsl/files/
commit: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:28:24 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:56 2018 +
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 000..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 000..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 @@
gen...@taujhe.de
- Jan Henke
+ Jan Henke
proxy-ma...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: 6a3f3e4a26efba4dede7603d9afc0eed7bc3120b
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:29:09 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f3e4a
dev-cpp/gsl: Drop old snapshot
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 1 -
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 --
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 28 ---
3 files changed, 60 deletions(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 601be068e06..5840dfcbf02 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1,2 +1 @@
-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_pre20171105-use_system_catch-636828.patch
b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
deleted file mode 100644
index e72eae02311..000
--- 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/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
deleted file mode 100644
index ae775ff3f8c..000
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${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) )
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: a344988b3992f7703680aba89b3cf7332f88a443
Author: Jan Henke taujhe de>
AuthorDate: Sun Dec 3 21:48:16 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Dec 3 22:50:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a344988b
dev-cpp/gsl: use system catch for USE="test".
Closes: https://bugs.gentoo.org/636828
Closes: https://github.com/gentoo/gentoo/pull/6431
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 2 +-
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 3b53acf9b7e..eb36ecd5112 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1 +1 @@
-DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
+DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B
cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657
SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
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
new file mode 100644
index 000..e72eae02311
--- /dev/null
+++ b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
@@ -0,0 +1,31 @@
+# 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 =)
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/, dev-cpp/gsl/files/
commit: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:28:24 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:56 2018 +
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 000..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 000..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 @@
gen...@taujhe.de
- Jan Henke
+ Jan Henke
proxy-ma...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: 6a3f3e4a26efba4dede7603d9afc0eed7bc3120b
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:29:09 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f3e4a
dev-cpp/gsl: Drop old snapshot
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 1 -
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 --
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 28 ---
3 files changed, 60 deletions(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 601be068e06..5840dfcbf02 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1,2 +1 @@
-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_pre20171105-use_system_catch-636828.patch
b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
deleted file mode 100644
index e72eae02311..000
--- 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/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
deleted file mode 100644
index ae775ff3f8c..000
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${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) )
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/, dev-cpp/gsl/files/
commit: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:28:24 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:56 2018 +
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 000..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 000..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 @@
gen...@taujhe.de
- Jan Henke
+ Jan Henke
proxy-ma...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: 6a3f3e4a26efba4dede7603d9afc0eed7bc3120b
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:29:09 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f3e4a
dev-cpp/gsl: Drop old snapshot
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 1 -
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 --
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 28 ---
3 files changed, 60 deletions(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 601be068e06..5840dfcbf02 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1,2 +1 @@
-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_pre20171105-use_system_catch-636828.patch
b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
deleted file mode 100644
index e72eae02311..000
--- 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/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
deleted file mode 100644
index ae775ff3f8c..000
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${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) )
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: a344988b3992f7703680aba89b3cf7332f88a443
Author: Jan Henke taujhe de>
AuthorDate: Sun Dec 3 21:48:16 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Dec 3 22:50:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a344988b
dev-cpp/gsl: use system catch for USE="test".
Closes: https://bugs.gentoo.org/636828
Closes: https://github.com/gentoo/gentoo/pull/6431
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 2 +-
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 3b53acf9b7e..eb36ecd5112 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1 +1 @@
-DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
+DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B
cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657
SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
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
new file mode 100644
index 000..e72eae02311
--- /dev/null
+++ b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
@@ -0,0 +1,31 @@
+# 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 =)
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: a344988b3992f7703680aba89b3cf7332f88a443
Author: Jan Henke taujhe de>
AuthorDate: Sun Dec 3 21:48:16 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Dec 3 22:50:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a344988b
dev-cpp/gsl: use system catch for USE="test".
Closes: https://bugs.gentoo.org/636828
Closes: https://github.com/gentoo/gentoo/pull/6431
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 2 +-
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 3b53acf9b7e..eb36ecd5112 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1 +1 @@
-DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
+DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B
cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657
SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
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
new file mode 100644
index 000..e72eae02311
--- /dev/null
+++ b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
@@ -0,0 +1,31 @@
+# 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 =)
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/, dev-cpp/gsl/files/
commit: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:28:24 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:56 2018 +
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 000..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 000..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 @@
gen...@taujhe.de
- Jan Henke
+ Jan Henke
proxy-ma...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: 6a3f3e4a26efba4dede7603d9afc0eed7bc3120b
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:29:09 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f3e4a
dev-cpp/gsl: Drop old snapshot
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 1 -
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 --
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 28 ---
3 files changed, 60 deletions(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 601be068e06..5840dfcbf02 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1,2 +1 @@
-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_pre20171105-use_system_catch-636828.patch
b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
deleted file mode 100644
index e72eae02311..000
--- 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/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
deleted file mode 100644
index ae775ff3f8c..000
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${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) )
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/, dev-cpp/gsl/files/
commit: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:28:24 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:56 2018 +
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 000..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 000..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 @@
gen...@taujhe.de
- Jan Henke
+ Jan Henke
proxy-ma...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: 6a3f3e4a26efba4dede7603d9afc0eed7bc3120b
Author: Jan Henke taujhe de>
AuthorDate: Mon Jan 8 19:29:09 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Jan 8 19:57:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f3e4a
dev-cpp/gsl: Drop old snapshot
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 1 -
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 --
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 28 ---
3 files changed, 60 deletions(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 601be068e06..5840dfcbf02 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1,2 +1 @@
-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_pre20171105-use_system_catch-636828.patch
b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
deleted file mode 100644
index e72eae02311..000
--- 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/gsl-0_pre20171105.ebuild
b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
deleted file mode 100644
index ae775ff3f8c..000
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 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/d10ebc6555b627c9d1196076a78467e7be505987
-> ${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) )
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gsl/files/, dev-cpp/gsl/
commit: a344988b3992f7703680aba89b3cf7332f88a443
Author: Jan Henke taujhe de>
AuthorDate: Sun Dec 3 21:48:16 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Dec 3 22:50:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a344988b
dev-cpp/gsl: use system catch for USE="test".
Closes: https://bugs.gentoo.org/636828
Closes: https://github.com/gentoo/gentoo/pull/6431
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-cpp/gsl/Manifest | 2 +-
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
index 3b53acf9b7e..eb36ecd5112 100644
--- a/dev-cpp/gsl/Manifest
+++ b/dev-cpp/gsl/Manifest
@@ -1 +1 @@
-DIST gsl-0_pre20171105.tar.gz 55870 SHA256
5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
WHIRLPOOL
98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
+DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B
cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657
SHA512
0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a
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
new file mode 100644
index 000..e72eae02311
--- /dev/null
+++ b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch
@@ -0,0 +1,31 @@
+# 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 =)
