gentoo resync : 14.08.2021

8 files changed, 222 insertions, 11 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index b98f6fc44f87..2dfe7bad6946 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/kasumi/Manifest b/app-dicts/kasumi/Manifest
index 2bda2a8be034..8991f0d1292c 100644
--- a/app-dicts/kasumi/Manifest
+++ b/app-dicts/kasumi/Manifest
@@ -1,4 +1,5 @@
+AUX kasumi-2.5-fix-build-gcc-11.patch 6783 BLAKE2B d1c2bf3227cb49a8b0c5c93ff2fefbe7df694a5196384e1e9aef9166a5e553fb55c705a52963719fb43438302a6cc57abbeb2d3f20be629d7f794a9e3a250840 SHA512 053b09cc6099a93a0bd98146913a91a60cc83fe43458a7b56de475396d258941c836cba9c44e4295b5386425b540aa2fefdfc64956c74bb78398ac2fcc852a70
 AUX kasumi-desktop.patch 368 BLAKE2B 2d54d40cf569f3bad3552fc7461fcda4be17245937b14ac183d035410698a15efa1e2d1280055b2d21cee14e3dafa48c5c27a94f525e6948f37c7eea20193c5a SHA512 c45d95fe9d39b79fda38715ac00567b1993584f47b1e6040d7ec3c93f913d0d61f2667e07d3fcf6335e7ecf5f8978627b42f639caacf5da7a1e89d25faa8b35d
 DIST kasumi-2.5.tar.gz 279587 BLAKE2B 3f2b807f76bfe1915ef978b18cf3f26efc8f64c903bc0e271f0875c1f7d5611307e2587093f2f289d9ade95370725fb13d16253ae7dfa6a063c525b727f7bd15 SHA512 066dda59d84b456c514a896b376bfc6df8ac64404f06fbfa8c369381acb6d260b1f22874885be2eab844f8f3776b944a5c700a966464ebef74d82c28bc97f970
-EBUILD kasumi-2.5-r1.ebuild 577 BLAKE2B 67665eb627727948273703a2509a9d52ceddc8f375f76e9dc5f909918749e53afe5ee190a73e8b500b1c8d7fb640397bbee45a8fd3cfabebf1292f7e890514c5 SHA512 cd67bee7ea46e1d12e9b7af3bb2128d12c2b9b9594e0cb0aedf876d0587a2c0a4a8fe11d2c2ef1d91104e47f864eab89aee5223fb716543a49e37656de0655fc
+EBUILD kasumi-2.5-r1.ebuild 633 BLAKE2B b38d7f3c6f202698cb6a82dbf304b2416f1485aa82f16c0a83fc63ab0bf241682b7f010e19024378865ab4414642c37bb256b90d3482c6799380dfae929a8874 SHA512 97334afd87213dc59c58c57caa0ff0f8cde0a28d311865ed64c1affd7610e74d73a3e3d674594e4816b2439a12e0e41c268726f66324c1060550c62e78a0d18e
 MISC metadata.xml 323 BLAKE2B 7b24481a26431b43922ac5dbb7baa6e36179920e3f80c33c05aa76ee7773a5dd709585bb0a7cab12c3a5208da9717bc9caadb962f7937c3722c681e470750722 SHA512 b6a8ed90fab75456464706096931ee1cd739b0019ccd9fb25c1e863ab0d95365a54feaa30e7c37158edb5062e07564d1839f89f4adbf641cd4815deb717c01c2
diff --git a/app-dicts/kasumi/files/kasumi-2.5-fix-build-gcc-11.patch b/app-dicts/kasumi/files/kasumi-2.5-fix-build-gcc-11.patch
new file mode 100644
index 000000000000..9298e765881e
--- /dev/null
+++ b/app-dicts/kasumi/files/kasumi-2.5-fix-build-gcc-11.patch
@@ -0,0 +1,207 @@
+https://bugs.gentoo.org/786738
+
+From 84c34bc1b09ba85a66924ba50a6a33fa59d159f3 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 11 Aug 2021 20:32:40 +0100
+Subject: [PATCH] Drop dynamic exceptions for C++17
+
+---
+ KasumiConfiguration.cxx | 17 ++++++-----------
+ KasumiConfiguration.hxx | 13 ++++++-------
+ KasumiDic.cxx           |  7 ++-----
+ KasumiDic.hxx           |  9 ++++-----
+ KasumiWord.cxx          |  6 ++----
+ KasumiWord.hxx          |  6 ++----
+ 6 files changed, 22 insertions(+), 36 deletions(-)
+
+diff --git a/KasumiConfiguration.cxx b/KasumiConfiguration.cxx
+index 98a857b..543ea7c 100644
+--- a/KasumiConfiguration.cxx
++++ b/KasumiConfiguration.cxx
+@@ -57,8 +57,7 @@ using namespace std;
+ //  3. If the setting may be set by command line arguments, add some routines
+ //     to loadConfigurationFromArgument method
+ 
+-KasumiConfiguration::KasumiConfiguration(int argc, char *argv[])
+-  throw(KasumiException){
++KasumiConfiguration::KasumiConfiguration(int argc, char *argv[]){
+ 
+   try{  
+     loadDefaultProperties();
+@@ -87,7 +86,7 @@ KasumiConfiguration::~KasumiConfiguration(){
+   saveConfiguration();
+ }
+ 
+-void KasumiConfiguration::loadDefaultProperties() throw(KasumiException){
++void KasumiConfiguration::loadDefaultProperties(){
+   char *home = getenv("HOME");
+   if(home == NULL){
+       throw KasumiException(string("Cannot find $HOME environment variable."),
+@@ -123,8 +122,7 @@ void KasumiConfiguration::loadDefaultProperties() throw(KasumiException){
+ #endif // HAS_ANTHY_DICUTIL_SET_ENCODING
+ }
+ 
+-void KasumiConfiguration::loadConfigurationFromArgument(int argc, char *argv[])
+-  throw(KasumiException){
++void KasumiConfiguration::loadConfigurationFromArgument(int argc, char *argv[]){
+   int option_index = 0;
+   static struct option long_options[] = {
+     {"help", no_argument, NULL, 'h'},
+@@ -214,8 +212,7 @@ void KasumiConfiguration::loadConfigurationFromArgument(int argc, char *argv[])
+ }
+ 
+ 
+-void KasumiConfiguration::loadConfigurationFile()
+-  throw(KasumiException){
++void KasumiConfiguration::loadConfigurationFile(){
+ 
+   int line = 0;
+   string Contents = string();
+@@ -247,13 +244,11 @@ void KasumiConfiguration::loadConfigurationFile()
+ }
+ 
+ // ToDo: implement saveConfiguration method
+-void KasumiConfiguration::saveConfiguration()
+-  throw(KasumiException){
++void KasumiConfiguration::saveConfiguration(){
+ 
+ }
+ 
+-void KasumiConfiguration::checkValidity()
+-  throw(KasumiException){
++void KasumiConfiguration::checkValidity(){
+   
+   if(config[string("StartupMode")] != string("MANAGE") &&
+      config[string("StartupMode")] != string("ADD") &&
+diff --git a/KasumiConfiguration.hxx b/KasumiConfiguration.hxx
+index b42c5f6..2dc7524 100644
+--- a/KasumiConfiguration.hxx
++++ b/KasumiConfiguration.hxx
+@@ -38,16 +38,15 @@ private:
+   map<string, string> config;
+   string ConfFileName;
+   
+-  void loadDefaultProperties() throw(KasumiException);
+-  void loadConfigurationFile() throw (KasumiException);
+-  void loadConfigurationFromArgument(int argc, char *argv[])
+-    throw(KasumiException);
+-  void saveConfiguration() throw (KasumiException);
++  void loadDefaultProperties();
++  void loadConfigurationFile();
++  void loadConfigurationFromArgument(int argc, char *argv[]);
++  void saveConfiguration();
+ 
+   void setPropertyValue(const string &name, const string &value);
+-  void checkValidity() throw(KasumiException);
++  void checkValidity();
+ public:
+-  KasumiConfiguration(int argc, char *argv[]) throw (KasumiException);
++  KasumiConfiguration(int argc, char *argv[]);
+   ~KasumiConfiguration();
+   string getPropertyValue(const string &name);
+   int getPropertyValueByInt(const string &name);  
+diff --git a/KasumiDic.cxx b/KasumiDic.cxx
+index 291123b..19e88b4 100644
+--- a/KasumiDic.cxx
++++ b/KasumiDic.cxx
+@@ -46,8 +46,7 @@ using namespace std;
+ #define OptionOutput( Word, OptionName ) (string(OptionName) + " = " + (Word->getOption(OptionName) ? "y" : "n"))
+ #define BUFFER_SIZE (255)
+ 
+-KasumiDic::KasumiDic(KasumiConfiguration *conf)
+-  throw(KasumiException){
++KasumiDic::KasumiDic(KasumiConfiguration *conf){
+ 
+   try{
+     load(conf);
+@@ -68,8 +67,7 @@ KasumiDic::~KasumiDic()
+     }
+ }
+ 
+-void KasumiDic::load(KasumiConfiguration *conf)
+-    throw(KasumiException){
++void KasumiDic::load(KasumiConfiguration *conf){
+ 
+   const int FREQ_LBOUND = conf->getPropertyValueByInt("MinFrequency");  
+   const int FREQ_UBOUND = conf->getPropertyValueByInt("MaxFrequency");
+@@ -176,7 +174,6 @@ void KasumiDic::removeWord(unsigned int id)
+ }
+ 
+ void KasumiDic::store()
+-    throw(KasumiException)
+ {
+     list<KasumiWord*>::iterator p = mWordList.begin();
+ 
+diff --git a/KasumiDic.hxx b/KasumiDic.hxx
+index 20cc6b8..e487dca 100644
+--- a/KasumiDic.hxx
++++ b/KasumiDic.hxx
+@@ -49,12 +49,11 @@ private:
+   list<KasumiWord*> mWordList;
+   vector<KasumiDicEventListener*> EventListeners;
+   
+-  void load(KasumiConfiguration *conf) throw (KasumiException);
++  void load(KasumiConfiguration *conf);
+ public:
+-    KasumiDic(KasumiConfiguration *conf)
+-	throw(KasumiException);
++    KasumiDic(KasumiConfiguration *conf);
+     ~KasumiDic();
+-    void store() throw(KasumiException);
++    void store();
+     void appendWord(KasumiWord *word); // returns this word's ID
+     void removeWord(unsigned int id);
+ 
+@@ -69,7 +68,7 @@ public:
+     void changedSound(KasumiWord *word);
+     void changedWordType(KasumiWord *word);
+ 
+-//  KasumiWord *getWordWithID(unsigned int id) throw(KasumiException);
++//  KasumiWord *getWordWithID(unsigned int id);
+ //  int getUpperBoundOfWordID();
+ };
+ 
+diff --git a/KasumiWord.cxx b/KasumiWord.cxx
+index 650f97d..18e53f2 100644
+--- a/KasumiWord.cxx
++++ b/KasumiWord.cxx
+@@ -177,8 +177,7 @@ KasumiWord* KasumiWord::createNewWord(KasumiConfiguration *conf)
+     return word;
+ }
+ 
+-void KasumiWord::setSound(const string &aSound)
+-    throw(KasumiException){
++void KasumiWord::setSound(const string &aSound){
+ 
+     if(aSound == Sound)
+ 	return;
+@@ -201,8 +200,7 @@ void KasumiWord::setSound(const string &aSound)
+     }
+ }
+ 
+-void KasumiWord::setSoundByUTF8(const string &aSound)
+-    throw(KasumiException){
++void KasumiWord::setSoundByUTF8(const string &aSound){
+ 
+     if(aSound == Sound_UTF8)
+ 	return;
+diff --git a/KasumiWord.hxx b/KasumiWord.hxx
+index 25c6f8c..a54829d 100644
+--- a/KasumiWord.hxx
++++ b/KasumiWord.hxx
+@@ -69,10 +69,8 @@ public:
+     static KasumiWord* createNewWord(KasumiConfiguration *conf);
+ 
+     // property functions
+-    void setSound(const string &aSound)
+-      throw(KasumiException);
+-    void setSoundByUTF8(const string &aSound)
+-      throw(KasumiException);
++    void setSound(const string &aSound);
++    void setSoundByUTF8(const string &aSound);
+     string getSound(){ return Sound; };
+     string getSoundByUTF8(){ return Sound_UTF8; };
+ 
+-- 
+2.32.0
+
diff --git a/app-dicts/kasumi/kasumi-2.5-r1.ebuild b/app-dicts/kasumi/kasumi-2.5-r1.ebuild
index 404d3bfd2b92..fb6e4e046061 100644
--- a/app-dicts/kasumi/kasumi-2.5-r1.ebuild
+++ b/app-dicts/kasumi/kasumi-2.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="Anthy dictionary maintenance tool"
 HOMEPAGE="http://kasumi.osdn.jp/"
@@ -16,11 +16,14 @@ RDEPEND="app-i18n/anthy
 	virtual/libiconv
 	x11-libs/gtk+:2
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-PATCHES=( "${FILESDIR}"/${PN}-desktop.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-desktop.patch
+	"${FILESDIR}"/${PN}-2.5-fix-build-gcc-11.patch
+)
 
 src_configure() {
 	econf $(use_enable nls)
diff --git a/app-dicts/mecab-ipadic/Manifest b/app-dicts/mecab-ipadic/Manifest
index f70b21104bfc..53e5318406f0 100644
--- a/app-dicts/mecab-ipadic/Manifest
+++ b/app-dicts/mecab-ipadic/Manifest
@@ -1,3 +1,3 @@
 DIST mecab-ipadic-2.7.0-20070801.tar.gz 12208105 BLAKE2B 448aed0389a18be5cb8161c600827190353b884cbbce4b86b122098b9ce15a2d838da93b37c608bf66dcbac7ec84c11aef1b87ba7907d1a4cf5bcfcf4a491da1 SHA512 35ea662cb62f1967849f7ed5781bd6dafef0fe20d63e88d9a0057666e57ed23d5a0e6fb8d0701a0cc4da43a1050c1b02463bb862decc71c36b7fc2acdc158d86
-EBUILD mecab-ipadic-2.7.0.20070801.ebuild 511 BLAKE2B 16529cb0c3f3d75babf54f7b97a6468dc6a328700e9094636bc3ef28a109a236d772f07e48458dc64a67da3adea9b11b7081dce8fbedc3babda30027da4f7ff8 SHA512 272300803d3031c9adde23cd7f2ddffde315a9e140c4a9c262d4b8fba3aee99da9112ced5f43f3b21c53766fd70cb9cf91ea583a07ced9ccf008631dfebb0137
+EBUILD mecab-ipadic-2.7.0.20070801.ebuild 518 BLAKE2B 6dba1a81d6a9f95545344710089f4f5702dbaae5a17c0521b2f165cc7732b4f60fe20d812fe8b0ce80ed94271b6bc6b34d62252efe7632b20a6834b216f76887 SHA512 0bf8c65cf81dd48776e55566c98a4fcad9829a25bbdbba7b193fe948fde623399bbae61baddd1d4ba616ae71643c91fba45184dd3a028c5ce031cdad252a6f33
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
index 5b915ad25e9b..4dae28d131ed 100644
--- a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
+++ b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tar.gz"
 
 LICENSE="ipadic"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="unicode"
 
 DEPEND="app-text/mecab[unicode=]"
diff --git a/app-dicts/mecab-naist-jdic/Manifest b/app-dicts/mecab-naist-jdic/Manifest
index 0e6db083e7f7..48d124df76d2 100644
--- a/app-dicts/mecab-naist-jdic/Manifest
+++ b/app-dicts/mecab-naist-jdic/Manifest
@@ -1,3 +1,3 @@
 DIST mecab-naist-jdic-0.6.3b-20111013.tar.gz 14974238 BLAKE2B a665e0679be18ea7207d9fffcf7fbbd0a91f4e365209d2c711d9d97b093396daae235fc887af8eb4634db68fb36a8ad283742a48f1bdf6e289d8b4fdf73c1564 SHA512 03d04505d3d8d097d1389af987e87aca43d56ef36b0def9eb85e19ee15ffe3598d3acb1c78c6dde3b31519419acb87c595aaad594dd116b98ac5cabb82a2e61c
-EBUILD mecab-naist-jdic-0.6.3b_p20111013.ebuild 476 BLAKE2B 2d4bea16281a94ceaccad4dd065d1a260b976886516f9fbd18f21bc02ce2f914a98bd2fc140ddd06b9f1fcf764ea6aaf13c61674d33af763b0b1771a6cf45cce SHA512 0d6a48568ed84c77b701ea19a79942a2e8218ad64a8a4411e24044c2ed6730badd2bf00f52a4a4c3c81f7e22aed1eeefe576f083c4ff2d6efacc78a6c86f9e9f
+EBUILD mecab-naist-jdic-0.6.3b_p20111013.ebuild 480 BLAKE2B 42d447d9e5c0a01d1eca497c37acbcece0907151238db19111287c6bb507737f8ee55ef3d7044f02b69f1d6bcc6784718d5eb6b5979dbf33c4964f6ebe575348 SHA512 4c93b3071f3f9eaf9653addc22919b80e382a33e4e911d3171cf08f24a934bf94b7b3af11342ca2ba120199a45b311fc6a4ed325804566d405fee821ed4ffe07
 MISC metadata.xml 317 BLAKE2B b76cc92944b2a6674d5a984e5de3c3c688f96983699536056a5e740ca055bb7056d964978ba1c7afd0128b78bef8ea5c0e487e925af51abb12da8fb4a1a2b81f SHA512 43af9db72aefe63d12202c0f00896b7518836f64ef5aa919302ecc96155ab64c10aecba8a135bc8f7bc794c21a0ff5c61a467d2549327882d012ff24fad81997
diff --git a/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild b/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild
index e8c501d7ea57..39e48f5ef3b3 100644
--- a/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild
+++ b/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN#*-}/53500/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="unicode"
 
 DEPEND="app-text/mecab[unicode=]"