summaryrefslogtreecommitdiff
path: root/dev-ruby/facter
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-04-02 05:16:35 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-04-02 05:16:35 +0100
commit6882d8d1110ef4feeec532196a1f0a25420d0fd1 (patch)
treec8a3d28a31e6c077d6b9097ff36b1232d2ce04b7 /dev-ruby/facter
parent85a2a2153ef8027c2ba1be45143cd91914be0ad0 (diff)
gentoo auto-resync : 02:04:2023 - 05:16:35
Diffstat (limited to 'dev-ruby/facter')
-rw-r--r--dev-ruby/facter/Manifest4
-rw-r--r--dev-ruby/facter/facter-3.14.24.ebuild3
-rw-r--r--dev-ruby/facter/facter-4.3.0.ebuild41
3 files changed, 38 insertions, 10 deletions
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index fd1a6bd43de0..0b0de7e23d12 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -3,6 +3,6 @@ AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea
AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
DIST facter-3.14.24.tar.gz 410547 BLAKE2B 69d2fd3b1bf9f91456ca570f9fef44ddd6e7656a285c035ecb42df2553c461be137d06232fc1f96f239598143912928dcfaf0d9b3078f4335dfc83163eee5120 SHA512 88e47271f213570fb7819630f7b08076bd8b234612a2bb885de760acab48c37b588c1f214da11c5096f0db6b7df4a516b6e83abc56a1d95779b6f1353831e588
DIST facter-4.3.0.tar.gz 485528 BLAKE2B 87649bd543337d3f12b978cbff78b0829e2f11ea68884b357a131b421fa60a5c713fee7d0dd04e04aa4cbfa39a08889967b0b531bfc8fcde781be12b4f455f01 SHA512 52ed43ab1d11ded079ae221a60f1448f1cf3a3c66907e828f9d6e0c5c0e28c26641ce482a694100700633cc1459a3521be45029907307b2bf91cb6eaecc1b351
-EBUILD facter-3.14.24.ebuild 2136 BLAKE2B 36bab1deadfda1f3ad2f25116e2f345f1c0e39bd25339063307d18f2b7ba285930f267bc44573de8bb6ed23db5919d743cd08d8576d13150d84d17aff0e3f524 SHA512 b73aa7de328d6526fadba4002130d53b4157b2f8030b4481cd971cdb4620fbd8931605ec85d02166c4a6d7723e9e224ffdf6afb563fe8334a4cf79a0e45b4f34
-EBUILD facter-4.3.0.ebuild 1298 BLAKE2B faa278e5811601fe8240e7b8476b1efd5f7ab99eb7f937998222bbcabdc90b1fdebadf93900bfd1885248704c81632948997447d32752caaff6825f536fea02c SHA512 31ab6d1d0aa92338b291ad55d2e6b9fa80d2c6bb624e537dffa191fd5f8791c19ea540f518d3dec0c954065d8645eeb971d8a3da61287d1d703d1a8b7a079b80
+EBUILD facter-3.14.24.ebuild 2157 BLAKE2B 88354a568b06d3fe457baa1b72167210c8c2e67c56edc34a09b50a45e808e29aa80afbc2b52e86d56863514741cf98dde3d2e075a0cf04ff1067516ee3a4db03 SHA512 5ee0773755213bdbbeebfc16483933126aa2fc0433a1f4fcd5a63d659a75a35cff278384619bfac731a71aea95e5019af55f9f30021facb247345e316bcf7427
+EBUILD facter-4.3.0.ebuild 1827 BLAKE2B 5bba9612c83473584038dce74fa4733a43cfd3c18aded5daf98d45b4f611d33a6fba290201db7b5d58c4167fa3d0d0731fa0bb1c7eca0eba3ce488cc94bff8ff SHA512 a7d93272e233d7b5b4fa1d9bcf60c9ca3e96176f0bb3a783f085a6eb62c1f11a5c89fc8cc67957bb865d221f8a62a26e90da96b1e7a88f912ec94fbf5115c029
MISC metadata.xml 620 BLAKE2B d7d91d8ed2cb868eb9af749462e7dcd4364dd44543614387f646cab41691525a8a03dd0e59210efeb6f39ddbd1428f2562bb9d77d29e3612ed5a1fede702a5ee SHA512 e51c01831a4052976bc481fdbeb33bf4b185ed926faf7b141526da3cde0d2c99d9b29b6a575f1fe2bf2d00719881a7bdedcb2093058b62ed3ea4c820b8b3af42
diff --git a/dev-ruby/facter/facter-3.14.24.ebuild b/dev-ruby/facter/facter-3.14.24.ebuild
index f96cf08d6439..9bbc5292b5a5 100644
--- a/dev-ruby/facter/facter-3.14.24.ebuild
+++ b/dev-ruby/facter/facter-3.14.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -76,6 +76,7 @@ src_configure() {
local mycmakeargs=(
-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+ -DWITHOUT_JRUBY=ON
-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
)
cmake_src_configure
diff --git a/dev-ruby/facter/facter-4.3.0.ebuild b/dev-ruby/facter/facter-4.3.0.ebuild
index 1c4e136e7a9c..0c946eea9e22 100644
--- a/dev-ruby/facter/facter-4.3.0.ebuild
+++ b/dev-ruby/facter/facter-4.3.0.ebuild
@@ -2,9 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_RECIPE_DOC="yard"
inherit ruby-ng ruby-fakegem
@@ -14,7 +15,7 @@ HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
LICENSE="Apache-2.0"
SLOT="0"
-#IUSE="test"
+
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
@@ -25,10 +26,8 @@ else
SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi
-#RESTRICT="!test? ( test )"
-
ruby_add_rdepend "dev-ruby/hocon <dev-ruby/thor-2.0 dev-ruby/ffi"
-#ruby_add_bdepend "test? ( dev-ruby/simplecov dev-ruby/timecop dev-ruby/webmock )"
+ruby_add_bdepend "test? ( dev-ruby/timecop dev-ruby/webmock )"
src_unpack() {
if [[ ${PV} == 9999 ]] ; then
@@ -41,6 +40,34 @@ all_ruby_prepare() {
sed -e 's/__dir__/"."/' \
-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Linting and coverage aren't useful for us in testing
+ # Also loosen dependencies
+ sed -i \
+ -e '/rubocop/d' \
+ -e '/simplecov/d' \
+ -e '/rake/s:~> 12.3:>= 12.3:' \
+ -e '/yard/s:~> 0.9:>= 0.9:' \
+ -e '/sys-filesystem/d' \
+ -e '/octokit/d' \
+ ${RUBY_FAKEGEM_GEMSPEC} || die
+ sed -i \
+ -e '/octokit/d' \
+ -e '/packaging/d' \
+ -e '/ronn/d' \
+ Gemfile || die
+
+ sed -i \
+ -e '/simplecov/d' \
+ -e '/SimpleCov.start/,/^end/ s:^:#:' \
+ -e '/SimpleCov/d' \
+ spec/spec_helper.rb || die
+ rm tasks/{check,rubocop}.rake || die
+
# Breaks tests; handle deps ourselves
- sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+ #sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+ each_fakegem_test --trace
}