gentoo resync : 14.08.2021

3 files changed, 217 insertions, 6 deletions

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)