gentoo resync : 26.12.2017

22 files changed, 199 insertions, 30 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 71d49a57a060..e424fdf25b51 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/argtable/Manifest b/dev-libs/argtable/Manifest
index beda2420c29e..bb2eae228241 100644
--- a/dev-libs/argtable/Manifest
+++ b/dev-libs/argtable/Manifest
@@ -1,3 +1,3 @@
 DIST argtable2-13.tar.gz 3326444 BLAKE2B 8c78d56c2e1a53747cf480808064cb006644db50a2cb38adddd71eff07d4d7f6e5467c54eec4e5cbb729a7f639927b2d3283c6995bde54134d7a85e39788b87c SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
-EBUILD argtable-2.13.ebuild 1081 BLAKE2B 90042c53f867c1a3e70b0400fb7e59a687976133094494050168f04e3f781a211273fd04e0df102bfa79e826cfb419987ad3b4cda9cd4cd0de0d193592a565a0 SHA512 a00808a84cdd3dd0c1641d8c7a0a2d91072f68a2c38387d9a8f491584b2af6e313178d2d8c282065c983b5e55e56d28f6ce1b9b3ed99189a9c9985c023e6d068
+EBUILD argtable-2.13-r1.ebuild 981 BLAKE2B 2db639e2821c2f2ceaedf116db422aa42c3d83a9107f891d3b722d3b505f7746a7773baede26e7aa89a37daf42b3d22dc695bce586e5f5093fd5bc7ada791d46 SHA512 c8fad5446dedfc74a87c30a8339a61688e5b602470d3490b519117f5394f672a1ad66f8cf021dcdd15fede29d79668753001e1c2e66682eb39f88d429c6c85f0
 MISC metadata.xml 217 BLAKE2B 438da05602f4b0a6411647a3c99ae7ff0fd1c00d161335d20701ab5f6ffaa3326beab340b3e3412ea456427cad97853409ab9a8713641c4467056324f53c5dec SHA512 4eb7ae4e3ce2fa0c6be738235aa45c7351963720b7e5d8a293811740aa5047c6e6251b9dd43225f6fb7a425ad21d85088e4b308a22cbdce10b503cec2e68975f
diff --git a/dev-libs/argtable/argtable-2.13.ebuild b/dev-libs/argtable/argtable-2.13-r1.ebuild
index eb1d1ecaed64..bebef16f0f4a 100644
--- a/dev-libs/argtable/argtable-2.13.ebuild
+++ b/dev-libs/argtable/argtable-2.13-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 inherit versionator
 
 DESCRIPTION="An ANSI C library for parsing GNU-style command-line options with minimal fuss"
@@ -26,21 +26,22 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rm -rf "${D}"/usr/share/doc/${PN}2/
+	emake DESTDIR="${D}" install
+	rm -rf "${D}"/usr/share/doc/${PF}/
 
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+	dodoc AUTHORS ChangeLog NEWS README
 
 	if use doc ; then
 		cd "${S}/doc"
-		dohtml *.html *.gif || die "dohtml failed"
-		dodoc *.pdf *.ps || die "dodoc failed"
+		dodoc *.pdf *.ps
+		docinto html
+		dodoc *.html *.gif
 	fi
 
 	if use examples ; then
 		cd "${S}/example"
 		docinto examples
-		dodoc Makefile *.[ch] README.txt || die "dodoc failed"
+		dodoc Makefile *.[ch] README.txt
 	fi
 
 	find "${ED}" -name "*.la" -delete || die "failed to delete .la files"
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index bd9e4eed2280..6e861de3f9a6 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -5,7 +5,7 @@ DIST cloog-0.18.3.tar.gz 4577597 BLAKE2B 179f13d4cf1f3c13ed5afcbad9226a1fc496aac
 DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
 EBUILD cloog-0.18.0.ebuild 862 BLAKE2B 7613752201f4d1b140136a3178e9d91f46c120ad5a6a470d35d9f435f29aa5a88a663c6659d84a7d6fb2cf075d67270ad8ef677fdeafbebeb32133e6e2f84442 SHA512 f0d9140ac09082aa481163f47ec368fa1be4cbf032a5d7cbaf1eb7759ef503a2bbe7d175f3efe52e160c9ea6a7d941be094cce7781003f5fedbbcc4af32e4ba0
 EBUILD cloog-0.18.1.ebuild 1001 BLAKE2B 77856b1e195cc7ba924d90d69fb4413ac2f9407fa35fcb4d1c6328ebadbf6e1a9f9a16de664c7da319dd06d0c02a37673ee25fbfa86e65aa20823255067f0c7e SHA512 2ed2b561eb6acd33db2b55d54e15f01c95d9554f31ebe8af703fbbb26e81bb30c4775d3545f8e67e68db815294a6c994cc67bd0084b89dc6406e749388a4c1e3
-EBUILD cloog-0.18.3.ebuild 1481 BLAKE2B 66c49746a94cf44f5707a808b00d33925c930f41ef5d3d127f31b86e2ba239a4313dc32b3f6a92d27229edeca0ac0e8e9792e518c9fe3ac23e05871da7b6c2c4 SHA512 9fbbb121b3f08f862fc078591b28617eb52f1bfab24ba6434e815b42ac3c6aa802ece00746fa483655d1d036c1f895b50ba429bbd047692516f3f09994120afa
-EBUILD cloog-0.18.4.ebuild 1426 BLAKE2B 4723bfda479246ab5cf58be05c606b9a8350499619bb7634a7edae898c614060fd86ea93ca56ea79392a7c4126a0f0f42bf5dd9a846f51d956c23ebbb7a9d9a8 SHA512 04037adc21eb71f87d4cb3e8daeeb4525780f6e0252367d33fcee80ab9435cd8053a7b2a6660e4b211feee50b00f26b042078ad546fd8e221c4e75c412a0ef30
-EBUILD cloog-9999.ebuild 1435 BLAKE2B 54d5e04ff78abdb690a161578bdf13536aa7fc05f6fa0bb17975aff87d9f7a0c6897f407e0a37e7a1ecf53e8e7a4280e290c9c1a0c361c45b1b41e512e35bb66 SHA512 91d34eaaccec4d1e3cb72d67b5e51fdd63faf3aee08a473c389afdbc4cc95d321e714015426594cbb7a48020fa6cef9f64044887eb2c462982942d0e3c596365
+EBUILD cloog-0.18.3.ebuild 1481 BLAKE2B 806521dd1613a52fab0c27a116b58d4d3a4f43ab300a1e40781352f763a5bc88f522f9ef97a546777cf1617d7fa283cd1924c1b06bc5edcb6e99772ea2d906b9 SHA512 f19c0945bde9d4fdb7d9ab7ccf25f1e7c346512a0fae91b8c0da4f282602d3ad4529eff4abccd9e43a1f1313722baa57094bb8b0b8a62fa4b0a1dd18f5a8bf9d
+EBUILD cloog-0.18.4.ebuild 1426 BLAKE2B 2d0c6e34606f959c698416c3c2ea8f52a935c3f36bedf3afbf234b3a35c1efd7bb7289060ce5993e2ca5e830df0fb8895cb55233ce3c17c1f898d1a4b073536a SHA512 5f1ffef0aec96c0ae78e3feccca6680b0d0e52ec26f92231137975ff51b9cf24a3c645e934a1be95f49000f19a23020f06c27a3a63948cab96117f9682b1d936
+EBUILD cloog-9999.ebuild 1435 BLAKE2B d7022a55b8738e7716a47dbac07f1e4ab08aca9994d467ec5a45be7c1436ce59baf491d7c79538598684dc7a6a7274bd8967be87122fc65550efd6dfac8f72f6 SHA512 7cef7053a60f009fe8c2fe9467b5a087786e18d18bc32d774e455abcbdf40ca9572f5ae1a635b344e182068c9c15c78fd37bae81017a295222f7b67bb0164f01
 MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b
diff --git a/dev-libs/cloog/cloog-0.18.3.ebuild b/dev-libs/cloog/cloog-0.18.3.ebuild
index 5126c58deed1..afba131ead94 100644
--- a/dev-libs/cloog/cloog-0.18.3.ebuild
+++ b/dev-libs/cloog/cloog-0.18.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit eutils multilib-minimal
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
-	inherit autotools git-2
+	inherit autotools git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
index 755aa3decf73..dab39664621a 100644
--- a/dev-libs/cloog/cloog-0.18.4.ebuild
+++ b/dev-libs/cloog/cloog-0.18.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit eutils multilib-minimal
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
-	inherit autotools git-2
+	inherit autotools git-r3
 else
 	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index 43209f571e5c..85781b4d72c3 100644
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit eutils multilib-minimal
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
-	inherit autotools git-2
+	inherit autotools git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 071499949c36..2dc63a107eca 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,3 +1,3 @@
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
-EBUILD libbytesize-1.2-r1.ebuild 1089 BLAKE2B ddf2f2ebeda0d3e3d939a975783b54b8bf4c6164acee8d6706d8d5ebbf6e7c82375d1ef2ff1bad5f93745d82b2bbfb6c6a1afc28ebd78519f35bfb9f07b98010 SHA512 6df0be455d52193f485ab2443596b261828765fc78d53db63c13602c60069bfbe6dc630b8c26454edb804b1db944c50aee81ce4e339c543fdce2bb967cc2ec3e
+EBUILD libbytesize-1.2-r1.ebuild 1106 BLAKE2B d3fa4b63b936074626f5da79a1af7ea722be8f4fd6ae5850204ec1e8f7576252a80500ff1c406d4a57ae1178a5bf3159220538f2ff0db69267994746b45c305e SHA512 2eab0bcf07686989b3009953c1ff7142161a51b397468403e63765fd98d1059c34cbe32f33669b323dbdf7693ff7f39403786d625f0714e075fe5be44cc409dd
 MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a
diff --git a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
index ae965ed1b4bc..094677e48afd 100644
--- a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
@@ -18,6 +18,7 @@ IUSE="doc test"
 RDEPEND="
 	${PYTHON_DEPS}
 	dev-libs/gmp:0=
+	dev-libs/mpfr:=
 	>=dev-libs/libpcre-8.32
 "
 
diff --git a/dev-libs/liblist/Manifest b/dev-libs/liblist/Manifest
index 5373a7fe822e..3739165b016a 100644
--- a/dev-libs/liblist/Manifest
+++ b/dev-libs/liblist/Manifest
@@ -1,5 +1,5 @@
 DIST liblist-2.3.1.tar.bz2 257253 BLAKE2B 3ae30654d39db79e26aacb3f101bf217a7d97dcb8f29f261b0d8840f24a069759fc7d4a1b53d345828b96bdb3c30656a099bef3d1ce29cf6f5608950971414cc SHA512 4bb9cc678bafc3be68f94d028aa9a9a9c9dd792043adc6e7916955afa07b6e94653bd235ee81880307e433e07130823daf1fd36ba0663da7d09e5f4eb84efc6c
 DIST liblist-2.4.tar.bz2 275234 BLAKE2B 2f18d8b85476bd9369ef597553a546450fd33b3f3b4486ca371e6efd810a51b23ca3880300e0ecf826e9a9e8591f2b90a6a0006d224b34552f77416a83f7175e SHA512 814a02e4e47de8d234e592b87156533c30563c64c3a7515712fb9b75119bcee21796232b2a5abf7e4ab892932fa256890ad175aecb75aad8fb4614c6f4fbe3dd
 EBUILD liblist-2.3.1-r1.ebuild 1379 BLAKE2B 6b7c341d478051f4b506c09ef926e833c1a7b1eb0e8946eb2189e8b5f2edbb0f6755c2340676b4dd9486c8c399256ffd2fb952d8ce161d5b7d5b1b43d35cb2a9 SHA512 605425c69136ac9e7445a5056f5aea1acf1afc678301fbc69c70d7c3729252300a679ab0dbacd6cba6e88a6daefb5c0804520f52f37d80adacfe0d24f4b2daa9
-EBUILD liblist-2.4.ebuild 1315 BLAKE2B 5fbd545b6a597a116b8b218de5ba4fba8bdda88bb56a2961852bba1ccab1475af596b98257763b4f7087526a30e2496cd816293706a3d0650665c263ea47fa28 SHA512 74d9b4af5ed6cb82600d4687100e8d42df6885800cf7d627c5de011eb994cdb2976341a112918b84e3d54d7221d5fed13cb0c6f88bd5927986ac25e9aa672f62
+EBUILD liblist-2.4.ebuild 1314 BLAKE2B f3bab86cf0f2a853b248c8de5dd7ef125f05c481d8a90ff9d9412a1eac2cb1cfb2a877f600af84d62be6ab1740ded36043262baa0b6af5d6111f38ef455ab4fa SHA512 30bb549fbcdd4a8846669bbb779faf765b2e1f2726d605dbbe7866dd207c2accc5d51663865f61a46c39b41882644eaed5ba3de6849a9d88a8721634568cfefb
 MISC metadata.xml 329 BLAKE2B cfab16b6b8ca6091ab9be14dd10c450705a04efa707d7ce91fe695502929bdf91140af0b9a898c28d9b4b3236bf5bcc35222e367234575bd61ac160c6c29d0a2 SHA512 4e63a82dc13d3606b920b15ebc720ff19ea775dd6d37f494166ab89c23013cb5610b747063e768f7959c83bac48ab11f69233304f1e3314845e94fbe053fae71
diff --git a/dev-libs/liblist/liblist-2.4.ebuild b/dev-libs/liblist/liblist-2.4.ebuild
index 0d6a76723744..7999fd600cfa 100644
--- a/dev-libs/liblist/liblist-2.4.ebuild
+++ b/dev-libs/liblist/liblist-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ohnopublishing.net/mirror/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="doc examples static-libs"
 
 RDEPEND="doc? ( media-gfx/transfig
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 87c2b37f1750..7f8a3562739f 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -2,6 +2,6 @@ DIST libpqxx-4.0.1.tar.gz 1582532 BLAKE2B e84f455de3cdce1bbcdb29ae0ff5fea6e5c624
 DIST libpqxx-5.1.0.tar.gz 677998 BLAKE2B 5d486beff9d45249d191b380b2a552dcab621c0509c318e8745abfcb5d6d30b0c31dbe3431fea0c1c212b7a3d6d48abf15d537c6f5a6b3869963dd7615f3e4d3 SHA512 4e881bb509b36b6b48d18dddd0895ab6864ba0430630d3e1417036ff8ff0008b446467868f2672e0b49b46cc3a86c6a61a8a3e5c6b63e0bf422be3268d7f9702
 DIST libpqxx-5.1.1.tar.gz 678031 BLAKE2B c615094b7d872355ad45eb49c3f2e9776f314bca0fbf393ab9ec96daeae5732082c9907eef4793f575cf2cbb95ffa30e1d83cbfb9c4a2938019d9d207ebcc9cf SHA512 fbbefe37d01ef58dd7f73629b5174c7285c0fe7d2f2ae10d3118d55d944f7e92b88d0e9c8ac72425c3bc55bdcc12f3e110e1974b303b7fb227be805e935982dd
 EBUILD libpqxx-4.0.1.ebuild 2332 BLAKE2B a6d7affcddc3930d4a789ee7f7ae2cb2b1c1e823465a02dc8385930ac3951fb39bac8e1e85fe4dc577f02303143a26629aeadc98b05ad9f98a1b8687cda5412a SHA512 6d01421a6f56b160e51297cb02d73f5c0ad5c197a5bda8491efee96c8c46fc1cc0d792a3b3f21d9898e3296eadd5511e3be7b9e8482598db8b28ddf443c33b0a
-EBUILD libpqxx-5.1.0.ebuild 2185 BLAKE2B b3eeeea1ce0e5f1b3a8ddbe972d36a7097c03858247a92326fdcfbd507289ab4f69ed958bcc19b3eb14cc525e31ae3019a8895051053999a626245e67d27dabb SHA512 b34a4757c007db629b5fca8084b529d1318f4b64e4bacb4a64b85272f7b5016543d747bf4a546d589c4f184472a2ea6b3ed8af7a28e8bc414971d86b855ba925
+EBUILD libpqxx-5.1.0.ebuild 2184 BLAKE2B c00673839de0f61586c89586f9fec6e5dfe3830d4d02e7693f5b96c86ce6007ecc6b1c3c044a310451d82dea8ed695650108a8287d078e392db8458275f78fd9 SHA512 e263199c6c3dadb9dc46349ff7eae131a199d2837fc668e07188964fd069bcfa53c5df8129f1255ecc9eeb8dcf22d9b42c0d5c2ad9f23516b69d0dce21d36cb2
 EBUILD libpqxx-5.1.1.ebuild 2187 BLAKE2B 6bb232930a9db7762a0cc34301c31b691c9cd744dff027a32906891e253b0efb9a37b5edd337fc40548d370058339e2738b015212b4d742bcb98968c3df2d4ba SHA512 399b8ed2100dbef667be36a03df5f80793408ccdc33aeacbd44dcd41e413937676fc5e84535d4b5a0ddb426982f92d188095a953b92104e0c9b6df89d36e7c86
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-5.1.0.ebuild b/dev-libs/libpqxx/libpqxx-5.1.0.ebuild
index 7666f2f08503..1be267352c8e 100644
--- a/dev-libs/libpqxx/libpqxx-5.1.0.ebuild
+++ b/dev-libs/libpqxx/libpqxx-5.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 
 DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
 SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 243b46ab1c7c..28af25e3ca47 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,6 @@
 DIST libsass-3.4.6.tar.gz 319190 BLAKE2B 78a46cd61a43881cea755af545a7e8eedba10dea4d6fecfc91adb26575fb75ddd6d5d17286a36d389b77923c633a948484994bce74883f8dfa8b36be9be4977d SHA512 2715a0f38709df2f4f60ff4f14106495521f3c7c5762c8590eee630cf769dc7571d38a3e944a90ab8463552d6434994a76a95e23e994e9123941db072aea66c1
 DIST libsass-3.4.7.tar.gz 319824 BLAKE2B ca3e7091816474e318fb1eaefa01e5e361a66715b6267500a93f80dfc8b34bdc595e6ddc4b1872e4399093468d4ac06a9760685d8941d92f18e1834df7715b04 SHA512 5d743d4345b11e9e5315aa858637d3388d2b464150a46bc8a712e1e5d1b3df9c1e6b4dcac26f91827f1c38db24a5a084d04c0962a428f2994f42ad66a25b35a8
 EBUILD libsass-3.4.6.ebuild 1098 BLAKE2B 67522797ec1974d494107689a199a7c114e656bcf1bd22e62b746c4ef71c3d276e8b07c98076411cfc738f29d6c2cee81cb1c7208bb62229603483e3cdee216c SHA512 b3e79bdef665f864fdffc988494a6c2f0d7fc8660bc2193a3ef8f85b7529fa0652a7438ecce32ce1bc040765f9c9747c07c9409aa3c3afe4b7ad475332922596
-EBUILD libsass-3.4.7.ebuild 1098 BLAKE2B 67522797ec1974d494107689a199a7c114e656bcf1bd22e62b746c4ef71c3d276e8b07c98076411cfc738f29d6c2cee81cb1c7208bb62229603483e3cdee216c SHA512 b3e79bdef665f864fdffc988494a6c2f0d7fc8660bc2193a3ef8f85b7529fa0652a7438ecce32ce1bc040765f9c9747c07c9409aa3c3afe4b7ad475332922596
+EBUILD libsass-3.4.7.ebuild 1097 BLAKE2B 39123b7da76762144a893f58206193238ee1b19ab7a6029e1d2100864c4e9086c06b1c1d9b1908d9aaba7ea8ad90b2be07e4b336752ef6c6045782037ca98032 SHA512 25a6fe17447b92750e60ad0e22c7626e8794bdebf5af5d1e816763bf32fbaea412c5387a14a4f0269204cbf2531a3bbab949162f65c2da07700e8fbc78d1e068
 EBUILD libsass-9999.ebuild 1098 BLAKE2B 9bfaff1b30ff11fa8cb8c2082a2e91a61d8be9df2cb290444203b8d56111e63a914e439526ffa99a0ae21ec229ac4f7d672c2e58e2baafb2bb80edb947c0be64 SHA512 48833dfaf5b5c815d7922a93a988a15ea59b5d38d6f6cfb063109b89be479d617df8c8d9ff7394ece9901970c5f569efa59c80a6a3adfe6ecf4baffdcb803b32
 MISC metadata.xml 631 BLAKE2B 186d066c5e07a86e3b9878c3beb4453b1f708ddc456863fd43992955a6557df1151c92a5119614ea619b7e0aaad32248982170e5de514551c2cf6a4273ad4235 SHA512 b48a370653c205fd753b4a4d23346c58304c78ae9fe2ef4b63316bdeb29d641e5f4e1e2917d96ac05e59be7bef5663713b55ca8ff225bd8fee029da018789ddb
diff --git a/dev-libs/libsass/libsass-3.4.7.ebuild b/dev-libs/libsass/libsass-3.4.7.ebuild
index a220ac3e1e19..c8c20a34a75c 100644
--- a/dev-libs/libsass/libsass-3.4.7.ebuild
+++ b/dev-libs/libsass/libsass-3.4.7.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 464a40f1e640..2ff5c7129456 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,8 +1,9 @@
+AUX mpc-1.0.3-mpfr-4.0.0.patch 3095 BLAKE2B abc3625c12590b3cdab86f81f211b0235e2553a92a32e57fc08b43312dffab126d7ea063dc91aaa93b6df72203f44d1a266b47c2f764ecaf2819f5ac3df3c7d7 SHA512 ecaf150fffba88b613d0526c9d8fcb948fffb9fa38b8a4b2d08410a9948847c3409cffe424fb9f4ccac74f9b7cfdb010db3c6cf861fe44fe8f789a1a5c1837e6
 DIST mpc-1.0.1.tar.gz 624125 BLAKE2B ba5c63f5e0cdcff2cfd5b93d152f70422232bca472b5153209b525794e338f11bdd0e371a055535aa31bb3b8991a5f6ef645b1bf2393027803bf84c0d4346991 SHA512 fa381e75999bba626ba08d73225285b03c6d2f6cca87881b28829925d1624eaed1c9b544f75e7281cf5d8dcdd7831025a4eafc05f88f13375f9e08239a8a9303
 DIST mpc-1.0.2.tar.gz 633173 BLAKE2B 9d58d8a41bf4a2d7a82842dc1e76f7fc1376dac950919ae72d1cb04fe70132747a22dcbec91391e1f5aa857c96de553aa21548f20f139742ae4b2463df473d63 SHA512 0e94ba9a20c7374839d2a53a9ed8cce647cc74142b464634fdb9cbaf96e91e43ea13f0b4dab5c06c247e6719de0c0ae03fdcba0c7c4518ee504c545c96da70d0
 DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
 EBUILD mpc-1.0.1.ebuild 1234 BLAKE2B 6dead805fb50ba9ba666489508a3651fa9caeaf96941aacd3a387ea071b4e78a42cb1f14b5f847873fe402377ef0fcc7dd325d0567318f20f42f2d892729c8b8 SHA512 f4c78bc29a2f787fc88ca6b9a3f6f6058a152d4aa1367672c99fec73e5c5baaa3659da9db77d8c03f1d792331e0d2983987425f1a75afb7dbbde3db0b9fc366f
 EBUILD mpc-1.0.2-r1.ebuild 996 BLAKE2B 9c36199c2f71d9eeeab7eb92ccfb9db51763cf49ab7888524a5e4b801fe28f0a4173b591b2bb057cca186eda9d55101237d906544a686960a765b07e78396949 SHA512 282f0cb69c00a7777fd4a37a6f750e30ad4af8e68d5c5c47399582d5a509ec7a4756f9c0a85152d2042e612e4d4576d0ebf9b45a1fa25cdf88e40bfd20aa0535
 EBUILD mpc-1.0.2.ebuild 924 BLAKE2B fc40ac815a768a881d9f649345f44c1b9506368ec78b1a27b2703860ad70a1b672e59ad9232a0158716703d3ab4322fe317e6e4079c32bd048d8f79bd718ccc9 SHA512 072141030433d3646010b1a94f5a623bad734dc7e68756b37d3dce20a9f4e8c1482c0958c1bf3628c6251a46cdd82e2a85d364f3187e2bb8cf945b26a7622416
-EBUILD mpc-1.0.3.ebuild 1010 BLAKE2B 0a3d2092c5164964148e96ecefc789cbc842ae4cd013c310d8c37c10c168d782a3f70c2480dfe03958505498e87c6ee6a135f87eede1f3831ba13e7b40e33053 SHA512 0ff8e3a6ed9c7c8ec8c937e3aa7acd31384044a06d7c90a59994108b320dd2eb480e0c90828d0ee29341c24934c898c4b2217435c4cfc536811efe07d40ab19f
+EBUILD mpc-1.0.3.ebuild 1077 BLAKE2B 0bcc6bf08281c1707c7c23f7ddad442a6c0c17ab9fcc0b24dd6e166da93231c40d0e1187fec941119dc8f4f12263e550b129f1f89165701f5dcd049d6ea1dfc7 SHA512 903265d0b159ea09f93eb6d855eb775ed400c01fd04300840fe117ee9e6864694f586835ce0d39185179e29566cdb94cbd619b53c595de2832419b41702791ac
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch b/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch
new file mode 100644
index 000000000000..7f9f7e2b9743
--- /dev/null
+++ b/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch
@@ -0,0 +1,85 @@
+https://bugs.gentoo.org/642300
+
+From 36a84f43f326de14db888ba07936cc9621c23f19 Mon Sep 17 00:00:00 2001
+From: Paul Zimmermann <Paul.Zimmermann@inria.fr>
+Date: Sun, 10 Jan 2016 23:19:37 +0100
+Subject: [PATCH] use mpfr_fmma and mpfr_fmms if provided by mpfr
+
+---
+ configure.ac | 16 ++++++++++++++++
+ src/mul.c    | 15 ++++++++++++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b6fa199..bdb21ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -165,6 +165,22 @@ AC_LINK_IFELSE(
+         AC_MSG_ERROR([libmpfr not found or uses a different ABI (including static vs shared).])
+         ])
+ 
++AC_MSG_CHECKING(for mpfr_fmma)
++LIBS="-lmpfr $LIBS"
++AC_LINK_IFELSE(
++        [AC_LANG_PROGRAM(
++                [[#include "mpfr.h"]],
++                [[mpfr_t x; mpfr_fmma (x, x, x, x, x, 0);]]
++        )],
++        [
++	AC_MSG_RESULT(yes)
++	AC_DEFINE(HAVE_MPFR_FMMA, 1, [mpfr_fmma is present])
++	],
++        [
++        AC_MSG_RESULT(no)
++	AC_DEFINE(HAVE_MPFR_FMMA, 0, [mpfr_fmma	is not present])
++        ])
++
+ # Check for a recent GMP
+ # We only guarantee that with a *functional* and recent enough GMP version,
+ # MPC will compile; we do not guarantee that GMP will compile.
+diff --git a/src/mul.c b/src/mul.c
+index 3c9c0a7..8c4afe4 100644
+--- a/src/mul.c
++++ b/src/mul.c
+@@ -175,8 +175,9 @@ mul_imag (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
+ #define MPFR_EXP(x)       ((x)->_mpfr_exp)
+ #define MPFR_LIMB_SIZE(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS + 1)
+ 
++#if HAVE_MPFR_FMMA == 0
+ static int
+-mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c,
++mpc_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c,
+            mpfr_srcptr d, int sign, mpfr_rnd_t rnd)
+ {
+    /* Computes z = ab+cd if sign >= 0, or z = ab-cd if sign < 0.
+@@ -359,6 +360,7 @@ mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c,
+    return inex;
+ }
++#endif
+ 
+ 
+ int
+ mpc_mul_naive (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
+@@ -375,10 +377,17 @@ mpc_mul_naive (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
+    else
+       rop [0] = z [0];
+ 
+-   inex = MPC_INEX (mpfr_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x),
+-                               mpc_imagref (y), -1, MPC_RND_RE (rnd)),
++#if HAVE_MPFR_FMMA
++   inex = MPC_INEX (mpfr_fmms (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x),
++                               mpc_imagref (y), MPC_RND_RE (rnd)),
+                     mpfr_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x),
++                               mpc_realref (y), MPC_RND_IM (rnd)));
++#else
++   inex = MPC_INEX (mpc_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x),
++                               mpc_imagref (y), -1, MPC_RND_RE (rnd)),
++                    mpc_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x),
+                                mpc_realref (y), +1, MPC_RND_IM (rnd)));
++#endif
+ 
+    mpc_set (z, rop, MPC_RNDNN);
+    if (overlap)
+-- 
+2.15.1
+
diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild
index 198111c0b081..66845b9d3d0b 100644
--- a/dev-libs/mpc/mpc-1.0.3.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="4"
 
-inherit eutils libtool multilib-minimal
+inherit autotools eutils libtool multilib-minimal
 
 DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
 HOMEPAGE="http://mpc.multiprecision.org/"
@@ -19,6 +19,8 @@ DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-mpfr-4.0.0.patch
+	eautoreconf
 	elibtoolize #347317
 }
 
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 284c1a1e43b4..aa1c030a2a05 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -7,9 +7,11 @@ DIST mpfr-3.1.4.tar.xz 1122152 BLAKE2B d8d686c3280c062a0941c37cb0a0bacfb25a03a60
 DIST mpfr-3.1.5-patchset.tar.xz 1840 BLAKE2B c18392ecc3325c0b889b540257f3bfe3c382a7f0d12a5dc87550e9ee884f87480bcfec7541e05c6c27bcfd7c5fa60d35f575f56ccea59912434b241f51e5d113 SHA512 24ae807db036345267623dd977387b154e905197aa826e82cfc8dcf324ade78f78aef9e86ca6e2cbc091e01a8da9ea6c52a91a5183375d5fab45e54912bd3fd8
 DIST mpfr-3.1.5.tar.xz 1126668 BLAKE2B f902925036a4310e7b10461438bae5d5770b95ca6bd897038dc306d597ea412013c869b3d2f9c4ba2a1d5e59eee67f562fc3bf5db8fd1584b70c1b30574e42f5 SHA512 3643469b9099b31e41d6ec9158196cd1c30894030c8864ee5b1b1e91b488bccbf7c263c951b03fe9f4ae6f9d29279e157a7dfed0885467d875f107a3d964f032
 DIST mpfr-3.1.6.tar.xz 1133672 BLAKE2B ab8b87be9d29e9ae5807976f72d65e16cd3e5b4c2ffc4e5bd7829e664250b1969a1ec3928b3519cd75365692e23eadfd413a8116f8c77d6cd66183020b72b656 SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054
+DIST mpfr-4.0.0.tar.xz 1406244 BLAKE2B 2d1e356ac1f7119aa8896c438e7e30c4b316780d76fa2690e50482005e9ff5d6b5cd368d4c9a524df66ea3e7f2942c627329fa15be83402209c6e249cd1abd28 SHA512 9c9c4535f33fffd2126d1c290e5eeda7cd2804219244643f09c9a2d2acfa3d410d2cb1e4a7bb77cd86cffc2fac59c7f5d32c9910317cac37dbca474ab6d63808
 EBUILD mpfr-2.4.2_p3-r1.ebuild 1507 BLAKE2B 1dee9bc908cb086e91478f7522540625be4ea5c77e4b060dfad9af6394f0605de694d06aa829ba6ac364dac580aed8815adf928371fa2f1188745b2bad49fd5d SHA512 2c02b88e29419c26b66c03f522d174ea409698b46b3567cabbd55b075d8921ac49a3de2a0adc161fda7c0bd652396616ea1b1b8350af875b0e5d3e024b5b6dbd
 EBUILD mpfr-3.1.3_p4.ebuild 1826 BLAKE2B cb2c4252b7c1c5dbc39b147f5d109a2b40f67cafe7fc9f9e410e25ffaab929774df3870996fcd95e52cecaaf7ed3eb99b1ef9f743f13f932c18e184a8ea48fbe SHA512 3e0c9ae63c66de33c1a4afc69f1790d1e6a1728ce15b9bc7d06d53510c1fa0bbf068fd7c527de3b37dd2916adf3e324d305f6578958d6b3b19284183bde47759
 EBUILD mpfr-3.1.4.ebuild 1655 BLAKE2B feffc8a44671a6a4d3fdee5e7bb4b30a679cbf5960c3eb9ed83a0b8b0985e4e8ad6e7bc7394f075dddb9f06185318028c048fe967cca2bc910c704ac20ac5f1e SHA512 6b9f4b4a769e485fa0fccdcb7af0d79c18c9ef22c197c19f11a721dcb039399f6163458520e5d3744bc9d13209eac7c83ba339b9a2d0aa6589740475c828ccdf
 EBUILD mpfr-3.1.5_p2.ebuild 1715 BLAKE2B 8deffe623eafe5b560cd336e5e7b2db7bd064f7ecefcafa20f79dfde0eaff7943ae8aedde69a159ef5117371875daece701a509a0e18c7b3fbc7b779ee9feac1 SHA512 d4706305aaf08f64ad52a9573f724a637f8b5972e7e36adf8ef3cbc77d41a241127f175fea584bc2e5558f487a17aea8d31fbca12ca337a624357f38d4fd70b9
 EBUILD mpfr-3.1.6.ebuild 1639 BLAKE2B 7c1beeb915f4aec01c005ba27d6703268b7890eea4e3bb1d4a207009b350d5b72cf304c391dd95ce70c5feb81890376c4f14a6d8df3ea68817ba37adc0585358 SHA512 32c2c9cea50d4d4b19af36c7cabe9a2b329fcc7c6f245ceaef78c77e89d6ba94bb99c5e3ff20cc87f6e4814b993ead058a7dfe38938a598d83e8e99c705173a8
+EBUILD mpfr-4.0.0.ebuild 1566 BLAKE2B 70b75564be5969103c7517dd0c034ca64f07ba166d040873b98232c15e298c047d35ee2b1c34da8fdb564830ade78199bf8905bde1dbe8aad3e515cc81f8817d SHA512 6ac7f3e62c5898b041d45ea528be47f1a68c268211bb575a2261fe4959d0b5529c6f5a3ab43154a12321692de0878742a8d60f5c373cf3d5562be6c94b3ed132
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.0.0.ebuild b/dev-libs/mpfr/mpfr-4.0.0.ebuild
new file mode 100644
index 000000000000..d74928dff902
--- /dev/null
+++ b/dev-libs/mpfr/mpfr-4.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
+inherit eutils libtool multilib-minimal
+
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
+HOMEPAGE="http://www.mpfr.org/"
+SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/6" # libmpfr.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+HTML_DOCS=( doc/FAQ.html )
+
+src_prepare() {
+	if [[ ${PLEVEL} != ${PV} ]] ; then
+		local i
+		for (( i = 1; i <= PLEVEL; ++i )) ; do
+			epatch "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i})
+		done
+	fi
+	eapply_user
+	find . -type f -exec touch -r configure {} +
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
+	ECONF_SOURCE=${S} \
+	user_redefine_cc=yes \
+	econf \
+		--docdir="\$(datarootdir)/doc/${PF}" \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	rm "${ED}"/usr/share/doc/"${P}"/COPYING*
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 40f73ff0dbbb..35810c2bf7d4 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -5,8 +5,10 @@ DIST tinyxml2-2.2.0.tar.gz 455226 BLAKE2B b3e76f0cda38ad01186b85ffadc554398edaf5
 DIST tinyxml2-3.0.0.tar.gz 339620 BLAKE2B 02c083462779467a40a30922b224634179d7feee19191a36d6106962e59d3cf2e29e6080628bd89881241d0010355bad619d8f47a31a0139bed219cd3476195b SHA512 724f1f6ea9bbc74b679067dfe69d156eb05f5d4a694cd825814b717dd676fe53ddc8707e0512a0c8449bb13586cc4bc085bbaca41bf8e29c304c5fafae53b1d2
 DIST tinyxml2-4.0.1.tar.gz 344295 BLAKE2B 58044e7898b4004aa0c1ec4b65d11a75c7a85568665baff419a23ac096596bf424c49d13318bee43c467de2e722c21ac3304eab8978e7ca3602e68a83fad4ac5 SHA512 4add31a72c62b3f68bdb17fb90630bc51bf96b616f4beafb413082dc77bc699b8d516fa0955d001d5d69bc3371b7ca9ce5cd9696d91dd913b09a1c10681b819e
 DIST tinyxml2-5.0.1.tar.gz 349622 BLAKE2B 13cec7ee49ad2fc2e74ce993e27de96fba45ed599b38a2d08463c2b6513be862e9f5f6c425549f0f07ee81e6fc8dc0ca1056295929c862b9da628d507dc9a3a1 SHA512 a51ec5843774df0482620c549fb6c61d30a6db5025be26ff6d25b3c53533a27a57f00b026bd9fbca78e9e30084b3f5f6fbff9dba315d078419da084b57f518ba
+DIST tinyxml2-6.0.0.tar.gz 576612 BLAKE2B e7ad757edae2d07504b76821caf7a68a8dcac90fc90dc3d0a2fedd082297e522e5cc1f294ba31f14c6046d9742a09e16a046f6d283d7e1ed165d8d35703c6cb2 SHA512 30c68f491830187738b01ca5db1a96e7b4907cf8fa09a533c90ea084ab5e73f798dff6305cfc4edccc8989926e91c0482677bb5796799113c839dbd0528c8ad5
 EBUILD tinyxml2-2.2.0.ebuild 745 BLAKE2B a3274f447601fe19bf427e42fc8ca0985d299e724843dab48fbf6748cd66bdcec5ad03cc40ce1314405d24a138a49c8fd79164fe02b7f340071fdb47ea7957ae SHA512 7eccbdbed726312173a7d46f3fde4deb07998797b7f4f0cec97cad1ea8c55ae6e87eaa460b25932dbd2236b2b90e2f7f35ed4dc5ebdb26a22f5c5a90ff3876db
 EBUILD tinyxml2-3.0.0.ebuild 674 BLAKE2B 3a49aa481e1111dec0e48d034b8635d6a542e556ce1dc1511c33f0c5e4a657d49e05960e791afaf377626c51c49fff45b2d39ebaf4a4791aa61090196cdd5576 SHA512 f2438d45760f1c594427ced51718d1e4d48855dbc963d2d8b437dc5f13d16aaa5714b042b027909c0c8d0e417c0f2546c2b8362f767f6954461bd42e7d44c396
 EBUILD tinyxml2-4.0.1.ebuild 762 BLAKE2B d3a802a3813a9f99c16feec006f07a5e136b3415098a6e8793a757ca7583fec0d0b5989d80cc38efb2803a4eb564dc3ad53a76d649655c415101e3ac233c108e SHA512 0405efdf3fb5621653f620331050de75edae080e9bb7e41132ff532a7595d76dc9231e31102df0992f88be15321908ead5fd23d69544fed2e66cf697864d02bc
 EBUILD tinyxml2-5.0.1.ebuild 625 BLAKE2B 4e212a8cd13d3cdf62d89a1735e8e5d49e99426e5fd7b00e74049af868840a8be5997626356a42a04b86b39f2912342816ca56bf4b65da114ba5bae92fb6d84c SHA512 ef5934e90c628ab8a15e7824e930e19c7d461321cdbd1e69bff07226172bdb59bc228e992959f5d9373c5fe3b8513cdd1d42e0e51faf802dbdd3cc7340391af9
+EBUILD tinyxml2-6.0.0.ebuild 625 BLAKE2B 0d327c832f502b523d9e3479bcb474dfb0fa161a771ffdcb01af25253f29203c720bed574f2353c9effe0a1a65072bceae5d2357f17eac4f233e1b9a93f50b86 SHA512 c65e97a56c42b1cb81bfb4a116c534cdb9bae5ab67a42e104dbc4d95b01eba8a9b47537fa43c92baa84415d8df754bf1c0d74682eff24b3df7e946bc456cbb02
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild
new file mode 100644
index 000000000000..adc1f1a46ed7
--- /dev/null
+++ b/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="A simple, small, efficient, C++ XML parser"
+HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
+SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/6"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="static-libs test"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake-utils_src_configure
+}