1 |
commit: 842a1f19d234c17896e7102e691c95c5b552bbb7 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 10 07:47:28 2018 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 10 07:47:28 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842a1f19 |
7 |
|
8 |
dev-ruby/facter: cleanup |
9 |
|
10 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
dev-ruby/facter/Manifest | 1 - |
14 |
dev-ruby/facter/facter-2.4.6.ebuild | 61 ------------------------------------- |
15 |
dev-ruby/facter/metadata.xml | 5 --- |
16 |
3 files changed, 67 deletions(-) |
17 |
|
18 |
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest |
19 |
index 2d2f067a6ec..9ab832b6888 100644 |
20 |
--- a/dev-ruby/facter/Manifest |
21 |
+++ b/dev-ruby/facter/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a |
24 |
DIST facter-3.12.1.tar.gz 390863 BLAKE2B 3326fc52e95e73c3f083fead5b9e5c6e4fa691d99c5948dc2ffb1a1aeebc928e6a08dd4d09b417cbb33cecb776d75c488956df7b2fb9c5f937a20788ad3466f4 SHA512 34ed1cb50a38a8137301682c46c91c6b409be78c6349677b6544e082fb388248c4878719f57327b6ee4d0d2f35ff171a62afe5e3cc5972e0e9b24e3239a23216 |
25 |
DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374 |
26 |
|
27 |
diff --git a/dev-ruby/facter/facter-2.4.6.ebuild b/dev-ruby/facter/facter-2.4.6.ebuild |
28 |
deleted file mode 100644 |
29 |
index 355f548540d..00000000000 |
30 |
--- a/dev-ruby/facter/facter-2.4.6.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,61 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=5 |
37 |
- |
38 |
-USE_RUBY="ruby23 ruby24" |
39 |
-RUBY_FAKEGEM_TASK_DOC="" |
40 |
-RUBY_FAKEGEM_RECIPE_TEST="rspec" |
41 |
-RUBY_FAKEGEM_EXTRADOC="README.md" |
42 |
-RUBY_FAKEGEM_BINWRAP="facter" |
43 |
- |
44 |
-inherit ruby-fakegem |
45 |
- |
46 |
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems" |
47 |
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" |
48 |
- |
49 |
-LICENSE="Apache-2.0" |
50 |
-SLOT="0" |
51 |
-IUSE="+dmi +pciutils +virt" |
52 |
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86" |
53 |
- |
54 |
-CDEPEND=" |
55 |
- app-emulation/virt-what |
56 |
- sys-apps/net-tools |
57 |
- sys-apps/lsb-release |
58 |
- dmi? ( sys-apps/dmidecode ) |
59 |
- pciutils? ( sys-apps/pciutils )" |
60 |
- |
61 |
-RDEPEND+=" ${CDEPEND}" |
62 |
-DEPEND+=" test? ( ${CDEPEND} )" |
63 |
- |
64 |
-ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )" |
65 |
- |
66 |
-all_ruby_prepare() { |
67 |
- # Provide explicit path since /sbin is not in the default PATH on |
68 |
- # Gentoo. |
69 |
- sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb spec/unit/util/ec2_spec.rb || die |
70 |
- |
71 |
- # Ensure the correct version of mocha is used without using bundler. |
72 |
- sed -i -e '1igem "mocha", "~>1.0"' spec/spec_helper.rb || die |
73 |
- |
74 |
- # Avoid because tests try to access outside stuff, e.g. /sys/block |
75 |
- sed -i -e '/should load facts on the facter search path only once/,/^ end/ s:^:#:' spec/unit/util/loader_spec.rb || die |
76 |
- |
77 |
- # Allow specs to work with newer rspec 2.x versions. |
78 |
- sed -i -e '1irequire "rspec-expectations"' spec/puppetlabs_spec/matchers.rb || die |
79 |
- |
80 |
- # Avoid specs specific to macosx requiring cfpropertylist which is |
81 |
- # not available anymore. |
82 |
- rm spec/unit/util/macosx_spec.rb || die |
83 |
- sed -i -e '/macosx/ s:^:#:' \ |
84 |
- -e '/on Darwin/,/^ end/ s:^:#:' spec/unit/virtual_spec.rb || die |
85 |
- sed -i -e '/Facter::Processors::Darwin/,/^end/ s:^:#:' spec/unit/processors/os_spec.rb || die |
86 |
-} |
87 |
- |
88 |
-all_ruby_install() { |
89 |
- all_fakegem_install |
90 |
- |
91 |
- # Create the directory for custom facts. |
92 |
- keepdir /etc/facter/facts.d |
93 |
-} |
94 |
|
95 |
diff --git a/dev-ruby/facter/metadata.xml b/dev-ruby/facter/metadata.xml |
96 |
index 8f010b49bce..89ac2d179c9 100644 |
97 |
--- a/dev-ruby/facter/metadata.xml |
98 |
+++ b/dev-ruby/facter/metadata.xml |
99 |
@@ -12,11 +12,6 @@ |
100 |
<email>ruby@g.o</email> |
101 |
<name>Gentoo Ruby Project</name> |
102 |
</maintainer> |
103 |
- <use> |
104 |
- <flag name="dmi">Use <pkg>sys-apps/dmidecode</pkg> to determine hardware system properties</flag> |
105 |
- <flag name="virt">Use <pkg>app-emulation/virt-what</pkg> for virtual machine detection</flag> |
106 |
- <flag name="pciutils">Use <pkg>sys-apps/pciutils</pkg> to determine hardware system properties</flag> |
107 |
- </use> |
108 |
<upstream> |
109 |
<remote-id type="github">puppetlabs/facter</remote-id> |
110 |
</upstream> |