commit: 11fb63515d84e8022d26b029c79bc3664773546a Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Fri Sep 21 18:18:22 2018 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Fri Sep 21 18:18:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fb6351
dev-ruby/facter: 3.11.4 stable allarches with cleanup Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-ruby/facter/Manifest | 2 - dev-ruby/facter/facter-3.11.1.ebuild | 108 ----------------------------------- dev-ruby/facter/facter-3.11.2.ebuild | 105 ---------------------------------- dev-ruby/facter/facter-3.11.4.ebuild | 2 +- 4 files changed, 1 insertion(+), 216 deletions(-) diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest index 7c129b02248..47cf93c427b 100644 --- a/dev-ruby/facter/Manifest +++ b/dev-ruby/facter/Manifest @@ -1,6 +1,4 @@ DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a -DIST facter-3.11.1.tar.gz 384201 BLAKE2B 349493f0046239ed900cb22df6cac2f5c1f748503e057a68e9be34c2f24f134a280ab9292d7f4e754a5974818a1fd01bc55634905d84706b47686a9e7a1ccc39 SHA512 295c91817912fb43fe259ede4b51ecf4ae5efd500d64b2682c700583bfdf694a8849a4bd4cb3a16a8046d563f487225957a49b760cc03d8bf86ac8487e37a756 -DIST facter-3.11.2.tar.gz 384784 BLAKE2B f280772231a9105e5924cdb777411861a76a67c15b4d7f3cc73fb9c089752a4e5fa43c4d84b8525917fae71ae34c770925161cc94882e74a704d6609b1c1778a SHA512 aaeee7449813590ac8bc8d3b1b2a654e75bcdaabbb19f91f8b282f747e0f8af05ef71bc872b99c226f0db4d06b67549551f62c365853f5829c6b26c931c0b582 DIST facter-3.11.3.tar.gz 384882 BLAKE2B ad6103df38efb6abd68d9f831e53dba2767401e129d55bb94adee4dc3f8bc48c7a969050cc52d395a196883d561317ccb72bfaba2775e003171fd6941935feb8 SHA512 6b2dbc5a0bc1c70739a4c0987311ef0891a27f64ed1b45a46cc20a37e6d1d24fda0481976fbf743f83f10d2014f6e0df0e2b5cc9eba19924e831652e1a8417ef DIST facter-3.11.4.tar.gz 388074 BLAKE2B c3105376ba8d74df08e7e19ca7b5291d241d57aebb43a77d0dabe96668a07a62bf70fb18aa3bc3d85011e22f935a711daade17cf60ad867a7503e1b731647c88 SHA512 af58d0592a4b220d8f1d9a6d065da71136b58b7a474587c140021fd2915d920d328bad52178566f26292bd932ca1ac1371a631f88a567876265c7494bb01c518 DIST facter-3.12.0.tar.gz 390445 BLAKE2B 8c7f2fccd16df3b13df451c18eaeb0cb837d1408b247bbf35f264e3adc2daeb5efaf3008ecf95428433d19067310b2d273a6001e1e151c260d7777dd5185f54b SHA512 2ef78903f62784f86f8d155f9f10ba793c10742f87d80c894c6bd505ae9186b5e875366d9c05899fe5e25f2994cf66b7d73d6c6570a38a7bc6e45ff0d5108c36 diff --git a/dev-ruby/facter/facter-3.11.1.ebuild b/dev-ruby/facter/facter-3.11.1.ebuild deleted file mode 100644 index f1584484e8b..00000000000 --- a/dev-ruby/facter/facter-3.11.1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" - -# 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" -HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="debug test" -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"; - EGIT_BRANCH="master" - S="${S}/${P}" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" - SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${S}/all/${P}" -fi - -BDEPEND=" - >=sys-devel/gcc-4.8:* - dev-cpp/cpp-hocon" -CDEPEND=" - >=dev-libs/leatherman-1.0.0:= - dev-libs/openssl:* - sys-apps/util-linux - app-emulation/virt-what - net-misc/curl - >=dev-libs/boost-1.54:=[nls] - >=dev-cpp/yaml-cpp-0.5.1 - !<app-admin/puppet-4.0.0" - -ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )" - -RDEPEND="${CDEPEND}" -DEPEND="${BDEPEND} - ${CDEPEND}" - -src_prepare() { - # 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 - # be explicit about the version of rspec we test with and use the - # correct lib directory for tests - sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \ - -e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die - # be more lenient for software versions for tests - sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \ - -e '/rspec/ s/2.11.0/2.11/' \ - -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die - # patches - default - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -DUSE_JRUBY_SUPPORT=FALSE - -DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1 - ) - if use debug; then - mycmakeargs+=( - -DCMAKE_BUILD_TYPE=Debug - ) - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -each_ruby_install() { - doruby "${BUILD_DIR}"/lib/facter.rb -} - -src_test() { - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - ruby-ng_src_install - - # 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 -} diff --git a/dev-ruby/facter/facter-3.11.2.ebuild b/dev-ruby/facter/facter-3.11.2.ebuild deleted file mode 100644 index 1d8bed51422..00000000000 --- a/dev-ruby/facter/facter-3.11.2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" - -# 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" -HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="debug test" -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"; - EGIT_BRANCH="master" - S="${S}/${P}" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" - SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${S}/all/${P}" -fi - -BDEPEND=" - >=sys-devel/gcc-4.8:* - dev-cpp/cpp-hocon" -CDEPEND=" - >=dev-libs/leatherman-1.0.0:= - dev-libs/openssl:* - sys-apps/util-linux - app-emulation/virt-what - net-misc/curl - >=dev-libs/boost-1.54:=[nls] - >=dev-cpp/yaml-cpp-0.5.1 - !<app-admin/puppet-4.0.0" - -ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )" - -RDEPEND="${CDEPEND}" -DEPEND="${BDEPEND} - ${CDEPEND}" - -src_prepare() { - # 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 - # be explicit about the version of rspec we test with and use the - # correct lib directory for tests - sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \ - -e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die - # be more lenient for software versions for tests - sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \ - -e '/rspec/ s/2.11.0/2.11/' \ - -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die - # patches - default - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr - -DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1 - ) - if use debug; then - mycmakeargs+=( - -DCMAKE_BUILD_TYPE=Debug - ) - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -each_ruby_install() { - doruby "${BUILD_DIR}"/lib/facter.rb -} - -src_test() { - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - ruby-ng_src_install - - # 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 -} diff --git a/dev-ruby/facter/facter-3.11.4.ebuild b/dev-ruby/facter/facter-3.11.4.ebuild index 683775e7668..28bfa5860ac 100644 --- a/dev-ruby/facter/facter-3.11.4.ebuild +++ b/dev-ruby/facter/facter-3.11.4.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_BRANCH="master" else [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86" SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" fi
