diff options
| author |   Matt Thode <prometheanfire@gentoo.org> | 2015-07-11 22:13:59 +0000 |
|---|---|---|
| committer | Matt Thode <prometheanfire@gentoo.org> | 2015-07-11 22:13:59 +0000 |
| commit | e8ecc08f89cccdbb29e5e6367b28dd10872b9694 (patch) | |
| tree | 9573fc562416e6c1cc57efe7e52ad88dd128bf1c /dev-ruby | |
| parent | Fix swapped DEPEND and RDEPEND, bug 552338 (diff) | |
| download | historical-e8ecc08f89cccdbb29e5e6367b28dd10872b9694.tar.gz historical-e8ecc08f89cccdbb29e5e6367b28dd10872b9694.tar.bz2 historical-e8ecc08f89cccdbb29e5e6367b28dd10872b9694.zip | |
fix build errors on 32 bit
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/facter/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-ruby/facter/Manifest | 30 | ||||
| -rw-r--r-- | dev-ruby/facter/facter-3.0.1-r1.ebuild | 9 |
3 files changed, 24 insertions, 20 deletions
diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog index ca4392b056f1..e335325aa278 100644 --- a/dev-ruby/facter/ChangeLog +++ b/dev-ruby/facter/ChangeLog @@ -1,6 +1,9 @@ # 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.135 2015/07/11 21:58:49 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.136 2015/07/11 22:13:43 prometheanfire Exp $ + + 11 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> facter-3.0.1-r1.ebuild: + fix build errors on 32 bit 11 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> facter-3.0.1-r1.ebuild: fixing build errors and fixing ruby install method diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest index 093d440e2041..617b32a02589 100644 --- a/dev-ruby/facter/Manifest +++ b/dev-ruby/facter/Manifest @@ -10,22 +10,22 @@ EBUILD facter-2.4.1-r1.ebuild 2024 SHA256 f37ed369296f224df670c458da18e30cbca4e5 EBUILD facter-2.4.1.ebuild 2007 SHA256 7f12da8e2622df478b96fe039e216267fb137009acfb38cf2823bcc484a6c619 SHA512 62c762177540bf0cd0cb4b2da69769bd343615d0d11dcb7fb45416aec5a4a0f3caf6136835ad80fb6705c26e139aec926af2d7353c9ca930aeb8c233b15cf586 WHIRLPOOL 5c77bcdad4f71fe79fc700a90c3c9b80677a871298a2963f6b8db339ed0b46e371e710e3396b17c67fcc177ed3368009155c959cdfa4ffde492cb3cde5fc76f5 EBUILD facter-2.4.3.ebuild 2028 SHA256 2cd11ef1c685639b723a065540031e83c5d3fd74db4f9c76c8c558856a994a3a SHA512 e364ddae335a794c05e3d665ccfc68433e02cfab9ac11cb3519f38b1125f3ee5b6b9c794a4c793dee6ee399eac07d872d66eaab1dc1a3cc453caff10317c9eb8 WHIRLPOOL 8934391b9efdb6125e9e274a2747370e7be8abbc5b89a5b25d7f3a12af6d36f90dd1990135284ed7e0ee734120e7f20e55cc261758fa857a74e223a68842d006 EBUILD facter-2.4.4.ebuild 2036 SHA256 151fcae88ab6bc27d00cac7446e3bdcbf03157b79f1ad4b2403b7e2101b6a80b SHA512 67810ad68192e91b5e0d43e8a9789ceca9a66bd4695a53c25a8b191c14613667126cc0f1781c1da06af45565f701059227313a194c90fbe65d43da12cc3862cc WHIRLPOOL ed6b7f589375058ede4e6575e4edb9582f0c10190f2950b0596c09b128f55dba25e6791cf3842ff56750109ef0325dd16ea71270c205a55954b93052a291a041 -EBUILD facter-3.0.1-r1.ebuild 1548 SHA256 5540139d58c8fb7fcc5bcc2fb5f20d9b78a6b87584973c18e9b7fe59daf650b1 SHA512 24855b4b8a2cf2aec5310a4caad7077b4cd3e4140b3736bfd2b6ceeca387d4b04de8c0785f04d0ca734ded688f2dfc8f83f866d3fea251e299ce691c7331e3b8 WHIRLPOOL b29aa257639faa70d78e0a2d4bc250d2238d1535499dc4978c909f341e8e46a9bc4b310b08ebc972ee6813bfee2ec5a286173d3dd71482f680693aa5b94c0d68 -MISC ChangeLog 18589 SHA256 a08d45c516857a0646ec99e4438bafadfed7d6f23485307bed00f13cf3a81ab2 SHA512 d48e3a9d1cf3fb1313ca436204c7ff0e991902ede519bcd9289483e7688c76d9893522326f81a8290cb8846680ac3f90e38adb0f4adafb53ae18c251f675afc5 WHIRLPOOL 08765dd9fa1a65a9896b48accb44bbd1e9f10706201eb08b3f621384e956c9716a80f6d390a29fd8a9af9acf9e8292b6ab8b498bf644fd9bf3571bece5bacb6e +EBUILD facter-3.0.1-r1.ebuild 1633 SHA256 d9e476055bef21b351940f83a98d2a28176d45ff9ef398d83015505049975dea SHA512 d5e7657d7482f05399cbfcac0f61d95af21ecf2707515c0bf51d633bd96ae6c4ee1978c7bf21a9319d2dba9189d8ff3ebb046d0fe6b7f1e5f12d81e1e2d6eeb1 WHIRLPOOL f5295ab65c3f39317c66a7d520f47fe4913b21d07bf0b05b53098559581a8ac88a97b64eb9fa3e9cc81f1a0f856118ca3a66ae44fb08e761435e58ba19f7fea1 +MISC ChangeLog 18700 SHA256 3789cc1a474bde461aee501cee3ea249fa902d5a92cfe955b9f9efc6f99d7525 SHA512 ded5e349ae51b94d7548e821a1d735d5d862deec14bdb626e33aff88300bed558142dcb43986d7f77d199fb2d48fde55e507efe8a758ac6139768d7f560b5252 WHIRLPOOL 825bf11a14ab142ed696f994fe3bdbcfc7deeabef1ee88f0a59e02b3dccb554aa4441041b2c275b759c4dcf64ea79f3bbab959979fc2fb4e658b450435debf69 MISC metadata.xml 568 SHA256 42e1960b3fa66b2bdbc939c389c59eca3c00736b3f88e8aefa4ffb85fdab8685 SHA512 92bc2c3743019e44faea40dd4dba228cabd7945c98bd07e8c5465347928a37e9e12fff8d84db5480fecdc8d8e29f84a5765b0baebaab6b00d4a4246a6968dca5 WHIRLPOOL e00bdad66ad8a155d9f071c551ac093641fb7f51646d2e20ca0baf357ffd2e4cd86f1774764d143432f92f4a7296a7ddddd96e3205b4b5cfdb4babb58ab5109f -----BEGIN PGP SIGNATURE----- -iQIcBAEBCAAGBQJVoZHUAAoJEGSje+quGaToiSwP/iTK0zUg5cPZjgg7tKb1Vx9u -vMolQmNGN5jB9J0p4N2hgWLXBQR3yLpZLKZdyZCQKuPqxmaYOgTS6/g4nXYPp2ih -J7+JhOxAE5oAXi7yxYPR6Hu/Oww5wliRITj5jxNHxKQ4fBIC9OjOl3Qa6ql85B0M -iXKkvoFLaoNeq7faDT+m9Vvg2EEjEw/ZoyS1I6TVi3JneoaPGsXPIvO32s2q+cG9 -VcC3cl3pcnGI/3nK/cD3125pizvI9Vybbv98kcbqzMVS23HdFrbM4lizGZgkbvFO -Uygi/EkCREAiT2dkYRSdrqAxr+d1Hw/b2BUSht9apyqnLSu7tjys4yONjlGId7QT -mS9uHfkq0PDZZFWBDF6dYBkh/zOyQ339u6bpOBtWdp/UQlkyHh5SJ+3fAGwWe9w9 -2E0bG/3Oypua0Ac+Ek1WjtJ/TTwb8KTzh61oxgv/II7WSRgU83IosxAMeDv5ZU+b -JEfUYP6B0tXoGopVAlHD46Lr6q1ePHgd5tyCuKktGJ/WKMBgqa9GwGqVGus1BcML -ci/2ErGUjPVzIOQG0F44TECZYRZvF/20mbd5FqVJ7vqlJUB6e6u6bhjdWEXETkV9 -v0fb/X6pU2Qvqk1Qn3S9IXp51aUNXQufNEjpTUcIaKFI490T9QpSswCgArQhe1ok -wRUCDrQ3EdSdAiAbQcWo -=PJgs +iQIcBAEBCAAGBQJVoZVSAAoJEGSje+quGaToRfIQAI9Xd4d3pbVw3K8D/qZd4gix +PrlHLRS6M8n96UWvQffPBVKE/blVyMSVmW3xzOEF/amB7iWcYd23pXBF7E6pxig0 +4RftsUaBEuNkdmrsxEKNx6uwCpKGBlbEt9MjemV+sxTclUdbKsKebWoJvwVSxctB +CxgFd/H9as2Lmjc7RhreW9TBrdRTgsVXitqs9AUJSPst9W06ccevIYtOJlN9sN/D +S+IaI26l0xbwW1O4ioG0w89rfjT/mj3iIZMA4AADZoYBegjgat58V+XMp2zGUUSB +LNx8IEmD+qyy9UPvPGPWyMl46J02D1aoS0POHiB6HG+mWCAs1NaXC3bMzlYc/Ulr +PUCv4NF1aFqQzM69k237RZ7WVj+DbR/HbEqQgponaIjsDNt97bZYYW/97Smflu8Z +a7zKlIUSw4xkUrIf/CUk/ZeZHOIVs/BDlsDuzu8Lr4vV7FHhl5+keJXJOIvpsZie +3n/dcIhFFwZOzxqpYeZL7Yg4YmGMM0G7ETGZjwHSlU+0miXrv/dYHiO1WPLXRvzb +qjqQ9fF2dwf+JFW5ridOslT7yVG5VteT5mnmrmT7945h7o2rM3sHzdImw+a5xjEg +Ik03TBatcgvjxVmdx0XjF6DhQoCDCm2kwqr/kaVYtgg2m+xkAHv6ZgJe0lSCAWa1 +LZdHNe6Q52Xi3xBAw+Va +=zkQj -----END PGP SIGNATURE----- diff --git a/dev-ruby/facter/facter-3.0.1-r1.ebuild b/dev-ruby/facter/facter-3.0.1-r1.ebuild index e032c6389cea..403a18605b80 100644 --- a/dev-ruby/facter/facter-3.0.1-r1.ebuild +++ b/dev-ruby/facter/facter-3.0.1-r1.ebuild @@ -1,11 +1,11 @@ # 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-3.0.1-r1.ebuild,v 1.2 2015/07/11 21:58:49 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-3.0.1-r1.ebuild,v 1.3 2015/07/11 22:13:43 prometheanfire Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21 ruby22" -inherit cmake-utils ruby-ng +inherit cmake-utils multilib ruby-ng DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems" HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" @@ -53,11 +53,12 @@ src_configure() { } each_ruby_install() { - doruby "${D}usr/lib64/ruby/vendor_ruby/facter.rb" + doruby "${D}usr/$(get_libdir)/ruby/vendor_ruby/facter.rb" + doruby "${D}usr/$(get_libdir)/ruby/vendor_ruby/facter.jar" } src_install() { cmake-utils_src_install ruby-ng_src_install - rm -R "${D}usr/lib64/ruby/vendor_ruby" || die + rm -R "${D}usr/$(get_libdir)/ruby/vendor_ruby" || die } |