diff options
Diffstat (limited to 'dev-ruby/facter')
| -rw-r--r-- | dev-ruby/facter/Manifest | 6 | ||||
| -rw-r--r-- | dev-ruby/facter/facter-3.9.2.ebuild | 2 | ||||
| -rw-r--r-- | dev-ruby/facter/facter-3.9.3.ebuild | 2 | ||||
| -rw-r--r-- | dev-ruby/facter/facter-9999.ebuild | 26 |
4 files changed, 20 insertions, 16 deletions
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest index a70f891f0ec2..0ebb4cdfd375 100644 --- a/dev-ruby/facter/Manifest +++ b/dev-ruby/facter/Manifest @@ -25,9 +25,9 @@ EBUILD facter-3.7.1.ebuild 2102 SHA256 941e369a7afbe1be6d86a6edd855949f013d0939e EBUILD facter-3.8.0.ebuild 2105 SHA256 ab7a24e49a89dc315c539079b752e700eb6b41f349efa1bc72905cf7e5744c7f SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74 WHIRLPOOL 0160dcbb5e8a3dca023098e120b1b05f654a93c0103e99335b3050526651ce2afec12bd570b25037099ee1a8581a097343a1f8cf77da90728caa5232568cf1d0 EBUILD facter-3.9.0.ebuild 2105 SHA256 ab7a24e49a89dc315c539079b752e700eb6b41f349efa1bc72905cf7e5744c7f SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74 WHIRLPOOL 0160dcbb5e8a3dca023098e120b1b05f654a93c0103e99335b3050526651ce2afec12bd570b25037099ee1a8581a097343a1f8cf77da90728caa5232568cf1d0 EBUILD facter-3.9.1.ebuild 2105 SHA256 ab7a24e49a89dc315c539079b752e700eb6b41f349efa1bc72905cf7e5744c7f SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74 WHIRLPOOL 0160dcbb5e8a3dca023098e120b1b05f654a93c0103e99335b3050526651ce2afec12bd570b25037099ee1a8581a097343a1f8cf77da90728caa5232568cf1d0 -EBUILD facter-3.9.2.ebuild 2103 SHA256 a01c79cbbfcbc55658cf72e4bd1f89fd9cf07e842d022f6806b1efcd38f20f01 SHA512 09dc3b62d4b0ba9a190c3cad58a5ede13f9e403b465fa480862c6b104fb8ec39687e366d67e325940fe3bdf8e3cfbba72292d2c5abd607cdf8d3ad02d2e5860f WHIRLPOOL 3d8a0084c9ab6f28e3def83337666ee3ddfb4ee0785d9b94e68e1204b57cace8a10135c7be66b851575b3ef580c2c36d83445c277bdaaeafb1c3816ba7322f4b -EBUILD facter-3.9.3.ebuild 2105 SHA256 ab7a24e49a89dc315c539079b752e700eb6b41f349efa1bc72905cf7e5744c7f SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74 WHIRLPOOL 0160dcbb5e8a3dca023098e120b1b05f654a93c0103e99335b3050526651ce2afec12bd570b25037099ee1a8581a097343a1f8cf77da90728caa5232568cf1d0 -EBUILD facter-9999.ebuild 2038 SHA256 d5f42a8b3924a0b81f926293eccf73e9db1f1d1f693ed455bddc069b26bfa160 SHA512 0bae7e5efa4650c7094688d31fb9e28af90dfb711cd75a7c325db20526fec36916fcb5752d7e635ad8613e0edf2eae3b454ad6c36c38ca034624c2b5cac9c472 WHIRLPOOL 1b94b07220a33aa779fb761829acdba64c410dda50fba975e90cd048b034e5cbbd9fcf0e29a6aa64c8f07a96a26a4a3734d4c7f5e7ea15611eb703003b27ab76 +EBUILD facter-3.9.2.ebuild 2102 SHA256 aad598726a0677fa9ae22f28d0765e34f982f26868651870cd3814d9d3de3c94 SHA512 c7cc4baee7aa5ceb6bea15a05eb93988f0e5e97690f3290e4207035afbb9e60fdd541ccaaf1b67ead1511819100285b3bed2cca1653957bdcfb0e9c8a9df7cbf WHIRLPOOL d9ade4557ef683cac54aad7707b6299ea99c4a7dfa97274194fd3e7c2b049f988bd64f26ae5719d6c1fe904404bcb817dfbe012938503e8b5e9465e6c3a82b37 +EBUILD facter-3.9.3.ebuild 2199 SHA256 84bb1346227cc2ef01806c1700bed2a35084c07bf07658a8df8a4126755c0ccd SHA512 f45e5b8efac13db86de95b97070d276786faddf4792dc593f7a4292d3d5ee29a32b7fa7ae5f375f0e6049fe8c46f22a54083840bd6f01a18878d216a626d0aad WHIRLPOOL 59ba08ba4499db6e63b590d63f39604edea25bc2c582acf2ffc19a9816eab2836a69521358d827688c0220888b950a1769515b71a509f7e6ed81b12a2b51851f +EBUILD facter-9999.ebuild 2164 SHA256 1d66b340340c14a085fdcda9de7540b11ae3c165dbd27b37dc1af62cc8f089c7 SHA512 122bd623d94b61dea09049514f2178a38e018702bb3f977ee1a876daf6f6d91d31dec586387c8efa255cdb6037da569801768a6487f40628cf66c3fd6b757a00 WHIRLPOOL 8784017d34eb8135ece93bd1404e581235dec6d76da273fcbaca2da799a927c782a258e7d9c46e6cf3e0788422c5671c4551ea64060e58e05f3505ed6f875769 MISC ChangeLog 10212 SHA256 dae20fc6ae002b0e1673ea1436e1e66643fb96d9b18e3b1d84688dbf8f9a97d8 SHA512 9350d115f1ebf9429ecb03ec0c353a9732112475b1388c6b4597a89fd337dafd0262dd1a7ca2be732c00daa3d35a247d14e31a5e8d31683d46d545be918a85e3 WHIRLPOOL 90e99b36281a1af5f736506ba7b003183fde71a60a6d6111ac3bde18cd98dd444b1ad12900369322cd1c08fe92b8154206d805650a47cc276379a29675f9b954 MISC ChangeLog-2015 19896 SHA256 60698d1f7fa5b1f36af72c2d69d521c6b005a99659eabb3287ea61b7080eff03 SHA512 9ee649caebab607412dc57a77a1116e5e3c71ce50add3e057366be1d2f9533014e13d67c27fceb6e2de3402ee8020f0a1458ba25b389fd03cc963230859018a9 WHIRLPOOL aaec00a423ed48d3e153e45f6079e895c1495f7b48f4cc7fb45a2193c2955bc73873161d8cb3fa13b779c365045f882feb54b9609238f4292a78ab7bf2123afa MISC metadata.xml 854 SHA256 669fc433af84b441d2feddaefe50fa485443ccae80e71608065ebb9a5182b58c SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639 WHIRLPOOL 9ea1f2d6e7bcb5d133ab1988d7ff1dfd5998ed38ffc430f7e1b0920a56b92a76503d15f9899654f69264274902c819cfc6fd2087d954bf6dbc62459495f893f9 diff --git a/dev-ruby/facter/facter-3.9.2.ebuild b/dev-ruby/facter/facter-3.9.2.ebuild index 9517c4b3746e..87d5830a154d 100644 --- a/dev-ruby/facter/facter-3.9.2.ebuild +++ b/dev-ruby/facter/facter-3.9.2.ebuild @@ -14,7 +14,7 @@ S="${S}/all/${P}" LICENSE="Apache-2.0" SLOT="0" IUSE="debug test" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86" BDEPEND=" >=sys-devel/gcc-4.8:* diff --git a/dev-ruby/facter/facter-3.9.3.ebuild b/dev-ruby/facter/facter-3.9.3.ebuild index 247eed1af456..02ce8a5fad95 100644 --- a/dev-ruby/facter/facter-3.9.3.ebuild +++ b/dev-ruby/facter/facter-3.9.3.ebuild @@ -4,6 +4,7 @@ EAPI=6 USE_RUBY="ruby21 ruby22 ruby23 ruby24" +# git-r3 goes after ruby-ng so that it overrides src_unpack properly inherit cmake-utils eutils multilib ruby-ng DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" @@ -44,6 +45,7 @@ src_prepare() { sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die # patches default + cmake-utils_src_prepare } src_configure() { diff --git a/dev-ruby/facter/facter-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild index 0fed77cf9e2c..95b52c0fbfd3 100644 --- a/dev-ruby/facter/facter-9999.ebuild +++ b/dev-ruby/facter/facter-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -USE_RUBY="ruby21 ruby22" +EAPI=6 +USE_RUBY="ruby21 ruby22 ruby23 ruby24" # git-r3 goes after ruby-ng so that it overrides src_unpack properly -inherit cmake-utils multilib ruby-ng git-r3 +inherit cmake-utils eutils multilib ruby-ng git-r3 DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" @@ -20,7 +20,7 @@ KEYWORDS="" BDEPEND=" >=sys-devel/gcc-4.8:* - >=dev-libs/leatherman-0.9.3 + >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon" CDEPEND=" dev-libs/openssl:* @@ -36,15 +36,17 @@ DEPEND="${BDEPEND} ${CDEPEND}" src_prepare() { - pwd # Remove the code that installs facter.rb to the wrong directory. 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 + # make the require work + sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die + # patches default - epatch "${FILESDIR}/facter-3.5.0-jar.patch" + cmake-utils_src_prepare } src_configure() { @@ -80,10 +82,10 @@ src_test() { src_install() { cmake-utils_src_install ruby-ng_src_install - if [[ $(get_libdir) == lib64 ]]; then - dodir /usr/lib64 - mv "${D}/usr/lib/"* "${D}/usr/lib64/" - rmdir "${D}/usr/lib" - fi - doenvd "${FILESDIR}"/00facterdir + + # need a variable file in env.d :( + diropts -m0755 + dodir /etc/env.d + echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir" + fperms 0644 /etc/env.d/00facterdir } |