| 1 |
commit: 5669fe69d1e87422beddee1d6aac41dc2c9fc2b0 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 26 20:05:42 2016 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 26 20:07:09 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5669fe69 |
| 7 |
|
| 8 |
dev-ruby/facter: fixing bug 573008 and bug 570304 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
.../facter/{facter-3.1.4.ebuild => facter-3.1.4-r1.ebuild} | 11 +++++++++-- |
| 13 |
1 file changed, 9 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-ruby/facter/facter-3.1.4.ebuild b/dev-ruby/facter/facter-3.1.4-r1.ebuild |
| 16 |
similarity index 81% |
| 17 |
rename from dev-ruby/facter/facter-3.1.4.ebuild |
| 18 |
rename to dev-ruby/facter/facter-3.1.4-r1.ebuild |
| 19 |
index 8034d1e..53f9a14 100644 |
| 20 |
--- a/dev-ruby/facter/facter-3.1.4.ebuild |
| 21 |
+++ b/dev-ruby/facter/facter-3.1.4-r1.ebuild |
| 22 |
@@ -5,7 +5,7 @@ |
| 23 |
EAPI=5 |
| 24 |
USE_RUBY="ruby20 ruby21 ruby22" |
| 25 |
|
| 26 |
-inherit cmake-utils ruby-ng |
| 27 |
+inherit cmake-utils multilib ruby-ng |
| 28 |
|
| 29 |
DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" |
| 30 |
HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" |
| 31 |
@@ -36,7 +36,8 @@ src_prepare() { |
| 32 |
sed -i 's/if(RUBY_VENDORDIR)/if(False)/g' lib/CMakeLists.txt || die |
| 33 |
sed -i '/RUBY_VENDORDIR/d' lib/CMakeLists.txt || die |
| 34 |
# make it support multilib |
| 35 |
- sed -i 's/\ lib)/\ lib${LIB_SUFFIX})/g' lib/CMakeLists.txt || die |
| 36 |
+ sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die |
| 37 |
+ sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die |
| 38 |
} |
| 39 |
|
| 40 |
src_configure() { |
| 41 |
@@ -47,6 +48,7 @@ src_configure() { |
| 42 |
-DCMAKE_INSTALL_SYSCONFDIR=/etc |
| 43 |
-DCMAKE_INSTALL_LOCALSTATEDIR=/var |
| 44 |
-DUSE_JRUBY_SUPPORT=FALSE |
| 45 |
+ -DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1 |
| 46 |
) |
| 47 |
if use debug; then |
| 48 |
mycmakeargs+=( |
| 49 |
@@ -63,4 +65,9 @@ each_ruby_install() { |
| 50 |
src_install() { |
| 51 |
cmake-utils_src_install |
| 52 |
ruby-ng_src_install |
| 53 |
+ if [[ $(get_libdir) == lib64 ]]; then |
| 54 |
+ dodir /usr/lib64 |
| 55 |
+ mv "${D}/usr/lib/"* "${D}/usr/lib64/" |
| 56 |
+ rmdir "${D}/usr/lib" |
| 57 |
+ fi |
| 58 |
} |
Archives