1 |
commit: b6423ce797b90533723cce2275e1d91f682cf5d7 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 17 19:34:57 2018 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 17 19:34:57 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6423ce7 |
7 |
|
8 |
dev-ruby/facter: 3.12.0 stable amd64 and x86 with cleanup |
9 |
|
10 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
12 |
|
13 |
dev-ruby/facter/Manifest | 2 - |
14 |
dev-ruby/facter/facter-3.11.3-r1.ebuild | 110 -------------------------------- |
15 |
dev-ruby/facter/facter-3.11.4.ebuild | 110 -------------------------------- |
16 |
dev-ruby/facter/facter-3.12.0.ebuild | 4 +- |
17 |
4 files changed, 2 insertions(+), 224 deletions(-) |
18 |
|
19 |
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest |
20 |
index 47cf93c427b..08a01168020 100644 |
21 |
--- a/dev-ruby/facter/Manifest |
22 |
+++ b/dev-ruby/facter/Manifest |
23 |
@@ -1,5 +1,3 @@ |
24 |
DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a |
25 |
-DIST facter-3.11.3.tar.gz 384882 BLAKE2B ad6103df38efb6abd68d9f831e53dba2767401e129d55bb94adee4dc3f8bc48c7a969050cc52d395a196883d561317ccb72bfaba2775e003171fd6941935feb8 SHA512 6b2dbc5a0bc1c70739a4c0987311ef0891a27f64ed1b45a46cc20a37e6d1d24fda0481976fbf743f83f10d2014f6e0df0e2b5cc9eba19924e831652e1a8417ef |
26 |
-DIST facter-3.11.4.tar.gz 388074 BLAKE2B c3105376ba8d74df08e7e19ca7b5291d241d57aebb43a77d0dabe96668a07a62bf70fb18aa3bc3d85011e22f935a711daade17cf60ad867a7503e1b731647c88 SHA512 af58d0592a4b220d8f1d9a6d065da71136b58b7a474587c140021fd2915d920d328bad52178566f26292bd932ca1ac1371a631f88a567876265c7494bb01c518 |
27 |
DIST facter-3.12.0.tar.gz 390445 BLAKE2B 8c7f2fccd16df3b13df451c18eaeb0cb837d1408b247bbf35f264e3adc2daeb5efaf3008ecf95428433d19067310b2d273a6001e1e151c260d7777dd5185f54b SHA512 2ef78903f62784f86f8d155f9f10ba793c10742f87d80c894c6bd505ae9186b5e875366d9c05899fe5e25f2994cf66b7d73d6c6570a38a7bc6e45ff0d5108c36 |
28 |
DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374 |
29 |
|
30 |
diff --git a/dev-ruby/facter/facter-3.11.3-r1.ebuild b/dev-ruby/facter/facter-3.11.3-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 5060a204e2a..00000000000 |
33 |
--- a/dev-ruby/facter/facter-3.11.3-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,110 +0,0 @@ |
36 |
-# Copyright 1999-2018 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
-USE_RUBY="ruby23 ruby24 ruby25" |
41 |
- |
42 |
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly |
43 |
-inherit cmake-utils eutils multilib ruby-ng |
44 |
- |
45 |
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" |
46 |
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" |
47 |
- |
48 |
-LICENSE="Apache-2.0" |
49 |
-SLOT="0" |
50 |
-IUSE="debug test" |
51 |
-if [[ ${PV} == 9999 ]] ; then |
52 |
- inherit git-r3 |
53 |
- EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" |
54 |
- EGIT_BRANCH="master" |
55 |
-else |
56 |
- [[ "${PV}" = *_rc* ]] || \ |
57 |
- KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" |
58 |
- SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
59 |
-fi |
60 |
- |
61 |
-BDEPEND=" |
62 |
- >=sys-devel/gcc-4.8:* |
63 |
- dev-cpp/cpp-hocon" |
64 |
-COMMON_DEPEND=" |
65 |
- >=dev-libs/leatherman-1.0.0:= |
66 |
- dev-libs/openssl:* |
67 |
- sys-apps/util-linux |
68 |
- app-emulation/virt-what |
69 |
- net-misc/curl |
70 |
- >=dev-libs/boost-1.54:=[nls] |
71 |
- >=dev-cpp/yaml-cpp-0.5.1 |
72 |
- !<app-admin/puppet-4.0.0" |
73 |
- |
74 |
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )" |
75 |
- |
76 |
-RDEPEND="${COMMON_DEPEND}" |
77 |
-DEPEND="${BDEPEND} |
78 |
- ${COMMON_DEPEND}" |
79 |
- |
80 |
-# restore ${S} and override all phases exported by ruby-ng.eclass |
81 |
-S="${WORKDIR}/${P}" |
82 |
- |
83 |
-pkg_setup() { |
84 |
- ruby-ng_pkg_setup |
85 |
-} |
86 |
- |
87 |
-src_unpack() { |
88 |
- default |
89 |
- |
90 |
- if [[ ${PV} == 9999 ]] ; then |
91 |
- git-r3_src_unpack |
92 |
- fi |
93 |
-} |
94 |
- |
95 |
-src_prepare() { |
96 |
- # be explicit about the version of rspec we test with |
97 |
- sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \ |
98 |
- CMakeLists.txt || die |
99 |
- # be more lenient for software versions for tests |
100 |
- sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \ |
101 |
- -e '/rspec/ s/2.11.0/2.11/' \ |
102 |
- -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die |
103 |
- # patches |
104 |
- default |
105 |
- cmake-utils_src_prepare |
106 |
-} |
107 |
- |
108 |
-each_ruby_configure() { |
109 |
- # hack for correct calculation of relative path from facter.rb to |
110 |
- # libfacter.so |
111 |
- my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir') |
112 |
-} |
113 |
- |
114 |
-src_configure() { |
115 |
- ruby-ng_src_configure |
116 |
- |
117 |
- local mycmakeargs=( |
118 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
119 |
- -DRUBY_LIB_INSTALL=${my_ruby_sitelibdir} |
120 |
- -DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)" |
121 |
- ) |
122 |
- if use debug; then |
123 |
- mycmakeargs+=( |
124 |
- -DCMAKE_BUILD_TYPE=Debug |
125 |
- ) |
126 |
- fi |
127 |
- cmake-utils_src_configure |
128 |
-} |
129 |
- |
130 |
-src_compile() { |
131 |
- cmake-utils_src_compile |
132 |
-} |
133 |
- |
134 |
-src_test() { |
135 |
- cmake-utils_src_test |
136 |
-} |
137 |
- |
138 |
-each_ruby_install() { |
139 |
- doruby "${BUILD_DIR}"/lib/facter.rb |
140 |
-} |
141 |
- |
142 |
-src_install() { |
143 |
- cmake-utils_src_install |
144 |
- ruby-ng_src_install |
145 |
-} |
146 |
|
147 |
diff --git a/dev-ruby/facter/facter-3.11.4.ebuild b/dev-ruby/facter/facter-3.11.4.ebuild |
148 |
deleted file mode 100644 |
149 |
index 28bfa5860ac..00000000000 |
150 |
--- a/dev-ruby/facter/facter-3.11.4.ebuild |
151 |
+++ /dev/null |
152 |
@@ -1,110 +0,0 @@ |
153 |
-# Copyright 1999-2018 Gentoo Foundation |
154 |
-# Distributed under the terms of the GNU General Public License v2 |
155 |
- |
156 |
-EAPI=6 |
157 |
-USE_RUBY="ruby23 ruby24 ruby25" |
158 |
- |
159 |
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly |
160 |
-inherit cmake-utils eutils multilib ruby-ng |
161 |
- |
162 |
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" |
163 |
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" |
164 |
- |
165 |
-LICENSE="Apache-2.0" |
166 |
-SLOT="0" |
167 |
-IUSE="debug test" |
168 |
-if [[ ${PV} == 9999 ]] ; then |
169 |
- inherit git-r3 |
170 |
- EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" |
171 |
- EGIT_BRANCH="master" |
172 |
-else |
173 |
- [[ "${PV}" = *_rc* ]] || \ |
174 |
- KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86" |
175 |
- SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
176 |
-fi |
177 |
- |
178 |
-BDEPEND=" |
179 |
- >=sys-devel/gcc-4.8:* |
180 |
- dev-cpp/cpp-hocon" |
181 |
-COMMON_DEPEND=" |
182 |
- >=dev-libs/leatherman-1.0.0:= |
183 |
- dev-libs/openssl:* |
184 |
- sys-apps/util-linux |
185 |
- app-emulation/virt-what |
186 |
- net-misc/curl |
187 |
- >=dev-libs/boost-1.54:=[nls] |
188 |
- >=dev-cpp/yaml-cpp-0.5.1 |
189 |
- !<app-admin/puppet-4.0.0" |
190 |
- |
191 |
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )" |
192 |
- |
193 |
-RDEPEND="${COMMON_DEPEND}" |
194 |
-DEPEND="${BDEPEND} |
195 |
- ${COMMON_DEPEND}" |
196 |
- |
197 |
-# restore ${S} and override all phases exported by ruby-ng.eclass |
198 |
-S="${WORKDIR}/${P}" |
199 |
- |
200 |
-pkg_setup() { |
201 |
- ruby-ng_pkg_setup |
202 |
-} |
203 |
- |
204 |
-src_unpack() { |
205 |
- default |
206 |
- |
207 |
- if [[ ${PV} == 9999 ]] ; then |
208 |
- git-r3_src_unpack |
209 |
- fi |
210 |
-} |
211 |
- |
212 |
-src_prepare() { |
213 |
- # be explicit about the version of rspec we test with |
214 |
- sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \ |
215 |
- CMakeLists.txt || die |
216 |
- # be more lenient for software versions for tests |
217 |
- sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \ |
218 |
- -e '/rspec/ s/2.11.0/2.11/' \ |
219 |
- -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die |
220 |
- # patches |
221 |
- default |
222 |
- cmake-utils_src_prepare |
223 |
-} |
224 |
- |
225 |
-each_ruby_configure() { |
226 |
- # hack for correct calculation of relative path from facter.rb to |
227 |
- # libfacter.so |
228 |
- my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir') |
229 |
-} |
230 |
- |
231 |
-src_configure() { |
232 |
- ruby-ng_src_configure |
233 |
- |
234 |
- local mycmakeargs=( |
235 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
236 |
- -DRUBY_LIB_INSTALL=${my_ruby_sitelibdir} |
237 |
- -DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)" |
238 |
- ) |
239 |
- if use debug; then |
240 |
- mycmakeargs+=( |
241 |
- -DCMAKE_BUILD_TYPE=Debug |
242 |
- ) |
243 |
- fi |
244 |
- cmake-utils_src_configure |
245 |
-} |
246 |
- |
247 |
-src_compile() { |
248 |
- cmake-utils_src_compile |
249 |
-} |
250 |
- |
251 |
-src_test() { |
252 |
- cmake-utils_src_test |
253 |
-} |
254 |
- |
255 |
-each_ruby_install() { |
256 |
- doruby "${BUILD_DIR}"/lib/facter.rb |
257 |
-} |
258 |
- |
259 |
-src_install() { |
260 |
- cmake-utils_src_install |
261 |
- ruby-ng_src_install |
262 |
-} |
263 |
|
264 |
diff --git a/dev-ruby/facter/facter-3.12.0.ebuild b/dev-ruby/facter/facter-3.12.0.ebuild |
265 |
index 683775e7668..47277b802f6 100644 |
266 |
--- a/dev-ruby/facter/facter-3.12.0.ebuild |
267 |
+++ b/dev-ruby/facter/facter-3.12.0.ebuild |
268 |
@@ -1,4 +1,4 @@ |
269 |
-# Copyright 1999-2018 Gentoo Foundation |
270 |
+# Copyright 1999-2018 Gentoo Authors |
271 |
# Distributed under the terms of the GNU General Public License v2 |
272 |
|
273 |
EAPI=6 |
274 |
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then |
275 |
EGIT_BRANCH="master" |
276 |
else |
277 |
[[ "${PV}" = *_rc* ]] || \ |
278 |
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
279 |
+ KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" |
280 |
SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
281 |
fi |