dev-ruby/facter: 3.14.9 stable amd64/x86 with cleanup

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>

3 files changed, 1 insertions, 101 deletions

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index dff6c9730252..734a02c8eeec 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,2 +1 @@
-DIST facter-3.14.8.tar.gz 403496 BLAKE2B 768e1675edd47671bd916fbfae8c1e246ac7a6edb3473bf4ef02627d074f19b54149fae6479156aed3931faaea7b3a867e41b45a7ea4316f03a63687102dff06 SHA512 558de74fb90ba03e6725087e3cdd40f164460a242b7d1b015ed633b8137cd97e2590cb1e5a8634a090da5e51164b0e19e0a509710a4b2ae370b5ef84c936731b
 DIST facter-3.14.9.tar.gz 404448 BLAKE2B f95c0acce84013d58565193a35931d7f562639f607f3fed36ede5d2197336bec0ea4318a28ef29297150ab07a1fd35c292ca15c056b0b8cfe879bbebc64bfb18 SHA512 ff809c87641d65c43a9764d0a2cfe42f64c17d50e473a6d27b6ff25adfbd7be15edf25286932aeba348b669b05a11780257d41aa541fbb013c1169b6d8d25582
diff --git a/dev-ruby/facter/facter-3.14.8.ebuild b/dev-ruby/facter/facter-3.14.8.ebuild
deleted file mode 100644
index bbe9df7aa20f..000000000000
--- a/dev-ruby/facter/facter-3.14.8.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils 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="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 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="
-	>=dev-cpp/cpp-hocon-0.2.1:=
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:0=
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	dev-libs/boost:=[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-DEPEND="${RDEPEND}"
-
-# restore ${S} and override all phases exported by ruby-ng.eclass
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
-	# be explicit about the version of rspec we test with
-	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
-)
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-each_ruby_configure() {
-	# hack for correct calculation of relative path from facter.rb to
-	# libfacter.so
-	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
-}
-
-src_configure() {
-	ruby-ng_src_configure
-
-	local mycmakeargs=(
-		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
-		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	addpredict /proc/self/oom_score_adj
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.14.9.ebuild b/dev-ruby/facter/facter-3.14.9.ebuild
index b7819b83844f..f2b40c9e3b70 100644
--- a/dev-ruby/facter/facter-3.14.9.ebuild
+++ b/dev-ruby/facter/facter-3.14.9.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi