From: Hans de Graaff <graaff@gentoo.org>
Date: Tue, 17 Feb 2015 06:45:19 +0000 (+0000)
Subject: Create stable candidate.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc7551de043ed53ed58f13becaa83d49781dc29e;p=gentoo.git

Create stable candidate.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!
---

diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index f88fdb4254cf..abfaf5148a8f 100644
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/facter
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.119 2015/02/11 07:51:54 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.120 2015/02/17 06:45:10 graaff Exp $
+
+*facter-2.4.1-r1 (17 Feb 2015)
+
+  17 Feb 2015; Hans de Graaff <graaff@gentoo.org> facter-2.4.1.ebuild,
+  +facter-2.4.1-r1.ebuild:
+  Create stable candidate.
 
 *facter-2.4.1 (11 Feb 2015)
 
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 1349a587fec6..ce7d298db799 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -11,23 +11,14 @@ EBUILD facter-1.7.6.ebuild 1224 SHA256 831b51969eaa89b46f7bc00dac057bf216560131c
 EBUILD facter-2.2.0.ebuild 1839 SHA256 8e1884f36f42bacbb1f9749047c9a2b6ded6246ce5d7bc650f343f258b62b2db SHA512 2367addd05b408a077506867abb829bb0923f58fda68c90ac4e44b947017cb84466810266c93c5953d933aaa1143832d43985177eb297a959ecedd21034d01c7 WHIRLPOOL 84fbb7cece4909181b9918530ba826163735c59bdf75c833347ca5f314a781f08ad867fed75fb4d31db6373d04353241eeb9ede77c5dcf189032b409f0d78e6f
 EBUILD facter-2.3.0.ebuild 2134 SHA256 cd269fcf367f198750d52e5235fdac2c5fd28a89f3c905fcd4a6dae86654a6e9 SHA512 791e1cce618e618f2c8ba3e044fb86d1c2034f862b5b3a4f0fb1be74496f411fcf3397623d88e0d8f485df75b210274c3f379a526ffa25a8e837d4f9f0369f21 WHIRLPOOL 76f71d089f40aa578dc6482635530de6a94383dc6c260e3de294b37f78541ae6c67724a7fcaa57cdf3d5bd0b69c435ba49690d1a0c1fee416dc1880a2d9844b0
 EBUILD facter-2.4.0.ebuild 2021 SHA256 abf9b39dfa516792f1e74ad6911768c01b4e7c60bc31e7ae07d5cf7cd2190f4d SHA512 a2e4e563942d0aebe7531340529a991a22b6dc4f9805ec8490fc160a47fa1a40bdc2d2466d403cf261be956a50fd9f418580606234e8abf10467afdba17d390f WHIRLPOOL 0c957ff71431ecaf3e21ccc7dec0a2f4006d0695d80a0bc3806b83bd0bad8821dcc4faa62f512b8b629b13805ad5b7e5be3c4ef70d3450db347e5c222fa5920d
-EBUILD facter-2.4.1.ebuild 2029 SHA256 0a2606d0d9ac6bb1305d5e0de7c69141b525a11177262812e63f4662eeca6e4f SHA512 0ec8868a864271e9ea9a7ee9f099d3d14cfd1ebe1e1547a5a2c0af00f0701269dab1be0ae3850aa6c90ad17240ddc230df15110bddd25e33e749afcd8dfede99 WHIRLPOOL 8c68aa67226f2b9b44fbd34e5872c46942ff5fdccd8a3f24cbbdd9870e5edc0f637c7a3f62e1b762ba5dad71b45d19066bba163d9fb1d9d51995c8b5c6542ad2
-MISC ChangeLog 16582 SHA256 b34b6b74282bbcc7156c0fdf5202f182556fd1a5d8fe0e15c4685b88a1d493f1 SHA512 ac2413361af1e26a742b7255d0f96d67a258463042281e413ab3107089e53b0c32f9cc2bc54d3c77eb28203fda36199fabb39b640a2db5c3032304dcd90bdb10 WHIRLPOOL a2b02b29ea8f8ace558665959cd99859c82c9bda9af426b6484bb9ef2299a8009476f87b4d5b85dbc42f5bf04704f47ba501329696f01386ba791cd9c68242c1
+EBUILD facter-2.4.1-r1.ebuild 2024 SHA256 f37ed369296f224df670c458da18e30cbca4e52a5c7e0bcf5c92514b24c8d24a SHA512 26f8dbf4f0d68ac5efc16810e00fe9d966eb9aab2d41a3ac931352c765b2202d412b4a2679004ca5a7b102afafad9e4e6557908ae6a2519a4cafdf6236350c75 WHIRLPOOL 1dec4b7ff6a06a4cf5a508b621cf6b88b54b3262dc421e012d96e8be5abe3a011a0702745fdbfb4cac5ef00aa940b79b14777433cdce6e7fbbc8c469b1e329c3
+EBUILD facter-2.4.1.ebuild 2014 SHA256 98965697e57ca0b1c703421a5d23c3806d3af15421085ab9812eed5d8877aa07 SHA512 c4b002581d036d1346c34aed3cbf72ab0ca419023c1da28ccce686fc159be3fe6f2a6dcbddf749a59e6efc4cb45d8967ddb85021bd39784dd142804b15995ea2 WHIRLPOOL 3bd78bb3ae4a0f01b2dc8a7fb096e18dbce4566799b6062316b5e4f9ac1fbf5aa529feef486130e151a2d13467c541344cb2460b5b1c7bc598129f534789183b
+MISC ChangeLog 16732 SHA256 a51b4c26211e134a0fa33ace350fa298a113af1784f9e3b5ea375d5b696cb95b SHA512 eb2204bf6f54caaa70367d1828fda603f775bb5793cc0609e9569693d3c19a3fde14697a571cd9d6d9e96a12f61987e89f5cc9a2b51f3689935e7c3dd91a343c WHIRLPOOL 841c7783b0c7c6ad5c67d59fb5c40ad614c5820dbdc92d9341ad28b280453c5f01444751323562ea8b4bd7095086ba6d0ed3d786d0c71af60ef0b09fd5a48733
 MISC metadata.xml 568 SHA256 42e1960b3fa66b2bdbc939c389c59eca3c00736b3f88e8aefa4ffb85fdab8685 SHA512 92bc2c3743019e44faea40dd4dba228cabd7945c98bd07e8c5465347928a37e9e12fff8d84db5480fecdc8d8e29f84a5765b0baebaab6b00d4a4246a6968dca5 WHIRLPOOL e00bdad66ad8a155d9f071c551ac093641fb7f51646d2e20ca0baf357ffd2e4cd86f1774764d143432f92f4a7296a7ddddd96e3205b4b5cfdb4babb58ab5109f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU2wo4AAoJEGSje+quGaTo3F0P/0CX0akKZ1uNbVkKbjIm+bg+
-c1kbZDGrLDa5s23whnuO4TZaMAByQeowc6aEvQYjTE3KGxeslJixOE8yVBV4vp0R
-Hn/Ac2DjbLkQiqFowRzAPWsK2Hog1CP7RjeoB8cefe/7JUrsUOJUxjje7bg9Ht9G
-AsQDBfwTBxB3QIlfp8f8vWU+zcPA9xgMvflcd/C8ZZNP7Rom5VRQ0MHcqOJnb3rB
-lvyiR5A4gEYeQObzANPxB9VGf5dsTZor6J3ZXe7LeMJGopOclIC0ARAaMOHnU9sN
-mg6cfe5CXpep7Km0g6xMb20IvS0231SYM521rTVODN/fWegk4XXrmeruXJl3zFH0
-Hhy/ZbFhlJe++zjUIRY7QS5J9A0FdCjxHp1mMNhkTj27RR8/O3acAtCY16A3REhk
-OMNJBFizpy40TR+d65uNRptJU+HGajvfnTL/crcKmx/9/ibZ85txocF+3rKpLXST
-qbpwxl//QJPUfJq1QjaB39lD/kZ7DZuha8N4Ev6ADQybR88ENDXoVkwCCsB6evBd
-noXVJZnmKtuCSbWvFNn7URaM7oP78Mtkd6R/m88WA60tVJjgUOgDSifdacnlFoC8
-2xCqPXTr22GmpIgZF7Z8m34e+gojhdhPjsLBZj6QMbJ2hei4IH42ddlEpNtDQqm2
-HAmC4iUNBe5HLnNxkRj8
-=bHqt
+iF4EAREIAAYFAlTi438ACgkQiIP6VqMIqNeyVwEAjhyqKKpMltu/+jNCAoCk3XI+
+PT4931yd/licR3uZh/kA+wSsah/uOaydQ8gCxTloT4jRtRC0jjCxd9X0tQSL92Wg
+=+kOo
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/facter/facter-2.4.1-r1.ebuild b/dev-ruby/facter/facter-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..34143c042294
--- /dev/null
+++ b/dev-ruby/facter/facter-2.4.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.4.1-r1.ebuild,v 1.1 2015/02/17 06:45:10 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+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-2.4.1.ebuild b/dev-ruby/facter/facter-2.4.1.ebuild
index 4af8f2b54982..f93ced58215d 100644
--- a/dev-ruby/facter/facter-2.4.1.ebuild
+++ b/dev-ruby/facter/facter-2.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.4.1.ebuild,v 1.1 2015/02/11 07:51:54 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.4.1.ebuild,v 1.2 2015/02/17 06:45:10 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"