gentoo resync : 17.02.2021

3 files changed, 7 insertions, 121 deletions

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 682549eaf82c..b7f45ac3b06b 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -5,6 +5,5 @@ DIST facter-3.14.15.tar.gz 407293 BLAKE2B 0f9bfe78314144e920695e678fa7ce8b4656ba
 DIST facter-3.14.16.tar.gz 407315 BLAKE2B f9637841bd2c1d369d262c77876f08bb248f6a98e0fcb10573c872d521473790ba6eaa8dfcd6a8f0da2becd2f10c2bc7fbfde0d3a44f6a3d38c9e5f363e27e66 SHA512 3adcb7c3ce90a9cb71486c5d86eeaf1f0794194f51faf149052333d2f55a8a8fbe1e5772ecf9a0ed53196cfe732effeb383a42a43942a7803aa8b27e23939d23
 EBUILD facter-3.14.14.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
 EBUILD facter-3.14.15.ebuild 2140 BLAKE2B 230753014d081e4f4960ea8da9bc6f67556f372ea291a8c13136f1ab08bf4ecc52cae9a9f961623f92ecde6e84c232c04c5f830a111ca8e7a385a8fde9453ab5 SHA512 01fe42671b8cead735468a78cc7c9076bff32beba95d1b1bac8188e0cdd2c16a07368f8a26fbd3c9c2d414fec34aa49bb32d7bf5dec9c6642dcea7bcd2e7884c
-EBUILD facter-3.14.16.ebuild 2140 BLAKE2B 230753014d081e4f4960ea8da9bc6f67556f372ea291a8c13136f1ab08bf4ecc52cae9a9f961623f92ecde6e84c232c04c5f830a111ca8e7a385a8fde9453ab5 SHA512 01fe42671b8cead735468a78cc7c9076bff32beba95d1b1bac8188e0cdd2c16a07368f8a26fbd3c9c2d414fec34aa49bb32d7bf5dec9c6642dcea7bcd2e7884c
-EBUILD facter-9999.ebuild 2490 BLAKE2B 9c480e951320b78a43aac1c436d5008d3461de4a62f73f76e7ae6a1eb62d5ac0b4af8f58b2fe25738c892e68d3c014be43f0ac79a8ccfc065c0f1485dbc03428 SHA512 41a5ca3bbbbfb9e5c94271490e7d9a9a1a99ca76b9c3c3ccf5b9ac6b3da005101063ad9b6e3ae8c53e9335c1d55e8b3f8f528f1b759b85a40f6251217b8a7e76
+EBUILD facter-3.14.16-r1.ebuild 2104 BLAKE2B 4b154757d004888f958fbb7d6d916fb44c540b2b46322134b8b5d4e2a1aa14939e85f76d7c7ebc8c594a16f6842de998b9135c1c69ecdd51a702ff097a09cac9 SHA512 1f345cf8e7fadcd7f95266084c0a5cf8e8d3b1e2b895127a6de610b6c63fc1d7ebda5f3093948851e7dd0718ac52e5ddd71f1fa9911cf3a269b43341ce3656b7
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.16.ebuild b/dev-ruby/facter/facter-3.14.16-r1.ebuild
index 0feb8baceeec..249ddd7569a6 100644
--- a/dev-ruby/facter/facter-3.14.16.ebuild
+++ b/dev-ruby/facter/facter-3.14.16-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 # git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils ruby-ng
+inherit cmake eutils ruby-ng
 
 DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
 HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
@@ -61,7 +61,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 each_ruby_configure() {
@@ -77,16 +77,16 @@ src_configure() {
 		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
 		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	addpredict /proc/self/oom_score_adj
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_test() {
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 each_ruby_install() {
@@ -94,6 +94,6 @@ each_ruby_install() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	ruby-ng_src_install
 }
diff --git a/dev-ruby/facter/facter-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild
deleted file mode 100644
index de60deb0a216..000000000000
--- a/dev-ruby/facter/facter-9999.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# 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"
-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 )"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	dev-cpp/cpp-hocon"
-COMMON_DEPEND="
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:0=
-	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="${COMMON_DEPEND}"
-DEPEND="${BDEPEND}
-	${COMMON_DEPEND}"
-
-# restore ${S} and override all phases exported by ruby-ng.eclass
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	# be explicit about the version of rspec we test with
-	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		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
-}
-
-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=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
-		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	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
-}