[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/

[Matt Thode]

commit:     3882cc2071d170916d58201c28f2300ee45be174
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 19:01:00 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 19:01:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3882cc20

dev-ruby/facter: 3.11.2 stable amd64 and x86 with cleanup

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-ruby/facter/Manifest             |   3 -
 dev-ruby/facter/facter-2.5.1.ebuild  |  61 --------------------
 dev-ruby/facter/facter-3.10.0.ebuild | 108 -----------------------------------
 dev-ruby/facter/facter-3.11.2.ebuild |   2 +-
 dev-ruby/facter/facter-3.9.5.ebuild  | 108 -----------------------------------
 5 files changed, 1 insertion(+), 281 deletions(-)

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 7ef38e725c1..72f62d63374 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,7 +1,4 @@
 DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a
-DIST facter-2.5.1.gem 254464 BLAKE2B 7276e9c406c000e51e68a2a1c22d0636e294902d31bcaf58e922961a8e1dd99a362467b7046362a5f179fe72f6c077656d4d400e354ed40ed3a06c71de7f07cc SHA512 4fa4b5248bac64c7a76036e428f0f5fdb0b2173987fbaaf18d0130386126dabb083e23cea8cb4df37bae0ea5a883663f71bc6c04406c562bfb7adc23e0899f57
-DIST facter-3.10.0.tar.gz 388935 BLAKE2B fe224a098bf306cccdfea919eb898e0d60dff09d8277ad7bf70f9af5a2c10983d47bc7abc397357c9296169e3864aa5547e8e67bf7e76596929f1a2b77fa26c5 SHA512 4b8538948871578c88498e95b87757e0bf4b3ced6bef174a120fcc16189996adf6c17c9815e1fa7d8d0921dc7d8c45fe518061f79020a3e2ac49dfd3b5457c59
 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.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
-DIST facter-3.9.5.tar.gz 388129 BLAKE2B baa63de9c2faf4b1891999fdbb5c576461ebc0fe522b77d01d7c711a67466a739802426e2b60812083eacd4e684422353227029152384a78477a840be223781f SHA512 32462caa637e08bae5964b18821bceec3ec4de4d1f5d8c28feaacb3574e3d0dbeabe09c41a7972358d874b29ebc0b0ea73dbc75adf118ec6379d3ad04fb1b36a

diff --git a/dev-ruby/facter/facter-2.5.1.ebuild b/dev-ruby/facter/facter-2.5.1.ebuild
deleted file mode 100644
index 55e308b2c58..00000000000
--- a/dev-ruby/facter/facter-2.5.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="facter"
-
-inherit ruby-fakegem
-
-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="+dmi +pciutils +virt"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	app-emulation/virt-what
-	sys-apps/net-tools
-	sys-apps/lsb-release
-	dmi? ( sys-apps/dmidecode )
-	pciutils? ( sys-apps/pciutils )"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )"
-
-all_ruby_prepare() {
-	# Provide explicit path since /sbin is not in the default PATH on
-	# Gentoo.
-	sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb spec/unit/util/ec2_spec.rb || die
-
-	# Ensure the correct version of mocha is used without using bundler.
-	sed -i -e '1igem "mocha", "~>1.0"' spec/spec_helper.rb || die
-
-	# Avoid because tests try to access outside stuff, e.g. /sys/block
-	sed -i -e '/should load facts on the facter search path only once/,/^  end/ s:^:#:' spec/unit/util/loader_spec.rb || die
-
-	# Allow specs to work with newer rspec 2.x versions.
-	sed -i -e '1irequire "rspec-expectations"' spec/puppetlabs_spec/matchers.rb || die
-
-	# Avoid specs specific to macosx requiring cfpropertylist which is
-	# not available anymore.
-	rm spec/unit/util/macosx_spec.rb || die
-	sed -i -e '/macosx/ s:^:#:' \
-		-e '/on Darwin/,/^  end/ s:^:#:' spec/unit/virtual_spec.rb || die
-	sed -i -e '/Facter::Processors::Darwin/,/^end/ s:^:#:' spec/unit/processors/os_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# Create the directory for custom facts.
-	keepdir /etc/facter/facts.d
-}

diff --git a/dev-ruby/facter/facter-3.10.0.ebuild b/dev-ruby/facter/facter-3.10.0.ebuild
deleted file mode 100644
index 7e5d9190829..00000000000
--- a/dev-ruby/facter/facter-3.10.0.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="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"
-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
index 6210613630d..1d8bed51422 100644
--- a/dev-ruby/facter/facter-3.11.2.ebuild
+++ b/dev-ruby/facter/facter-3.11.2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${S}/${P}"
 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"
 	S="${S}/all/${P}"
 fi

diff --git a/dev-ruby/facter/facter-3.9.5.ebuild b/dev-ruby/facter/facter-3.9.5.ebuild
deleted file mode 100644
index 921e49af450..00000000000
--- a/dev-ruby/facter/facter-3.9.5.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="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"
-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
-}