1 |
commit: 9166d24e338077efadafa88b6e760f0ce24a568d |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 28 18:54:26 2018 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 28 19:01:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9166d24e |
7 |
|
8 |
dev-erlang/hamcrest: Drop old, to allow removal of vulnerable erlang |
9 |
|
10 |
Package-Manager: Portage-2.3.26, Repoman-2.3.7 |
11 |
|
12 |
dev-erlang/hamcrest/Manifest | 1 - |
13 |
.../files/0.1.0_p20150103-0001-Fix-unittests.patch | 88 ---------------------- |
14 |
.../hamcrest/hamcrest-0.1.0_p20150103.ebuild | 35 --------- |
15 |
3 files changed, 124 deletions(-) |
16 |
|
17 |
diff --git a/dev-erlang/hamcrest/Manifest b/dev-erlang/hamcrest/Manifest |
18 |
index 73ef9536a88..cfda7768b23 100644 |
19 |
--- a/dev-erlang/hamcrest/Manifest |
20 |
+++ b/dev-erlang/hamcrest/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST hamcrest-0.1.0_p20150103.tar.gz 160516 BLAKE2B 30ef36c9e1c9078cecc5077a2fc6ae35b1e4a120513f7a6f52f33207f364de1c87b6206812116aefe0c64e9480dc772154e7a2d39a36f8c1556bc957532fbf75 SHA512 d7ed0db598f15e5a2724c31d35a2e34ca55ff37d715c1e8a4b35fd438567f1ae2c4d266dee7215690e8508f77f625a551b7ecbef06582a9ffddb9d14d895fab8 |
23 |
DIST hamcrest-0.1.0_p20160709.tar.gz 160574 BLAKE2B e7fd8db2ea69e89ff4adb89d4c9cd87ce1557019f18200201bffb0e9f867d03ccaaa2f957f38057ed1d0b01372f1646e7233f013e08cd4fdcdd56ac631af4230 SHA512 a1d162e72019bcd56c3f1c486e65b7f788e69a1a2985e5500920565bf6c40b6dd7b920e720ffc8da81cac3b1919124b8defadec2fcef5b27585e63da3abd852e |
24 |
|
25 |
diff --git a/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-Fix-unittests.patch b/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-Fix-unittests.patch |
26 |
deleted file mode 100644 |
27 |
index 94e507cf66c..00000000000 |
28 |
--- a/dev-erlang/hamcrest/files/0.1.0_p20150103-0001-Fix-unittests.patch |
29 |
+++ /dev/null |
30 |
@@ -1,88 +0,0 @@ |
31 |
-From 4eb8b813d0086a6eca9627ab64721378b07aa030 Mon Sep 17 00:00:00 2001 |
32 |
-From: Luke Bakken <lbakken@×××××.com> |
33 |
-Date: Sat, 9 Jul 2016 07:43:41 -0700 |
34 |
-Subject: [PATCH] OTP 19 support via compilation of CT suite. This defines |
35 |
- namespaced_types. Disable CT auto-compile. Fix warnings. Update to proper |
36 |
- v1.2 |
37 |
- |
38 |
---- |
39 |
- .gitignore | 8 ++++++++ |
40 |
- test.config | 16 +++++++++++++--- |
41 |
- test/hamcrest_matchers_SUITE.erl | 4 ++-- |
42 |
- 3 files changed, 23 insertions(+), 5 deletions(-) |
43 |
- |
44 |
-diff --git a/.gitignore b/.gitignore |
45 |
-index 59ac5eb..d6882d0 100755 |
46 |
---- a/.gitignore |
47 |
-+++ b/.gitignore |
48 |
-@@ -4,6 +4,7 @@ |
49 |
- *.o |
50 |
- *.so |
51 |
- *.swp |
52 |
-+.rebar/ |
53 |
- build/* |
54 |
- ^build$ |
55 |
- Emakefile |
56 |
-@@ -15,3 +16,10 @@ ebin/*.beam |
57 |
- logs/* |
58 |
- include/hamcrest.hrl |
59 |
- qc.hrl |
60 |
-+deps/ |
61 |
-+ct_*/ |
62 |
-+all_runs.html |
63 |
-+ct_* |
64 |
-+jquery-latest.js |
65 |
-+jquery.tablesorter.min.js |
66 |
-+variables-ct@localhost |
67 |
-diff --git a/test.config b/test.config |
68 |
-index bff1a63..f206e37 100644 |
69 |
---- a/test.config |
70 |
-+++ b/test.config |
71 |
-@@ -1,9 +1,19 @@ |
72 |
-- |
73 |
- {cover_enabled, true}. |
74 |
-+ |
75 |
- {deps, [ |
76 |
-- %% TODO: bind to a specific commit or tag instead of 'master' |
77 |
-- {proper, ".*", {git, "http://github.com/manopapad/proper.git", "v1.1"}} |
78 |
-+ {proper, "1.*", {git, "http://github.com/manopapad/proper.git", "v1.2"}} |
79 |
- ]}. |
80 |
- |
81 |
-+{erl_opts, [ |
82 |
-+ debug_info, |
83 |
-+ fail_on_warning, |
84 |
-+ {src_dirs, ["test"]}, |
85 |
-+ {platform_define, "^[0-9]+", namespaced_types} |
86 |
-+ ]}. |
87 |
-+ |
88 |
-+{validate_app_modules, false}. |
89 |
-+ |
90 |
-+{ct_extra_params, "-no_auto_compile"}. |
91 |
-+ |
92 |
- {plugin_dir, "priv/build/plugins"}. |
93 |
- {plugins, [eqc_resolver]}. |
94 |
-diff --git a/test/hamcrest_matchers_SUITE.erl b/test/hamcrest_matchers_SUITE.erl |
95 |
-index f2889e2..6726425 100644 |
96 |
---- a/test/hamcrest_matchers_SUITE.erl |
97 |
-+++ b/test/hamcrest_matchers_SUITE.erl |
98 |
-@@ -69,7 +69,7 @@ is_not_evaluates_to_logical_negation_of_underlying_matcher(_) -> |
99 |
- ?EQC(P). |
100 |
- |
101 |
- is_not_provides_convenient_shortcut_for_not_equal_to(_) -> |
102 |
-- P = ?FORALL({X, Y}, {binary(), binary()}, |
103 |
-+ P = ?FORALL({X, _Y}, {binary(), binary()}, |
104 |
- begin |
105 |
- #'hamcrest.matchspec'{matcher=F1} = equal_to(X), |
106 |
- #'hamcrest.matchspec'{matcher=F2} = is_not(X), |
107 |
-@@ -240,7 +240,7 @@ ends_with_should_only_match_last_portion_of_string(_) -> |
108 |
- ?IMPLIES(length(Xs) > 0, |
109 |
- begin |
110 |
- Y = round(length(Xs) / 2), |
111 |
-- LStr = string:left(Xs, Y), |
112 |
-+ _LStr = string:left(Xs, Y), |
113 |
- RStr = string:right(Xs, Y), |
114 |
- case (assert_that(Xs, ends_with(RStr))) of |
115 |
- true -> true; |
116 |
--- |
117 |
-2.9.0 |
118 |
- |
119 |
|
120 |
diff --git a/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild b/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild |
121 |
deleted file mode 100644 |
122 |
index 66f111f47de..00000000000 |
123 |
--- a/dev-erlang/hamcrest/hamcrest-0.1.0_p20150103.ebuild |
124 |
+++ /dev/null |
125 |
@@ -1,35 +0,0 @@ |
126 |
-# Copyright 1999-2016 Gentoo Foundation |
127 |
-# Distributed under the terms of the GNU General Public License v2 |
128 |
- |
129 |
-EAPI=6 |
130 |
- |
131 |
-inherit rebar |
132 |
- |
133 |
-DESCRIPTION="Erlang port of Hamcrest" |
134 |
-HOMEPAGE="https://github.com/hyperthunk/hamcrest-erlang" |
135 |
-SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.gz" |
136 |
- |
137 |
-LICENSE="BSD" |
138 |
-SLOT="0" |
139 |
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86" |
140 |
-IUSE="test" |
141 |
- |
142 |
-CDEPEND=">=dev-lang/erlang-17.1 |
143 |
- <dev-lang/erlang-19" |
144 |
-DEPEND="${CDEPEND} |
145 |
- test? ( >=dev-erlang/proper-1.1 )" |
146 |
-RDEPEND="${CDEPEND}" |
147 |
- |
148 |
-DOCS=( NOTES README.markdown TODO.md ) |
149 |
-PATCHES=( "${FILESDIR}"/${PV}-0001-Fix-unittests.patch ) |
150 |
- |
151 |
-# Override with EAPI default because it's missing hamcrest.app.src and doesn't |
152 |
-# have any deps. |
153 |
-src_prepare() { |
154 |
- default |
155 |
-} |
156 |
- |
157 |
-src_test() { |
158 |
- rebar_remove_deps test.config |
159 |
- erebar -C test.config compile ct |
160 |
-} |