[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/

[Matt Thode]

commit:     2aca4e8019650fe6d7b553bea1db91c745743d89
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 00:49:43 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 00:49:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aca4e80

dev-ruby/facter: fixed ruby install

Package-Manager: portage-2.2.26

 dev-ruby/facter/{facter-3.1.6.ebuild => facter-3.1.6-r1.ebuild} | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/facter/facter-3.1.6.ebuild b/dev-ruby/facter/facter-3.1.6-r1.ebuild
similarity index 89%
rename from dev-ruby/facter/facter-3.1.6.ebuild
rename to dev-ruby/facter/facter-3.1.6-r1.ebuild
index 2475f6d..49e34b7 100644
--- a/dev-ruby/facter/facter-3.1.6.ebuild
+++ b/dev-ruby/facter/facter-3.1.6-r1.ebuild
@@ -33,8 +33,8 @@ DEPEND+=" test? ( ${CDEPEND} )"
 
 src_prepare() {
 	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i 's/if(RUBY_VENDORDIR)/if(False)/g' lib/CMakeLists.txt || die
-	sed -i '/RUBY_VENDORDIR/d' lib/CMakeLists.txt || die
+	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
+	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
 	# make it support multilib
 	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
 	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
@@ -58,6 +58,10 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
 src_install() {
 	cmake-utils_src_install
 	ruby-ng_src_install