Version bump to 1.7.1, add pciutils USE flag to make it possible to disable that dependency on vservers.

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0x1E0CA85F!)

4 files changed, 96 insertions, 9 deletions

diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index decb93cdd509..5793b7d91bff 100644
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/facter
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.73 2013/04/27 08:24:02 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.74 2013/05/31 08:52:05 dev-zero Exp $
+
+*facter-1.7.1 (31 May 2013)
+
+  31 May 2013; Tiziano Müller <dev-zero@gentoo.org> +facter-1.7.1.ebuild,
+  +files/facter-1.7.1-fix-proc-self-status.patch, metadata.xml:
+  Version bump to 1.7.1, add pciutils USE flag to make it possible to disable
+  that dependency on vservers.
 
 *facter-1.7.0 (27 Apr 2013)
 
diff --git a/dev-ruby/facter/facter-1.7.1.ebuild b/dev-ruby/facter/facter-1.7.1.ebuild
new file mode 100644
index 000000000000..5a480ce1015f
--- /dev/null
+++ b/dev-ruby/facter/facter-1.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.1.ebuild,v 1.1 2013/05/31 08:52:05 dev-zero Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+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"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	sys-apps/net-tools
+	sys-apps/lsb-release
+	dmi? ( sys-apps/dmidecode )
+	pciutils? ( sys-apps/pciutils )"
+
+RDEPEND+=" ${CDEPEND}"
+DEPEND+=" test? ( ${CDEPEND} )"
+
+RUBY_PATCHES=( ${P}-fix-proc-self-status.patch )
+
+ruby_add_bdepend "test? ( =dev-ruby/mocha-0.10.5 )"
+
+ruby_all_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 || die
+}
diff --git a/dev-ruby/facter/files/facter-1.7.1-fix-proc-self-status.patch b/dev-ruby/facter/files/facter-1.7.1-fix-proc-self-status.patch
new file mode 100644
index 000000000000..1119bdf510b9
--- /dev/null
+++ b/dev-ruby/facter/files/facter-1.7.1-fix-proc-self-status.patch
@@ -0,0 +1,39 @@
+From d54c86abfba35f48cad78bb99b1d199afe8c2095 Mon Sep 17 00:00:00 2001
+From: Jeff McCune <jeff@puppetlabs.com>
+Date: Tue, 16 Apr 2013 11:27:30 -0400
+Subject: [PATCH] (#14522) Force /proc/self/status encoding to valid UTF-8 (try
+ 2)
+
+Without this patch the previous attempt to fix issue 14522 is
+insufficient because the String#encode method is a no-op when the source
+and destination encodings are the same encoding, even if there are
+invalid byte sequences.
+
+This is a problem because we're still getting unhandled `invalid byte
+sequence in UTF-8` errors running the specs.
+
+This patch addresses the problem by changing encoding from UTF-8 to
+UTF-16, replacing all invalid byte sequences with the default unicode
+string of "uFFFD"  We then convert back to UTF-8 to guarantee only valid
+byte sequences remain.
+---
+ lib/facter/util/virtual.rb | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/facter/util/virtual.rb b/lib/facter/util/virtual.rb
+index 8223b41..65cf58a 100644
+--- a/lib/facter/util/virtual.rb
++++ b/lib/facter/util/virtual.rb
+@@ -63,7 +63,8 @@ def self.vserver?
+     return false unless FileTest.exists?("/proc/self/status")
+     txt = File.open("/proc/self/status", "rb").read
+     if txt.respond_to?(:encode!)
+-      txt.encode!('UTF-8', 'UTF-8', :invalid => :replace)
++      txt.encode!('UTF-16', 'UTF-8', :invalid => :replace)
++      txt.encode!('UTF-8', 'UTF-16')
+     end
+     return true if txt =~ /^(s_context|VxID):[[:blank:]]*[0-9]/
+     return false
+-- 
+1.8.1.6
+
diff --git a/dev-ruby/facter/metadata.xml b/dev-ruby/facter/metadata.xml
index d9d2d3ed2dd0..4d7c3df7b1b8 100644
--- a/dev-ruby/facter/metadata.xml
+++ b/dev-ruby/facter/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>prometheanfire@gentoo.org</email>
-</maintainer>
-<herd>sysadmin</herd>
-<herd>ruby</herd>
-<use>
-<flag name='dmi'>Use sys-apps/dmidecode to determine system properties</flag>
-</use>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<herd>sysadmin</herd>
+	<herd>ruby</herd>
+	<use>
+		<flag name='dmi'>Use <pkg>sys-apps/dmidecode</pkg> to determine hardware system properties</flag>
+		<flag name='pciutils'>Use <pkg>sys-apps/pciutils</pkg> to determine hardware system properties</flag>
+	</use>
 </pkgmetadata>