gentoo resync : 13.03.2018

4 files changed, 6 insertions, 218 deletions

diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 49fda97d6ce9..fb0552dea28b 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,6 +1,5 @@
-AUX kdelibs4support-5.40.0-libressl.patch 8790 BLAKE2B 31d9bb613f355716990b0d332b1bc601a4f29047fadd867e94b430552ae2d6654830b7383d81d34ca5ec8618028a611655f20eb32fcaf1adbc796ad10121dda5 SHA512 a6c47354094326a0c665473a563bd0c24ee74ca5206bb6fecb661723cdddbf65c2d39860efb91f401fbb4d723638dfa89cfc20fe461ef8d4beb0c233e5b4d200
-DIST kdelibs4support-5.40.0.tar.xz 3341884 BLAKE2B 693816728db15b9e8d28fa2c01634083d11d4b3da942fd06606eaf7715e75ac14978bb9020df37ae154e4dddf740e0672fc90f561f2d467307a24f0362bb282a SHA512 ea6758a42d993af312f0231c75b77f00c0a4938dfd8efa82d443d60e553865ed59621413a651aef1443ec1d07bcc273532b11f1699382b66c0ea91e2bfdf94d1
 DIST kdelibs4support-5.43.0.tar.xz 3343312 BLAKE2B 96a73c18df4110c4a51d78114ef8e10311429c280582bdd9e95a73c4c809157706e565ea33e14cb8f3ce595b1d13d7c8348e3212e1293896ae556bf829f2a641 SHA512 bd73459e5334a1158f68d2af2032fa9236bae303c2c45ac9c3b46ffcf46654f9175fae68222a7cfb3398642634aa21fd023f19f0318af633574f448bfab8e467
-EBUILD kdelibs4support-5.40.0.ebuild 2149 BLAKE2B a73f8b8ef0a28e9dcd65229756329ff1c49a4e3c5aa74f2b1a0b8f597a6cdb43c2abb23cb9d4b708344bcef883c76fce4f8f1b3af8ffa8c5eabe374f524c195b SHA512 ab8b693e5f1311eb78f615176b0b36d64efe6b65f1b66e59cbfe7f4bc3ebf8352bccd39c08b2f15e8a94861e2620f1f70bb92597c682b7b98b771221d776e47e
-EBUILD kdelibs4support-5.43.0.ebuild 2074 BLAKE2B 9ad6f9bfe8d8a63f0eff7bd2416b08f8fa5749e2f823f4c5a7e1b4fc74be9f31e594c130b54e9fc1af7bb1a343e4ee005c8b267bfb57f29a29440cf3453fefca SHA512 e7f612bbb97d69eb0201e4bd25c116e7455f3486e2d12591e56e50cf6fd0268c76e6a1d8432a17a020a72407d71ee73af84ac909da20d2106d771e664a33c7c6
+DIST kdelibs4support-5.44.0.tar.xz 3345800 BLAKE2B 29b90436748cfa290b9a341412f53f1b7c8d3f036c55e2f207f9f8a92e7f65d62e854ea136236b153ba04ff06e1c17c4971a0361ab9ff971d4b64331836d57b6 SHA512 57f48f9221f3cef5b6346a223086ce528117f00bd042c3c207c4bea8f5ce7ebf10ea6f11da88bab25539e84b778a37c35d053a867b8f973e68adbe951bb73337
+EBUILD kdelibs4support-5.43.0.ebuild 2072 BLAKE2B c4843bf815021ad5f106659ae8c303bc41ea2dfb2c893f65861f4306fde03ea690fb562b5bbd76418d05f7d448a08d3d53e2dab35e6e2b318c5a29f093cfb6d0 SHA512 f2bcece17ba35c2647b1d86e8939a5b2818db5715f91d1ed46494b0e48aa88c30be1327400af78821df2fede4bb872609412f4d76d2bc72b78b4312fee0efc93
+EBUILD kdelibs4support-5.44.0.ebuild 2074 BLAKE2B 9ad6f9bfe8d8a63f0eff7bd2416b08f8fa5749e2f823f4c5a7e1b4fc74be9f31e594c130b54e9fc1af7bb1a343e4ee005c8b267bfb57f29a29440cf3453fefca SHA512 e7f612bbb97d69eb0201e4bd25c116e7455f3486e2d12591e56e50cf6fd0268c76e6a1d8432a17a020a72407d71ee73af84ac909da20d2106d771e664a33c7c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch
deleted file mode 100644
index ad7cd7999672..000000000000
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 00cae452ac619810f311cf63d4dfd268887d30e5 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Sun, 5 Nov 2017 22:52:54 +0100
-Subject: Fix build with LibreSSL
-
-Summary:
-Unfortunately LibreSSL sets OPENSSL_VERSION_NUMBER to
-0x20000000L and doesn't support the OpenSSL 1.1 API.
-
-Test Plan: Builds with LibreSSL
-
-Reviewers: #frameworks
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D8672
----
- src/kssl/kopenssl.cpp        | 34 +++++++++++++++++-----------------
- src/kssl/kopenssl.h          |  2 +-
- src/kssl/ksslcertificate.cpp |  2 +-
- 3 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/src/kssl/kopenssl.cpp b/src/kssl/kopenssl.cpp
-index c68a134..ce5f137 100644
---- a/src/kssl/kopenssl.cpp
-+++ b/src/kssl/kopenssl.cpp
-@@ -81,7 +81,7 @@ extern "C" {
-     static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = nullptr;
-     static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = nullptr;
-     static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = nullptr;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     static void (*K_CRYPTO_free)(void *) = nullptr;
- #else
-     static void (*K_CRYPTO_free)(void *, const char *, int) = nullptr;
-@@ -430,7 +430,7 @@ KOpenSSLProxy::KOpenSSLProxy()
-         K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolve("RAND_load_file");
-         K_RAND_file_name = (const char *(*)(char *, size_t)) d->cryptoLib->resolve("RAND_file_name");
-         K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolve("RAND_write_file");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         K_CRYPTO_free = (void (*)(void *)) d->cryptoLib->resolve("CRYPTO_free");
- #else
-         K_CRYPTO_free = (void (*)(void *, const char *, int)) d->cryptoLib->resolve("CRYPTO_free");
-@@ -485,7 +485,7 @@ KOpenSSLProxy::KOpenSSLProxy()
-         K_X509_STORE_CTX_get_current_cert = (X509 * (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_current_cert");
-         K_X509_STORE_CTX_set_error = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_error");
-         K_X509_STORE_CTX_get_error = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_error");
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_free");
-         K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_num");
-         K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_pop");
-@@ -979,7 +979,7 @@ void KOpenSSLProxy::X509_STORE_free(X509_STORE *v)
- 
- void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *))
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     X509_STORE_set_verify_cb_func(store, verify_cb);
- #else
-     if (K_X509_STORE_set_verify_cb) {
-@@ -1044,7 +1044,7 @@ X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a)
- 
- void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     if (psig) {
-         *psig = x->signature;
-     }
-@@ -1096,7 +1096,7 @@ void KOpenSSLProxy::X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,
-     }
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- void KOpenSSLProxy::CRYPTO_free(void *x)
- {
-     if (K_CRYPTO_free) {
-@@ -1122,7 +1122,7 @@ X509 *KOpenSSLProxy::X509_dup(X509 *x509)
- 
- ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return X509_get_notBefore(x);
- #else
-     if (K_X509_getm_notBefore) {
-@@ -1135,7 +1135,7 @@ ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x)
- 
- ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return X509_get_notAfter(x);
- #else
-     if (K_X509_getm_notAfter) {
-@@ -1413,7 +1413,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose)
- 
- X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return v->current_cert;
- #else
-     if (K_X509_STORE_CTX_get_current_cert) {
-@@ -1426,7 +1426,7 @@ X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v)
- 
- void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     v->error = error;
- #else
-     if (K_X509_STORE_CTX_set_error) {
-@@ -1437,7 +1437,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error)
- 
- int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return v->error;
- #else
-     if (K_X509_STORE_CTX_get_error) {
-@@ -1894,7 +1894,7 @@ int KOpenSSLProxy::EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
- 
- int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return pkey->type;
- #else
-     if (K_EVP_PKEY_base_id) {
-@@ -1907,7 +1907,7 @@ int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey)
- 
- RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return pkey->pkey.rsa;
- #else
-     if (K_EVP_PKEY_get0_RSA) {
-@@ -1920,7 +1920,7 @@ RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
- 
- void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     if (n) {
-         *n = rsa->n;
-     }
-@@ -1939,7 +1939,7 @@ void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, c
- 
- DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return pkey->pkey.dsa;
- #else
-     if (K_EVP_PKEY_get0_DSA) {
-@@ -1952,7 +1952,7 @@ DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
- 
- void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     if (p) {
-         *p = dsa->p;
-     }
-@@ -1971,7 +1971,7 @@ void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, c
- 
- void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     if (pub_key) {
-         *pub_key = dsa->pub_key;
-     }
-diff --git a/src/kssl/kopenssl.h b/src/kssl/kopenssl.h
-index 518cd5b..fa23efe 100644
---- a/src/kssl/kopenssl.h
-+++ b/src/kssl/kopenssl.h
-@@ -395,7 +395,7 @@ public:
-     /*
-      *   CRYPTO_free - free up an internally allocated object
-      */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     void CRYPTO_free(void *x);
- #else
-     void CRYPTO_free(void *x, const char *file, int line);
-diff --git a/src/kssl/ksslcertificate.cpp b/src/kssl/ksslcertificate.cpp
-index 4c96e4b..e9631fb 100644
---- a/src/kssl/ksslcertificate.cpp
-+++ b/src/kssl/ksslcertificate.cpp
-@@ -1222,7 +1222,7 @@ QByteArray KSSLCertificate::toNetscape()
- {
-     QByteArray qba;
-      // no equivalent in OpenSSL 1.1.0 (?), so behave as if we had no OpenSSL at all
--#if KSSL_HAVE_SSL && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if KSSL_HAVE_SSL && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-     NETSCAPE_X509 nx;
-     ASN1_OCTET_STRING hdr;
-     QTemporaryFile ktf;
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.43.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.43.0.ebuild
index 111c1d3718c3..00c1376f5092 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.43.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="libressl X"
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.44.0.ebuild
index 1c7a2e9cbce4..111c1d3718c3 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.44.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="libressl X"
 
 COMMON_DEPEND="
@@ -71,13 +71,10 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kinit)
 	$(add_frameworks_dep kitemmodels)
 	$(add_qt_dep qtxml)
-	!<kde-apps/kde4-l10n-16.04.3
 "
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${P}-libressl.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package X X11)