gentoo resync : 24.12.2018

6 files changed, 9 insertions, 77 deletions

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 44e5839b1a99..880c89e02b18 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,11 +1,9 @@
 AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f9391615958b27b842ede98d7a476cb488e249b1dc14258574bf2f77912599fef98fc325914c8f014 SHA512 381973ca23aec0853714495f74b77155f0079e504312dc55e6e22c8a099aeafd2b7bc4a762c95543c3cd9c5fa5f88a6821f4104b7522536aee7b6f5426d9ec2f
-DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a
-DIST facter-3.12.0.tar.gz 390445 BLAKE2B 8c7f2fccd16df3b13df451c18eaeb0cb837d1408b247bbf35f264e3adc2daeb5efaf3008ecf95428433d19067310b2d273a6001e1e151c260d7777dd5185f54b SHA512 2ef78903f62784f86f8d155f9f10ba793c10742f87d80c894c6bd505ae9186b5e875366d9c05899fe5e25f2994cf66b7d73d6c6570a38a7bc6e45ff0d5108c36
 DIST facter-3.12.1.tar.gz 390863 BLAKE2B 3326fc52e95e73c3f083fead5b9e5c6e4fa691d99c5948dc2ffb1a1aeebc928e6a08dd4d09b417cbb33cecb776d75c488956df7b2fb9c5f937a20788ad3466f4 SHA512 34ed1cb50a38a8137301682c46c91c6b409be78c6349677b6544e082fb388248c4878719f57327b6ee4d0d2f35ff171a62afe5e3cc5972e0e9b24e3239a23216
+DIST facter-3.12.2.tar.gz 391789 BLAKE2B a4476dd37629aa770d66c2597d29a2bf46ae67df2484bffc8c66fb18a0a93eea58bb11fbfb117c8f4778e10649315b1b53b4a609bc51327e29e87dcb00e96d07 SHA512 82901e973c187faf2b70863fe34e46d4f8f4a706364587fa293a8b91818c75bd3ec3cc6e5784bcb600f3dacb2c43c918708ae0996ea0e0e68cbcfaec458f9c27
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
-EBUILD facter-2.4.6.ebuild 1899 BLAKE2B a8e0d7c7a83c42150219a300d4a1a512913deee5d66e3a28a4f285a27d731cfa1937bb4d0d9bd8c80e133f2956ecf17690f5a94d66b385507a4f3740a425872f SHA512 0f4a589cb04567a42181bf366e51f6224d792c63bc2b38d2db3653688844e2cb611223fe148a6ff015d8dd734695214afc33ec0812e1707ac629344a691a396e
-EBUILD facter-3.12.0.ebuild 2415 BLAKE2B 1ce025dab7ff9afb6d0fae342e667ea6ff38645b4503baddfe80f2dbd19ad5cde74d74ba6e1d55e7244a23a428a5969f0aefe769661579b776a74cded3190204 SHA512 a820f8b288a3794be22d8de2817224071ec1aa633a6c9a5217235fa8f5700b541b9a9f76c380743e4f756926cf66e695fc09ef22de745407293ce949a06fa52a
-EBUILD facter-3.12.1.ebuild 2417 BLAKE2B 40fefec1ddc747d6c83be159fc069b5e04ac081cd1b909bec0fd15f7d75ad98f39c73a40b2783d97814559a05cef7e8eec39b0621fcac98037e1375862a63d1c SHA512 f86468bfc4a6096d2e365ccd51383a8e97712ecd94f3cd2d6cc0bb801e6bb08149d26eef6e279ce30d9a5af6c0add21a72f68c1042cb0b0bffc066f53e5d77dd
-EBUILD facter-3.9.2.ebuild 2106 BLAKE2B efcbbd0cfe6a71b1b1a08bbc1f7abe4b94845c9e13192deae811466211ab2ba533ae10732a4d72635609b9cb419051b7c4a39f248e9b06f7ec751cd893d28852 SHA512 5cfb67a3db8d288302f21bf0092c05ce19b40c8a2f00b4b9b63e3e02cd7d1af3dd20670b744520cb42db2b2ccd52e9153d86c0e1db7a36c4c7854c70d79149dc
+EBUILD facter-3.12.1.ebuild 2415 BLAKE2B 1ce025dab7ff9afb6d0fae342e667ea6ff38645b4503baddfe80f2dbd19ad5cde74d74ba6e1d55e7244a23a428a5969f0aefe769661579b776a74cded3190204 SHA512 a820f8b288a3794be22d8de2817224071ec1aa633a6c9a5217235fa8f5700b541b9a9f76c380743e4f756926cf66e695fc09ef22de745407293ce949a06fa52a
+EBUILD facter-3.12.2.ebuild 2417 BLAKE2B 40fefec1ddc747d6c83be159fc069b5e04ac081cd1b909bec0fd15f7d75ad98f39c73a40b2783d97814559a05cef7e8eec39b0621fcac98037e1375862a63d1c SHA512 f86468bfc4a6096d2e365ccd51383a8e97712ecd94f3cd2d6cc0bb801e6bb08149d26eef6e279ce30d9a5af6c0add21a72f68c1042cb0b0bffc066f53e5d77dd
+EBUILD facter-3.9.2.ebuild 2104 BLAKE2B 657616098817dc41ff43f1034dc697789e0e971ba0393ebe819e52a171cbb2d2a757aaeac60d4797b98df6a043b6afd28720cf79e6ae8ad33eee1ace71bca9de SHA512 49aedb61355c7b9a5f48b8be4c7fe76c8e48526470e094ea4491d8c36df5e97ae21b585bdd2d8afb932ed8bbcc806e3ef4d779d514fd8eaebc3b99c05cf68e9a
 EBUILD facter-9999.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
-MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
+MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-2.4.6.ebuild b/dev-ruby/facter/facter-2.4.6.ebuild
deleted file mode 100644
index ec8007fe201d..000000000000
--- a/dev-ruby/facter/facter-2.4.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="facter"
-
-inherit ruby-fakegem
-
-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="+dmi +pciutils +virt"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
-
-CDEPEND="
-	app-emulation/virt-what
-	sys-apps/net-tools
-	sys-apps/lsb-release
-	dmi? ( sys-apps/dmidecode )
-	pciutils? ( sys-apps/pciutils )"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )"
-
-all_ruby_prepare() {
-	# Provide explicit path since /sbin is not in the default PATH on
-	# Gentoo.
-	sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb spec/unit/util/ec2_spec.rb || die
-
-	# Ensure the correct version of mocha is used without using bundler.
-	sed -i -e '1igem "mocha", "~>1.0"' spec/spec_helper.rb || die
-
-	# Avoid because tests try to access outside stuff, e.g. /sys/block
-	sed -i -e '/should load facts on the facter search path only once/,/^  end/ s:^:#:' spec/unit/util/loader_spec.rb || die
-
-	# Allow specs to work with newer rspec 2.x versions.
-	sed -i -e '1irequire "rspec-expectations"' spec/puppetlabs_spec/matchers.rb || die
-
-	# Avoid specs specific to macosx requiring cfpropertylist which is
-	# not available anymore.
-	rm spec/unit/util/macosx_spec.rb || die
-	sed -i -e '/macosx/ s:^:#:' \
-		-e '/on Darwin/,/^  end/ s:^:#:' spec/unit/virtual_spec.rb || die
-	sed -i -e '/Facter::Processors::Darwin/,/^end/ s:^:#:' spec/unit/processors/os_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# Create the directory for custom facts.
-	keepdir /etc/facter/facts.d
-}
diff --git a/dev-ruby/facter/facter-3.12.1.ebuild b/dev-ruby/facter/facter-3.12.1.ebuild
index 21124e27b591..47277b802f63 100644
--- a/dev-ruby/facter/facter-3.12.1.ebuild
+++ b/dev-ruby/facter/facter-3.12.1.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.12.0.ebuild b/dev-ruby/facter/facter-3.12.2.ebuild
index 47277b802f63..21124e27b591 100644
--- a/dev-ruby/facter/facter-3.12.0.ebuild
+++ b/dev-ruby/facter/facter-3.12.2.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.9.2.ebuild b/dev-ruby/facter/facter-3.9.2.ebuild
index 7783cc037914..67281c8efef9 100644
--- a/dev-ruby/facter/facter-3.9.2.ebuild
+++ b/dev-ruby/facter/facter-3.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ S="${S}/all/${P}"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="debug test"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
 
 BDEPEND="
 	>=sys-devel/gcc-4.8:*
diff --git a/dev-ruby/facter/metadata.xml b/dev-ruby/facter/metadata.xml
index 8f010b49bce9..89ac2d179c9f 100644
--- a/dev-ruby/facter/metadata.xml
+++ b/dev-ruby/facter/metadata.xml
@@ -12,11 +12,6 @@
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
-	<use>
-		<flag name="dmi">Use <pkg>sys-apps/dmidecode</pkg> to determine hardware system properties</flag>
-		<flag name="virt">Use <pkg>app-emulation/virt-what</pkg> for virtual machine detection</flag>
-		<flag name="pciutils">Use <pkg>sys-apps/pciutils</pkg> to determine hardware system properties</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">puppetlabs/facter</remote-id>
 	</upstream>