From 1d3e2c20a8e45f2f7d44954170e8a79d79e8b804 Mon Sep 17 00:00:00 2001
From: Matthew Thode <prometheanfire@gentoo.org>
Date: Mon, 5 Dec 2016 18:11:17 -0600
Subject: dev-ruby/facter: partial fix for bug 601746

Package-Manager: portage-2.3.0
---
 dev-ruby/facter/facter-3.5.0-r1.ebuild | 88 ++++++++++++++++++++++++++++++++++
 dev-ruby/facter/facter-3.5.0.ebuild    | 86 ---------------------------------
 dev-ruby/facter/facter-9999.ebuild     | 10 ++--
 3 files changed, 94 insertions(+), 90 deletions(-)
 create mode 100644 dev-ruby/facter/facter-3.5.0-r1.ebuild
 delete mode 100644 dev-ruby/facter/facter-3.5.0.ebuild

(limited to 'dev-ruby')

diff --git a/dev-ruby/facter/facter-3.5.0-r1.ebuild b/dev-ruby/facter/facter-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..ac7909141a91
--- /dev/null
+++ b/dev-ruby/facter/facter-3.5.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-collection-fix.patch"
+	epatch "${FILESDIR}/facter-3.5.0-jar.patch"
+}
+
+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.5.0.ebuild b/dev-ruby/facter/facter-3.5.0.ebuild
deleted file mode 100644
index a9627cedf02c..000000000000
--- a/dev-ruby/facter/facter-3.5.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-CDEPEND="
-	>=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
-	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() {
-	# 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-collection-fix.patch"
-	epatch "${FILESDIR}/facter-3.5.0-jar.patch"
-}
-
-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-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild
index 4ac7496eff6a..598871d63a1a 100644
--- a/dev-ruby/facter/facter-9999.ebuild
+++ b/dev-ruby/facter/facter-9999.ebuild
@@ -19,20 +19,22 @@ SLOT="0"
 IUSE="debug test"
 KEYWORDS=""
 
-CDEPEND="
+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
+	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+=" test? ( ${CDEPEND} )"
+RDEPEND="${CDEPEND}"
+DEPEND="${BDEPEND}
+	${CDEPEND}"
 
 src_prepare() {
 	pwd
-- 
cgit v1.2.3-65-gdbad