gentoo resync : 29.10.2017

3 files changed, 26 insertions, 1 deletions

diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 590328e5e18a..ed797f7c1531 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,6 +1,7 @@
 AUX 50ledger-gentoo-3.1.1.el 166 SHA256 e16c4eaa7a034e44c7cc53d5288d6506ad791765510d534adf964a38c96dff0e SHA512 d5e2450d19d5d24e2db22429fa2ee8d46ae7284c91b1f2ed6eb32a0e6b70e1996f4b2f41812084b0330011d33fbcb2da11bf2d5b9f28a157f4c05d1106c418d5 WHIRLPOOL 3eb8764fd439bdba197c879d7e6e127485249afeb83f5c65855f56a51202842b12d0f051020447ccf7862eb47ea1d6df769c2fe7ad8bf8616f391fbf978ddde4
+AUX ledger-3.1.1-boost.patch 774 SHA256 3fe6750973d1ac10c822735759b35f362a68afb3dfa9887aaa7d83839a9e99eb SHA512 7f7eaa69ef377df1e9e449981c446ea52ef1d2311a9d96e325bf067af702f0361b05d70d6d52bdeefc7c9471cb68eceaa6fae313976e9b9676110b4e97198ba8 WHIRLPOOL 2f29624ef089cc31477ce8f000706906d90a8c24d28202f88151e52442f5176a1c49e1e7c4ec1008a5c29daf66bba54d42ee9c7827d10e313196a84cfd6ccc69
 DIST ledger-3.1.1.tar.gz 842364 SHA256 90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5 WHIRLPOOL 89a83818adbe206167dbfc999dd589f1943d199cf84979fa82754f597a863c115fec85bbdabc4413714b4253502833170e6327bfc0d2321c392b9a3d73400061
-EBUILD ledger-3.1.1.ebuild 3145 SHA256 8dbfa834dedaf4dd47ee30aa2558e6c7f53530d835e20d4835ab09ae1cca589f SHA512 ac3f3f0ac50fd428dc00adc379a03a0454d9db9290d86af6c27695b585b12fbfe59f7a755bf485c4f14185275ca37012e7658b3e26f1126c210c9d02d94fa441 WHIRLPOOL 0036e33dfcbda823948c10e8bc52ef8a73333536a7845c9775f6565266bbcfca16b8da6a43701446b977f6cc15ec318240c9d86d96097d457e0987039c121c5d
+EBUILD ledger-3.1.1.ebuild 3202 SHA256 c5ba8445587edbde8b2672ffab0c38eb944c4ac5a144552241bc1b9b6236d464 SHA512 86954ff4ffac4f5105e13f4a362e8a5f46dccedf236e0a465dce878996308e12a7302931c87bf08f7bbedfdd5b577fe486c363c5dd80ee28afebc6f7b8e78082 WHIRLPOOL 2fe01fb8924d79931e20333d857a4699df6bd7b6341d0629cd8135a19c67df0f4a643d5aee1d23bff93c242146abf0411ac7886882a1430debbf464fbdb9258c
 MISC ChangeLog 3839 SHA256 bc9a08e3e77d41a35d6ef3105976de882b36d931433af67f63f39119e1492e53 SHA512 e3803d9055adf59ad8014014209416d79437aa705057eb7b8fdade921dbe47d62153a744c6e7f9c1d7f26228ed29f798a45fb19cabe469f98660dea5c9c50991 WHIRLPOOL 94dbb592ca0d98bc172229bafdad430c2e6d5869908919e7acc8830f93019f0c51cb9e4da73a2ee8eb8d3940b54325b01bf1f7a31134dbeb8dd84f010ab8b603
 MISC ChangeLog-2015 5605 SHA256 f7f8807d67c60170c3c6dab4b9b2731fbe325c1f1fa6fb2152598852f303c3a9 SHA512 2f174a32b13ee74e74c92add0fb5575af76513aad6d76d5c1f2ef3ca242fa21f91caf068876e7df33ea730386966d0e6faab907d00eae5e716e2d4352eb61747 WHIRLPOOL 1861fe794e918e7c536ca2d50262acbddeb2c613d155cd706dbbbd4b9d5e46b03ba49dc871c98f62930fb6992ff49cb89ba7e3bed060fbb5126f7ffda4ded661
 MISC metadata.xml 306 SHA256 ca968234f5aa5aa39ded94b12d271aa7190b5445ad2a2b28c030a63f2d6b3adb SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb WHIRLPOOL 9247dec90625b7ba70fdc239496ff4ed2fab88dc4d31fadcf280824c28ee0557076e70141dde4f1f552d35ab285890e2a9096d5b48f38ee82c4086c15c07b5b9
diff --git a/app-office/ledger/files/ledger-3.1.1-boost.patch b/app-office/ledger/files/ledger-3.1.1-boost.patch
new file mode 100644
index 000000000000..b69a42a50113
--- /dev/null
+++ b/app-office/ledger/files/ledger-3.1.1-boost.patch
@@ -0,0 +1,22 @@
+From 1856b8c4902498843f4da37a7aaeb2ce85acc1d3 Mon Sep 17 00:00:00 2001
+From: Denis <dkasak@users.noreply.github.com>
+Date: Mon, 12 Sep 2016 12:49:40 +0200
+Subject: [PATCH] Fix compilation error with boost 1.61
+
+---
+ src/item.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/item.h b/src/item.h
+index ca16d87b3..4dc6df7e6 100644
+--- a/src/item.h
++++ b/src/item.h
+@@ -92,7 +92,7 @@ class item_t : public supports_flags<uint_least16_t>, public scope_t
+ 
+   typedef std::pair<optional<value_t>, bool> tag_data_t;
+   typedef std::map<string, tag_data_t,
+-                   function<bool(string, string)> > string_map;
++                   std::function<bool(string, string)> > string_map;
+ 
+   state_t              _state;
+   optional<date_t>     _date;
diff --git a/app-office/ledger/ledger-3.1.1.ebuild b/app-office/ledger/ledger-3.1.1.ebuild
index f32cda9c830f..31ed49d068b1 100644
--- a/app-office/ledger/ledger-3.1.1.ebuild
+++ b/app-office/ledger/ledger-3.1.1.ebuild
@@ -42,6 +42,8 @@ DEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost.patch" ) # bug 609108
+
 # Building with python integration seems to fail without 8G available
 # RAM(!)  Since the memory check in check-reqs doesn't count swap, it
 # may be unfair to fail the build entirely on the memory test alone.