6 files changed, 138 insertions, 70 deletions
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index c78945ffed04..a9676032c501 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,5 +1,4 @@
 AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f9391615958b27b842ede98d7a476cb488e249b1dc14258574bf2f77912599fef98fc325914c8f014 SHA512 381973ca23aec0853714495f74b77155f0079e504312dc55e6e22c8a099aeafd2b7bc4a762c95543c3cd9c5fa5f88a6821f4104b7522536aee7b6f5426d9ec2f
-AUX is-integer_fact-1624_3.6.5.patch 2220 BLAKE2B b8253f3d7eb654c944cce5d75715f795a0e6514da87841c3083c20c205c4fd0fad8fc5962495d7a2d3c10b77d90f3ba5b77cb106d9b04293371f4dd36a3b9b99 SHA512 ce5c10ba7b1a249c4ece233994f11b06481e84a5cc53922a86680931683a0bd719b6045d0a36f3259e9c60044d9d3591736226cc0239f8cc236de63f97c6d1ea
 DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a
 DIST facter-2.5.1.gem 254464 BLAKE2B 7276e9c406c000e51e68a2a1c22d0636e294902d31bcaf58e922961a8e1dd99a362467b7046362a5f179fe72f6c077656d4d400e354ed40ed3a06c71de7f07cc SHA512 4fa4b5248bac64c7a76036e428f0f5fdb0b2173987fbaaf18d0130386126dabb083e23cea8cb4df37bae0ea5a883663f71bc6c04406c562bfb7adc23e0899f57
 DIST facter-3.1.8.tar.gz 324710 BLAKE2B 9b7ce93d7d0b2112771ea79df0cb35e7bb752e19e4a54d213161479c27c7ade79e148fe1fdbbb3c20d0d61462aac5f4b97b6e84fdca89623d9ba4911f286e9fd SHA512 2884c2c0bb3075b2552763dee7f33228b0e70b4eb46367f52c4cbf9e01930ddc5e58d062d06ced4174900fc3eae5214d80471a4fe499bf0f2ac0278640e0e8c7
@@ -9,14 +8,16 @@ DIST facter-3.9.0.tar.gz 380715 BLAKE2B c4045020edaae06b23e0c75788cc76854f440ec7
 DIST facter-3.9.1.tar.gz 380762 BLAKE2B 15d6c4884a4bd4ce1de252f51b1f480c0908ed8b1b3d7b386e651265a21359305f93dfe199b7e100d027d8507ddf99a0ee712e85e63f26f07f3f6f7c2976cc99 SHA512 a3b66bf40c062dbef644d60909a2c2afd0839c8a11fd02a0a15ccbbc1a1f216d9b0420a0f90dd44166487faa4e00843f2c0f3f057bb43bb30c22677dfac325a0
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 DIST facter-3.9.3.tar.gz 387062 BLAKE2B 7fef72ae0ded8be1ac0eae317b748995df58e66837daf410970cca4049304a54af5976f4502a36a3c7d0963d0e65d5bd1c8df5dc1347cc0d6325a9d79512b676 SHA512 c01685e67ed25ae12f51086012e563df9ea80dde43c4cf40ab2f17b90e7bcb0791369a9c8ea67af7a0039e1fb2714b0758d8f0d00e4e857201ad8075d8ba51c4
-EBUILD facter-2.4.6.ebuild 1914 BLAKE2B b13ba79845f5a6ce0d27a8b66f034e12be1a7b522fe263c74760d65d3bf4565bf43fed49cf7e475afb673aaa57f579a5d9ad79b38219c8dfdf0ce32b15eb6536 SHA512 e1e6727b7b66fcf3b306f83563293c5bc7ac541efa775a1b4894c99fc0fa0fe00202cee368b25b389d4264ed868af57fa88489df6b4d8e0283fb0ada79d97440
+DIST facter-3.9.4.tar.gz 388097 BLAKE2B 872ea33c2412ccafd3df1b5e49e79559bac578e91003eda717d03ee1c82e5550f237459066d7fb6692df066fcce183ea4057b4e5e37d1ceaa4b79079ef1c4599 SHA512 e3bb57ad5e538c2561968aab3b47ca7324162dfc5f2a507ed872e41b98f5bbc91f6e836a3452ea2d519a933c76c17a8e1253e74b5d5769e395d7c6895a4400b1
+EBUILD facter-2.4.6.ebuild 1913 BLAKE2B c05f0516f84135fac1d9b4b6a456045e4e5934416f1fee52654c901a9d50b4e69e10e2669f98806779fdb36f6bb6184698581be4191058d91eed8807c602b407 SHA512 bdad132d8bd7abf5cdb15f3fa35ba76dedf5fbb5243799b46538eb6377776f3a7ca08ed8bf21af11ff5b301add9d2f0cbbc794c4e35ba5d5ba8f27cc74f1519b
 EBUILD facter-2.5.1.ebuild 1918 BLAKE2B 303788746f2ba6e1385356526e17965528f10e06546c918f0aed7ecb884bd4e0386387ad01d9e59fd7cb9254d91b26c91ceec1fa9bd75dfd34bedb1d02df9115 SHA512 ed07f3b39a71b147a1a07ac161e1895a4e7380aa773c146d702f82eb5a6bf342aa8700f100c4c56ac2996a2d7fc82b5bd4af492c77aed4ba78d308c18a507ab6
-EBUILD facter-3.1.8.ebuild 1833 BLAKE2B 35fb5f497db4c8285afef7c7448f67532a8dd6d180a6ea0d63faf8d87d2c09fb8d9ecb27ed40d1dded577205e7e1529035abf8dd0f268f22bc7686c09f8f091c SHA512 56425967d45ec216d15a8604d17688b6103d023587e6b806869372bc5b6ed0927d6503ba2be0da4010ad1400f6a475ad82a03bd8a39757c92da952eb599238f1
+EBUILD facter-3.1.8.ebuild 1832 BLAKE2B d82c18bb394b316a1c397be60905bbc0333697ebe68504562053acde280d0cb3c56ec6bb767be3c6c9edf78bd32b72ec919c8092a255574ff2076bc83efc6ffd SHA512 48bf7bb8ac8b39c8ab7ca2ac97fa6bbf4201b485eabdb3d6410e4568270b11fe863e88dbd1cc93f8c0b690372b5fc635cf72e5a5debb1e97bb5ed1797811d5b0
 EBUILD facter-3.7.1.ebuild 2102 BLAKE2B 96a000c70aeabd1554b918c6c38b40097a4a5edeceaa93d57c8a53e7d9cf09988d00ee426d1618f98fb24aec5d6a2b04b199488af591771ddc563719c61cef6d SHA512 8111259a1c695acc9dd884f6dc19560fb18dcaf4412c924529312b288565d20efb010cb41c64a55594f32cce47071b1216a29df23e93df578cdfa047897736ad
 EBUILD facter-3.8.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
 EBUILD facter-3.9.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
 EBUILD facter-3.9.1.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
 EBUILD facter-3.9.2.ebuild 2108 BLAKE2B f5ff96477d41f3c85555e15cafc455d5fc571a27594d5fe9fe38525c6ee083e0cd59435031ca81bfb7666632a683ea24d0e9c4b55eadeebd17dad6bb8a241f4b SHA512 67fb489f027193816d966aa4132873e73892c3ef36146abd6c069746c6a807e7ad1aa1f2b3b14f0aa7c97236018882be37a71f5daa95a27491110e6375b5040c
 EBUILD facter-3.9.3.ebuild 2676 BLAKE2B b99a93367d4e27afe75602238ba9da2a8a90b6661dc0388797b86f214156b6c420c6bc26fe0f77a0f1c860c38b13f9f612463c75123ee55c21636e7b20257443 SHA512 04f7d0bedecbfc814fdedfb31c9d7ee11bdc5f345967dfff93d1cdd2697a4bc02731fa7b4b289c521636ff37226310df62ab4876972e57d034a6c05ea10a65ae
-EBUILD facter-9999.ebuild 2164 BLAKE2B d546a830062cfce1a81c24b5d36f9e6cb5226d1c001ea6e6ef1587766ef48afac5b32c4cab7179f8939f1598cdd4d866837a217f5e70b8b16b3f8c35f67382ea SHA512 122bd623d94b61dea09049514f2178a38e018702bb3f977ee1a876daf6f6d91d31dec586387c8efa255cdb6037da569801768a6487f40628cf66c3fd6b757a00
+EBUILD facter-3.9.4.ebuild 2856 BLAKE2B d0495940e38a3a79b71f8583ca919caf296e8ed548724481f0147be4a1d1216502ab27e9c7a0c110e3c8c9bb015767051c05a928542ab74462bb4c1c28908f89 SHA512 bea7abfe6c1f2215f9db8db98afcf7b3a342da77b238dade61de3c87a4395643ae3ef271dcb17e995119410ca716e535bfe1d17b49f84ad55093b6f6d3e8c758
+EBUILD facter-9999.ebuild 2856 BLAKE2B d0495940e38a3a79b71f8583ca919caf296e8ed548724481f0147be4a1d1216502ab27e9c7a0c110e3c8c9bb015767051c05a928542ab74462bb4c1c28908f89 SHA512 bea7abfe6c1f2215f9db8db98afcf7b3a342da77b238dade61de3c87a4395643ae3ef271dcb17e995119410ca716e535bfe1d17b49f84ad55093b6f6d3e8c758
 MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
diff --git a/dev-ruby/facter/facter-2.4.6.ebuild b/dev-ruby/facter/facter-2.4.6.ebuild
index 18180e3884e6..bd8ef484f6a3 100644
--- a/dev-ruby/facter/facter-2.4.6.ebuild
+++ b/dev-ruby/facter/facter-2.4.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+dmi +pciutils +virt"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
 
 CDEPEND="
 	app-emulation/virt-what
diff --git a/dev-ruby/facter/facter-3.1.8.ebuild b/dev-ruby/facter/facter-3.1.8.ebuild
index 5604ec6096d4..3c5472826b04 100644
--- a/dev-ruby/facter/facter-3.1.8.ebuild
+++ b/dev-ruby/facter/facter-3.1.8.ebuild
@@ -14,7 +14,7 @@ S="${S}/all/${P}"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="debug test"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 
 CDEPEND="
 	>=sys-devel/gcc-4.8:*
diff --git a/dev-ruby/facter/facter-3.9.4.ebuild b/dev-ruby/facter/facter-3.9.4.ebuild
new file mode 100644
index 000000000000..c15426643a6a
--- /dev/null
+++ b/dev-ruby/facter/facter-3.9.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils multilib ruby-ng
+
+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="debug test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+	S="${S}/${P}"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${S}/all/${P}"
+fi
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	>=dev-libs/leatherman-1.0.0
+	dev-cpp/cpp-hocon"
+CDEPEND="
+	dev-libs/openssl:*
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	>=dev-libs/boost-1.54[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${BDEPEND}
+	${CDEPEND}"
+
+src_prepare() {
+	# Remove the code that installs facter.rb to the wrong directory.
+	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
+	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
+	# make it support multilib
+	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
+	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
+	# make the require work
+	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
+	# be explicit about the version of rspec we test with and use the
+	# correct lib directory for tests
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		-e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
+	# patches
+	default
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DUSE_JRUBY_SUPPORT=FALSE
+		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+
+	# need a variable file in env.d :(
+	diropts -m0755
+	dodir /etc/env.d
+	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
+	fperms 0644 /etc/env.d/00facterdir
+}
diff --git a/dev-ruby/facter/facter-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild
index 95b52c0fbfd3..c15426643a6a 100644
--- a/dev-ruby/facter/facter-9999.ebuild
+++ b/dev-ruby/facter/facter-9999.ebuild
@@ -1,22 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 # git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils multilib ruby-ng git-r3
+inherit cmake-utils eutils multilib ruby-ng
 
 DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
 HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
-EGIT_BRANCH="master"
-S="${S}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="debug test"
-KEYWORDS=""
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+	S="${S}/${P}"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${S}/all/${P}"
+fi
 
 BDEPEND="
 	>=sys-devel/gcc-4.8:*
@@ -31,6 +38,8 @@ CDEPEND="
 	>=dev-cpp/yaml-cpp-0.5.1
 	!<app-admin/puppet-4.0.0"
 
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
 RDEPEND="${CDEPEND}"
 DEPEND="${BDEPEND}
 	${CDEPEND}"
@@ -44,6 +53,14 @@ src_prepare() {
 	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
 	# make the require work
 	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
+	# be explicit about the version of rspec we test with and use the
+	# correct lib directory for tests
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		-e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
 	# patches
 	default
 	cmake-utils_src_prepare
diff --git a/dev-ruby/facter/files/is-integer_fact-1624_3.6.5.patch b/dev-ruby/facter/files/is-integer_fact-1624_3.6.5.patch
deleted file mode 100644
index c7b8d80b2c73..000000000000
--- a/dev-ruby/facter/files/is-integer_fact-1624_3.6.5.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9cb17d9fdffabab3693f6548f6bfc54ed2251325 Mon Sep 17 00:00:00 2001
-From: Maggie Dreyer <maggie@puppet.com>
-Date: Tue, 2 May 2017 10:21:06 -0700
-Subject: [PATCH] (FACT-1624) Use `is_integer` instead of `is_fixednum` and
- `is_bignum`
-
-Ruby 2.4 unified Fixnum and Bignum into Integer. We updated the
-Leatherman API to match this. This commit updates Facter to use the new
-API.
----
- lib/src/ruby/module.cc     | 2 +-
- lib/src/ruby/ruby_value.cc | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/src/ruby/module.cc b/lib/src/ruby/module.cc
-index 2d7223e0f..b8aeeed09 100644
---- a/lib/src/ruby/module.cc
-+++ b/lib/src/ruby/module.cc
-@@ -866,7 +866,7 @@ namespace facter { namespace ruby {
-             // Unfortunately we have to call to_sym rather than using ID2SYM, which is Ruby version dependent
-             uint32_t timeout = 0;
-             volatile VALUE timeout_option = ruby.rb_hash_lookup(argv[1], ruby.to_symbol("timeout"));
--            if (ruby.is_fixednum(timeout_option)) {
-+            if (ruby.is_integer(timeout_option)) {
-                 timeout = ruby.num2size_t(timeout_option);
-             }
- 
-diff --git a/lib/src/ruby/ruby_value.cc b/lib/src/ruby/ruby_value.cc
-index d8ea20ce6..645472a3f 100644
---- a/lib/src/ruby/ruby_value.cc
-+++ b/lib/src/ruby/ruby_value.cc
-@@ -86,7 +86,7 @@ namespace facter { namespace ruby {
-             json.SetString(str, size, allocator);
-             return;
-         }
--        if (ruby.is_fixednum(value) || ruby.is_bignum(value)) {
-+        if (ruby.is_integer(value)) {
-             json.SetInt64(ruby.rb_num2ll(value));
-             return;
-         }
-@@ -155,7 +155,7 @@ namespace facter { namespace ruby {
-             }
-             return;
-         }
--        if (ruby.is_fixednum(value) || ruby.is_bignum(value)) {
-+        if (ruby.is_integer(value)) {
-             os << ruby.rb_num2ll(value);
-             return;
-         }
-@@ -241,7 +241,7 @@ namespace facter { namespace ruby {
-             emitter << str;
-             return;
-         }
--        if (ruby.is_fixednum(value) || ruby.is_bignum(value)) {
-+        if (ruby.is_integer(value)) {
-             emitter << ruby.rb_num2ll(value);
-             return;
-         }