gentoo (leap year) resync : 29.02.2020

3 files changed, 112 insertions, 0 deletions

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 2b9073e78046..e03476cc9342 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,6 +1,9 @@
 AUX facter-3.14.6-explicit-rspec-2.patch 480 BLAKE2B 60ebc035ea3e37628879628de36cd4c4ac9672e3fc00fec671f61b5c8cf646ccd95b1686f791032e66b7567f0f7f96cd4c9be7441f39e4e8f25346c8a4fa609c SHA512 a33322a1e2906c3ac400b798855158450a0465ed809d34bf033a868864c9e7aab0284c98c3eb85b27c8248ba6b3efb8f6cdb45219adac290151232bf87322153
 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
 DIST facter-3.14.7.tar.gz 398902 BLAKE2B e399fba120bee70b85fb7ea39ba0f719efd6b6509add4000a4eb220aa0f59e1ffe7457a8959cbb81be78ace04ba9ef3038c39d2c975e8c0c6071cd22aa5aae78 SHA512 33c187844642645b4ad780c6a5be4af0d860fb824e70935d60eb626267cae46f00487ea408fab28149472c58e80c33bdb4585e6eec18f16d817b014c3f2bc675
+DIST facter-3.14.8.tar.gz 403496 BLAKE2B 768e1675edd47671bd916fbfae8c1e246ac7a6edb3473bf4ef02627d074f19b54149fae6479156aed3931faaea7b3a867e41b45a7ea4316f03a63687102dff06 SHA512 558de74fb90ba03e6725087e3cdd40f164460a242b7d1b015ed633b8137cd97e2590cb1e5a8634a090da5e51164b0e19e0a509710a4b2ae370b5ef84c936731b
 EBUILD facter-3.14.7.ebuild 2138 BLAKE2B efbfc8934e75de90479dc228a6f42f9313df1d1725dc2d437cd3b31a613bc809a421d62146b75154f7bb04f7ca5c9b7454506a372133f2dc882e366640fdb781 SHA512 dc329d53646925f2c6e1b484cbb56e4c36f1d68b30ba46059e710e02cae5bdeb55985f2629c5b7c09c0174e9c61f964f42f00d3fc77e8400cda98e2269adcf11
+EBUILD facter-3.14.8.ebuild 2140 BLAKE2B f05396e14d5e3797463d8343ea77ce2132fb1793fa1b442b4478419b52561db3d38cdfb26e75988717ce5ae8bbab23e1cfaebf139b4366243c40f1c14f155090 SHA512 692e1dc44d710b1ba2b2195894929fe21b746ea40a4a1b52e55b687bf6f629d904383084a240b79c8871abeb79d3df98a6e698cc4a787d03699004d8549e34b0
 EBUILD facter-9999.ebuild 2490 BLAKE2B 9c480e951320b78a43aac1c436d5008d3461de4a62f73f76e7ae6a1eb62d5ac0b4af8f58b2fe25738c892e68d3c014be43f0ac79a8ccfc065c0f1485dbc03428 SHA512 41a5ca3bbbbfb9e5c94271490e7d9a9a1a99ca76b9c3c3ccf5b9ac6b3da005101063ad9b6e3ae8c53e9335c1d55e8b3f8f528f1b759b85a40f6251217b8a7e76
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.8.ebuild b/dev-ruby/facter/facter-3.14.8.ebuild
new file mode 100644
index 000000000000..dbf805620b4a
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.8.ebuild
@@ -0,0 +1,99 @@
+# 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/files/facter-3.14.8-explicit-rspec-2.patch b/dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch
new file mode 100644
index 000000000000..bca424be1b8e
--- /dev/null
+++ b/dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -205,7 +205,7 @@
+     if (BUNDLER_PATH)
+         message(STATUS "Bundler found, installing dependencies for Ruby tests...")
+         execute_process(COMMAND ${BUNDLER_PATH} install --retry 2 --path=vendor/bundle WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
+-        add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
++        add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec-2 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
+     endif()
+ endif()