gentoo resync : 28.04.2019

4 files changed, 5 insertions, 117 deletions

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 0c07329b947d..89ac1f0bf92c 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,15 +1,13 @@
 AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f9391615958b27b842ede98d7a476cb488e249b1dc14258574bf2f77912599fef98fc325914c8f014 SHA512 381973ca23aec0853714495f74b77155f0079e504312dc55e6e22c8a099aeafd2b7bc4a762c95543c3cd9c5fa5f88a6821f4104b7522536aee7b6f5426d9ec2f
-DIST facter-3.12.2.tar.gz 391789 BLAKE2B a4476dd37629aa770d66c2597d29a2bf46ae67df2484bffc8c66fb18a0a93eea58bb11fbfb117c8f4778e10649315b1b53b4a609bc51327e29e87dcb00e96d07 SHA512 82901e973c187faf2b70863fe34e46d4f8f4a706364587fa293a8b91818c75bd3ec3cc6e5784bcb600f3dacb2c43c918708ae0996ea0e0e68cbcfaec458f9c27
 DIST facter-3.12.3.tar.gz 391836 BLAKE2B 60ec23ab9df0d6ca069608c897949be8aaf719b2ab1b71455871a9364b7d0111ec78753cdb45d082041d2b028bac8e468a415a2bd9a15fe51dc69ec9738dc723 SHA512 d1568ca606b07c67f2e293b020dc5c2d399d5080857e47d3c748a7d104f75231d59dc95d54e5504b24f951ce540d1223102ee1b882e4495633ed89324ccc1c7b
 DIST facter-3.12.4.tar.gz 392011 BLAKE2B 5e3d7ce65eb6c35cddba70b2b397cdc9c591a6c420a58a04ecddabdc537f0f799c510d14bba436aadbdce9c9932a28b6b36b893526a7727c8017c79827a97b9a SHA512 952bf1ac4c67bfb5170d31bca471c317211523804a14bd39f34b4fd0730586b3764499200b5c816d4b6bd0338482ea8bd83cedc5fe670db38ea6ec144b6e2e94
 DIST facter-3.13.0.tar.gz 391833 BLAKE2B 8fabb2ebb438975564a770657866c6ac8ac77394c4e3cdb635eae78a744a097ef5eabb4307092cd2b9cf12b4db70623b18b3ca1e2c9e1a248825a2bf53b76565 SHA512 f3c39239d7b0708bd98a3e5de5d5623406edf5e60b6321de1d4ec7c8cf903f3ec777640b9301979f2316e90e97e2aa0a80dc71975239dc715aaba61ec7cc37de
-DIST facter-3.13.1.tar.gz 392008 BLAKE2B c08eccbad8210aa8f75563566b84d8a179fc90dc74829c8a325a0c20d96189870cc4f59eb46d12603a1e3fd12650eebceba39a6553a54dcb0138c37c5d94395d SHA512 22d65d3c7eeedc674b99dcba1503bcecdc268abda0f25e6e209f1c3560dc8077b13fc5a6bbb8de1b45f2b7f5d1f2dfec8aa4fe20461a1b1d6a1a65674f570e56
+DIST facter-3.13.2.tar.gz 392065 BLAKE2B ae06a1a44de25f55b2eb84483a7abc70433b9437a00724f239a908846148f20bdb3e208d10256e6ddeb7d609ee9eb1c572e14dad84d8640fee147c34cb1bf184 SHA512 c7d1d0958720e0884b06eccf6d7fca64d2c8462c1747bbfbfe5df957ad009c3e930fe5eee80d42c985ea9f59e2b8b7d0a34a194a7e1c713a043bbee9a3b89df3
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
-EBUILD facter-3.12.2.ebuild 2415 BLAKE2B 1dded0b152090abc05db0a008088ef00e208add94f75cff29527c15bb1465e6252bdc613cf658e5e5126d3fd69966c8f47f637801336b9a3d24f351871f5179c SHA512 8a89678c3623b723594b70884a634214e34430aee18a28cd98d93746d559a4843841b5194ba968c76979e97ca6d2fd8a9c45948ac8c10382e97b33af2f69be82
 EBUILD facter-3.12.3.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
-EBUILD facter-3.12.4.ebuild 2454 BLAKE2B 1a9ffcf7665c5b4ab655d4714b2196c1e5e54668bd69e48ef54b1197031c14cc2e8f40d3ba58c272c8e474b3ac45a8b2d30965a73b89ccb2f10bd3b3c739253b SHA512 ad4a9f8924d15b0fd7cd9a712fe740411fbeb81dbf60f10a3aca4d12b6e66097d09973370fdfba2fcf06fee1baff31ffec5b5b0fb0fad1f3185f675e352a49e3
+EBUILD facter-3.12.4.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
 EBUILD facter-3.13.0.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
-EBUILD facter-3.13.1.ebuild 2454 BLAKE2B 1a9ffcf7665c5b4ab655d4714b2196c1e5e54668bd69e48ef54b1197031c14cc2e8f40d3ba58c272c8e474b3ac45a8b2d30965a73b89ccb2f10bd3b3c739253b SHA512 ad4a9f8924d15b0fd7cd9a712fe740411fbeb81dbf60f10a3aca4d12b6e66097d09973370fdfba2fcf06fee1baff31ffec5b5b0fb0fad1f3185f675e352a49e3
+EBUILD facter-3.13.2.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
 EBUILD facter-3.9.2.ebuild 2104 BLAKE2B 657616098817dc41ff43f1034dc697789e0e971ba0393ebe819e52a171cbb2d2a757aaeac60d4797b98df6a043b6afd28720cf79e6ae8ad33eee1ace71bca9de SHA512 49aedb61355c7b9a5f48b8be4c7fe76c8e48526470e094ea4491d8c36df5e97ae21b585bdd2d8afb932ed8bbcc806e3ef4d779d514fd8eaebc3b99c05cf68e9a
 EBUILD facter-9999.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.12.4.ebuild b/dev-ruby/facter/facter-3.12.4.ebuild
index c6ee584a2aff..1f3d28128872 100644
--- a/dev-ruby/facter/facter-3.12.4.ebuild
+++ b/dev-ruby/facter/facter-3.12.4.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
 
diff --git a/dev-ruby/facter/facter-3.13.1.ebuild b/dev-ruby/facter/facter-3.13.1.ebuild
deleted file mode 100644
index c6ee584a2aff..000000000000
--- a/dev-ruby/facter/facter-3.13.1.ebuild
+++ /dev/null
@@ -1,111 +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"
-
-# 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
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	dev-cpp/cpp-hocon"
-COMMON_DEPEND="
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:*
-	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
-}
diff --git a/dev-ruby/facter/facter-3.12.2.ebuild b/dev-ruby/facter/facter-3.13.2.ebuild
index ec0ab0344592..1f3d28128872 100644
--- a/dev-ruby/facter/facter-3.12.2.ebuild
+++ b/dev-ruby/facter/facter-3.13.2.ebuild
@@ -93,6 +93,7 @@ src_configure() {
 }
 
 src_compile() {
+	addpredict /proc/self/oom_score_adj
 	cmake-utils_src_compile
 }