gentoo resync : 02.12.2017

21 files changed, 242 insertions, 465 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 50e2d5cee714..fb04a795bcf8 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 8334c240bd8d..af099409eb9f 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -1,6 +1,7 @@
 AUX beecrypt-4.2.1-build-system.patch 3796 BLAKE2B 2b89dcd9c8c06420100d9c59e75c07368705f853e3cfe1f301fb4c1c2246545d55ae64f10ced7b3a1d8772b5b8ce2ff1dac86a157b9f715fbe131ef3e98fb9cc SHA512 6f13707e238cd2602c1482554381fc4ffb59d367fc095453ae05c7bc17438552745b304ce2ad5c071a367a0a90809173682676a392396521e20006f214db0c46
 AUX beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch 734 BLAKE2B a0997dde4da38d681fc8cb2858eaf40e8e4ce6b90aafb0c53fb2b268cad41eefb8a0fce5d708bdd5509357ca77d52cec0dbbf2455f3498a08743db7ea37b53a9 SHA512 b6963a089587ecb495f097a890b57375f4580308f935424883ec0e694bf88848cded2e8108edc01f0887b6a8151437c94b7a2cd5bbdc48df151e16ea4755d2e4
+AUX beecrypt-4.2.1-cast-uchar.patch 8230 BLAKE2B ee94bf2e741e2c250ac4dbd6dbc7b2f5af4bbec8db5c87f7faefa381e8d973159f2b1a5e74189511eb43d200b7617cafd5cec18e23eaa69c99b68113fcf5998f SHA512 d344979022ea1e7ed2b7894bf9015996488cb5ec7c458aaad93a639ce457a1b790ba9e51b5369318566eb9ffc0df12d0b4108fd2997aa21c886dc079b836e973
 AUX beecrypt-4.2.1-gcc-4.7.patch 262 BLAKE2B a99fa0e61728bd38510622a1770c3ecad156654dd79a2e380a0aaf48cd895d1308964a4dbc0ebcbbed978f78c066e4e480e193eeeb9b0e941828301256b0cabb SHA512 908d688ae29f23a3f67cb1ddf8d2f5277853abbf6fe291e371fa8595b8c6c5e4293c1c15b80171270639b9d4f092b4602bbd5144448c4f19ff958d5522edbc77
-DIST beecrypt-4.2.1.tar.gz 882758 SHA256 286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc WHIRLPOOL c4a0371d8e2cf37194800867c58e77d72bb59ab464fdff9c561230ece0f288dabdebfdd0ac13382c9ebe45b455ffbfdd81e6a15969dcb86d3d8c8e6635e294bb
-EBUILD beecrypt-4.2.1-r4.ebuild 2054 BLAKE2B 30e178a7d9abd163a206d175c6b54b5e4466a9e63e6978555d3e5c38228f6487b993a674cf78dd2badf7b792837b8d7b4e4398363e230bc71ec0c1b64e782c4e SHA512 b131f25372dec86dd22c57163a855d560db8b28a222711b40827e4b156c3469c8900fcc77386a36602068661cd0733e08358de52608aeafe656969bf6f59a289
+DIST beecrypt-4.2.1.tar.gz 882758 BLAKE2B 7ca25613cf95df8657c762d932618979783ea2ddfbaecdf066701d61a5f9ac76bd474a51eb65e140c83ef01880477cb7104e3d67c2fc078ae7b710637d18bb53 SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc
+EBUILD beecrypt-4.2.1-r4.ebuild 2099 BLAKE2B 8ba4066a84105a8e6c90cf0baef87d96764eb89f611438b0fe8579d549003cc31ebde98519fdc77475ef46b5f143e10b040209ff9621cb0749d44e61f79526cb SHA512 34a7f2c9a0fb97b69b62db41e587872e80cac7d4b6733dd6084ff99cf53c5e7b213925abc53821fcd5a579bd40cdc07219e4a27315d6fef4f41161671f5fc809
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
index 4d835cb2cd94..69a3ccb8f34f 100644
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 
 	# Fixes bug 596904
 	"${FILESDIR}"/${P}-c++11-allow-throw-in-destructors.patch
+	"${FILESDIR}"/${P}-cast-uchar.patch #618676
 )
 
 pkg_setup() {
diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-cast-uchar.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-cast-uchar.patch
new file mode 100644
index 000000000000..8efedc01e4aa
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-cast-uchar.patch
@@ -0,0 +1,214 @@
+beecrypt's c++ api uses jchar arrays for strings, while ICU 59 expects
+char16_t type
+
+In practice these both seem to be defined as short int on amd64 so it
+might be okay to just reinterpret_cast them? There's probably no easy
+way out on a platform where char16_t won't match jchar
+
+Patch by Valeriy Malov <jazzvoid@gmail.com>
+https://bugs.gentoo.org/618676
+
+--- a/c++/io/DataInputStream.cxx
++++ b/c++/io/DataInputStream.cxx
+@@ -201,7 +201,7 @@ String DataInputStream::readUTF() throw (IOException)
+ 		jchar* buffer = new jchar[ulen+1];
+ 
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUChars(_utf, buffer, ulen+1, (const char*) data, (jint) utflen, &status);
++		ucnv_toUChars(_utf, reinterpret_cast<UChar*>(buffer), ulen+1, (const char*) data, (jint) utflen, &status);
+ 
+ 		delete[] data;
+ 
+@@ -232,7 +232,7 @@ String DataInputStream::readLine() throw (IOException)
+ 
+ 	array<jchar> target_buffer(80);
+ 	jint         target_offset = 0;
+-	      UChar* target = target_buffer.data();
++		  UChar* target = reinterpret_cast<UChar*>(target_buffer.data());
+ 	const UChar* target_limit = target+1;
+ 	      char  source_buffer[MAX_BYTES_PER_CHARACTER];
+ 	const char* source = source_buffer;
+--- a/c++/io/DataOutputStream.cxx
++++ b/c++/io/DataOutputStream.cxx
+@@ -187,7 +187,7 @@ void DataOutputStream::writeUTF(const String& str) throw (IOException)
+ 	const array<jchar>& src = str.toCharArray();
+ 
+ 	// the expected status code here is U_BUFFER_OVERFLOW_ERROR
+-	jint need = ucnv_fromUChars(_utf, 0, 0, src.data(), src.size(), &status);
++	jint need = ucnv_fromUChars(_utf, 0, 0, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 	if (U_FAILURE(status))
+ 		if (status != U_BUFFER_OVERFLOW_ERROR)
+ 			throw IOException("ucnv_fromUChars failed");
+@@ -200,7 +200,7 @@ void DataOutputStream::writeUTF(const String& str) throw (IOException)
+ 	status = U_ZERO_ERROR;
+ 
+ 	// the expected status code here is U_STRING_NOT_TERMINATED_WARNING
+-	ucnv_fromUChars(_utf, (char*) buffer, need, src.data(), src.size(), &status);
++	ucnv_fromUChars(_utf, (char*) buffer, need, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 	if (status != U_STRING_NOT_TERMINATED_WARNING)
+ 	{
+ 		delete[] buffer;
+--- a/c++/io/PrintStream.cxx
++++ b/c++/io/PrintStream.cxx
+@@ -191,7 +191,7 @@ void PrintStream::print(jchar ch) throw ()
+ 			UErrorCode status = U_ZERO_ERROR;
+ 
+ 			// do conversion of one character
+-			size_t used = ucnv_fromUChars(_loc, buffer, 8, &ch, 1, &status);
++			size_t used = ucnv_fromUChars(_loc, buffer, 8, reinterpret_cast<UChar*>(&ch), 1, &status);
+ 			if (U_FAILURE(status))
+ 				throw IOException("failure in ucnv_fromUChars");
+ 
+@@ -268,14 +268,14 @@ void PrintStream::print(jlong x) throw ()
+ 
+ void PrintStream::print(const array<jchar>& chars) throw ()
+ {
+-	print(chars.data(), chars.size());
++	print(reinterpret_cast<const UChar*>(chars.data()), chars.size());
+ }
+ 
+ void PrintStream::print(const String& str) throw ()
+ {
+ 	const array<jchar>& tmp = str.toCharArray();
+ 
+-	print(tmp.data(), tmp.size());
++	print(reinterpret_cast<const UChar*>(tmp.data()), tmp.size());
+ }
+ 
+ void PrintStream::println() throw ()
+--- a/c++/lang/String.cxx
++++ b/c++/lang/String.cxx
+@@ -33,6 +33,8 @@ using namespace beecrypt::lang;
+ #include <unicode/ustdio.h>
+ #include <unicode/ustring.h>
+ 
++static_assert(sizeof(jchar) == sizeof(UChar), "jchar and UChar sizes mismatch");
++
+ String::String(array<jchar>& swapWith)
+ {
+ 	assert(swapWith.size() <= Integer::MAX_VALUE);
+@@ -56,7 +58,7 @@ String::String()
+ 
+ String::String(char c) : _value(1)
+ {
+-	u_charsToUChars(&c, _value.data(), 1);
++	u_charsToUChars(&c, reinterpret_cast<UChar*>(_value.data()), 1);
+ }
+ 
+ String::String(jchar c) : _value(&c, 1)
+@@ -67,7 +69,7 @@ String::String(const char* value) : _value(::strlen(value))
+ {
+ 	assert(_value.size() <= Integer::MAX_VALUE);
+ 
+-	u_charsToUChars(value, _value.data(), _value.size());
++	u_charsToUChars(value, reinterpret_cast<UChar*>(_value.data()), _value.size());
+ }
+ 
+ String::String(const jchar* value, int offset, int length) : _value(value+offset, length)
+@@ -449,7 +451,7 @@ std::ostream& beecrypt::lang::operator<<(std::ostream& stream, const String& str
+ 		if (U_FAILURE(status))
+ 			throw RuntimeException("ucnv_open failed");
+ 
+-		int need = ucnv_fromUChars(loc, 0, 0, src.data(), src.size(), &status);
++		int need = ucnv_fromUChars(loc, 0, 0, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 		if (U_FAILURE(status))
+ 			if (status != U_BUFFER_OVERFLOW_ERROR)
+ 				throw RuntimeException("ucnv_fromUChars failed");
+@@ -458,7 +460,7 @@ std::ostream& beecrypt::lang::operator<<(std::ostream& stream, const String& str
+ 
+ 		status = U_ZERO_ERROR;
+ 
+-		ucnv_fromUChars(loc, out, need+1, src.data(), src.size(), &status);
++		ucnv_fromUChars(loc, out, need+1, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 		if (U_FAILURE(status))
+ 			throw RuntimeException("ucnv_fromUChars failed");
+ 
+--- a/c++/lang/StringBuffer.cxx
++++ b/c++/lang/StringBuffer.cxx
+@@ -35,7 +35,7 @@ StringBuffer::StringBuffer() : _buffer(16)
+ 
+ StringBuffer::StringBuffer(const char* s) : _buffer(16 + strlen(s))
+ {
+-	u_charsToUChars(s, _buffer.data(), _used = strlen(s));
++	u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data()), _used = strlen(s));
+ }
+ 
+ StringBuffer::StringBuffer(const String& s) : _buffer(16 + s._value.size())
+@@ -53,7 +53,7 @@ StringBuffer& StringBuffer::append(char c)
+ 	synchronized (this)
+ 	{
+ 		core_ensureCapacity(_used+1);
+-		u_charsToUChars(&c, _buffer.data() + _used++, 1);
++		u_charsToUChars(&c, reinterpret_cast<UChar*>(_buffer.data() + _used++), 1);
+ 	}
+ 	return *this;
+ }
+@@ -88,7 +88,7 @@ StringBuffer& StringBuffer::append(const char* s)
+ 		jint need = strlen(s);
+ 
+ 		core_ensureCapacity(_used + need);
+-		u_charsToUChars(s, _buffer.data() + _used, need);
++		u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data() + _used), need);
+ 
+ 		_used += need;
+ 	}
+--- a/c++/lang/StringBuilder.cxx
++++ b/c++/lang/StringBuilder.cxx
+@@ -38,7 +38,7 @@ StringBuilder::StringBuilder() : _buffer(16)
+ 
+ StringBuilder::StringBuilder(const char* s) : _buffer(16 + strlen(s))
+ {
+-	u_charsToUChars(s, _buffer.data(), _used = strlen(s));
++	u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data()), _used = strlen(s));
+ }
+ 
+ StringBuilder::StringBuilder(const String& s) : _buffer(16 + s._value.size())
+@@ -55,7 +55,7 @@ StringBuilder& StringBuilder::append(char c)
+ {
+ 	ensureCapacity(_used+1);
+ 
+-	u_charsToUChars(&c, _buffer.data() + _used++, 1);
++	u_charsToUChars(&c, reinterpret_cast<UChar*>(_buffer.data() + _used++), 1);
+ 
+ 	return *this;
+ }
+@@ -97,7 +97,7 @@ StringBuilder& StringBuilder::append(const char* s)
+ 
+ 	ensureCapacity(_used + need);
+ 
+-	u_charsToUChars(s, _buffer.data() + _used, need);
++	u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data() + _used), need);
+ 
+ 	_used += need;
+ 
+--- a/c++/security/Provider.cxx
++++ b/c++/security/Provider.cxx
+@@ -90,7 +90,7 @@ Object* Provider::setProperty(const String& key, const String& value)
+ 
+ 			UErrorCode status = U_ZERO_ERROR;
+ 
+-			ucnv_fromUChars(_conv, symname, 1024, src.data(), src.size(), &status);
++			ucnv_fromUChars(_conv, symname, 1024, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 
+ 			if (status != U_ZERO_ERROR)
+ 					throw RuntimeException("error in ucnv_fromUChars");
+--- a/c++/security/Security.cxx
++++ b/c++/security/Security.cxx
+@@ -104,7 +104,7 @@ void Security::initialize()
+ 
+ 					const array<jchar>& src = value->toCharArray();
+ 
+-					int need = ucnv_fromUChars(_loc, 0, 0, src.data(), src.size(), &status);
++					int need = ucnv_fromUChars(_loc, 0, 0, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 					if (U_FAILURE(status))
+ 						if (status != U_BUFFER_OVERFLOW_ERROR)
+ 							throw RuntimeException("ucnv_fromUChars failed");
+@@ -112,7 +112,7 @@ void Security::initialize()
+ 					char* shared_library = new char[need+1];
+ 
+ 					status = U_ZERO_ERROR;
+-					ucnv_fromUChars(_loc, shared_library, need+1, src.data(), src.size(), &status);
++					ucnv_fromUChars(_loc, shared_library, need+1, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 					if (U_FAILURE(status))
+ 						throw RuntimeException("ucnv_fromUChars failed");
+ 
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 6e87a8e94f48..e454a2d4248f 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -8,6 +8,6 @@ DIST beignet-1.3.1-source.tar.gz 1136608 SHA256 399b7bc64d674b3092683263f7c085c5
 DIST beignet-1.3.2-source.tar.gz 1143573 SHA256 c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a WHIRLPOOL 5d1c48bce9e8ffb4928baebce80d5bc50cb6ffb5a6d5f144b7e7258b9d42bdb995a604f98d5d942ef6edea636ba7cd7308b7156b00c9234772d1c1fc597ece02
 EBUILD beignet-1.3.1-r1.ebuild 2473 BLAKE2B aa562dcc1164162dddd40baedb85f1a683330d9371d9269c8fed913a5ee865725821086dbc40e7013274ac7fb346a836830253ea48885a174c91b9d875a40b94 SHA512 f3449b8fd6a3b0df42cb22c7dcd97948d1f73710155ce1723e1db19a1f08853c8734b86a57b51c36e1d74713d026105f3d2c6974083de69acd971e589da19148
 EBUILD beignet-1.3.1.ebuild 2468 BLAKE2B 8f35c89e9d5510ba4c93eafe2df0d0913a571603e9df705974916b90409294a0b08ff0d56e692a98ecc2bb4a6bf69dfbfaf300f23a9eb9d0b75590405fd35147 SHA512 b722fbda796b6776e263b1ed7b09db5e305fff4fa15a0257add357c5f03e8368ec7d3b4eae467a3282d33db71b4a4062e1081bf78779a3ee8ff21a62dbb6ca3c
-EBUILD beignet-1.3.2.ebuild 2436 BLAKE2B 003521051c05fd307138c1fa13e41e191f233326bfcc4d6e1ccace195797f22c264b4ef1e07f6bced63cef5839fba4b39991432ad77b1434b44853e8fe5022a6 SHA512 7a883e250b12a816795c74718e3cbf0866453022bfa4779da29475574f15ad730e394048c42825991140ceeb9e990cfffdab569ec9d6518cfcf2742b85aaf934
+EBUILD beignet-1.3.2.ebuild 2555 BLAKE2B d8021b67f93b5d9d387e8f1de4dffea47a88a85a16a18448ff55686ff0130ecbb1b32a3fee53250f0263173baedc19dfa7805a53781dab7b5c7466d8bd910dae SHA512 686671fbd4062aa3127b865289a7f75d78988d084ce07fa38a308168eb03594a1390ee7e96e292b776032745411a6789f3a82f9cf0cfedd937e2dfe1ed950e68
 EBUILD beignet-9999.ebuild 2448 BLAKE2B a35f0d38ff5f4c7c404b5d980b2762fb0e0aee9cfbfef1fe5d573ca9d54d8ed5ba5701355ebcf963d6736f2883577b06c4987d3b8eb8c5b078079a72b8377dfc SHA512 32dfb4b910f7bd7d7f1ccddd64b452850c8cd63f9e15f08a1ae2f747ae1c0986dbbfba0be8d6c4b2a08a3f3a24b6ee8fc04c0b02c45281674fe17114a1ef7b11
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index 9b6fbba591aa..e70e9d24d2a5 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -25,12 +25,12 @@ else
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi
 
-COMMON="media-libs/mesa
-	sys-devel/clang:=
-	sys-devel/llvm:=
-	>=x11-libs/libdrm-2.4.70[video_cards_intel]
-	x11-libs/libXext
-	x11-libs/libXfixes"
+COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
+	sys-devel/clang:=[${MULTILIB_USEDEP}]
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]"
 RDEPEND="${COMMON}
 	app-eselect/eselect-opencl"
 DEPEND="${COMMON}
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 9fc85003f13b..ed0782ea4d00 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,7 +2,7 @@ AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432e
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 AUX botan-2.3.0-build.patch 1433 BLAKE2B 125c79ede4b803ff444f3e5f3b381e75140174b21aa694b4746c548b787ca4f83fd12e4fc5307bb700e48aa82d6b9ca2e7d17b9082b3f85f60a14b8c26d7fdc3 SHA512 b62758505ec7f6b8cd62a6891c3c721fc5499e529c44f55600f1bb7572d58d2f1707b3d88bde4c8b6eb715b80fb60fdd09ae233c6586df3aeb2146934cfa07a2
 DIST Botan-1.10.17.tgz 2706678 SHA256 6847ffb64b8d2f939dccfecc17bd2c80385d08f7621e2c56d3a335118e823613 SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649 WHIRLPOOL b2d82fb18ad7f69e26325c797cee939f65211e3b09c7058881633d410acd88e1839960c4be65637b00714b19d06a1c181704a5d184c1890cd7ee75b0e90a301b
-DIST Botan-2.3.0.tgz 5947072 SHA256 39f970fee5986a4c3e425030aef50ac284da18596c004d1a9cce7688c4e6d47c SHA512 a8575bdb2eaa01fb45d8565bea0b54ddf47a21d2fb761fc0a286373b09d51e5a00e84d5cefc51040c5720db66f5625c6bc73ab09cffa9cd42472545610f9892a WHIRLPOOL 295965db5d6d0f21511a6a49f79a80cc7adffb8c67e05c6c09081eae233e2bb5abe506147a7e84ded9ddd1e29faba3276527449da3484e0b07e8bdc03018e211
+DIST Botan-2.3.0.tgz 5947072 BLAKE2B b8eaf4228c01200f839031b423901f93c1b6863d10424ad52afeac85131e95bc1bad024478c8e4c8e4c12210e85aa62d30fb83b3ece8facdb57763f95c45687c SHA512 a8575bdb2eaa01fb45d8565bea0b54ddf47a21d2fb761fc0a286373b09d51e5a00e84d5cefc51040c5720db66f5625c6bc73ab09cffa9cd42472545610f9892a
 EBUILD botan-1.10.17.ebuild 4215 BLAKE2B b4d1e16b4ed8ab4f8dfba08312c26b744896a59b3eaeed8df784ffd1ef8d81233eaf841270fa0e761ae9491797aa2ae965d4a8f0704140c5761263103fe856e1 SHA512 a8134be2cb93db31e468c7b1dc3559cbd6e54c32d36848df4597da7a49ca8d8d027ff9695393d6902e06dbdf101eac1ef55542bef366ce8ed334f2a7fe8e4b0c
-EBUILD botan-2.3.0.ebuild 2784 BLAKE2B 2b1cadf3fe5487103105d411245a7f3c29a1b5d3da347738fdc08e3d744a7656231074abb3544b21fa0c2458986cc4348c12daf0c1e8c949f4bdfde0353cdeef SHA512 518e88870f890d56678fdf1890930fc0eea7230fbe843f8c7b7f05ca992cc05d86a1b8ffc1857d75ae6423a8bcd28d6aac9def0ca7a517270135f26f0152621e
+EBUILD botan-2.3.0.ebuild 2783 BLAKE2B c65f5c4b2c84305bb10bf38439e34b25545d6ff7c06be17fcf276c87b4513b353d713075de183c92c701f9b161c949be081e5b874ac31b9b87917b04050d1092 SHA512 49471ee62fdc03e9a058ba90b7e2260b8bee4cad677d804a35ccf4e22d2179220497e0cc47733d80974f7af686ae10a68164babc27586e0ebd155d7b32526a45
 MISC metadata.xml 675 BLAKE2B 20c2dc44426b9e2c7d57f45b5838b0ca27d80e6cbef49471cfe1cafb3c5db47ec3f243736856550bda25fd21e12fef08a71f6db7d855a025a3f4133fd2b5a1d7 SHA512 6773167b2e46f8d2251d369bd668a2ea309ce3b874166ebd102c7758f1f23a215f47d6581999d49325e9fdda88082ab46db8dc4f98ad6a20722f50a56b474b39
diff --git a/dev-libs/botan/botan-2.3.0.ebuild b/dev-libs/botan/botan-2.3.0.ebuild
index b48e00ca7831..d715da51c97e 100644
--- a/dev-libs/botan/botan-2.3.0.ebuild
+++ b/dev-libs/botan/botan-2.3.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos"
 SLOT="2/3" # soname version
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 9fcc757e8649..0e4122bce4f3 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,13 +1,11 @@
 DIST libinput-1.6.2.tar.xz 929180 SHA256 96fc0e0b24a96042b16e561201979dfa4a3f00a642538195c62f72b79f4084fa SHA512 f1e1436ec4259ebddf93a50fe4d39a52713efd246a39a072b44bf296a413bdadbb789d6a4f0107ed3eb37afe34a37a43c9e75dcf814462385011eff2d3f42db7 WHIRLPOOL e9ed43ab8efb5b984a8c431e82880a691f7c94577a7a3789cf1e52c82f8aeee70d56474895a349f286f4d7fc845be8302ca7432b8e4801a6233fbe96b0078db3
 DIST libinput-1.7.3.tar.xz 922464 SHA256 096d612d2711f0caa2de544976ff3729e6233511ab373808644cc2dd5affcb1d SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b WHIRLPOOL 06ea9038f7b3127b3238fc863b1ec862647a08b1ab4956fcfd433093dc3c68585ba3b166515370681ed158a48ce6a5670c6b8dcb6d536af25f8bda2c84c74286
 DIST libinput-1.8.3.tar.xz 941832 SHA256 2fe2e2f52f0971a9c43541b8f26582ca8df6ed4bb9050e85eb40d4ff6b13142d SHA512 88006d217e3507858fa6b9ac1f25c267255fb51d1bcf1208d2afd423bf2a9292944bc5526ea91f27fad3ff04c2f9f43ab3aa25fd9fb7ace1231ecd33ddf18de6 WHIRLPOOL ebe128f8e9bce71dc7e878cd7dd7815cb0a358f91945ea47945568a1994f1a80c2d6f8db7d5f8f9c5e554c22fcc13733ca4bdcb68b47a72e16e55098904a93e2
-DIST libinput-1.9.0.tar.xz 455248 SHA256 fd717b1f9cf867b2ca1763a5a4638423af178f3a70aa34d278e8bf42777d108e SHA512 4111dd02ef7778c246da28ead284a77014f6eaa4b7f90f36ee124af809e31c70ac065216ef5648d1d2dc525355176e2aa22788bfbb19f5f6d25276fbba42e150 WHIRLPOOL 7a6da661226ef8721bbad446a75be75a3d556d9e886cf44d2296a0fe17207ac181ebd4a4f25dca7ae4072d97cb9759d626d26a1572f007c6b1e9499a0d71beaf
-DIST libinput-1.9.1.tar.xz 456772 SHA256 f0780de4211b3d09f86c17f619f936261a213ca532f8c9ec8f8e7e43422a65f8 SHA512 e60c401cdec6b862c6c7186e636bba285e229b82998d9f86940659806bb64c295ec1060b5e8065345668e4b3ff95457bd01327351520d9f6cf8cbc98b9b95da0 WHIRLPOOL 3a2b679d5d0f1671281fd689a842ccca1f1750f5af6d004d767364daaf17edc7dd8ec17413f1c05c28d162d03036a2719ac2db02bd253f051a9f82c6a667698d
 DIST libinput-1.9.2.tar.xz 460388 SHA256 dd6853241ffe1f1d83b5a375a2f1c17b2901fdbba5d302c67987cc0f4101de3b SHA512 99719ab26be8ed35937ce91307459fa8c4aa7c383a555f1012a058ba98ca1d1c5df0d9b5e6a45046341c6dbae496dc29512b487ac7873b6ec67cab1176ee04ac WHIRLPOOL fdb281e7a0fdf4bb3feca06c7baaa3f9095265b6e65ed810a20f98e9aac2a89f7f740375296fd0ff9209475d548aa0d3ffcac8b8607c9fea7d7298af487bb682
+DIST libinput-1.9.3.tar.xz 473724 BLAKE2B 2cad3514f2e04505f015a8d105eaecb9ffb93ce57ccc2b035e5e031f72d278d966bae16fd804e7f315d0d651021567b2118fc9e53ee64d91e6e34cec6b92a8cf SHA512 33fb17724d4c2992bf31f9bb2e0825955468058e122ad420678b01ee293e1651d659fbae8873a7913f571243b3618032774cd350d2513eb73320d40aaa9953d1
 EBUILD libinput-1.6.2.ebuild 1535 BLAKE2B 6d99e610dda382651bed647c29ee8073d14879ec2fa83f22e724ff294018cecc78f16799802974aac29153924c15f922d42d188e9199eaee60a81282be840d0d SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c
 EBUILD libinput-1.7.3.ebuild 1536 BLAKE2B 2bc976665faea4481d62be67e47a21d483d3652b929bc153aae5cb4dc1ebcaa7937944bc1e5aabc40a2e30fb8be8e81d135dc59770049e0c7f95b4e2e6023660 SHA512 c5bebcd1026c988bd5b517b76351c0a1326f5e60754a53d25aa73f3c2b7c034623336b0861d8e62254808649fae94bede58a2afd8df415b11327c31bac5e0621
 EBUILD libinput-1.8.3.ebuild 1544 BLAKE2B d2fe752951be5a015ec92f907c7cf5ac2739f35c51bafcf26e2381f3d22e8a14a6bc21c3697f02e0a0684c27dc1cd4379b5390d1df9b8a083b7405f7b31b2c5c SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a
-EBUILD libinput-1.9.0.ebuild 1444 BLAKE2B 59041221521a92dc1abfa25be4017f3da7229cdaa67e4d6f1eefc9af97c34beebe871cfbad1620d0472582fbb9fd28c7a86bf6f2ab5e290c27564d7a38cbc3da SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d
-EBUILD libinput-1.9.1.ebuild 1444 BLAKE2B 59041221521a92dc1abfa25be4017f3da7229cdaa67e4d6f1eefc9af97c34beebe871cfbad1620d0472582fbb9fd28c7a86bf6f2ab5e290c27564d7a38cbc3da SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d
 EBUILD libinput-1.9.2.ebuild 1444 BLAKE2B 59041221521a92dc1abfa25be4017f3da7229cdaa67e4d6f1eefc9af97c34beebe871cfbad1620d0472582fbb9fd28c7a86bf6f2ab5e290c27564d7a38cbc3da SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d
+EBUILD libinput-1.9.3.ebuild 1444 BLAKE2B 59041221521a92dc1abfa25be4017f3da7229cdaa67e4d6f1eefc9af97c34beebe871cfbad1620d0472582fbb9fd28c7a86bf6f2ab5e290c27564d7a38cbc3da SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.9.1.ebuild b/dev-libs/libinput/libinput-1.9.1.ebuild
deleted file mode 100644
index 89bf24d7c505..000000000000
--- a/dev-libs/libinput/libinput-1.9.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc input_devices_wacom test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		-Ddocumentation="$(usex doc true false)"
-		-Dlibwacom="$(usex input_devices_wacom true false)"
-		-Dtests="$(usex test true false)"
-		-Dudev-dir="$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/html/.
-	fi
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libinput/libinput-1.9.0.ebuild b/dev-libs/libinput/libinput-1.9.3.ebuild
index 89bf24d7c505..89bf24d7c505 100644
--- a/dev-libs/libinput/libinput-1.9.0.ebuild
+++ b/dev-libs/libinput/libinput-1.9.3.ebuild
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index 68d23ae7250e..6418bf10ff5f 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -1,15 +1,9 @@
 AUX continuum-1.0.18.patch 3086 BLAKE2B 4f5b004d0910be5a8f8bb9c568a2555c2b3f4ab71b52964622d66ef43a0ca2c7ee8e6e0e9128b7863a465bb887ac300a8cfc1f6efcdb740fdd88ed36cd465b75 SHA512 905c5f1dc22b665ef8910b6319b25e1d1e9dd80892c03c6c71de597599d8ce2972b35d92e6976ad8798d2f10927e3e884570246d5d8162e84dc3e1f963959012
 AUX debug-disable-enable-1.0.18.patch 1458 BLAKE2B ce806c34ab5525f8d493030ad870d9a7fb1b27d18159c6626d37c1540f0cb7aec6a9d45d17423dabebfde8fb68fdb6796cc88ff8fa109c9622958a2eef322ede SHA512 f4d731ce227e91324b88d155daaf35f2228a48e61d8e448c93f9d102c9939fa4c3b2a07b96741d442382cc5498358e9ae0471f766373654b21d849a96a42d813
-AUX libmemcached-1.0.17-gcc4_8.patch 9467 BLAKE2B 6de357401207dfece0f1f87361fbfea157f63b93275905d460f987a729c947c3afb084dc055ce3ccd2732a4dcf8da49e8feba07c6ac433c7e87b7116b186d7bd SHA512 7aaed25fef7abde531dc1ca1f86b946e2b3277abe582257dae24650546d42dae499a5c8cae9ed84c3a189d42921ce50f42d06efbe2bba0af0b739e7b1ac5ad21
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
-DIST libmemcached-0.50.tar.gz 884272 SHA256 d3ed82f9c5cdfa816047ed6b7475b5708f9040b5cf3d9e2aed55de235e8b2f9a SHA512 f06a17b365779eb8fb0c94982e5141643ed17f91e5137565ff756912cf96b3f68b11a643f84d0cba1b474411f16a64086cc311ac5cea4bc3792da81b40d423b7 WHIRLPOOL fc1d3107772a45e844764c570261ccd2556ff11b770377c84788cc3d8a8ee946a8e5b3527c21e70c1c5aa1d9493270d9079f8a75cd5387835ccd7def1cab0f9e
-DIST libmemcached-1.0.14.tar.gz 1000929 SHA256 32eaea2c4b8965a12bd33fe1af043d7e20b7ec64977937973a3d97514f1e946b SHA512 4c0371cc4752eeee94baad6063b2413f096b5050166ce761ac26080559537dab32b69131a97703fdebf8f4886520d4bc29c7d4d8d1df6d0d681c81b88354c15b WHIRLPOOL be3760f75a6de33687272b5bf7be950edb0a3f96184c7f8f7e1cb47ff85479ea76c277f298d36f21a5f15c1ce8e04a0714f1bf73700711842bb4c0841959674a
-DIST libmemcached-1.0.17.tar.gz 1023177 SHA256 7bb27b2589400f918df1cf5002cb01ef7ccac6e23f818604e2386de62c80bba5 SHA512 7cc2a836524a628f4617bad12e8ea3b0192a3f8530a3588a076daac56b3e773d7d36823091a81d6447da9fe9d017849c59dbbcc65190ff9817bb985dc6c11a3b WHIRLPOOL 34b57811750667bca59efa5a4356a15dd2bd0135534c1d157df4b3d9ff3575db1848f363914ee1b6b606a45dae3145985c791f11ae5890a7493207cb2e9eb3b4
-DIST libmemcached-1.0.18.tar.gz 1039649 SHA256 e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585 WHIRLPOOL f7d8f405306fd7cbfee6ba8b340305bc79b1dbcd6a2a2dcb0ee74a24d8928e5a5a7f0d20afebf58cecf44e7ca3fd66abd2d30041848b89ddbb10eb1da9179b94
-EBUILD libmemcached-0.50.ebuild 1691 BLAKE2B 1de2a34c365944a93d28af3c295e250964c68691c02cc67ff16f64f9a2e3bc4b28579c5686ed555f6b045406af62ae718e7821266a065de83038c7814e40951a SHA512 780d968506f3898820c06914b3b3e9b269f2ef5b80331c1a34a6351c36cbfddbcdedc23436ee9ed23bfb333be56768df874d4563f0bc7ace9437de712d332efc
+DIST libmemcached-1.0.14.tar.gz 1000929 BLAKE2B 6dfef0fa5714e6383514ff28d3eb75740f30f7adce4e4c0ea4c26a6667fc6cfa5df84e0c52b47393d156e9a8e5de0409699b47d77128a400f64f37b981977dbb SHA512 4c0371cc4752eeee94baad6063b2413f096b5050166ce761ac26080559537dab32b69131a97703fdebf8f4886520d4bc29c7d4d8d1df6d0d681c81b88354c15b
+DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
 EBUILD libmemcached-1.0.14.ebuild 1141 BLAKE2B b0d6b34378e4232b176499157a38c4054c0bcd7e2de8381a590b2623e631a8766490ae487f103720ee8fddcdc8c069b8a05ddb957a36b4a686ba6c187ac9a7e8 SHA512 3ae6c31505deca27858613d40168012e8ced46262f41ce8fab7ff822b2255944e1bee8646800fb54325aeacbbc6227e05879ae6448f5d4527aa4e6bb1c8a6257
-EBUILD libmemcached-1.0.17-r3.ebuild 1383 BLAKE2B d0470863f4c5b1f3fd6d8c06e753cb80799f0ad28147b11bf3706df242c308ed181642928b8fbabe6d873165780b2e4578cf2642c128ccfb74c53a2094ae9997 SHA512 af7fc1c3350b1ae6688cc32cc78084cbbf7e1d839f042292189621b510fd9f616cb7fbee7f84df216dcc5ce1e862b285cb03be6c7e7e8d9b4d813cca83e89d64
-EBUILD libmemcached-1.0.17-r4.ebuild 1426 BLAKE2B 27213c86edcbf06334101471ebdeae17dc60fd7129f653171a6dd1dd68daeba61057ae8fca32be45c3f0bd8c4672001398233daaf80768fc6814eb20a10728f0 SHA512 b011e26ad29f9d1c6a0a6791d15811a138fb9d3e6799edd7e64a34182717a05018c4efc3fb29a24283ccfada99b90f77a1caa17ad466ba49d94c9413368a5af4
 EBUILD libmemcached-1.0.18-r1.ebuild 1528 BLAKE2B fc33e62cd363d2d87f97078fe57f1f5085782428201db29b952babaa2899e330fd8d7b14727de0c1fb5077e2dc11a077a4e06ebaaa4c217b41690156eb320fd3 SHA512 e5043ffabbe07b7d9b98c1bf2411d705f99046fb8c1133eaa80a65e2e51cc97274b6568b167e4f720e983977f703daf067faad0fcf94f5a79f120bb8fc560b84
 EBUILD libmemcached-1.0.18-r2.ebuild 1548 BLAKE2B c4092143293265b13b66a4ff6905df79b889f418551eb62b5dea92a4f9666c4ac31b563ec7355cb374d5a798b2e3a6bf3b91e4088dee006c414a3a53071cd2ae SHA512 d335f33d1d7137283c10a39d9913fcfa5cb3e69c264ceba527fa54863adc680561406c69c3b29173bac42aad4d7d9e1971aed7f9890d698c75746a8f8fb99a49
 EBUILD libmemcached-1.0.18-r3.ebuild 1622 BLAKE2B 4df5c628025f721bc447a9059972218e924ad83d18e3bf4f606e8ebbd681eb06e142c33795cb8a864e69d3d06161cd492d3ecb6d222882e1d0e2117c59a51b0e SHA512 440fb952134caaf031e12252991c8fed6595b2a4dca158a94253a0075558251b3bc6ad0f2db42317418b3d4071f46357b35cd516a7d0c47c59609ae477d3c072
diff --git a/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch b/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch
deleted file mode 100644
index 5f42d3f3cabd..000000000000
--- a/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Description: Fix compilation with gcc-4.8
- This patch fixes the error flags made incompatible with gcc-4.8:
- g++: error: -fsanitize=address is incompatible with -fsanitize=thread
-Author: Brian Aker
-Last-Update: 2013-06-14
-Bug: https://bugs.launchpad.net/libmemcached/+bug/1164442
-
---- a/libtest/run.gdb	2012-03-26 01:08:09 +0000
-+++ b/libtest/run.gdb	2013-04-10 05:25:24 +0000
-@@ -1,5 +1,6 @@
- set logging on
- set logging overwrite on
- set environment LIBTEST_IN_GDB=1
-+set ASAN_OPTIONS=abort_on_error=1
- run
- thread apply all bt
-
---- a/m4/ax_harden_compiler_flags.m4	2013-02-12 05:44:21 +0000
-+++ b/m4/ax_harden_compiler_flags.m4	2013-04-10 05:25:24 +0000
-@@ -53,7 +53,7 @@
- # ?  _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long]) -- Don't turn on for
- # compatibility issues memcached_stat_st
- 
--#serial 8
-+#serial 9
- 
- AC_DEFUN([_WARNINGS_AS_ERRORS],
-     [AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
-@@ -92,9 +92,12 @@
-            _APPEND_COMPILE_FLAGS_ERROR([-H])
-            _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
-            _APPEND_COMPILE_FLAGS_ERROR([-g])
--           _APPEND_COMPILE_FLAGS_ERROR([-O0])],
--           [_APPEND_COMPILE_FLAGS_ERROR([-g])
--           _APPEND_COMPILE_FLAGS_ERROR([-O2])])
-+           _APPEND_COMPILE_FLAGS_ERROR([-O0]),
-+           _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
-+           ],[
-+           _APPEND_COMPILE_FLAGS_ERROR([-g])
-+           _APPEND_COMPILE_FLAGS_ERROR([-O2])
-+           ])
- 
-          AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
-            [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
-@@ -155,26 +158,31 @@
-           _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
-           _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
-+          AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
-+            _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
-+            AS_IF([test "x$enable_shared" = "xyes"],[
-+                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
-+                ])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
-+          ])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
-@@ -186,6 +194,7 @@
-           _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
-           _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
-           _APPEND_COMPILE_FLAGS_ERROR([-pipe])
-+          _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
- 
-           AS_IF([test "x$ax_enable_debug" = xno],
-             [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
-@@ -213,9 +222,12 @@
-            _APPEND_COMPILE_FLAGS_ERROR([-H])
-            _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
-            _APPEND_COMPILE_FLAGS_ERROR([-g])
--           _APPEND_COMPILE_FLAGS_ERROR([-O0])],
--           [_APPEND_COMPILE_FLAGS_ERROR([-g])
--           _APPEND_COMPILE_FLAGS_ERROR([-O2])])
-+           _APPEND_COMPILE_FLAGS_ERROR([-O0]),
-+           _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
-+           ],[
-+           _APPEND_COMPILE_FLAGS_ERROR([-g])
-+           _APPEND_COMPILE_FLAGS_ERROR([-O2])
-+           ])
- 
-          AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
-            [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
-@@ -268,27 +280,32 @@
-           _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat])
- #         _APPEND_COMPILE_FLAGS_ERROR([-Weffc++])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
--#          _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
-+          AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
-+            _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
-+            AS_IF([test "x$enable_shared" = "xyes"],[
-+                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
-+                ])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
-+          ])
-+#         _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
-@@ -301,6 +318,7 @@
-           _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
-           _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
-           _APPEND_COMPILE_FLAGS_ERROR([-pipe])
-+          _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
- 
-           AS_IF([test "x$ax_enable_debug" = xno],
-           [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
-
diff --git a/dev-libs/libmemcached/libmemcached-0.50.ebuild b/dev-libs/libmemcached/libmemcached-0.50.ebuild
deleted file mode 100644
index 1f9bf894d977..000000000000
--- a/dev-libs/libmemcached/libmemcached-0.50.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils multilib
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://tangent.org/552/libmemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug doc hsieh +libevent sasl static-libs tcmalloc"
-
-DEPEND="net-misc/memcached
-		virtual/perl-Pod-Parser
-		doc? ( dev-python/sphinx )
-		libevent? ( dev-libs/libevent )
-		tcmalloc? ( dev-util/google-perftools )
-		sasl? ( virtual/gsasl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# These tests freezes for me
-	sed -i -e "/connectionpool/d" \
-		-e "/lp:583031/d" tests/mem_functions.cc || die
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		--disable-libinnodb \
-		$(use_enable debug assert) \
-		$(use_with debug debug) \
-		$(use_enable hsieh hsieh_hash) \
-		$(use_enable libevent libevent) \
-		$(use_enable tcmalloc tcmalloc) \
-		$(use_with sasl libsasl-prefix) \
-		$(use_with sasl libsasl2-prefix) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake || die
-
-	if use doc; then
-		emake html-local || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.* || die "Install failed"
-	newman docs/man/memdump.1 memcached_memdump.1
-	if use doc; then
-		dohtml -r docs/html/* || die
-	fi
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.17-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.17-r3.ebuild
deleted file mode 100644
index a9cd9f3a1fdd..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.17-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.0.17-gcc4_8.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.17-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.17-r4.ebuild
deleted file mode 100644
index 4e98e815134e..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.17-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	epatch "${FILESDIR}/${PN}-1.0.17-gcc4_8.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index fc30f30b59e0..a2648e70f8d1 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,8 +1,6 @@
 DIST libmowgli-1.0.0.tar.bz2 105929 SHA256 8ea0dfd606b0ac280747c9a5f93ca940c23c7367dee0776715c87623ae6624fb SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313 WHIRLPOOL 209cb5a81003eac9952a771a0afc08073f242566e28d378432a0f172b8b195ccfc03b1a8f85949f1d22063c1519afd48b6263de7e4403a14c365de94d5f8f83e
-DIST libmowgli-2.0.0.tar.gz 200771 SHA256 7c5a94082899d055fc9a02b94e2658b42616fdb98e58e9a71165c07b6f5cceba SHA512 efccd93824c116fa8440f1d327382997f7d752d007dc9fad650ef1935fe0cee1a3fa1c645442a3f3f0f6d9f2916f66882e537a1692c494303fc0bf062df51e3a WHIRLPOOL 75c5698e1ccc5e1895d8d5f35d00347ceaf5424a621ecae399ebfe6537bf591edc21d0e42f7923704e3c857cc7349447d514605bb1d3e0e78f136e530933e8ed
 DIST libmowgli-2.1.3.tar.gz 227742 SHA256 b7faab2fb9f46366a52b51443054a2ed4ecdd04774c65754bf807c5e9bdda477 SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533 WHIRLPOOL d22e33fa4741282779f2ae341e5cdd3ecf18a5d9812e708a5ddd0df51f7a30fdc5b4c8f611187f894d2975f9a013d8f841268be75369abba56407a9d66c50d7f
 EBUILD libmowgli-1.0.0.ebuild 592 BLAKE2B 8ecd3367a72255f72f4d1f33898fdcb6f6e668d1b6ff04866b2f8eca7660d508ca17e7f175da3b32e37d99dc7f21eafe26bfcd5ce5a3715d2bbcc6e74a316209 SHA512 9d9ea4ee4239c5c8be7fa37e653afc06a7d61fd2561b6dc7940e39af689cc1e6f64ac774ef00c6f2c3c8a95b6d47fc41c5d5ed64fecb7472b74b6e2ae2169567
-EBUILD libmowgli-2.0.0-r1.ebuild 801 BLAKE2B 1a50bf356ba9dfc4bbdae5eb26432fdbf19ff9b10526766dceacbf89638d7b9a7fcb7a25779ed18f4e3a00c938b16919a4e03eff6fde5a0ada81de508491697d SHA512 5dd401336088ef6fd66cfd62bb5da31885e13030d67825e636c84c8ac72fd07e595ede030b0449d7b9433469bb279145ea8073b36364d618e6fcbf1ef39b60f4
 EBUILD libmowgli-2.1.3.ebuild 801 BLAKE2B 295cf5e587db6db974e4e6e6d85ad2f049b1ec2b03477ed7f6c9f7dcf3b92023c54736c06a31a97fc94c88a175cd3b0011c4639dca4fba04a9865e496b219c48 SHA512 800bf7527324edf31827105316ce965abae9dcb9e283ab4c3810af13ba74e41fc9a5344646991fce235504588563c23282a15d6c079d0e246117dba9033e4759
-EBUILD libmowgli-9999.ebuild 714 BLAKE2B 02d0f1b1667400b1c3a1a6d7b408194514fbf5a89290cb9e7b59bf776973e826185b38a4fd1f1f411d36a76b60b98ed72ae4f3278ee79cacc6460a1022793798 SHA512 b5363b8374ffe5a0fd1332bc9b1a7a2aa576e99ae6e92653562f5fcf67df11e5dd5cdb28df539dd2d205389ffdf977dbf9d3f6f7b29776e8095cec8828c574b8
+EBUILD libmowgli-9999.ebuild 605 BLAKE2B 986896d6abd75d660d69f86a3822ef95d0626a1d4159970b2b58045b63b1c46866250b59b4467e1216d54cc74664e15790e671ab9a130d908bf0ce58d3d3528c SHA512 635c00a5c1ac8f50ab4f9dff6a1be4fc3e82ee73ca8eead7c553a4f961f65f332f04756328b878b678d4835c763974f8d2588a966679a6113d92fa95c80034bd
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/libmowgli-2.0.0-r1.ebuild b/dev-libs/libmowgli/libmowgli-2.0.0-r1.ebuild
deleted file mode 100644
index 84028f134be9..000000000000
--- a/dev-libs/libmowgli/libmowgli-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
-HOMEPAGE="http://atheme.org/projects/libmowgli.html"
-SRC_URI="http://atheme.org/downloads/${P}.tar.gz"
-IUSE="libressl ssl"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-RDEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-)"
-DEPEND="${RDEPEND}"
-DOCS="AUTHORS README doc/BOOST doc/design-concepts.txt"
-
-src_configure() {
-	# disabling SSL is "broken" in 2.0.0 so we have to use this hack till 2.0.1
-	use !ssl && myconf="--with-openssl=/dev/null"
-	econf ${myconf}
-}
diff --git a/dev-libs/libmowgli/libmowgli-9999.ebuild b/dev-libs/libmowgli/libmowgli-9999.ebuild
index 9a22f89057f1..5450f37c16c5 100644
--- a/dev-libs/libmowgli/libmowgli-9999.ebuild
+++ b/dev-libs/libmowgli/libmowgli-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit git-2
+inherit git-r3
 
 DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
 HOMEPAGE="http://atheme.org/projects/libmowgli.html"
@@ -18,10 +18,9 @@ RDEPEND="ssl? (
 	libressl? ( dev-libs/libressl:0= )
 )"
 DEPEND="${RDEPEND}"
-DOCS="AUTHORS README doc/BOOST doc/design-concepts.txt"
+DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
 
 src_configure() {
-	    # disabling SSL is "broken" in 2.0.0 so we have to use this hack till 2.0.1
-		use !ssl && myconf="--with-openssl=/dev/null"
-		econf ${myconf}
+	econf \
+		$(use_with ssl openssl)
 }
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 638f090b78c5..01ad3f146b06 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,7 @@
-DIST pcre2-10.22.tar.bz2 1470620 SHA256 b2b44619f4ac6c50ad74c2865fd56807571392496fae1c9ad7a70993d018f416 SHA512 dcf70b5e5b73f29188a56e4d9efb9afdf2b9ebe50e13a7640b80f543851235a289e476e1f517f49fac9628b456268bcdaf2b492237bc879ddff36f84ef4f32ea WHIRLPOOL 154ee1c4d2445878c2d2fd1eafa96584d8c943e9e545937b37d4c1fb12ba847938647184723d429244bf5aa989ba335cfbf74fadb5d38227862762bd34166232
+DIST pcre2-10.22.tar.bz2 1470620 BLAKE2B d968869db31cb9b0d93586227e6b44ecab57dea625108a386bf6bf8cb007c17f83e0b427744eaa6b4d6a1f6a7f344ee0aed29726bb51d077ff51889e68faf072 SHA512 dcf70b5e5b73f29188a56e4d9efb9afdf2b9ebe50e13a7640b80f543851235a289e476e1f517f49fac9628b456268bcdaf2b492237bc879ddff36f84ef4f32ea
 DIST pcre2-10.23.tar.bz2 1515314 SHA256 dfc79b918771f02d33968bd34a749ad7487fa1014aeb787fad29dd392b78c56e SHA512 3e5910bd2405cc35934d91e4be760abe4f2e900202a20b6ba74adb7a3acb2b74b3bf9b0e97e8de10f8e8534133e0722e0bf0f5fb40d6c2c4520d1ed61749d456 WHIRLPOOL 8db3deb22c26688607e1dc4b52229c64f8bcbb80908155ff9bd58b690a239984b6f5d1aff0cdc70efa3abf3ee899e22ea6e3a502437af424cb92d345133889a6
-DIST pcre2-10.30.tar.bz2 1583543 SHA256 90bd41c605d30e3745771eb81928d779f158081a51b2f314bbcc1f73de5773db SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e WHIRLPOOL 4491d5ea682ee90dad91f5b1a3dccf482c17768ea5de3c5cca2fa2b56ba97180b746242e552fbe240b154f98eac5b11da466b86d34e9bfe7c7a202d4c976172f
+DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
 EBUILD libpcre2-10.22.ebuild 2332 BLAKE2B 9836c5f234ce946d68c4e72cfdd2af039a9bf3664c8bab49a11a69dd3fdf337966cdeb2fb621f4493ddd0afa1ab42e56b21e3b0858ab84314a67069eb3448a1d SHA512 2dde1a17abd2795e57aa006a4b7f2a2e33c8d64d03ef1b9f106fad617f3b72ee0f897fe6e1263fa6244fb3e8c9a2ed18318fcd209232bed7825ef4cb71a46061
 EBUILD libpcre2-10.23.ebuild 2341 BLAKE2B 60d9fa579e14a2384c49d559ef6efe4ed1f62655c61fdc0b839f219bbe161bd8499251a67a84b1a726d0679fa29d828b3a667346a080b3b0a685194b376e78a6 SHA512 f6e07b46cebc6ea2a5414a1a023124a1078fe1a2f11b3e31b95758c7f77e95b6b455e86e89385811d6b5787584cbe3a0564d2aaf8e39f4112c9cb255641c79c1
-EBUILD libpcre2-10.30.ebuild 2352 BLAKE2B d01aab65319d1b63d9c59210666a8f53eeda1d6e86bc7d13a044a73b79b287d9afa49c9045e644a6ab998924b2f32bd18cd3774b24212c290c99ddfe93d72f91 SHA512 1c090e317e3714f0a7a2837a38ed3531a07201a3a6b0e2c2f380f03e5dc359e0442a73b094ae4933d55deddedf13606627f9105bdc97de1233275ad61c10faff
+EBUILD libpcre2-10.30.ebuild 2351 BLAKE2B e9c44ebe6e2d100a1cf700a143f0e6c455bcffe8b8688e8bc1defcaf0777f3ab89a2ef44431bcff773332a7ec8b5c62d6ec4f7a4511fdfde2527437f6cd1fbb6 SHA512 9d4067bf15e51df5df51f991e7812ee61a202321c1a69bc5fe2b22dbb56e57945bafd592f24e5c90d6a38366d440f207ba64e65ba8ec37190371fd432f9a8450
 MISC metadata.xml 1106 BLAKE2B 357dea3a03dcd1184cd5ac7c3fd79cb826d37410d27f06ad267e92c024bfc6fab891363894469e87bb8982d8c0a315320a20c22eb4877b3411b196a8b89c42e8 SHA512 8f2e0a7fd277da813c6aa00ff9ed9fe69443a6c738b2e66d09d5c5b4f6381110c1bab0a6b8be315f99f07254ae38c347aea4d50b54693bab3056c83830bec8cf
diff --git a/dev-libs/libpcre2/libpcre2-10.30.ebuild b/dev-libs/libpcre2/libpcre2-10.30.ebuild
index 5e9a3da42808..0cb030245022 100644
--- a/dev-libs/libpcre2/libpcre2-10.30.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.30.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"