gentoo auto-resync : 10:09:2023 - 10:35:29

3 files changed, 110 insertions, 0 deletions

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 04dfddbbdb3e..94717bd76610 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,6 +1,7 @@
 AUX facter-3.14.23-gcc12.patch 302 BLAKE2B ebb0251449a861db1fe55f005d62df7d14c8ae760712fa934268f459b89b544cb43892b7e19008b19ec85e4759b04fbe4fe1880fe638f1b8dca67603e3455982 SHA512 9e50f0c48ceaa6c68372d333f3f0cf0628ae68c76153f33a399bc5cfa3dd3367490e81e35427f68c0e7887f9d5b741e4470e09a30be992a23737ea76cbe540c7
 AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
+AUX facter-4.4.3-rspec-gentoo-tweak.patch 2991 BLAKE2B a7bc8342d27a99d6230c46f7a238ad81716ff59e10028aca27e0260c7ac2bf4b39ba002758379fdca608d6a23f60d16252c12fbae4eb19be7f590cb73dae1057 SHA512 5b60dc7ca96465af101e823326187ae7e22decce106ce11d62f13126bb36cfa96031431628ee14ce16b82f454eb9f8ca63a13246e0019954fa9e5a5f57696d71
 DIST facter-3.14.24.tar.gz 410547 BLAKE2B 69d2fd3b1bf9f91456ca570f9fef44ddd6e7656a285c035ecb42df2553c461be137d06232fc1f96f239598143912928dcfaf0d9b3078f4335dfc83163eee5120 SHA512 88e47271f213570fb7819630f7b08076bd8b234612a2bb885de760acab48c37b588c1f214da11c5096f0db6b7df4a516b6e83abc56a1d95779b6f1353831e588
 DIST facter-4.4.1.tar.gz 492785 BLAKE2B b8f173aee1e2c3a6e9b650e1962ee6a7f860cadb0ea09254f396cce60cb01d702feaf23e0e147a80ca95554bcf835bd23df59d4faa78404dc92fd86defb65472 SHA512 c9e148141b3348977c9d6209ed3d72ab1eaaff46e0ada2ce5c3452ee71c3cbc051605bf0d9aad77c249559639e52fbb423c6b3e0cb784f2c208ea206fb3f4fd8
 DIST facter-4.4.2.tar.gz 493658 BLAKE2B 162bb85f739c4c0c18c763323351a2d8a44799782b0ce89ccea3e1584a0cd587fb8c08bb9f7f2a7d234efe87e60a11e7e1ec709dae735d10c672b50016daf5a9 SHA512 035415253305eea67959cd4e41e426f842d9d0a1af2499f2cac8e0c651b30f314f50822ff48ad80d462bc56a92b88b7c021aa09558650f9ebdd26e55ef244829
@@ -8,5 +9,6 @@ DIST facter-4.4.3.tar.gz 493663 BLAKE2B 19f670e503b5ccf3d78b7fa72b0f3d25cef827ea
 EBUILD facter-3.14.24.ebuild 2157 BLAKE2B 88354a568b06d3fe457baa1b72167210c8c2e67c56edc34a09b50a45e808e29aa80afbc2b52e86d56863514741cf98dde3d2e075a0cf04ff1067516ee3a4db03 SHA512 5ee0773755213bdbbeebfc16483933126aa2fc0433a1f4fcd5a63d659a75a35cff278384619bfac731a71aea95e5019af55f9f30021facb247345e316bcf7427
 EBUILD facter-4.4.1.ebuild 1298 BLAKE2B faa278e5811601fe8240e7b8476b1efd5f7ab99eb7f937998222bbcabdc90b1fdebadf93900bfd1885248704c81632948997447d32752caaff6825f536fea02c SHA512 31ab6d1d0aa92338b291ad55d2e6b9fa80d2c6bb624e537dffa191fd5f8791c19ea540f518d3dec0c954065d8645eeb971d8a3da61287d1d703d1a8b7a079b80
 EBUILD facter-4.4.2.ebuild 1324 BLAKE2B 1dc07977e9fc5652ff31c4839aa5206d8b2e174cba08b67672b6c5d9553db3895c01e989f276069fe13e9e8a5e6e856f882769b3a6e0df4fde9528bd5f2aeb9b SHA512 fcc2f8ca96b71375de1074a45ce741afeab575b9d9c6606191198ba8e629eeffa327a93bab3977e942409df69e0c82887a77929933c474c616964a622d6e41fb
+EBUILD facter-4.4.3-r1.ebuild 1551 BLAKE2B e6f3b48494b13379f40c103c9b28b2181760031ca23df4a532d01e694ff4a1c940bef5d6eca7d225059649474e44c86f526571f1795b069b0501d1f6ade338b3 SHA512 94ffb96d8cf3cc37f90aa1a53e191e0f171b5856d7b34eb064cf7e73474ec64427ebcfb6b08fc56ee2bf82d7226b54bab244f03d2d7fa93061362bdfca457863
 EBUILD facter-4.4.3.ebuild 1324 BLAKE2B 1dc07977e9fc5652ff31c4839aa5206d8b2e174cba08b67672b6c5d9553db3895c01e989f276069fe13e9e8a5e6e856f882769b3a6e0df4fde9528bd5f2aeb9b SHA512 fcc2f8ca96b71375de1074a45ce741afeab575b9d9c6606191198ba8e629eeffa327a93bab3977e942409df69e0c82887a77929933c474c616964a622d6e41fb
 MISC metadata.xml 540 BLAKE2B 584d6db1a27bfa9383048929df3d6da07040cf507acc2aa58de7a4e9ba665079cac60b48b398bbb0510914acc03be1fd3468e5678e690f8d6fd03060e659dd4a SHA512 c1311ca348655bf9566889ec9edcd012a2d003f0b1122749caa9066cea2005d3fed7b7a0d1bca75281396e8e43cb6a2f611550572523dc011113424d642c2a2f
diff --git a/dev-ruby/facter/facter-4.4.3-r1.ebuild b/dev-ruby/facter/facter-4.4.3-r1.ebuild
new file mode 100644
index 000000000000..1020d9528957
--- /dev/null
+++ b/dev-ruby/facter/facter-4.4.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-ng ruby-fakegem
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+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"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+	#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	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 dev-ruby/sys-filesystem"
+ruby_add_bdepend "test? ( dev-ruby/simplecov dev-ruby/timecop dev-ruby/webmock )"
+
+PATCHES=(
+	"${FILESDIR}"/facter-4.4.3-rspec-gentoo-tweak.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+	ruby-ng_src_unpack
+}
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Breaks tests; handle deps ourselves
+	sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+	# dev tasks not needed, but block tests
+	for f in tasks/rubocop.rake tasks/check.rake ; do
+		test -e ${f} && mv -f ${f}{,.DISABLE}
+	done
+}
diff --git a/dev-ruby/facter/files/facter-4.4.3-rspec-gentoo-tweak.patch b/dev-ruby/facter/files/facter-4.4.3-rspec-gentoo-tweak.patch
new file mode 100644
index 000000000000..ce97bbbccee9
--- /dev/null
+++ b/dev-ruby/facter/files/facter-4.4.3-rspec-gentoo-tweak.patch
@@ -0,0 +1,53 @@
+These two tests fail on a Gentoo system. Mark as pending so we have coverage of the other tests.
+
+```
+ 1) Facter::Core::Execution::Base#execute with expand on posix does not expant builtin command
+     # False positive on Gentoo due to environment, returns GEM_SKIP instead of PATH
+     Failure/Error: old_require(path) unless LIBS_TO_SKIP.include?(path)
+
+       {"SHELL"=>"/bin/bash", ...,  "_"=>"/usr/bin/rspec", "RACK_ENV"=>"test",
+	   "resolution_test_foo"=>"foo"} received :[] with unexpected arguments
+         expected: ("PATH")
+              got: ("GEM_SKIP")
+        Please stub a default value first if message might be received with other args as well.
+     # ./spec/mocks/kernel.rb:7:in `require'
+     # ./lib/facter/custom_facts/core/execution/base.rb:74:in `execute_command'
+     # ./lib/facter/custom_facts/core/execution/base.rb:63:in `execute'
+     # ./spec/custom_facts/core/execution/fact_manager_spec.rb:106:in `block (4 levels) in <top (required)>'
+
+
+  2) Facter::Core::Execution::Posix when calling execute_command executes a command
+     # False positive on Gentoo due to environment, returns "" instead of ["", ""]
+     Failure/Error: expect(posix_executor.execute_command('/usr/bin/true', nil, logger)).to eq(['', ''])
+
+       expected: ["", ""]
+            got: ""
+
+       (compared using ==)
+     # ./spec/custom_facts/core/execution/posix_spec.rb:112:in `block (3 levels) in <top (required)>'
+```
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -NuarwbB --exclude '*swp' facter-4.4.3.orig/spec/custom_facts/core/execution/fact_manager_spec.rb facter-4.4.3/spec/custom_facts/core/execution/fact_manager_spec.rb
+--- facter-4.4.3.orig/spec/custom_facts/core/execution/fact_manager_spec.rb	2023-08-24 10:49:03.000000000 -0700
++++ facter-4.4.3/spec/custom_facts/core/execution/fact_manager_spec.rb	2023-09-09 21:25:03.428326009 -0700
+@@ -99,6 +99,7 @@
+       end
+
+       it 'does not expant builtin command' do
++        pending('False positive on Gentoo due to environment, returns GEM_SKIP instead of PATH')
+         allow(Facter::Core::Execution::Popen3).to receive(:popen3e).with({ 'LC_ALL' => 'C', 'LANG' => 'C' }, '/bin/foo')
+                                                                    .and_return('')
+         allow(Open3).to receive(:capture2).with('type /bin/foo').and_return('builtin')
+diff -NuarwbB --exclude '*swp' facter-4.4.3.orig/spec/custom_facts/core/execution/posix_spec.rb facter-4.4.3/spec/custom_facts/core/execution/posix_spec.rb
+--- facter-4.4.3.orig/spec/custom_facts/core/execution/posix_spec.rb	2023-08-24 10:49:03.000000000 -0700
++++ facter-4.4.3/spec/custom_facts/core/execution/posix_spec.rb	2023-09-09 21:24:39.484374593 -0700
+@@ -108,6 +108,7 @@
+     let(:logger) { instance_spy(Logger) }
+
+     it 'executes a command' do
++      pending('False positive on Gentoo due to environment, returns "" instead of ["", ""]')
+       expect(posix_executor.execute_command('/usr/bin/true', nil, logger)).to eq(['', ''])
+     end
+