summaryrefslogtreecommitdiff
path: root/dev-ruby/facter
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-02-15 16:58:00 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-02-15 16:58:00 +0000
commit434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch)
treeb72c523c72e764420f835ba9d63d43ffef687dcf /dev-ruby/facter
parentf78108598211053d41752a83e0345441bb9014ae (diff)
gentoo resync : 15.02.2018
Diffstat (limited to 'dev-ruby/facter')
-rw-r--r--dev-ruby/facter/Manifest16
-rw-r--r--dev-ruby/facter/facter-3.10.0.ebuild (renamed from dev-ruby/facter/facter-3.9.4.ebuild)0
-rw-r--r--dev-ruby/facter/facter-3.7.1.ebuild88
-rw-r--r--dev-ruby/facter/facter-3.8.0.ebuild88
-rw-r--r--dev-ruby/facter/facter-3.9.0.ebuild88
-rw-r--r--dev-ruby/facter/facter-3.9.1.ebuild88
-rw-r--r--dev-ruby/facter/facter-3.9.5.ebuild (renamed from dev-ruby/facter/facter-3.9.3.ebuild)16
7 files changed, 16 insertions, 368 deletions
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index a9676032c501..7d4c101b75cc 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,22 +2,14 @@ AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f93916
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.1.8.tar.gz 324710 BLAKE2B 9b7ce93d7d0b2112771ea79df0cb35e7bb752e19e4a54d213161479c27c7ade79e148fe1fdbbb3c20d0d61462aac5f4b97b6e84fdca89623d9ba4911f286e9fd SHA512 2884c2c0bb3075b2552763dee7f33228b0e70b4eb46367f52c4cbf9e01930ddc5e58d062d06ced4174900fc3eae5214d80471a4fe499bf0f2ac0278640e0e8c7
-DIST facter-3.7.1.tar.gz 374576 BLAKE2B 58f3a8f22c0a01bee1202fdb3f44a8f61a2f9bfed18585c6ccc8f0f3990fcde8c267540a0d06b805b91c538dcdee90e9b9dba3d618cd2df8e935d8d994134167 SHA512 3b2d218d60f5ad9ef756a50540f638303b7a4eb0ea2afca10d2c41f4e6e3f6c2bb6337de417e4989664e32317b0f8db921fed68e813e4cebe10083c943b33fee
-DIST facter-3.8.0.tar.gz 378859 BLAKE2B 3fe790c21211fe749727e6da7849911751c8deb51c5ef08ca9669ba385a1791a289c50d4696eb1ed72b06c934bdf385b6928ef04d20ae7b903090162e047b3c5 SHA512 e28771c7136c9b40e2f8b3509fbe07188d2640288705b5bd531521e476b8b8386e5003448b4c199c9d6cced8128ec113dcc9ae317cd4aa5319da906e605cfc4d
-DIST facter-3.9.0.tar.gz 380715 BLAKE2B c4045020edaae06b23e0c75788cc76854f440ec7605234e3fef476e92ebb4d541d4b1b9148fc0350cc4b1854c1cb7888482120a3566fc579dabe033301791019 SHA512 ca818ba58fe232752a74faaa8377f706a49661e37ce85af7e6eaf735ecbcdcda4071618a6b8906b0444fea989b7b16cb85171b980a089cd57aaad37508a2b905
-DIST facter-3.9.1.tar.gz 380762 BLAKE2B 15d6c4884a4bd4ce1de252f51b1f480c0908ed8b1b3d7b386e651265a21359305f93dfe199b7e100d027d8507ddf99a0ee712e85e63f26f07f3f6f7c2976cc99 SHA512 a3b66bf40c062dbef644d60909a2c2afd0839c8a11fd02a0a15ccbbc1a1f216d9b0420a0f90dd44166487faa4e00843f2c0f3f057bb43bb30c22677dfac325a0
+DIST facter-3.10.0.tar.gz 388935 BLAKE2B fe224a098bf306cccdfea919eb898e0d60dff09d8277ad7bf70f9af5a2c10983d47bc7abc397357c9296169e3864aa5547e8e67bf7e76596929f1a2b77fa26c5 SHA512 4b8538948871578c88498e95b87757e0bf4b3ced6bef174a120fcc16189996adf6c17c9815e1fa7d8d0921dc7d8c45fe518061f79020a3e2ac49dfd3b5457c59
DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
-DIST facter-3.9.3.tar.gz 387062 BLAKE2B 7fef72ae0ded8be1ac0eae317b748995df58e66837daf410970cca4049304a54af5976f4502a36a3c7d0963d0e65d5bd1c8df5dc1347cc0d6325a9d79512b676 SHA512 c01685e67ed25ae12f51086012e563df9ea80dde43c4cf40ab2f17b90e7bcb0791369a9c8ea67af7a0039e1fb2714b0758d8f0d00e4e857201ad8075d8ba51c4
-DIST facter-3.9.4.tar.gz 388097 BLAKE2B 872ea33c2412ccafd3df1b5e49e79559bac578e91003eda717d03ee1c82e5550f237459066d7fb6692df066fcce183ea4057b4e5e37d1ceaa4b79079ef1c4599 SHA512 e3bb57ad5e538c2561968aab3b47ca7324162dfc5f2a507ed872e41b98f5bbc91f6e836a3452ea2d519a933c76c17a8e1253e74b5d5769e395d7c6895a4400b1
+DIST facter-3.9.5.tar.gz 388129 BLAKE2B baa63de9c2faf4b1891999fdbb5c576461ebc0fe522b77d01d7c711a67466a739802426e2b60812083eacd4e684422353227029152384a78477a840be223781f SHA512 32462caa637e08bae5964b18821bceec3ec4de4d1f5d8c28feaacb3574e3d0dbeabe09c41a7972358d874b29ebc0b0ea73dbc75adf118ec6379d3ad04fb1b36a
EBUILD facter-2.4.6.ebuild 1913 BLAKE2B c05f0516f84135fac1d9b4b6a456045e4e5934416f1fee52654c901a9d50b4e69e10e2669f98806779fdb36f6bb6184698581be4191058d91eed8807c602b407 SHA512 bdad132d8bd7abf5cdb15f3fa35ba76dedf5fbb5243799b46538eb6377776f3a7ca08ed8bf21af11ff5b301add9d2f0cbbc794c4e35ba5d5ba8f27cc74f1519b
EBUILD facter-2.5.1.ebuild 1918 BLAKE2B 303788746f2ba6e1385356526e17965528f10e06546c918f0aed7ecb884bd4e0386387ad01d9e59fd7cb9254d91b26c91ceec1fa9bd75dfd34bedb1d02df9115 SHA512 ed07f3b39a71b147a1a07ac161e1895a4e7380aa773c146d702f82eb5a6bf342aa8700f100c4c56ac2996a2d7fc82b5bd4af492c77aed4ba78d308c18a507ab6
EBUILD facter-3.1.8.ebuild 1832 BLAKE2B d82c18bb394b316a1c397be60905bbc0333697ebe68504562053acde280d0cb3c56ec6bb767be3c6c9edf78bd32b72ec919c8092a255574ff2076bc83efc6ffd SHA512 48bf7bb8ac8b39c8ab7ca2ac97fa6bbf4201b485eabdb3d6410e4568270b11fe863e88dbd1cc93f8c0b690372b5fc635cf72e5a5debb1e97bb5ed1797811d5b0
-EBUILD facter-3.7.1.ebuild 2102 BLAKE2B 96a000c70aeabd1554b918c6c38b40097a4a5edeceaa93d57c8a53e7d9cf09988d00ee426d1618f98fb24aec5d6a2b04b199488af591771ddc563719c61cef6d SHA512 8111259a1c695acc9dd884f6dc19560fb18dcaf4412c924529312b288565d20efb010cb41c64a55594f32cce47071b1216a29df23e93df578cdfa047897736ad
-EBUILD facter-3.8.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
-EBUILD facter-3.9.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
-EBUILD facter-3.9.1.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
+EBUILD facter-3.10.0.ebuild 2856 BLAKE2B d0495940e38a3a79b71f8583ca919caf296e8ed548724481f0147be4a1d1216502ab27e9c7a0c110e3c8c9bb015767051c05a928542ab74462bb4c1c28908f89 SHA512 bea7abfe6c1f2215f9db8db98afcf7b3a342da77b238dade61de3c87a4395643ae3ef271dcb17e995119410ca716e535bfe1d17b49f84ad55093b6f6d3e8c758
EBUILD facter-3.9.2.ebuild 2108 BLAKE2B f5ff96477d41f3c85555e15cafc455d5fc571a27594d5fe9fe38525c6ee083e0cd59435031ca81bfb7666632a683ea24d0e9c4b55eadeebd17dad6bb8a241f4b SHA512 67fb489f027193816d966aa4132873e73892c3ef36146abd6c069746c6a807e7ad1aa1f2b3b14f0aa7c97236018882be37a71f5daa95a27491110e6375b5040c
-EBUILD facter-3.9.3.ebuild 2676 BLAKE2B b99a93367d4e27afe75602238ba9da2a8a90b6661dc0388797b86f214156b6c420c6bc26fe0f77a0f1c860c38b13f9f612463c75123ee55c21636e7b20257443 SHA512 04f7d0bedecbfc814fdedfb31c9d7ee11bdc5f345967dfff93d1cdd2697a4bc02731fa7b4b289c521636ff37226310df62ab4876972e57d034a6c05ea10a65ae
-EBUILD facter-3.9.4.ebuild 2856 BLAKE2B d0495940e38a3a79b71f8583ca919caf296e8ed548724481f0147be4a1d1216502ab27e9c7a0c110e3c8c9bb015767051c05a928542ab74462bb4c1c28908f89 SHA512 bea7abfe6c1f2215f9db8db98afcf7b3a342da77b238dade61de3c87a4395643ae3ef271dcb17e995119410ca716e535bfe1d17b49f84ad55093b6f6d3e8c758
+EBUILD facter-3.9.5.ebuild 2856 BLAKE2B d0495940e38a3a79b71f8583ca919caf296e8ed548724481f0147be4a1d1216502ab27e9c7a0c110e3c8c9bb015767051c05a928542ab74462bb4c1c28908f89 SHA512 bea7abfe6c1f2215f9db8db98afcf7b3a342da77b238dade61de3c87a4395643ae3ef271dcb17e995119410ca716e535bfe1d17b49f84ad55093b6f6d3e8c758
EBUILD facter-9999.ebuild 2856 BLAKE2B d0495940e38a3a79b71f8583ca919caf296e8ed548724481f0147be4a1d1216502ab27e9c7a0c110e3c8c9bb015767051c05a928542ab74462bb4c1c28908f89 SHA512 bea7abfe6c1f2215f9db8db98afcf7b3a342da77b238dade61de3c87a4395643ae3ef271dcb17e995119410ca716e535bfe1d17b49f84ad55093b6f6d3e8c758
MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
diff --git a/dev-ruby/facter/facter-3.9.4.ebuild b/dev-ruby/facter/facter-3.10.0.ebuild
index c15426643a6a..c15426643a6a 100644
--- a/dev-ruby/facter/facter-3.9.4.ebuild
+++ b/dev-ruby/facter/facter-3.10.0.ebuild
diff --git a/dev-ruby/facter/facter-3.7.1.ebuild b/dev-ruby/facter/facter-3.7.1.ebuild
deleted file mode 100644
index 5f534455759d..000000000000
--- a/dev-ruby/facter/facter-3.7.1.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
-}
diff --git a/dev-ruby/facter/facter-3.8.0.ebuild b/dev-ruby/facter/facter-3.8.0.ebuild
deleted file mode 100644
index 247eed1af456..000000000000
--- a/dev-ruby/facter/facter-3.8.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=6
-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 ~arm ~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
- default
-}
-
-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.9.0.ebuild b/dev-ruby/facter/facter-3.9.0.ebuild
deleted file mode 100644
index 247eed1af456..000000000000
--- a/dev-ruby/facter/facter-3.9.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=6
-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 ~arm ~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
- default
-}
-
-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.9.1.ebuild b/dev-ruby/facter/facter-3.9.1.ebuild
deleted file mode 100644
index 247eed1af456..000000000000
--- a/dev-ruby/facter/facter-3.9.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 ~arm ~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
- default
-}
-
-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.9.3.ebuild b/dev-ruby/facter/facter-3.9.5.ebuild
index d15e9288ae66..c15426643a6a 100644
--- a/dev-ruby/facter/facter-3.9.3.ebuild
+++ b/dev-ruby/facter/facter-3.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,13 +9,21 @@ 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 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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:*