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

[Matt Thode]

commit:     26bee981260b3928a7061785e10ca07731dc55b6
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 19:24:28 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 19:32:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26bee981

dev-ruby/facter: more cleanup

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-ruby/facter/Manifest               |  3 --
 dev-ruby/facter/facter-3.1.4-r1.ebuild | 72 ----------------------------
 dev-ruby/facter/facter-3.6.1.ebuild    | 87 ---------------------------------
 dev-ruby/facter/facter-3.6.3-r1.ebuild | 88 ----------------------------------
 dev-ruby/facter/facter-3.7.0.ebuild    | 88 ----------------------------------
 5 files changed, 338 deletions(-)

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 0f950577b5c..413ace4a5e9 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,11 +1,8 @@
 DIST facter-2.4.6.gem 246272 SHA256 56ffc5fbcd550fcdb4788bc4d7fd0199bff69937d6df1e5a1f61c92d143d78fe SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a WHIRLPOOL fca6165c55d6123e1ab123e5d3459943fda845e696b111520fb6de682ab56fd51a9a4ca072e0a533496c0aedd83b2b26f827147ed01a30dbe72389250437301e
 DIST facter-2.5.0.gem 246784 SHA256 dd9c42a76630a7334570419b03886a1e2f0dc298db3630f92ed25090fad5241c SHA512 a67fc220a181152a639f130f9b0f2313eed2f7bcadf7b956d71051a6a6e1e6f099d2db9f86e8c67a14d1101f7d97481556028b7a559f7c5aaa27aad7515654eb WHIRLPOOL f723ed180a93a837b7b8abdd7af08175c8042f71c4339c6f0a3d8342138d364e9502f2abd04241ca0833367edc0edbe6468a73e3ade47a4f2033b9d2e5859d27
-DIST facter-3.1.4.tar.gz 620501 SHA256 7ca1872edbdc5ffcd11dc292e5e0625c9e0d35aa7966d8803859da0d035c7fcf SHA512 2fcc990c8e26349b9fa87cd1f7c43dffd49ffacf03c3467e836ea0bcd7527e1d40b6240646fd7dd6346121ca802fe86e996e209d838db91e8fe55298fdab4e0e WHIRLPOOL 224b17990fc559fce3a7c9b31c14dd45033127b078d68fac024cb6db192573085187163932c9dacd8fd94a281bd8d58ac1c75229a8e3bce4c4f070ebc81ff0f3
 DIST facter-3.1.8.tar.gz 324710 SHA256 bd393026640baf149507c11d36be144759889d4c90174d7c6bfb35e0a341fbca SHA512 2884c2c0bb3075b2552763dee7f33228b0e70b4eb46367f52c4cbf9e01930ddc5e58d062d06ced4174900fc3eae5214d80471a4fe499bf0f2ac0278640e0e8c7 WHIRLPOOL 465432940e068318da0028ce1c8ea3084392212cfc6a50449a3ba034fe721836c88ba16c2248b4b3f062a890087421c93a3d14574c8d03e1eafe4f4f82b49d0d
-DIST facter-3.6.1.tar.gz 364596 SHA256 cee28c3fb0134cfd90417c6facec795c1de724ea067911aa4f5b21b1c3785591 SHA512 7cb01536c2682576a8074abf0d617de31f3c9b79eb7f753e8a2ea8b231a9dc4d2017a1e8cf383f6a664596799111803b40e3772f0559c6de74351b8bb75ec0f3 WHIRLPOOL 2eafcfdae1cf83592907624716e21b8f030f96a42b4fa613eacde99ea895a0eae06bb6571d4a197c418aa0db9ad8f04b56938fc8f490d05423824b321ee11b74
 DIST facter-3.6.3.tar.gz 370771 SHA256 8c7491db7937a350d738985ee9b4ab370f074d82d89b6ed0115cc21e5adadcbe SHA512 cdcc6bd848c664f395f656d57e0bd28b62cccfdaeccdc9cd364d90a96693c6c8cdc079aa70409297f0ecfdee041c28bad52b3cb4b8981e66de2887bc5eb1bf33 WHIRLPOOL 91d7b8df9e79455f65e89f7a4e17c1cd7076e08091af89a8eb2116bc4716a7b4d4163559cdbed55f356d2fafc6a86cd075de6e15d8b9103be62d6ec3f68b69f6
 DIST facter-3.6.4.tar.gz 373722 SHA256 de12c53c74dd3f39633e61f62a900842d829cbe24b76e72b0c6e85000a99b8bc SHA512 d5e03bb40da448805a56accc2fb972569f686a1e8c8b343d4e0defb5a00a982665496049174c225a8b04abb4d09112bd2117a8a96c9360bb2e36e4d569d86337 WHIRLPOOL f7a05a044c7031f248a888458678b48fc8d7996a2d0bc588323bf6c76513ff4fc838f0299db19f212dd0b5ba094b8135558db7da7f4ff596267832354d369634
 DIST facter-3.6.5.tar.gz 371967 SHA256 00e37c4c2cb0e8a95e3957239477e23c778c37d61d71f66bdab3e905ff969876 SHA512 d925a9f8e0c0a2b94f56b6683b99fc70b7d48ad3388001bc341abed5b9c4594701a1756430fa2fd6a9ac8a2d3ec73562f1f8b909d364dc8b1c1e3c81f15041d6 WHIRLPOOL ac4f5a1d52c8890a085f7f4aa6ee76a93c6af76021e4c1461164ba6d5536c0d1a371450247e40ecf5803533e27b25dbc6aa0b992d8444d65b0c76902703b6662
 DIST facter-3.6.6.tar.gz 372137 SHA256 a06b6907d39a0974f39535a162a409a31bb9c4e99f9969aaa4cd1cb04062039f SHA512 a0b83b1a03ae1abc0822d69b190dcfbf269f8219b3c17c887517fafcc16d9cdabd0938a14103ce3ed66e13d4b528620694a9f7e2697d23fadb108c44686dd8af WHIRLPOOL adea4eeb562c0995b1c7dfa972c4e83bea9c480451be3f88d4957fcfa41bef0bef9163c385eb385b17cdc98bc463147e3d6d7ab5c5ef44354c73c765c3da380c
-DIST facter-3.7.0.tar.gz 374550 SHA256 b5b507df89757982309c089f10bde333124fa11eba7de6aec3639b51570d28b3 SHA512 c2c1e08526625fc031a79c57fa8d3e7d7ce4271c84ba11e1a721bdc421103ef70144e0a85b612bb5936bfc3c275a562ddc40fda675083a03c5d8b46779304a7e WHIRLPOOL 0400b3cc42d5e1fa298b68d865839562b6e356c2ade764d683110f754e214e373356420e6b4ed54b1014a4dcf0c03185eedf53c7d1ee24145d8da3f4e4d167a5
 DIST facter-3.7.1.tar.gz 374576 SHA256 fe62b0a33c9edd3f945c1d3057e45172a26952439e0e922341d3844864b92320 SHA512 3b2d218d60f5ad9ef756a50540f638303b7a4eb0ea2afca10d2c41f4e6e3f6c2bb6337de417e4989664e32317b0f8db921fed68e813e4cebe10083c943b33fee WHIRLPOOL 342d3d26cb23116a469530f4e3621575650dbfce0b66f8e5debcd05d05736b24df14b20213b4540a0be2065b50e445385b4c3cc583c88490dce4b59b1408e806

diff --git a/dev-ruby/facter/facter-3.1.4-r1.ebuild b/dev-ruby/facter/facter-3.1.4-r1.ebuild
deleted file mode 100644
index 580fc79cb51..00000000000
--- a/dev-ruby/facter/facter-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-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/"
-SRC_URI="https://downloads.puppetlabs.com/facter/${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
-
-CDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "vendor/leatherman/cmake/cflags.cmake" || die
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i 's/if(RUBY_VENDORDIR)/if(False)/g' lib/CMakeLists.txt || die
-	sed -i '/RUBY_VENDORDIR/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
-}
-
-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
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-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
-}

diff --git a/dev-ruby/facter/facter-3.6.1.ebuild b/dev-ruby/facter/facter-3.6.1.ebuild
deleted file mode 100644
index bf72714bc21..00000000000
--- a/dev-ruby/facter/facter-3.6.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-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/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54[nls]
-	>=dev-libs/leatherman-0.9.3
-	>=dev-cpp/yaml-cpp-0.5.1
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	!<app-admin/puppet-4.0.0"
-
-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
-	# patches
-	epatch "${FILESDIR}/facter-3.5.0-jar.patch"
-	epatch_user
-}
-
-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
-	if [[ $(get_libdir) == lib64 ]]; then
-		dodir /usr/lib64
-		mv "${D}/usr/lib/"* "${D}/usr/lib64/"
-		rmdir "${D}/usr/lib"
-	fi
-	doenvd "${FILESDIR}"/00facterdir
-}

diff --git a/dev-ruby/facter/facter-3.6.3-r1.ebuild b/dev-ruby/facter/facter-3.6.3-r1.ebuild
deleted file mode 100644
index 47f77c3cc1a..00000000000
--- a/dev-ruby/facter/facter-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-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/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54[nls]
-	>=dev-libs/leatherman-0.9.3
-	>=dev-cpp/yaml-cpp-0.5.1
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	!<app-admin/puppet-4.0.0"
-
-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
-	# patches
-	epatch_user
-}
-
-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.7.0.ebuild b/dev-ruby/facter/facter-3.7.0.ebuild
deleted file mode 100644
index cc659bb14f6..00000000000
--- a/dev-ruby/facter/facter-3.7.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-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/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	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"
-
-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
-	# patches
-	epatch_user
-}
-
-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
-}