commit: df3e5740fbee1de313a9ee8942e5b5bcc67080b0 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Tue Nov 29 01:51:45 2016 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> 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<std::string> const& blocklist = std::set<std::string>(), +- std::unordered_map<std::string, int64_t> const& ttls = {}); ++ std::unordered_map<std::string, int64_t> const& ttls = std::unordered_map<std::string, int64_t>{}); + + /** + * 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<std::string> const& blocklist = std::set<std::string>(), +- std::unordered_map<std::string, int64_t> const& ttls = {}); ++ std::unordered_map<std::string, int64_t> const& ttls = std::unordered_map<std::string, int64_t>{}); + + protected: + virtual std::vector<std::string> get_external_fact_directories() const override;