gentoo resync : 15.12.2019

6 files changed, 15 insertions, 102 deletions

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 5cdec0167dc2..cd2f0da842a5 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,9 +1,6 @@
-AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f9391615958b27b842ede98d7a476cb488e249b1dc14258574bf2f77912599fef98fc325914c8f014 SHA512 381973ca23aec0853714495f74b77155f0079e504312dc55e6e22c8a099aeafd2b7bc4a762c95543c3cd9c5fa5f88a6821f4104b7522536aee7b6f5426d9ec2f
-DIST facter-3.14.3.tar.gz 395278 BLAKE2B bda071fb92d337e2d6e58faaa33a6b135b6dfd3b6f4077af3b872bd44191629810fe99a7a1f8d9e3b16c4ff45ba587730bccb0652dcd85f4562120def42c7f38 SHA512 abd7cb3e102bff7635d6b2c17e5650e0a7b7be5ed6b81003df17053f0c9c4887f7db948714daaa313c7569bcc788ab18b0361a57395cd5118a6be38d571794df
 DIST facter-3.14.5.tar.gz 395892 BLAKE2B c8f98716f4abca8d5f32c1cbfa79437b4021b1994476a31f7c00fc092f02aa08ed01eff4357368e140763bd3d39a38915c99606914e697ff8c769c9f0dd26638 SHA512 387f3d4c654ce3231129dbf6c22ccb04023d73006e4709b330b11ac01ef55831c618d80171ffb8de455be2a12e339a2b52ab782b0ed97e2dbfeaca2692ed951d
-DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
-EBUILD facter-3.14.3.ebuild 2484 BLAKE2B 6d17be9d833f372fcc9621af84a0159ef8aa339e2065a24d6922622777532c6380d7b56c6b37ea8816bf41bd445f8a68b4a2937ff570f372862ec301a5fc11fb SHA512 f83756fa4e53069ed531611d227ae9aeb324d9e43dca3508103a32f1458d715cc88694abd303794418b52bd6f5a6bb9d0725b1c2223645177f22d8c3dfcf682a
-EBUILD facter-3.14.5.ebuild 2460 BLAKE2B c61a7e483fd07cfa046ef307d0145be401ba889ed567bba879a54c6514b9441933db6511368f1d50e57819154dcadca5eb9998d31ef38b27eb532ce3f645fc4b SHA512 93a7ab3eec9edf826eb7086e1bbd961dede5a05e241c4a871b6bf452d14a8fb008c0f846bdd83f6b5ea85f9770b3a0bfbbcdd885275e3fd72f91b5b6ff711c67
-EBUILD facter-3.9.2-r1.ebuild 2129 BLAKE2B ace1032be069c17e69c0fed40327848241f31d50b8e165bd01bec7edc08a4d8aeed614bf449e1d878a74b686c2fb18df4c9873338641a6f8ad33248c9c746714 SHA512 c3cd67ac050a0ee35bacf2c7907022c2b46c6b208a3d20e684916dd2361fbe5e5040a2ce7d94779e5283b1af4b1fa60ce4eef48cb28816ffe404c47f98d7f422
-EBUILD facter-9999.ebuild 2418 BLAKE2B 4bf8b77b1b66039da3d4bfa50e8bdf829f5443c7f578043b044f21c716d4103e10f22ccf1c83014f3c4bc7674232ae1df14a7de4eba5e99f5eb9b5da96a39041 SHA512 2709eeaa36352957bc4c958ee4441e6b6004a6d849653f2765b2989a7cb6d4f4e8a8ac904d76d6746954d3ab2b4e8b98e93fcab3fa14600c0e2f7bf26bf093b0
+DIST facter-3.14.6.tar.gz 397339 BLAKE2B 74fae02a70194fd85789428c779f000e6b6750f52ecb0c713d6b772b3592a1974835367b148d046f849d61704adf82d93f519b86ecfe0007fb492f880a2aebca SHA512 6c17ba200fe82a2223b76505c29c6fb7bce2bff6e795316ea0b91d2fc8bc42bed9b930ba9c5d7b3851fd36fe93fb20e81a9cbc919589d4012e989234be1ba787
+EBUILD facter-3.14.5.ebuild 2499 BLAKE2B 767fff9faedbc31625e70f487df2d68e454601ad17c09e5ab900b0d9331090165408b740b3a3b1d0ee777ebd18432af2d4e13308bb6972525c5fee50b2fde69f SHA512 1ddadc65a51b6c1e96eee2c113753c3ea127f2e03c485668eb8af10efe3e7db8c4aa8a1450d75d1036eb450402101aa67677bdddc9a247877f27ca6d1a5228f3
+EBUILD facter-3.14.6.ebuild 2501 BLAKE2B 2f48dce0a54cb7335299fb245f7576f3d39f50ac8c7fadf2232cdf02e23263ba75f1967ccd1f2542906075e83c73c62ed04a19670a04d3707a11b48aa9d8d868 SHA512 48d61d08e5eba09d4a227877aee96503bfd599da4fcfce4114b5f939a26c4c4feefa995f5382a1b371e7196aee57aac30515a2d7b8863b11dd3c2aded338cc2d
+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.5.ebuild b/dev-ruby/facter/facter-3.14.5.ebuild
index ebbe2255c467..dbf4788a2881 100644
--- a/dev-ruby/facter/facter-3.14.5.ebuild
+++ b/dev-ruby/facter/facter-3.14.5.ebuild
@@ -23,9 +23,11 @@ else
 	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"
+	>=dev-cpp/cpp-hocon-0.1.4-r1"
 COMMON_DEPEND="
 	>=dev-libs/leatherman-1.0.0:=
 	dev-libs/openssl:0=
diff --git a/dev-ruby/facter/facter-3.14.3.ebuild b/dev-ruby/facter/facter-3.14.6.ebuild
index b9491751f31b..a4124fce9bdd 100644
--- a/dev-ruby/facter/facter-3.14.3.ebuild
+++ b/dev-ruby/facter/facter-3.14.6.ebuild
@@ -19,13 +19,15 @@ 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
 
+RESTRICT="!test? ( test )"
+
 BDEPEND="
 	>=sys-devel/gcc-4.8:*
-	dev-cpp/cpp-hocon"
+	>=dev-cpp/cpp-hocon-0.1.4-r1"
 COMMON_DEPEND="
 	>=dev-libs/leatherman-1.0.0:=
 	dev-libs/openssl:0=
@@ -33,7 +35,6 @@ COMMON_DEPEND="
 	app-emulation/virt-what
 	net-misc/curl
 	>=dev-libs/boost-1.54:=[nls]
-	<dev-libs/boost-1.70.0
 	>=dev-cpp/yaml-cpp-0.5.1
 	!<app-admin/puppet-4.0.0"
 
diff --git a/dev-ruby/facter/facter-3.9.2-r1.ebuild b/dev-ruby/facter/facter-3.9.2-r1.ebuild
deleted file mode 100644
index 1c70dd61c8d8..000000000000
--- a/dev-ruby/facter/facter-3.9.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-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/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:0=
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	<dev-libs/boost-1.70.0
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-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
-	# patches
-	default
-}
-
-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 89cbbf1b0b4b..de60deb0a216 100644
--- a/dev-ruby/facter/facter-9999.ebuild
+++ b/dev-ruby/facter/facter-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+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
@@ -23,6 +23,8 @@ else
 	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"
@@ -93,6 +95,7 @@ src_configure() {
 }
 
 src_compile() {
+	addpredict /proc/self/oom_score_adj
 	cmake-utils_src_compile
 }
 
diff --git a/dev-ruby/facter/files/00facterdir b/dev-ruby/facter/files/00facterdir
deleted file mode 100644
index 45e29a2405a8..000000000000
--- a/dev-ruby/facter/files/00facterdir
+++ /dev/null
@@ -1 +0,0 @@
-FACTERDIR=/usr