1 |
commit: b0505bc9063373e69b2895be9c37800f4562f39d |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 16 16:17:23 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 16 16:45:48 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0505bc9 |
7 |
|
8 |
dev-ruby/facter: 3.14.3 stable amd64/x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.17 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
dev-ruby/facter/Manifest | 1 - |
14 |
dev-ruby/facter/facter-3.13.2-r1.ebuild | 112 -------------------------------- |
15 |
dev-ruby/facter/facter-3.14.3.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 114 deletions(-) |
17 |
|
18 |
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest |
19 |
index b476b90ea8e..8969c6bfe89 100644 |
20 |
--- a/dev-ruby/facter/Manifest |
21 |
+++ b/dev-ruby/facter/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
-DIST facter-3.13.2.tar.gz 392065 BLAKE2B ae06a1a44de25f55b2eb84483a7abc70433b9437a00724f239a908846148f20bdb3e208d10256e6ddeb7d609ee9eb1c572e14dad84d8640fee147c34cb1bf184 SHA512 c7d1d0958720e0884b06eccf6d7fca64d2c8462c1747bbfbfe5df957ad009c3e930fe5eee80d42c985ea9f59e2b8b7d0a34a194a7e1c713a043bbee9a3b89df3 |
24 |
DIST facter-3.14.2.tar.gz 393499 BLAKE2B 41e8c81668580f215eb597a2130b0d9830bed4067c76d6429f54d7389767f79ef7f059b8d14d8fdf5baeeb1abdce1fa7c0ae69fee4eb221facb1cc66b9a5049b SHA512 83520da9b9739eb7f1fa72bea6765d02d92d09f20143b7c605b032cd5e720b239035c4ae9991711a0e1b9699ee074710506aa4de5f630c28c3d5c9c1a0682fb2 |
25 |
DIST facter-3.14.3.tar.gz 395278 BLAKE2B bda071fb92d337e2d6e58faaa33a6b135b6dfd3b6f4077af3b872bd44191629810fe99a7a1f8d9e3b16c4ff45ba587730bccb0652dcd85f4562120def42c7f38 SHA512 abd7cb3e102bff7635d6b2c17e5650e0a7b7be5ed6b81003df17053f0c9c4887f7db948714daaa313c7569bcc788ab18b0361a57395cd5118a6be38d571794df |
26 |
DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374 |
27 |
|
28 |
diff --git a/dev-ruby/facter/facter-3.13.2-r1.ebuild b/dev-ruby/facter/facter-3.13.2-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index b9491751f31..00000000000 |
31 |
--- a/dev-ruby/facter/facter-3.13.2-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,112 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
-USE_RUBY="ruby23 ruby24 ruby25 ruby26" |
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:0= |
65 |
- sys-apps/util-linux |
66 |
- app-emulation/virt-what |
67 |
- net-misc/curl |
68 |
- >=dev-libs/boost-1.54:=[nls] |
69 |
- <dev-libs/boost-1.70.0 |
70 |
- >=dev-cpp/yaml-cpp-0.5.1 |
71 |
- !<app-admin/puppet-4.0.0" |
72 |
- |
73 |
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )" |
74 |
- |
75 |
-RDEPEND="${COMMON_DEPEND}" |
76 |
-DEPEND="${BDEPEND} |
77 |
- ${COMMON_DEPEND}" |
78 |
- |
79 |
-# restore ${S} and override all phases exported by ruby-ng.eclass |
80 |
-S="${WORKDIR}/${P}" |
81 |
- |
82 |
-pkg_setup() { |
83 |
- ruby-ng_pkg_setup |
84 |
-} |
85 |
- |
86 |
-src_unpack() { |
87 |
- default |
88 |
- |
89 |
- if [[ ${PV} == 9999 ]] ; then |
90 |
- git-r3_src_unpack |
91 |
- fi |
92 |
-} |
93 |
- |
94 |
-src_prepare() { |
95 |
- # be explicit about the version of rspec we test with |
96 |
- sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \ |
97 |
- CMakeLists.txt || die |
98 |
- # be more lenient for software versions for tests |
99 |
- sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \ |
100 |
- -e '/rspec/ s/2.11.0/2.11/' \ |
101 |
- -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die |
102 |
- # patches |
103 |
- default |
104 |
- cmake-utils_src_prepare |
105 |
-} |
106 |
- |
107 |
-each_ruby_configure() { |
108 |
- # hack for correct calculation of relative path from facter.rb to |
109 |
- # libfacter.so |
110 |
- my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir') |
111 |
-} |
112 |
- |
113 |
-src_configure() { |
114 |
- ruby-ng_src_configure |
115 |
- |
116 |
- local mycmakeargs=( |
117 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
118 |
- -DRUBY_LIB_INSTALL=${my_ruby_sitelibdir} |
119 |
- -DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)" |
120 |
- ) |
121 |
- if use debug; then |
122 |
- mycmakeargs+=( |
123 |
- -DCMAKE_BUILD_TYPE=Debug |
124 |
- ) |
125 |
- fi |
126 |
- cmake-utils_src_configure |
127 |
-} |
128 |
- |
129 |
-src_compile() { |
130 |
- addpredict /proc/self/oom_score_adj |
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.14.3.ebuild b/dev-ruby/facter/facter-3.14.3.ebuild |
148 |
index 4c7110c0cf6..b9491751f31 100644 |
149 |
--- a/dev-ruby/facter/facter-3.14.3.ebuild |
150 |
+++ b/dev-ruby/facter/facter-3.14.3.ebuild |
151 |
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then |
152 |
EGIT_BRANCH="master" |
153 |
else |
154 |
[[ "${PV}" = *_rc* ]] || \ |
155 |
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
156 |
+ KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" |
157 |
SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
158 |
fi |