gentoo resync : 18.11.2017

3 files changed, 23 insertions, 1 deletions

diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index c921151cd502..0fd7cab4e8b2 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,10 +1,11 @@
 AUX libmwaw-0.3.11-CVE-2017-9433.patch 792 SHA256 4bfe6e85cad2d9b5e8fcbc59c15d09cfbeab93fe310e05f6bf4c4a54a083044d SHA512 a5f2996dd2e2de6eec0c637ee9e9777a803a4f7386c38436ad59c0af972c0a2b0ababc90018e5ebf0a67453fd66f154c175b82a1fb7dc6ba82d16468f7aee696 WHIRLPOOL a90b6109af04787d923e4f5ffb0fde62e2aee201e59c4f29b6a0d76e9e9ff9e1bb174c0462831080e30c66f4be7741e5ee01b2c73a8e1d7377153641727a2f33
+AUX libmwaw-0.3.13-buildfix.patch 562 SHA256 f290d981f7f0751e2bc7b340d77b972d52dba722c543ed8417538930419c35b8 SHA512 c7a87b316308f4448988d70e07184bcad462b7286e3f690eec8f377dd63ba95653e010bac8c1e00aba821fbab72d9c22d67a859f3b6e9c1bc88b5ca56e3756f7 WHIRLPOOL 52aa8022b7a247ad896dbfe1fde6d2059bb29c033a918015304132f3bdfc7a519fdde256da01588b51b216ad38a77fc825bf8576188e3d41357e87a4de348a27
 DIST libmwaw-0.3.11.tar.xz 1254200 SHA256 4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a SHA512 d4a810c6066023608a15ece8a6bbc958e586d679fc4ad51156091ec88355292872f10198e723e28776b45e140a830fd4c698732cf6103743d6e80ad8e1d778ab WHIRLPOOL 2de11bde90937727372eb7e7d4d1af52b66e8ef2f14bd78ce1d26399aa6ee853dc1fe11000cfcf8a361698296866ced2f2da7848f75763a22458ae0504903b48
 DIST libmwaw-0.3.12.tar.xz 1258972 SHA256 7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7 SHA512 8af8477ff6fc251600f9a66059b20fd8b9fad8d599c01e847d7185944447b3a34567036daff4d4510934aa1462bd4810a39467e8ac0ec223147b3b53447220ec WHIRLPOOL 9dd39fc43c7b8cf3806889a1cabde4c1bbd4f21e5e1ea2dfa66a6ea69f28ab28c966e160d157f0ee4559e85b6b7fac07dfa314d2ef0597986c85660b3a5cc0f9
 DIST libmwaw-0.3.13.tar.xz 1258220 SHA256 db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea SHA512 3d6a5142cc45f6519ac29f935c01418278ed4cc1bdcb0ecb1a190309c43d3f7ee06deab519d29a3e2aec01ef091cb4f4c17809662640b54a8e4fe8d4bd8db5f3 WHIRLPOOL 34310e946e398f577c76f2eacda496b64417fe3f7bc5f02af7852f51fa94c46df6f4df397a02fe56c7585b19dc62b796723b878f7ed66adf3698c14261e01f73
 EBUILD libmwaw-0.3.11-r1.ebuild 1080 SHA256 0900891771d1ed67d8a028c295ec2993ec66cbf1fc20b5664c2af922d6118b57 SHA512 a044974bdc83a5d7ad63fd585596ff366cb3f1bcb16147b11e7813242a36ae3f983f05a49280a6cadf1468f658fbefb22fa0973fad03a80eeb740d317fe34163 WHIRLPOOL 74d385a364de0acdf748a4ecb1eaa4c4b05a02d194e80cdf92d710517489ec33905fd98e3da0db1e04965ac0cae88d2595d94b16ea3f67cf097b28d5e7282f75
 EBUILD libmwaw-0.3.12.ebuild 1035 SHA256 86d983b1e06be30606c910717afa49babbae02ab464995b88d73f6e216c1fe0a SHA512 7c53399cc2575b1859fb5bbeb9ea2b11b84066119d3966def2addf60991b7c8c21da225a43e00c48cf6cc2130b1f82e98453ac637d0ee4ce0bd6768498731478 WHIRLPOOL 879080328d9a8f90915eacb183df9c8715064284e39c7dba3d1c9a66c1acd9dbeeb59ecb1d9052a7a956fbcb79f6b906b1f34eae13488176fec8159006010f48
-EBUILD libmwaw-0.3.13.ebuild 1010 SHA256 be6b21909def91af42f80e99998bda583abe7a74fd7a5dc0f9a1612e6b33d09c SHA512 6fe07afbf646c96d4bcf22264cf8bb4de3bda52aff57d379eccd43c376b9ae96c82eb0a95fea134ccfed7bfdd0cb1907735451aa7ca7926e6ffaa734776324ea WHIRLPOOL f24f2992e4be04f389f2f7d2b8a6a87f3abb241f4652bebe597165435dd9a695d3bd213a13ec821d15bd604b2443472f6bf53388fe1353fabf5164c30c29880e
+EBUILD libmwaw-0.3.13.ebuild 1057 SHA256 e09eadc60698ffad276d98061675e0813069d190f19c723f0f6b3f9ba1e0786d SHA512 2b8dce5c0855e092848a9436630ca0fbefe23763093f1482de12c208651e592e2c619facf714165fc1e0d571421b1296652ce7a57d3448410decc4236161ebc8 WHIRLPOOL fe35b86418782318b8ffebcd28cb89cbcfd5f617d62b5af1abd89fa6a28bc2ab3ddc82d1212b7bc8ee64936f3bfc8236b25c31aba9791af280c57603ac15db2f
 EBUILD libmwaw-9999.ebuild 1010 SHA256 be6b21909def91af42f80e99998bda583abe7a74fd7a5dc0f9a1612e6b33d09c SHA512 6fe07afbf646c96d4bcf22264cf8bb4de3bda52aff57d379eccd43c376b9ae96c82eb0a95fea134ccfed7bfdd0cb1907735451aa7ca7926e6ffaa734776324ea WHIRLPOOL f24f2992e4be04f389f2f7d2b8a6a87f3abb241f4652bebe597165435dd9a695d3bd213a13ec821d15bd604b2443472f6bf53388fe1353fabf5164c30c29880e
 MISC ChangeLog 5189 SHA256 60cf618cc047ff50be95311d7ee467a81fc77c05ae515246aaf484b444d73db3 SHA512 92b79f39c8a5a2a46132ed7e92f2511a6b26fef8bdbc07afb5a46a09d8f27fcc44a9101657af2b2d7decaa4ad7aa1f68d089ec1f2751f73834f1a8468113d57c WHIRLPOOL 808bd24d756f597d51c52a13ab795fde0beaf6dbd9b15efd7f48c961829d8b1aeeddd083153f42a2a0741cf353a44988d7f14d571cbbff5fbaf2445516fe90fe
 MISC ChangeLog-2015 3078 SHA256 1024b69c7cda3bd25b237d89db5d8b7aa24ad4acdf8e8aee491811f797c43c83 SHA512 6057013db3fce9175ae94710482a6aa6b4ef519ffcccbb73c08da7328e9fd06df2ba8b9060c49af1f62d3f30a70a96f3c7a4ab64735da98db14aa6a7bd2dfe67 WHIRLPOOL 7b9875d8c9e6bf3a30224167007087a7070dad369e287a31fae1e7c1b3f261132faefbb2e83f944f8927a9f8d4b5574529a27cd30b1d913a8a56b1609e35b164
diff --git a/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch b/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch
new file mode 100644
index 000000000000..5c9940e8860d
--- /dev/null
+++ b/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch
@@ -0,0 +1,19 @@
+commit 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9
+Author: David Tardon <dtardon@redhat.com>
+Date:   Wed Nov 15 13:15:44 2017 +0100
+
+    fix call of explicit ctor
+
+diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
+index 2875a0fb..b844a9d5 100644
+--- a/src/lib/libmwaw_internal.hxx
++++ b/src/lib/libmwaw_internal.hxx
+@@ -1027,7 +1027,7 @@ public:
+   }
+   //! generic constructor
+   template <class U> explicit MWAWBox2(MWAWBox2<U> const &p)
+-    : m_data(p.min(), p.max())
++    : m_data(MWAWVec2<T>(p.min()), MWAWVec2<T>(p.max()))
+   {
+   }
+ 
diff --git a/app-text/libmwaw/libmwaw-0.3.13.ebuild b/app-text/libmwaw/libmwaw-0.3.13.ebuild
index 0b26fe70b823..bd2d45589301 100644
--- a/app-text/libmwaw/libmwaw-0.3.13.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.13.ebuild
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
+PATCHES=( "${FILESDIR}/${P}-buildfix.patch" )
+
 src_prepare() {
 	default
 	[[ ${PV} == 9999 ]] && eautoreconf