gentoo resync : 29.12.2022

4 files changed, 13 insertions, 102 deletions

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 1bf60d2093cf..91d608f6cc4b 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,7 +1,6 @@
+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
-DIST facter-3.14.21.tar.gz 410594 BLAKE2B 30b502debaec476d7ba03a73ad3a251aeabf3347c2c552204e825dea8d85807d50cd6d06de03be32a5977e5e8cefe4869e2cc453b1ea79b9045c80369df6a0d7 SHA512 69618e54d2c46ae1230fa99ead88413ca8d5be6a01c149fcc00a7485767b9e624283fdf6064679e825a1ecb426be59a86e7ef903cd0ffca58383006ba5e9cf7f
 DIST facter-3.14.23.tar.gz 410645 BLAKE2B 7455435d1ab1b1f6e97996aa54be57321bbe0e294652b1aebe0e1ee0e7be45309c1a89fae4079a4350fd6e689c0fe782a7f5d3eee3d766842fba1e8b70a702b7 SHA512 be207d37cf5eac4b6b95cb13e8c2598ccc03af3bcbeedb0d814e5c11c43eb7579427fa1fc1a29eb6db4d6c43b19b2c87c88bd0c85ac3550fa886753267626986
-EBUILD facter-3.14.21.ebuild 2109 BLAKE2B 7254af54a1da94f294292d6356123fb35e6d6924d7ee0d67f3d266bd26442f01d38649214fd9b12fd85b3977392eeb4993cf533aa528c7f51f7dc6e9d49aa023 SHA512 bca419520fae55af55242d0daf70abce704f6628584ce0688b5f5aff2b67e2ed424bfb25168e915411a68ade62c19fe3c033958fa1a3eb840f78d057f16f624f
-EBUILD facter-3.14.23.ebuild 2109 BLAKE2B 7254af54a1da94f294292d6356123fb35e6d6924d7ee0d67f3d266bd26442f01d38649214fd9b12fd85b3977392eeb4993cf533aa528c7f51f7dc6e9d49aa023 SHA512 bca419520fae55af55242d0daf70abce704f6628584ce0688b5f5aff2b67e2ed424bfb25168e915411a68ade62c19fe3c033958fa1a3eb840f78d057f16f624f
+EBUILD facter-3.14.23.ebuild 2150 BLAKE2B 6b7b055b1cdaf6bfbfb255ed7fac660b60e2bd7b7ddc35ac61d7cb605581eadff0755dfb5ca76c8579304d2c3722c354ae4d2698b5587fb2e856dde13c203141 SHA512 1381db2518fefeca228c8674f047c2c20eea61b1708ac7c326cd00449375ad2125848ab12fca04517fe0cc7c88a739c99d1506253454795643e172c6e62a36da
 MISC metadata.xml 540 BLAKE2B 584d6db1a27bfa9383048929df3d6da07040cf507acc2aa58de7a4e9ba665079cac60b48b398bbb0510914acc03be1fd3468e5678e690f8d6fd03060e659dd4a SHA512 c1311ca348655bf9566889ec9edcd012a2d003f0b1122749caa9066cea2005d3fed7b7a0d1bca75281396e8e43cb6a2f611550572523dc011113424d642c2a2f
diff --git a/dev-ruby/facter/facter-3.14.21.ebuild b/dev-ruby/facter/facter-3.14.21.ebuild
deleted file mode 100644
index a8b3fb88f65b..000000000000
--- a/dev-ruby/facter/facter-3.14.21.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-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/"
-
-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 ~arm64 ~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_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_src_configure
-}
-
-src_compile() {
-	addpredict /proc/self/oom_score_adj
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.14.23.ebuild b/dev-ruby/facter/facter-3.14.23.ebuild
index a8b3fb88f65b..0eeddc26c2f1 100644
--- a/dev-ruby/facter/facter-3.14.23.ebuild
+++ b/dev-ruby/facter/facter-3.14.23.ebuild
@@ -46,6 +46,7 @@ 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
+	"${FILESDIR}"/${PN}-3.14.23-gcc12.patch
 )
 
 pkg_setup() {
diff --git a/dev-ruby/facter/files/facter-3.14.23-gcc12.patch b/dev-ruby/facter/files/facter-3.14.23-gcc12.patch
new file mode 100644
index 000000000000..671b085a15b5
--- /dev/null
+++ b/dev-ruby/facter/files/facter-3.14.23-gcc12.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/840116
+--- a/lib/src/facts/glib/load_average_resolver.cc
++++ b/lib/src/facts/glib/load_average_resolver.cc
+@@ -1,5 +1,6 @@
+ #include <internal/facts/glib/load_average_resolver.hpp>
+ #include <leatherman/logging/logging.hpp>
++#include <array>
+ #include <cstdlib>
+ 
+ #ifdef __sun