| 1 |
commit: 3512c12707719861264f451907850ca71bde04f8 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 6 16:56:38 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 6 17:05:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3512c127 |
| 7 |
|
| 8 |
dev-ruby/facter: 3.9.4 bup |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-ruby/facter/Manifest | 1 + |
| 13 |
.../{facter-9999.ebuild => facter-3.9.4.ebuild} | 29 +++++++++++++++++----- |
| 14 |
dev-ruby/facter/facter-9999.ebuild | 29 +++++++++++++++++----- |
| 15 |
3 files changed, 47 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest |
| 18 |
index 31f80620966..8fb3db7828c 100644 |
| 19 |
--- a/dev-ruby/facter/Manifest |
| 20 |
+++ b/dev-ruby/facter/Manifest |
| 21 |
@@ -7,3 +7,4 @@ DIST facter-3.9.0.tar.gz 380715 BLAKE2B c4045020edaae06b23e0c75788cc76854f440ec7 |
| 22 |
DIST facter-3.9.1.tar.gz 380762 BLAKE2B 15d6c4884a4bd4ce1de252f51b1f480c0908ed8b1b3d7b386e651265a21359305f93dfe199b7e100d027d8507ddf99a0ee712e85e63f26f07f3f6f7c2976cc99 SHA512 a3b66bf40c062dbef644d60909a2c2afd0839c8a11fd02a0a15ccbbc1a1f216d9b0420a0f90dd44166487faa4e00843f2c0f3f057bb43bb30c22677dfac325a0 |
| 23 |
DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374 |
| 24 |
DIST facter-3.9.3.tar.gz 387062 BLAKE2B 7fef72ae0ded8be1ac0eae317b748995df58e66837daf410970cca4049304a54af5976f4502a36a3c7d0963d0e65d5bd1c8df5dc1347cc0d6325a9d79512b676 SHA512 c01685e67ed25ae12f51086012e563df9ea80dde43c4cf40ab2f17b90e7bcb0791369a9c8ea67af7a0039e1fb2714b0758d8f0d00e4e857201ad8075d8ba51c4 |
| 25 |
+DIST facter-3.9.4.tar.gz 388097 BLAKE2B 872ea33c2412ccafd3df1b5e49e79559bac578e91003eda717d03ee1c82e5550f237459066d7fb6692df066fcce183ea4057b4e5e37d1ceaa4b79079ef1c4599 SHA512 e3bb57ad5e538c2561968aab3b47ca7324162dfc5f2a507ed872e41b98f5bbc91f6e836a3452ea2d519a933c76c17a8e1253e74b5d5769e395d7c6895a4400b1 |
| 26 |
|
| 27 |
diff --git a/dev-ruby/facter/facter-9999.ebuild b/dev-ruby/facter/facter-3.9.4.ebuild |
| 28 |
similarity index 68% |
| 29 |
copy from dev-ruby/facter/facter-9999.ebuild |
| 30 |
copy to dev-ruby/facter/facter-3.9.4.ebuild |
| 31 |
index 95b52c0fbfd..c15426643a6 100644 |
| 32 |
--- a/dev-ruby/facter/facter-9999.ebuild |
| 33 |
+++ b/dev-ruby/facter/facter-3.9.4.ebuild |
| 34 |
@@ -1,22 +1,29 @@ |
| 35 |
-# Copyright 1999-2017 Gentoo Foundation |
| 36 |
+# Copyright 1999-2018 Gentoo Foundation |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
|
| 39 |
EAPI=6 |
| 40 |
USE_RUBY="ruby21 ruby22 ruby23 ruby24" |
| 41 |
|
| 42 |
# git-r3 goes after ruby-ng so that it overrides src_unpack properly |
| 43 |
-inherit cmake-utils eutils multilib ruby-ng git-r3 |
| 44 |
+inherit cmake-utils eutils multilib ruby-ng |
| 45 |
|
| 46 |
DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" |
| 47 |
HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" |
| 48 |
-EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" |
| 49 |
-EGIT_BRANCH="master" |
| 50 |
-S="${S}/${P}" |
| 51 |
|
| 52 |
LICENSE="Apache-2.0" |
| 53 |
SLOT="0" |
| 54 |
IUSE="debug test" |
| 55 |
-KEYWORDS="" |
| 56 |
+if [[ ${PV} == 9999 ]] ; then |
| 57 |
+ inherit git-r3 |
| 58 |
+ EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" |
| 59 |
+ EGIT_BRANCH="master" |
| 60 |
+ S="${S}/${P}" |
| 61 |
+else |
| 62 |
+ [[ "${PV}" = *_rc* ]] || \ |
| 63 |
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
| 64 |
+ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 65 |
+ S="${S}/all/${P}" |
| 66 |
+fi |
| 67 |
|
| 68 |
BDEPEND=" |
| 69 |
>=sys-devel/gcc-4.8:* |
| 70 |
@@ -31,6 +38,8 @@ CDEPEND=" |
| 71 |
>=dev-cpp/yaml-cpp-0.5.1 |
| 72 |
!<app-admin/puppet-4.0.0" |
| 73 |
|
| 74 |
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )" |
| 75 |
+ |
| 76 |
RDEPEND="${CDEPEND}" |
| 77 |
DEPEND="${BDEPEND} |
| 78 |
${CDEPEND}" |
| 79 |
@@ -44,6 +53,14 @@ src_prepare() { |
| 80 |
sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die |
| 81 |
# make the require work |
| 82 |
sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die |
| 83 |
+ # be explicit about the version of rspec we test with and use the |
| 84 |
+ # correct lib directory for tests |
| 85 |
+ sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \ |
| 86 |
+ -e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die |
| 87 |
+ # be more lenient for software versions for tests |
| 88 |
+ sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \ |
| 89 |
+ -e '/rspec/ s/2.11.0/2.11/' \ |
| 90 |
+ -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die |
| 91 |
# patches |
| 92 |
default |
| 93 |
cmake-utils_src_prepare |
| 94 |
|
| 95 |
diff --git a/dev-ruby/facter/facter-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild |
| 96 |
index 95b52c0fbfd..c15426643a6 100644 |
| 97 |
--- a/dev-ruby/facter/facter-9999.ebuild |
| 98 |
+++ b/dev-ruby/facter/facter-9999.ebuild |
| 99 |
@@ -1,22 +1,29 @@ |
| 100 |
-# Copyright 1999-2017 Gentoo Foundation |
| 101 |
+# Copyright 1999-2018 Gentoo Foundation |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
|
| 104 |
EAPI=6 |
| 105 |
USE_RUBY="ruby21 ruby22 ruby23 ruby24" |
| 106 |
|
| 107 |
# git-r3 goes after ruby-ng so that it overrides src_unpack properly |
| 108 |
-inherit cmake-utils eutils multilib ruby-ng git-r3 |
| 109 |
+inherit cmake-utils eutils multilib ruby-ng |
| 110 |
|
| 111 |
DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" |
| 112 |
HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" |
| 113 |
-EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" |
| 114 |
-EGIT_BRANCH="master" |
| 115 |
-S="${S}/${P}" |
| 116 |
|
| 117 |
LICENSE="Apache-2.0" |
| 118 |
SLOT="0" |
| 119 |
IUSE="debug test" |
| 120 |
-KEYWORDS="" |
| 121 |
+if [[ ${PV} == 9999 ]] ; then |
| 122 |
+ inherit git-r3 |
| 123 |
+ EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" |
| 124 |
+ EGIT_BRANCH="master" |
| 125 |
+ S="${S}/${P}" |
| 126 |
+else |
| 127 |
+ [[ "${PV}" = *_rc* ]] || \ |
| 128 |
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
| 129 |
+ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 130 |
+ S="${S}/all/${P}" |
| 131 |
+fi |
| 132 |
|
| 133 |
BDEPEND=" |
| 134 |
>=sys-devel/gcc-4.8:* |
| 135 |
@@ -31,6 +38,8 @@ CDEPEND=" |
| 136 |
>=dev-cpp/yaml-cpp-0.5.1 |
| 137 |
!<app-admin/puppet-4.0.0" |
| 138 |
|
| 139 |
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )" |
| 140 |
+ |
| 141 |
RDEPEND="${CDEPEND}" |
| 142 |
DEPEND="${BDEPEND} |
| 143 |
${CDEPEND}" |
| 144 |
@@ -44,6 +53,14 @@ src_prepare() { |
| 145 |
sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die |
| 146 |
# make the require work |
| 147 |
sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die |
| 148 |
+ # be explicit about the version of rspec we test with and use the |
| 149 |
+ # correct lib directory for tests |
| 150 |
+ sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \ |
| 151 |
+ -e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die |
| 152 |
+ # be more lenient for software versions for tests |
| 153 |
+ sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \ |
| 154 |
+ -e '/rspec/ s/2.11.0/2.11/' \ |
| 155 |
+ -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die |
| 156 |
# patches |
| 157 |
default |
| 158 |
cmake-utils_src_prepare |
Archives