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 A9BAC1395E3 for ; Tue, 29 Nov 2016 01:52:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A411E0B80; Tue, 29 Nov 2016 01:52:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB302E0B80 for ; Tue, 29 Nov 2016 01:52:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C241C340F43 for ; Tue, 29 Nov 2016 01:52:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 357E049A for ; Tue, 29 Nov 2016 01:52:20 +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: <1480384321.df3e5740fbee1de313a9ee8942e5b5bcc67080b0.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/, dev-ruby/facter/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/facter/facter-3.5.0.ebuild dev-ruby/facter/files/facter-3.5.0-collection-fix.patch X-VCS-Directories: dev-ruby/facter/files/ dev-ruby/facter/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: df3e5740fbee1de313a9ee8942e5b5bcc67080b0 X-VCS-Branch: master Date: Tue, 29 Nov 2016 01:52:20 +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: 9772870c-77d0-4334-b44a-7e824a5f201a X-Archives-Hash: 4323deffda0c8554b819a55d216aae44 commit: df3e5740fbee1de313a9ee8942e5b5bcc67080b0 Author: Matthew Thode gentoo org> AuthorDate: Tue Nov 29 01:51:45 2016 +0000 Commit: Matt Thode gentoo org> CommitDate: Tue Nov 29 01:52:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df3e5740 dev-ruby/facter: fixing build issue for bug 600942 Package-Manager: portage-2.3.0 dev-ruby/facter/facter-3.5.0.ebuild | 2 ++ .../facter/files/facter-3.5.0-collection-fix.patch | 24 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dev-ruby/facter/facter-3.5.0.ebuild b/dev-ruby/facter/facter-3.5.0.ebuild index c90ae7c..693d798 100644 --- a/dev-ruby/facter/facter-3.5.0.ebuild +++ b/dev-ruby/facter/facter-3.5.0.ebuild @@ -39,6 +39,8 @@ src_prepare() { # 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" } src_configure() { diff --git a/dev-ruby/facter/files/facter-3.5.0-collection-fix.patch b/dev-ruby/facter/files/facter-3.5.0-collection-fix.patch new file mode 100644 index 00000000..edd10d2 --- /dev/null +++ b/dev-ruby/facter/files/facter-3.5.0-collection-fix.patch @@ -0,0 +1,24 @@ +diff -Naur /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0.old/lib/inc/facter/facts/collection.hpp /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0/lib/inc/facter/facts/collection.hpp +--- facter-3.5.0.old/lib/inc/facter/facts/collection.hpp 2016-10-21 18:32:16.000000000 -0500 ++++ facter-3.5.0/lib/inc/facter/facts/collection.hpp 2016-11-28 19:36:55.025454011 -0600 +@@ -94,7 +94,7 @@ + * for the facts they resolve + */ + collection(std::set const& blocklist = std::set(), +- std::unordered_map const& ttls = {}); ++ std::unordered_map const& ttls = std::unordered_map{}); + + /** + * Destructor for fact collection. +diff -Naur /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0.old/lib/tests/collection_fixture.hpp /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0/lib/tests/collection_fixture.hpp +--- facter-3.5.0.old/lib/tests/collection_fixture.hpp 2016-10-21 18:32:16.000000000 -0500 ++++ facter-3.5.0/lib/tests/collection_fixture.hpp 2016-11-28 19:36:47.322311122 -0600 +@@ -10,7 +10,7 @@ + { + public: + collection_fixture(std::set const& blocklist = std::set(), +- std::unordered_map const& ttls = {}); ++ std::unordered_map const& ttls = std::unordered_map{}); + + protected: + virtual std::vector get_external_fact_directories() const override;