From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 900411396D9 for ; Sat, 18 Nov 2017 22:23:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4AE9E0E5A; Sat, 18 Nov 2017 22:23:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9211CE0E5A for ; Sat, 18 Nov 2017 22:23:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5277E33BF55 for ; Sat, 18 Nov 2017 22:23:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E64D89F71 for ; Sat, 18 Nov 2017 22:23:19 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1511043784.c0c94f4e8212f9572401f42834118554f4586748.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/facter/facter-3.9.3.ebuild dev-ruby/facter/facter-9999.ebuild X-VCS-Directories: dev-ruby/facter/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: c0c94f4e8212f9572401f42834118554f4586748 X-VCS-Branch: master Date: Sat, 18 Nov 2017 22:23:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 12422ff7-54df-471b-811b-22e8b92902ad X-Archives-Hash: 7dcbf72dfa881d952a4e60db7845cb88 commit: c0c94f4e8212f9572401f42834118554f4586748 Author: Matthew Thode gentoo org> AuthorDate: Sat Nov 18 22:20:53 2017 +0000 Commit: Matt Thode gentoo org> CommitDate: Sat Nov 18 22:23:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c94f4e dev-ruby/facter: fixing bug 637364 Package-Manager: Portage-2.3.14, Repoman-2.3.6 dev-ruby/facter/facter-3.9.3.ebuild | 2 ++ dev-ruby/facter/facter-9999.ebuild | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dev-ruby/facter/facter-3.9.3.ebuild b/dev-ruby/facter/facter-3.9.3.ebuild index 247eed1af45..02ce8a5fad9 100644 --- a/dev-ruby/facter/facter-3.9.3.ebuild +++ b/dev-ruby/facter/facter-3.9.3.ebuild @@ -4,6 +4,7 @@ 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" @@ -44,6 +45,7 @@ src_prepare() { sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die # patches default + cmake-utils_src_prepare } src_configure() { diff --git a/dev-ruby/facter/facter-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild index 0fed77cf9e2..95b52c0fbfd 100644 --- a/dev-ruby/facter/facter-9999.ebuild +++ b/dev-ruby/facter/facter-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -USE_RUBY="ruby21 ruby22" +EAPI=6 +USE_RUBY="ruby21 ruby22 ruby23 ruby24" # git-r3 goes after ruby-ng so that it overrides src_unpack properly -inherit cmake-utils multilib ruby-ng git-r3 +inherit cmake-utils eutils multilib ruby-ng git-r3 DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" @@ -20,7 +20,7 @@ KEYWORDS="" BDEPEND=" >=sys-devel/gcc-4.8:* - >=dev-libs/leatherman-0.9.3 + >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon" CDEPEND=" dev-libs/openssl:* @@ -36,15 +36,17 @@ DEPEND="${BDEPEND} ${CDEPEND}" src_prepare() { - pwd # 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 - epatch "${FILESDIR}/facter-3.5.0-jar.patch" + cmake-utils_src_prepare } src_configure() { @@ -80,10 +82,10 @@ 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 + + # 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 }