gentoo resync : 11.05.2021

5 files changed, 7 insertions, 6 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index b6645e1ec264..7c3525234cd9 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 4824f98e8729..4584d668dbf2 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,4 +1,4 @@
-DIST abiword-3.0.4-patchset-r2.tar.xz 9668 BLAKE2B 56739e2a0239a57a26f34e52d54290cb54f246e05209c2c5493f6a0e4d3290df3f7cf87a8463f2688ad3f15d2402f743fb9cdaffa0c53a7bacb2dcf4a6c1bbb5 SHA512 47d65edde9217f107ee2aee9e08e65d69f170f11f8532e2c8e6327b4bec67b13f42bdafe751d88fa525819081ed5b19b1f75859b24d4a07748fb03c62ebd0b13
+DIST abiword-3.0.4-patchset-r3.txz 14752 BLAKE2B 2faaaf333a38ea181b83819fd53fd97c5e98a0cbb0b2ad6e668254a88cb69e922fd3b70a181fc7edd789bc313d929915460a0524ff463166400d8e46d878c034 SHA512 e8d2508cf561b49581441b3b581dd663a966da67175f2a39d4a95a6035d8c8c7c3198ca99f253f8d6f3993a66be752265f612b6c59c7712592e464a1da0f240e
 DIST abiword-3.0.4.tar.gz 11064305 BLAKE2B fda1732df0bf78f8830c5d68be18f2aec7f88b8d5bb4fe0effc31b48f03d9195a4337087154ba707a70d80bfcff38f92d7298e7b281afe2eacf000eca8dac9c4 SHA512 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4
-EBUILD abiword-3.0.4.ebuild 4194 BLAKE2B ebcdb1e04fd20b83f7e6d777d552c72a876112c4ca882182caa3cc2cb954908144f7624f011e743f433473e912a4bf7cc2169fceae3dfd57a4da3eafb7557d4e SHA512 44ae62d45b64400b0db7d51a69ce02d0f579e1b8a3becd05d1788301da7b0cb127c14514cc16bcbc9fe6ee9f2b66af73bb9a1ad32bd9ab417afde36f6f18f4a6
+EBUILD abiword-3.0.4.ebuild 4270 BLAKE2B 6f47b3df310bbbfa222e961da34a86a72035a8cfca5fef13ea887b5ead56c6cf7b5ab686c05db87ad0d9d64a1fd42a67a3d1818d6da88f32773c7d3a35f4eae5 SHA512 7fc0e10905095d8e418bfe0f298fb9617eac02c870600eae06c16513a0870994e30b6c858e0466eb171bd6d0c6814ff074665bc6544c6267420581872d254c13
 MISC metadata.xml 1226 BLAKE2B c2af3a8b9075eaf01d3837ee80724b84174731811e457b2096e049a6ac3bb76f965ed0f881e0e93675404d92c6680658d5e2009ae20f4de2f86e10455f8ec360 SHA512 e8aa23e26cb73ea421d5af8097972236f22832690d26a9725b0c8cc410b620edd593e91733f659c2c99c973a0179b5db31e96d84b957a28889fc322ed425654d
diff --git a/app-office/abiword/abiword-3.0.4.ebuild b/app-office/abiword/abiword-3.0.4.ebuild
index 17ec5d04dbed..2bc3966f767c 100644
--- a/app-office/abiword/abiword-3.0.4.ebuild
+++ b/app-office/abiword/abiword-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Fully featured yet light and fast cross platform word processor"
 HOMEPAGE="http://www.abisource.com/"
 SRC_URI="
 	http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz
-	https://dev.gentoo.org/~soap/distfiles/${P}-patchset-r2.tar.xz"
+	https://dev.gentoo.org/~soap/distfiles/${P}-patchset-r3.txz"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -74,6 +74,7 @@ PATCHES=(
 	"${WORKDIR}"/patches/${PN}-3.0.4-enchant-2.patch # backport
 	"${WORKDIR}"/patches/${PN}-3.0.4-pygobject.patch
 	"${WORKDIR}"/patches/${PN}-3.0.4-asio-standalone-placeholders.patch
+	"${WORKDIR}"/patches/${PN}-3.0.4-c++17-dynamic-exception-specifications.patch
 )
 
 src_prepare() {
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index b716595b711d..eec047c867c5 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -7,5 +7,5 @@ DIST mdbtools-0.9.3.tar.gz 214697 BLAKE2B 59aca58d11b9c513c8d5b8401423b044846575
 EBUILD mdbtools-0.7.1-r2.ebuild 1134 BLAKE2B cf15361d03c654a166260cf2c64469d74d6c0085708204732a40e319cf78a1e9e89e5ca9694f80b8bffaa297ac1c19d7d7b76a3f278d58faa26e1f89848b8d5e SHA512 410bb846549dbdc5a99b848847980d2c5a29b2c38e493df38d7162986bde16045c0674d291e944157806df5bdc8bdd52c4eaab20e313bba1e51611577bf04883
 EBUILD mdbtools-0.9.1.ebuild 1182 BLAKE2B df9f6bc65fc09be68aae1e304e14ea9ce16334910404e7da8389b0fc27b253dbde89b957b6d153298dcbb8fb61ca99ac228071e440bb4734b06ca40bf6b9f1d3 SHA512 9a0792c77fbc5cb8436a1f37f543a3ae2abd7603995359b2c77ec1fcd6d7066007934de62bf3d434a18a8023b6dfc2f0044995e11badf7d34ee0a7cdf8063d1f
 EBUILD mdbtools-0.9.2.ebuild 1145 BLAKE2B 8f6696b5fefc19c4ae2f3264ef3dd24a9cef1237db97a6ee545b0a928a444e002f9f2353cfa5cb58e8060805b868790412a49d128d636d780bbaac274987a4cb SHA512 a635ffbb5ad30f6be4816d5f76eae97afb908a427c5c768e49b5b6fd9ff8525d593f3eecee5825ecee42aeab8bea2621b6e9549a2dcea37b03cea33b40b15141
-EBUILD mdbtools-0.9.3.ebuild 1115 BLAKE2B 0e0fb9b8193b371b940d133d36c880096a93702cd79be93df0a3831bdaeb6c67b9a334fdcdcd6d6939eec271430d5a21b4db8d455022e8672e22543810c17c45 SHA512 5e876de883b8b25759a9fcb589a04946b1937dc203c3dbe87c5d6255cfeb459d66b626148110424986c66559a01d565c6d8112ef11027c91f4b7667d71cd7718
+EBUILD mdbtools-0.9.3.ebuild 1110 BLAKE2B 181a84d7e2e87cd3f8a947706221492f4c5471388fddf4351940b95530ad5c51d812d5a4a1e241c202c22b2970f87d4177900da547bcde3ff2587626d5cb63bb SHA512 22209ce4dbdbb12afb2ecfa90a79a45f5d7cdc26fc2d751f8f34dee2df9928b6f985dca292f9b7fb59fc48cf1df41baaf3dce5efa4d57ad082bb0839af2dd4de
 MISC metadata.xml 354 BLAKE2B fff9791af58b802e3ac40795a7d3c298d70a09cdf3e394ed265411bb98587802fc29e5b670f96b45ef0a03c001efd5bd6a246f46a9ad9f4e55690efb4f920cfb SHA512 dadf070ffc6e1ffc0b55ebc63147b88c74586b9d357ea60e931c676683607243ae1537e607167bebe84267b095637b0380034f617bd5562e5b5011db09f8a35a
diff --git a/app-office/mdbtools/mdbtools-0.9.3.ebuild b/app-office/mdbtools/mdbtools-0.9.3.ebuild
index f23e1aadf9c6..d996a4726dbd 100644
--- a/app-office/mdbtools/mdbtools-0.9.3.ebuild
+++ b/app-office/mdbtools/mdbtools-0.9.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brianb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="glib odbc"
 
 BDEPEND="