summaryrefslogtreecommitdiff
path: root/dev-libs/ucommon
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/ucommon')
-rw-r--r--dev-libs/ucommon/Manifest3
-rw-r--r--dev-libs/ucommon/files/ucommon-7.0.0-c++17-dynamic-exception-specifications.patch502
-rw-r--r--dev-libs/ucommon/ucommon-7.0.0.ebuild55
3 files changed, 531 insertions, 29 deletions
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index ec30fa6f4062..16cf1115c341 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,4 +1,5 @@
AUX ucommon-6.0.3-install_gcrypt.m4_file.patch 4902 BLAKE2B 5c56eb0d9e397a653eb1a932e49cdce0c30fbe52f98f8d1b7403c27f53f5371da6f0bde83dff18250bfec5c9d3817bedb803d49344183e0dc5cb117e688dea6a SHA512 13604093ed0dba4064a8868785309d1de645dc0d010940febbf29166f69302c7272293bf161514396064d4f2ef0805dc6bb30336773568b0e5959ef76c1a0aad
+AUX ucommon-7.0.0-c++17-dynamic-exception-specifications.patch 20164 BLAKE2B 7ff4cee29d8c458536395e9ddc5cf00f3a54f3e9adf109b4bef5be163eda283031471de89159f95b4d97a0da537c7662f4e25dd87c595cda193bffec535a844d SHA512 7d6feb6fbe79678757ae280648133a57baa5b9337960249313cd11ccf5fa879ef9fd2c040a8d5b4416ccd62bd852bb4d159f0a0a7b92007c6f11e34420683432
DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
-EBUILD ucommon-7.0.0.ebuild 1422 BLAKE2B 736212e2aa3963ede287b186de584560c476026f2bc62237871b8b0136c0dae018b2ff41db8c4380c5e9b92e2c9ea7242e7b01fab496c350bd6f98bad8707266 SHA512 2b0a7ee8180df784616d614ce9bf521df7dae113ca279c78123dfc80fba6ed00e009649eecb3c6a0cde5e79abdc761514380a1af02bbf7cb7bff0b535672b69e
+EBUILD ucommon-7.0.0.ebuild 1555 BLAKE2B 092429d49b5b224ab472f3bcae31d2234760332acfefda8292d0ce51ca205f70b171eb3f2b139a3c7598f10f64db420703872da823f98c1beaaf292b1b1b3b5f SHA512 348629a361315ef7114816367b554c230d4053fd7818857a20cc57ded66cbb3d0a0e3cd7a5b6e5f72da4f16be87a5a471b1caca4d9dee879834b3df1539d53ce
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ucommon/files/ucommon-7.0.0-c++17-dynamic-exception-specifications.patch b/dev-libs/ucommon/files/ucommon-7.0.0-c++17-dynamic-exception-specifications.patch
new file mode 100644
index 000000000000..49e4b7828975
--- /dev/null
+++ b/dev-libs/ucommon/files/ucommon-7.0.0-c++17-dynamic-exception-specifications.patch
@@ -0,0 +1,502 @@
+--- a/commoncpp/exception.cpp
++++ b/commoncpp/exception.cpp
+@@ -53,14 +53,14 @@
+
+ namespace ost {
+
+-Exception::Exception(const String& what_arg) throw():
++Exception::Exception(const String& what_arg) :
+ _what(what_arg)
+ {}
+
+-Exception::~Exception() throw()
++Exception::~Exception()
+ {}
+
+-const char *Exception::what() const throw()
++const char *Exception::what() const noexcept
+ {
+ return _what.c_str();
+ }
+@@ -70,22 +70,22 @@
+ return _what.c_str();
+ }
+
+-IOException::IOException(const String &what_arg, long systemError) throw() :
++IOException::IOException(const String &what_arg, long systemError) :
+ Exception(what_arg), _systemError(systemError),
+ _systemErrorString(NULL) {
+ }
+
+-IOException::~IOException() throw()
++IOException::~IOException()
+ {
+ delete [] _systemErrorString;
+ }
+
+-long IOException::getSystemError() const throw()
++long IOException::getSystemError() const
+ {
+ return _systemError;
+ }
+
+-const char* IOException::getSystemErrorString() const throw()
++const char* IOException::getSystemErrorString() const
+ {
+ const uint32_t errStrSize = 2048;
+ if ( !_systemErrorString )
+--- a/commoncpp/persist.cpp
++++ b/commoncpp/persist.cpp
+@@ -39,7 +39,7 @@
+ return _what;
+ }
+
+-PersistException::~PersistException() throw()
++PersistException::~PersistException()
+ {
+ }
+
+@@ -114,7 +114,7 @@
+ TypeManager::remove(myName.c_str());
+ }
+
+-PersistEngine::PersistEngine(std::iostream& stream, EngineMode mode) throw(PersistException) :
++PersistEngine::PersistEngine(std::iostream& stream, EngineMode mode) :
+ myUnderlyingStream(stream), myOperationalMode(mode)
+ {
+ }
+@@ -125,7 +125,7 @@
+ myUnderlyingStream.sync();
+ }
+
+-void PersistEngine::writeBinary(const uint8_t* data, const uint32_t size) throw(PersistException)
++void PersistEngine::writeBinary(const uint8_t* data, const uint32_t size)
+ {
+ if(myOperationalMode != modeWrite)
+ throw("Cannot write to an input Engine");
+@@ -133,14 +133,14 @@
+ }
+
+
+-void PersistEngine::readBinary(uint8_t* data, uint32_t size) throw(PersistException)
++void PersistEngine::readBinary(uint8_t* data, uint32_t size)
+ {
+ if(myOperationalMode != modeRead)
+ throw("Cannot read from an output Engine");
+ myUnderlyingStream.read((char *)data,size);
+ }
+
+-void PersistEngine::write(const PersistObject *object) throw(PersistException)
++void PersistEngine::write(const PersistObject *object)
+ {
+ // Pre-step, if object is NULL, then don't serialize it - serialize a
+ // marker to say that it is null.
+@@ -181,7 +181,7 @@
+ }
+ }
+
+-void PersistEngine::read(PersistObject &object) throw(PersistException)
++void PersistEngine::read(PersistObject &object)
+ {
+ uint32_t id = 0;
+ read(id);
+@@ -202,7 +202,7 @@
+ readObject(&object);
+ }
+
+-void PersistEngine::read(PersistObject *&object) throw(PersistException)
++void PersistEngine::read(PersistObject *&object)
+ {
+ uint32_t id = 0;
+ read(id);
+@@ -237,7 +237,7 @@
+ throw(PersistException(std::string("Unable to instantiate object of class ")+className));
+ }
+
+-void PersistEngine::readObject(PersistObject* object) throw(PersistException)
++void PersistEngine::readObject(PersistObject* object)
+ {
+ // Okay then - we can make this object
+ myArchiveVector.push_back(object);
+@@ -251,7 +251,7 @@
+ throw( PersistException("Missing End-of-Object marker"));
+ }
+
+-const std::string PersistEngine::readClass() throw(PersistException)
++const std::string PersistEngine::readClass()
+ {
+ // Okay - read the identifier for the class in...
+ uint32_t classId = 0;
+@@ -269,14 +269,14 @@
+ return className;
+ }
+
+-void PersistEngine::write(const std::string& str) throw(PersistException)
++void PersistEngine::write(const std::string& str)
+ {
+ uint32_t len = (uint32_t)str.length();
+ write(len);
+ writeBinary((uint8_t*)str.c_str(),len);
+ }
+
+-void PersistEngine::read(std::string& str) throw(PersistException)
++void PersistEngine::read(std::string& str)
+ {
+ uint32_t len = 0;
+ read(len);
+--- a/commoncpp/tokenizer.cpp
++++ b/commoncpp/tokenizer.cpp
+@@ -70,7 +70,7 @@
+ }
+
+
+-StringTokenizer::iterator& StringTokenizer::iterator::operator ++ () THROWS (StringTokenizer::NoSuchElementException)
++StringTokenizer::iterator& StringTokenizer::iterator::operator ++ ()
+ {
+
+ // someone requested to read beyond the end .. tsts
+@@ -106,7 +106,7 @@
+ * if no one requests the token, no time is spent skipping the whitespaces
+ * or allocating memory.
+ */
+-const char * StringTokenizer::iterator::operator * () THROWS (StringTokenizer::NoSuchElementException)
++const char * StringTokenizer::iterator::operator * ()
+ {
+ // someone requested to read beyond the end .. tsts
+ if (endp == myTok->itEnd.endp)
+--- a/inc/commoncpp/exception.h
++++ b/inc/commoncpp/exception.h
+@@ -77,10 +77,10 @@
+ String _what;
+
+ public:
+- Exception(const String& what_arg) throw();
+- virtual ~Exception() throw();
++ Exception(const String& what_arg);
++ virtual ~Exception();
+ virtual const char *getString() const;
+- virtual const char *what() const throw();
++ virtual const char *what() const noexcept;
+ };
+
+ /**
+@@ -96,11 +96,11 @@
+ mutable char* _systemErrorString;
+
+ public:
+- IOException(const String &what_arg, long systemError = 0) throw();
+- virtual ~IOException() throw();
++ IOException(const String &what_arg, long systemError = 0);
++ virtual ~IOException();
+
+- virtual long getSystemError() const throw();
+- virtual const char* getSystemErrorString() const throw();
++ virtual long getSystemError() const;
++ virtual const char* getSystemErrorString() const;
+ };
+
+ /**
+--- a/inc/commoncpp/persist.h
++++ b/inc/commoncpp/persist.h
+@@ -46,7 +46,7 @@
+ PersistException(const std::string& reason);
+ const std::string& getString() const;
+
+- virtual ~PersistException() throw();
++ virtual ~PersistException();
+
+ protected:
+ std::string _what;
+@@ -210,7 +210,7 @@
+ * the given mode. The stream must be initialized properly prior
+ * to this call or problems will ensue.
+ */
+- PersistEngine(std::iostream& stream, EngineMode mode) throw(PersistException);
++ PersistEngine(std::iostream& stream, EngineMode mode);
+
+ virtual ~PersistEngine();
+
+@@ -219,75 +219,75 @@
+ /**
+ * writes a PersistObject from a reference.
+ */
+- inline void write(const PersistObject &object) throw(PersistException)
++ inline void write(const PersistObject &object)
+ {write(&object);}
+
+ /**
+ * writes a PersistObject from a pointer.
+ */
+- void write(const PersistObject *object) throw(PersistException);
++ void write(const PersistObject *object);
+
+ // writes supported primitive types
+ // shortcut, to make the following more readable
+ #define CCXX_ENGINEWRITE_REF(valref) writeBinary((const uint8_t*)&valref,sizeof(valref))
+- inline void write(int8_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+- inline void write(uint8_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+- inline void write(int16_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+- inline void write(uint16_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+- inline void write(int32_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+- inline void write(uint32_t i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+- inline void write(float i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+- inline void write(double i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
+- inline void write(bool i) throw(PersistException) { CCXX_ENGINEWRITE_REF(i); }
++ inline void write(int8_t i) { CCXX_ENGINEWRITE_REF(i); }
++ inline void write(uint8_t i) { CCXX_ENGINEWRITE_REF(i); }
++ inline void write(int16_t i) { CCXX_ENGINEWRITE_REF(i); }
++ inline void write(uint16_t i) { CCXX_ENGINEWRITE_REF(i); }
++ inline void write(int32_t i) { CCXX_ENGINEWRITE_REF(i); }
++ inline void write(uint32_t i) { CCXX_ENGINEWRITE_REF(i); }
++ inline void write(float i) { CCXX_ENGINEWRITE_REF(i); }
++ inline void write(double i) { CCXX_ENGINEWRITE_REF(i); }
++ inline void write(bool i) { CCXX_ENGINEWRITE_REF(i); }
+ #undef CCXX_ENGINEWRITE_REF
+
+- void write(const std::string& str) throw(PersistException);
++ void write(const std::string& str);
+
+ // Every write operation boils down to one or more of these
+- void writeBinary(const uint8_t* data, const uint32_t size) throw(PersistException);
++ void writeBinary(const uint8_t* data, const uint32_t size);
+
+ // Read Operations
+
+ /**
+ * reads a PersistObject into a reference overwriting the object.
+ */
+- void read(PersistObject &object) throw(PersistException);
++ void read(PersistObject &object);
+
+ /**
+ * reads a PersistObject into a pointer allocating memory for the object if necessary.
+ */
+- void read(PersistObject *&object) throw(PersistException);
++ void read(PersistObject *&object);
+
+ // reads supported primitive types
+ // shortcut, to make the following more readable
+ #define CCXX_ENGINEREAD_REF(valref) readBinary((uint8_t*)&valref,sizeof(valref))
+- inline void read(int8_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+- inline void read(uint8_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+- inline void read(int16_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+- inline void read(uint16_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+- inline void read(int32_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+- inline void read(uint32_t& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+- inline void read(float& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+- inline void read(double& i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
+- inline void read(bool &i) throw(PersistException) { CCXX_ENGINEREAD_REF(i); }
++ inline void read(int8_t& i) { CCXX_ENGINEREAD_REF(i); }
++ inline void read(uint8_t& i) { CCXX_ENGINEREAD_REF(i); }
++ inline void read(int16_t& i) { CCXX_ENGINEREAD_REF(i); }
++ inline void read(uint16_t& i) { CCXX_ENGINEREAD_REF(i); }
++ inline void read(int32_t& i) { CCXX_ENGINEREAD_REF(i); }
++ inline void read(uint32_t& i) { CCXX_ENGINEREAD_REF(i); }
++ inline void read(float& i) { CCXX_ENGINEREAD_REF(i); }
++ inline void read(double& i) { CCXX_ENGINEREAD_REF(i); }
++ inline void read(bool &i) { CCXX_ENGINEREAD_REF(i); }
+ #undef CCXX_ENGINEREAD_REF
+
+- void read(std::string& str) throw(PersistException);
++ void read(std::string& str);
+
+ // Every read operation boiled down to one or more of these
+- void readBinary(uint8_t* data, uint32_t size) throw(PersistException);
++ void readBinary(uint8_t* data, uint32_t size);
+
+ private:
+ /**
+ * reads the actual object data into a pre-instantiated object pointer
+ * by calling the read function of the derived class.
+ */
+- void readObject(PersistObject* object) throw(PersistException);
++ void readObject(PersistObject* object);
+
+ /**
+ * reads in a class name, and caches it into the ClassMap.
+ */
+- const std::string readClass() throw(PersistException);
++ const std::string readClass();
+
+
+ /**
+@@ -319,63 +319,63 @@
+
+ // Standard >> and << stream operators for PersistObject
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, PersistObject &ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, PersistObject &ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, PersistObject *&ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, PersistObject *&ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const &ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const &ob) {CCXX_WE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const *ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, PersistObject const *ob) {CCXX_WE(ar,ob);}
+
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, int8_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, int8_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, int8_t ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, int8_t ob) {CCXX_WE(ar,ob);}
+
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, uint8_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, uint8_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, uint8_t ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, uint8_t ob) {CCXX_WE(ar,ob);}
+
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, int16_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, int16_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, int16_t ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, int16_t ob) {CCXX_WE(ar,ob);}
+
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, uint16_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, uint16_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, uint16_t ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, uint16_t ob) {CCXX_WE(ar,ob);}
+
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, int32_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, int32_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, int32_t ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, int32_t ob) {CCXX_WE(ar,ob);}
+
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, uint32_t& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, uint32_t& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, uint32_t ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, uint32_t ob) {CCXX_WE(ar,ob);}
+
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, float& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, float& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, float ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, float ob) {CCXX_WE(ar,ob);}
+
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, double& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, double& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, double ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, double ob) {CCXX_WE(ar,ob);}
+
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, std::string& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, std::string& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, std::string ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, std::string ob) {CCXX_WE(ar,ob);}
+
+ /** @relates PersistEngine */
+-inline PersistEngine& operator >>( PersistEngine& ar, bool& ob) throw(PersistException) {CCXX_RE(ar,ob);}
++inline PersistEngine& operator >>( PersistEngine& ar, bool& ob) {CCXX_RE(ar,ob);}
+ /** @relates PersistEngine */
+-inline PersistEngine& operator <<( PersistEngine& ar, bool ob) throw(PersistException) {CCXX_WE(ar,ob);}
++inline PersistEngine& operator <<( PersistEngine& ar, bool ob) {CCXX_WE(ar,ob);}
+
+ #undef CCXX_RE
+ #undef CCXX_WE
+@@ -390,7 +390,7 @@
+ * the engine
+ */
+ template<class T>
+-PersistEngine& operator <<( PersistEngine& ar, typename std::vector<T> const& ob) throw(PersistException)
++PersistEngine& operator <<( PersistEngine& ar, typename std::vector<T> const& ob)
+ {
+ ar << (uint32_t)ob.size();
+ for(unsigned int i=0; i < ob.size(); ++i)
+@@ -404,7 +404,7 @@
+ * an engine.
+ */
+ template<class T>
+-PersistEngine& operator >>( PersistEngine& ar, typename std::vector<T>& ob) throw(PersistException)
++PersistEngine& operator >>( PersistEngine& ar, typename std::vector<T>& ob)
+ {
+ ob.clear();
+ uint32_t siz;
+@@ -421,7 +421,7 @@
+ * the engine
+ */
+ template<class T>
+-PersistEngine& operator <<( PersistEngine& ar, typename std::deque<T> const& ob) throw(PersistException)
++PersistEngine& operator <<( PersistEngine& ar, typename std::deque<T> const& ob)
+ {
+ ar << (uint32_t)ob.size();
+ for(typename std::deque<T>::const_iterator it=ob.begin(); it != ob.end(); ++it)
+@@ -435,7 +435,7 @@
+ * an engine.
+ */
+ template<class T>
+-PersistEngine& operator >>( PersistEngine& ar, typename std::deque<T>& ob) throw(PersistException)
++PersistEngine& operator >>( PersistEngine& ar, typename std::deque<T>& ob)
+ {
+ ob.clear();
+ uint32_t siz;
+@@ -456,7 +456,7 @@
+ * to an engine.
+ */
+ template<class Key, class Value>
+-PersistEngine& operator <<( PersistEngine& ar, typename std::map<Key,Value> const & ob) throw(PersistException)
++PersistEngine& operator <<( PersistEngine& ar, typename std::map<Key,Value> const & ob)
+ {
+ ar << (uint32_t)ob.size();
+ for(typename std::map<Key,Value>::const_iterator it = ob.begin();it != ob.end();++it)
+@@ -470,7 +470,7 @@
+ * from an engine.
+ */
+ template<class Key, class Value>
+-PersistEngine& operator >>( PersistEngine& ar, typename std::map<Key,Value>& ob) throw(PersistException)
++PersistEngine& operator >>( PersistEngine& ar, typename std::map<Key,Value>& ob)
+ {
+ ob.clear();
+ uint32_t siz;
+@@ -488,7 +488,7 @@
+ * serialize a pair of some serializable content to the engine.
+ */
+ template<class x, class y>
+-PersistEngine& operator <<( PersistEngine& ar, std::pair<x,y> &ob) throw(PersistException)
++PersistEngine& operator <<( PersistEngine& ar, std::pair<x,y> &ob)
+ {
+ ar << ob.first << ob.second;
+ return ar;
+@@ -499,7 +499,7 @@
+ * deserialize a pair of some serializable content to the engine.
+ */
+ template<class x, class y>
+-PersistEngine& operator >>(PersistEngine& ar, std::pair<x, y> &ob) throw(PersistException)
++PersistEngine& operator >>(PersistEngine& ar, std::pair<x, y> &ob)
+ {
+ ar >> ob.first >> ob.second;
+ return ar;
+--- a/inc/commoncpp/tokenizer.h
++++ b/inc/commoncpp/tokenizer.h
+@@ -175,7 +175,7 @@
+ /**
+ * shifts this iterator to the next token in the string.
+ */
+- iterator &operator++() THROWS (NoSuchElementException);
++ iterator &operator++();
+
+ /**
+ * returns the immutable string this iterator
+@@ -185,7 +185,7 @@
+ * invalidated for each iteration. If you need the token,
+ * copy it (e.g. with strdup());
+ */
+- const char* operator*() THROWS (NoSuchElementException);
++ const char* operator*();
+
+ /**
+ * returns the next delimiter after the current token or
diff --git a/dev-libs/ucommon/ucommon-7.0.0.ebuild b/dev-libs/ucommon/ucommon-7.0.0.ebuild
index db1a90863ba5..52f09366593d 100644
--- a/dev-libs/ucommon/ucommon-7.0.0.ebuild
+++ b/dev-libs/ucommon/ucommon-7.0.0.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools
+
+inherit autotools flag-o-matic
DESCRIPTION="Portable C++ runtime for threads and sockets"
HOMEPAGE="https://www.gnu.org/software/commoncpp"
@@ -11,28 +12,21 @@ SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/8" # soname version
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="doc static-libs +cxx debug ssl gnutls"
+IUSE="doc +cxx debug ssl gnutls"
RDEPEND="
ssl? (
- gnutls? (
- net-libs/gnutls:0=
- dev-libs/libgcrypt:0=
- )
- !gnutls? (
- dev-libs/openssl:0=
- )
+ net-libs/gnutls:=
+ dev-libs/libgcrypt:=
)"
-
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+ doc? ( app-doc/doxygen )"
PATCHES=(
- "${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch"
+ "${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
+ "${FILESDIR}"/${PN}-7.0.0-c++17-dynamic-exception-specifications.patch
)
src_prepare() {
@@ -49,28 +43,33 @@ src_prepare() {
}
src_configure() {
- local myconf=""
- if use ssl; then
- myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
- else
- myconf+=" --with-sslstack=nossl ";
- fi
+ # https://bugs.gentoo.org/730018
+ # need to link GCC's libatomic when compiling with clang
+ append-libs -latomic
local myeconfargs=(
- $(use_enable cxx stdcpp)
- ${myconf}
- --enable-atomics
+ --disable-static
--with-pkg-config
+ # don't bother with openssl, incompatible with the 1.1 API
+ --with-sslstack=$(usex ssl gnu nossl)
+ $(use_enable cxx stdcpp)
)
- econf "${myeconfargs}"
+ econf "${myeconfargs[@]}"
}
src_compile() {
default
- use doc && emake doxy
+
+ if use doc; then
+ emake doxy
+ HTML_DOCS=( doc/html/. )
+ fi
}
src_install() {
- use doc && HTML_DOCS="doc/html/*"
default
+ dodoc SUPPORT
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
}