Actually apply the fix for the arp path. Drop ree18. Make sure the right version of mocha is used to run specs, needed on ruby18.

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

2 files changed, 50 insertions, 1 deletions

diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index 5793b7d91bff..b9e6c2243725 100644
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,12 @@
 # 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.74 2013/05/31 08:52:05 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.75 2013/06/03 17:48:15 graaff Exp $
+
+*facter-1.7.1-r1 (03 Jun 2013)
+
+  03 Jun 2013; Hans de Graaff <graaff@gentoo.org> +facter-1.7.1-r1.ebuild:
+  Actually apply the fix for the arp path. Drop ree18. Make sure the right
+  version of mocha is used to run specs, needed on ruby18.
 
 *facter-1.7.1 (31 May 2013)
 
diff --git a/dev-ruby/facter/facter-1.7.1-r1.ebuild b/dev-ruby/facter/facter-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..ecfb0880698c
--- /dev/null
+++ b/dev-ruby/facter/facter-1.7.1-r1.ebuild
@@ -0,0 +1,43 @@
+# 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-r1.ebuild,v 1.1 2013/06/03 17:48:15 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 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:0.10 )"
+
+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 '9igem "mocha", "~>0.10.5"' spec/spec_helper.rb || die
+}