| 1 |
commit: ee604746b688a9631001dff1618b97dd4ad1aa46 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 2 15:52:51 2018 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 2 15:52:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee604746 |
| 7 |
|
| 8 |
dev-cpp/yaml-cpp: Remove 0.5.3-r1 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/614850 |
| 11 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 12 |
|
| 13 |
dev-cpp/yaml-cpp/Manifest | 1 - |
| 14 |
dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch | 44 ------------------------ |
| 15 |
dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild | 37 -------------------- |
| 16 |
3 files changed, 82 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest |
| 19 |
index bac72aa90f8..4a2a21dbeb9 100644 |
| 20 |
--- a/dev-cpp/yaml-cpp/Manifest |
| 21 |
+++ b/dev-cpp/yaml-cpp/Manifest |
| 22 |
@@ -1,2 +1 @@ |
| 23 |
-DIST yaml-cpp-0.5.3.tar.gz 2016737 BLAKE2B 6c10d44fe04fdd81cd61c909acdb576834f5358dd44353723b04d8a42bf8a1312cfa752e445c84f93c6ce76358b2d42dee5263f6fbd47a1f928d1cd28aedef07 SHA512 5ed15fee3c6455c08e6bd8f74256b230f274ef18f8e144491e940640e41626517c7eaaf4a1f380c4179066a2a757c8a0f61878df9dc3caa15e37c4954be47fe0 |
| 24 |
DIST yaml-cpp-0.6.2.tar.gz 1396250 BLAKE2B be342c212c980cdb03349dbafbe1db0bb581123b4dd6909393d3cdc86145b997a9d2f9b57a5e9d7c8cc60cdfd03f1c37e9db610d8784f2d29fdeada5ab322894 SHA512 fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4 |
| 25 |
|
| 26 |
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch |
| 27 |
deleted file mode 100644 |
| 28 |
index 88ee25fa0ac..00000000000 |
| 29 |
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,44 +0,0 @@ |
| 32 |
-Bug: https://bugs.gentoo.org/609176 |
| 33 |
-Upstream PR: https://github.com/jbeder/yaml-cpp/pull/514 |
| 34 |
- |
| 35 |
-From a83a1b3a7bd0a5a4eb458d898b057f6a8d409b7e Mon Sep 17 00:00:00 2001 |
| 36 |
-From: Peter-Levine <plevine457@×××××.com> |
| 37 |
-Date: Mon, 24 Jul 2017 02:00:24 -0400 |
| 38 |
-Subject: [PATCH] Fix segfault in gmock when running tests |
| 39 |
- |
| 40 |
-Taken from https://github.com/google/googletest/issues/705#issuecomment-235067917 |
| 41 |
---- |
| 42 |
- test/gmock-1.7.0/include/gmock/gmock-spec-builders.h | 6 ++++-- |
| 43 |
- 1 file changed, 4 insertions(+), 2 deletions(-) |
| 44 |
- |
| 45 |
-diff --git a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h |
| 46 |
-index 312fbe87..2dd733b6 100644 |
| 47 |
---- a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h |
| 48 |
-+++ b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h |
| 49 |
-@@ -1370,6 +1370,8 @@ class ActionResultHolder : public UntypedActionResultHolderBase { |
| 50 |
- template <> |
| 51 |
- class ActionResultHolder<void> : public UntypedActionResultHolderBase { |
| 52 |
- public: |
| 53 |
-+ explicit ActionResultHolder() {} |
| 54 |
-+ |
| 55 |
- void GetValueAndDelete() const { delete this; } |
| 56 |
- |
| 57 |
- virtual void PrintAsActionResult(::std::ostream* /* os */) const {} |
| 58 |
-@@ -1381,7 +1383,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase { |
| 59 |
- const typename Function<F>::ArgumentTuple& args, |
| 60 |
- const string& call_description) { |
| 61 |
- func_mocker->PerformDefaultAction(args, call_description); |
| 62 |
-- return NULL; |
| 63 |
-+ return new ActionResultHolder(); |
| 64 |
- } |
| 65 |
- |
| 66 |
- // Performs the given action and returns NULL. |
| 67 |
-@@ -1390,7 +1392,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase { |
| 68 |
- const Action<F>& action, |
| 69 |
- const typename Function<F>::ArgumentTuple& args) { |
| 70 |
- action.Perform(args); |
| 71 |
-- return NULL; |
| 72 |
-+ return new ActionResultHolder(); |
| 73 |
- } |
| 74 |
- }; |
| 75 |
- |
| 76 |
|
| 77 |
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild |
| 78 |
deleted file mode 100644 |
| 79 |
index 6bf29f127ca..00000000000 |
| 80 |
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild |
| 81 |
+++ /dev/null |
| 82 |
@@ -1,37 +0,0 @@ |
| 83 |
-# Copyright 1999-2017 Gentoo Foundation |
| 84 |
-# Distributed under the terms of the GNU General Public License v2 |
| 85 |
- |
| 86 |
-EAPI=6 |
| 87 |
- |
| 88 |
-inherit cmake-utils |
| 89 |
- |
| 90 |
-DESCRIPTION="YAML parser and emitter in C++" |
| 91 |
-HOMEPAGE="https://github.com/jbeder/yaml-cpp" |
| 92 |
-SRC_URI="https://github.com/jbeder/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" |
| 93 |
- |
| 94 |
-LICENSE="MIT" |
| 95 |
-SLOT="0" |
| 96 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
| 97 |
-IUSE="" |
| 98 |
- |
| 99 |
-DEPEND=">=dev-libs/boost-1.49.0-r2:=" |
| 100 |
-RDEPEND="${DEPEND}" |
| 101 |
- |
| 102 |
-S="${WORKDIR}/${PN}-release-${PV}" |
| 103 |
- |
| 104 |
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) |
| 105 |
- |
| 106 |
-src_prepare() { |
| 107 |
- sed -i \ |
| 108 |
- -e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \ |
| 109 |
- yaml-cpp.pc.cmake || die |
| 110 |
- |
| 111 |
- cmake-utils_src_prepare |
| 112 |
-} |
| 113 |
- |
| 114 |
-src_configure() { |
| 115 |
- local mycmakeargs=( |
| 116 |
- -DBUILD_SHARED_LIBS=ON |
| 117 |
- ) |
| 118 |
- cmake-utils_src_configure |
| 119 |
-} |
Archives