1 |
commit: 4315b90a64d39d9f3ca5ecff2588b0eb86ce4341 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 23 22:12:02 2018 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 23 22:16:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4315b90a |
7 |
|
8 |
dev-ruby/facter: 3.12.1 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
dev-ruby/facter/Manifest | 1 - |
14 |
dev-ruby/facter/facter-3.12.0.ebuild | 110 ----------------------------------- |
15 |
dev-ruby/facter/facter-3.12.1.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 112 deletions(-) |
17 |
|
18 |
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest |
19 |
index 1ad6c72ea6f..2d2f067a6ec 100644 |
20 |
--- a/dev-ruby/facter/Manifest |
21 |
+++ b/dev-ruby/facter/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a |
24 |
-DIST facter-3.12.0.tar.gz 390445 BLAKE2B 8c7f2fccd16df3b13df451c18eaeb0cb837d1408b247bbf35f264e3adc2daeb5efaf3008ecf95428433d19067310b2d273a6001e1e151c260d7777dd5185f54b SHA512 2ef78903f62784f86f8d155f9f10ba793c10742f87d80c894c6bd505ae9186b5e875366d9c05899fe5e25f2994cf66b7d73d6c6570a38a7bc6e45ff0d5108c36 |
25 |
DIST facter-3.12.1.tar.gz 390863 BLAKE2B 3326fc52e95e73c3f083fead5b9e5c6e4fa691d99c5948dc2ffb1a1aeebc928e6a08dd4d09b417cbb33cecb776d75c488956df7b2fb9c5f937a20788ad3466f4 SHA512 34ed1cb50a38a8137301682c46c91c6b409be78c6349677b6544e082fb388248c4878719f57327b6ee4d0d2f35ff171a62afe5e3cc5972e0e9b24e3239a23216 |
26 |
DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374 |
27 |
|
28 |
diff --git a/dev-ruby/facter/facter-3.12.0.ebuild b/dev-ruby/facter/facter-3.12.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index 47277b802f6..00000000000 |
31 |
--- a/dev-ruby/facter/facter-3.12.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,110 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
-USE_RUBY="ruby23 ruby24 ruby25" |
39 |
- |
40 |
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly |
41 |
-inherit cmake-utils eutils multilib ruby-ng |
42 |
- |
43 |
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" |
44 |
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" |
45 |
- |
46 |
-LICENSE="Apache-2.0" |
47 |
-SLOT="0" |
48 |
-IUSE="debug test" |
49 |
-if [[ ${PV} == 9999 ]] ; then |
50 |
- inherit git-r3 |
51 |
- EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" |
52 |
- EGIT_BRANCH="master" |
53 |
-else |
54 |
- [[ "${PV}" = *_rc* ]] || \ |
55 |
- KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" |
56 |
- SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
57 |
-fi |
58 |
- |
59 |
-BDEPEND=" |
60 |
- >=sys-devel/gcc-4.8:* |
61 |
- dev-cpp/cpp-hocon" |
62 |
-COMMON_DEPEND=" |
63 |
- >=dev-libs/leatherman-1.0.0:= |
64 |
- dev-libs/openssl:* |
65 |
- sys-apps/util-linux |
66 |
- app-emulation/virt-what |
67 |
- net-misc/curl |
68 |
- >=dev-libs/boost-1.54:=[nls] |
69 |
- >=dev-cpp/yaml-cpp-0.5.1 |
70 |
- !<app-admin/puppet-4.0.0" |
71 |
- |
72 |
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )" |
73 |
- |
74 |
-RDEPEND="${COMMON_DEPEND}" |
75 |
-DEPEND="${BDEPEND} |
76 |
- ${COMMON_DEPEND}" |
77 |
- |
78 |
-# restore ${S} and override all phases exported by ruby-ng.eclass |
79 |
-S="${WORKDIR}/${P}" |
80 |
- |
81 |
-pkg_setup() { |
82 |
- ruby-ng_pkg_setup |
83 |
-} |
84 |
- |
85 |
-src_unpack() { |
86 |
- default |
87 |
- |
88 |
- if [[ ${PV} == 9999 ]] ; then |
89 |
- git-r3_src_unpack |
90 |
- fi |
91 |
-} |
92 |
- |
93 |
-src_prepare() { |
94 |
- # be explicit about the version of rspec we test with |
95 |
- sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \ |
96 |
- CMakeLists.txt || die |
97 |
- # be more lenient for software versions for tests |
98 |
- sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \ |
99 |
- -e '/rspec/ s/2.11.0/2.11/' \ |
100 |
- -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die |
101 |
- # patches |
102 |
- default |
103 |
- cmake-utils_src_prepare |
104 |
-} |
105 |
- |
106 |
-each_ruby_configure() { |
107 |
- # hack for correct calculation of relative path from facter.rb to |
108 |
- # libfacter.so |
109 |
- my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir') |
110 |
-} |
111 |
- |
112 |
-src_configure() { |
113 |
- ruby-ng_src_configure |
114 |
- |
115 |
- local mycmakeargs=( |
116 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
117 |
- -DRUBY_LIB_INSTALL=${my_ruby_sitelibdir} |
118 |
- -DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)" |
119 |
- ) |
120 |
- if use debug; then |
121 |
- mycmakeargs+=( |
122 |
- -DCMAKE_BUILD_TYPE=Debug |
123 |
- ) |
124 |
- fi |
125 |
- cmake-utils_src_configure |
126 |
-} |
127 |
- |
128 |
-src_compile() { |
129 |
- cmake-utils_src_compile |
130 |
-} |
131 |
- |
132 |
-src_test() { |
133 |
- cmake-utils_src_test |
134 |
-} |
135 |
- |
136 |
-each_ruby_install() { |
137 |
- doruby "${BUILD_DIR}"/lib/facter.rb |
138 |
-} |
139 |
- |
140 |
-src_install() { |
141 |
- cmake-utils_src_install |
142 |
- ruby-ng_src_install |
143 |
-} |
144 |
|
145 |
diff --git a/dev-ruby/facter/facter-3.12.1.ebuild b/dev-ruby/facter/facter-3.12.1.ebuild |
146 |
index 21124e27b59..47277b802f6 100644 |
147 |
--- a/dev-ruby/facter/facter-3.12.1.ebuild |
148 |
+++ b/dev-ruby/facter/facter-3.12.1.ebuild |
149 |
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then |
150 |
EGIT_BRANCH="master" |
151 |
else |
152 |
[[ "${PV}" = *_rc* ]] || \ |
153 |
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
154 |
+ KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" |
155 |
SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
156 |
fi |