gentoo resync : 20.02.2019

7 files changed, 3 insertions, 336 deletions

diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest
index 5ff2a949d124..322580263011 100644
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@@ -1,11 +1,4 @@
-AUX libcmis-0.5.2-boost-1.68.patch 691 BLAKE2B da58ae11be1c7be1c1a048c5459ac0b0d7ac9b8df23f804da85b2f2e6f2c4c9348c08aa3faf31c88a1240fa882585823edac3900589c1dfa77ef0bef8145bb58 SHA512 55b7346dc6a9876a6a52473acbce65bf2488394e4982f6caa80ed5dd9e262ab62a6bb0a2eb2b4114b9b90c59497b813a1da85b7dacfd1638873c1523a86f5205
-AUX libcmis-0.5.2-fix-gdrive-2fa.patch 3268 BLAKE2B be4d740655ae76c3cecde5d8ce643506c0a77f1b1cbd3320be9c9f3daa975e7579b28cb5f6ef11848bba875b6b9664fe07f81c3359be16f07b3ca305c7644279 SHA512 fbdae22b30da00b559111ce0b56aac8da90305ef0c1c4b9b55b5554a6747cf7690dd67c34bfdcb0c4597a8160a15fe9e611a01432523d31e6ea729e914a5fe6b
-AUX libcmis-0.5.2-oauth2-encode.patch 2184 BLAKE2B 98f6a50ea28da32aafd4326cb14d3907098321ed42c98d3c633c80c22ad9272041e8e211956a562f23358e1b3d942f4def40b4670b2edba08ee2ca0da6c91ca4 SHA512 9e38abe126ea145f274a31063e111ff90f4d0306b18e99b166215d7e1db2b14b19a02e1dcdd2a5925a87cbb0c70309a6e2f82d62ca24abac62bc4e4c99fae6db
 DIST libcmis-0.5.2.tar.gz 295020 BLAKE2B 325eacedd87eb1888a439c727a648c5aeb8d58c9b80add9761ffc55381193b71b589865d13ecd55177faafa935642685001f60456c1354e037989b29e9451c05 SHA512 45d8cd6d420a9593b46e1f2d6fbf384ea248cb218b0db6326ee2f082ff29100b65a2cc999ccb849e61df4f4ed7c3721b09addc6c322ef03c6c93f8c0acc02bde
-DIST libcmis-0.5.2_pre20160820.tar.gz 285100 BLAKE2B 980200d1a56240d8d069aba2ad349ec02e90d345bad4956f6cbbea3606f9f90951523804293b349ad0419dd2db6db294a45a97872469105c1ba392c888fab332 SHA512 4b6d0fc4d80444fea2c5eb16621b92a10b41c58128cc8a355caca50f12648ed5113bd977cc5dbe8971e3dbc11f9d7ae8d45c9d2aa19f37c83659141af135bd1a
-DIST libcmis-0.5.2_pre20180118.tar.gz 291080 BLAKE2B 1cb5664dcb0bef7f5a04c422b21ac54a9b70d38dec74d688327732630e4a134a88c7262d763a39d1730eda1cd45f5d3c3d47a56099959d01bf5e23972181a793 SHA512 630cf7e5c31266e2b55ca093aa942fc373eb24bbb5b9aedd687f67f1b3c6b627a3bdb58878859449bcb340626f3e1bdafa2b9cbb5e61e8e4336c45b804fca7a9
-EBUILD libcmis-0.5.2.ebuild 1181 BLAKE2B 6155ba742701f73436fbd13345a124d1439bd35e27505cef044265329c2904ac9b7e33950f846ed7e7a49ebfbc91991ab93767cc5c92371a76cfaa093b249fff SHA512 63661718b82f105d4572db7c41e29afb28228ac0f240aba4d746154b1a7a36481a50c47e3eab70f5497db81e772e2de9334cb408bcd32e80b9f0a03b938e2657
-EBUILD libcmis-0.5.2_pre20160820-r1.ebuild 1851 BLAKE2B 9f1d434f8ac067cd81dd7f6d7fb63db241ac63924e56b1da5ff069f7cd739127e5ec21504e357fde7ecc6bfb88c2b186df9ff151f186bb8cf2286035f77c724e SHA512 ec65003739c84b64293c88c98eb9b5ae931cf5644256607a35718665b87577d9413c133be140b13a9ed664efd1b5572f549adf04116801555dc75c08ef64db41
-EBUILD libcmis-0.5.2_pre20180118.ebuild 1613 BLAKE2B 7c8170e78ab95dfe7c8e083a1f5ac8231a1543b41de8a4457c8b36668abb99dd54b61d2270eea2cb0fb767b6b0dac537b56f5e7b3cda786953dfb2b4cee6d606 SHA512 f091b0812abdd997e443c71aebcb9f064b9b14607e87f57abd5e3f56e3913b47e3e6b6de58738ec1e4d5b9b5fd31ab2a1c9b569046f9856f0c134ca0f8b1fe4f
+EBUILD libcmis-0.5.2.ebuild 1179 BLAKE2B 0494be5eac19549e7893016a0e3093e58ff720ed0d471657513f82eb875a6aa5eba976b28b64e81ab945640c60afd30300a97531492df401773e8412e91b0abb SHA512 9193c38528178a608e4fc6ce74438d50bbe7a470d68b7a3db492e729c25837373d2fb73b1c74ead90e814fc1cac9a09e8af82b0992e0dfbb85664e6805702ac8
 EBUILD libcmis-9999.ebuild 1498 BLAKE2B ecc02d843a491f76b1dadf241e644c65b309142e60cf04190e33f787822d840fb263c75e509f683ed7535abed52d34b540236aa4374961f1e8b2c35447b0c718 SHA512 97b6b36f5b56553837ff08b00bac25ce68f33cc772ca0314079b78a8d7f6eb34c457b57ef1cb730fd4b10e8e624a72a072ebdc432b86dd6f708188817ce7bc51
 MISC metadata.xml 401 BLAKE2B 51ccbd2b64899189a740c498dee304fa62676b4673b22f5215e5e587925d74a3582f9a4206e47da42524f527cb1d36545d45c64c9a38b9783c65d2e923aba0b0 SHA512 b01b808fa630d2d02ef61b4f8e1d286c51108eb3e9120b687b8e2bdf012b05d70a32de1264c0699f9778d0cb9574b88ddd4df1cc428992c90780b4934973841b
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch
deleted file mode 100644
index 767464242f78..000000000000
--- a/dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3ef3569c4ae1c5319aff0664d52cbd8a8d42c909 Mon Sep 17 00:00:00 2001
-From: rezso <rezso@rezso.net>
-Date: Tue, 4 Sep 2018 01:18:10 +0200
-Subject: tdf#119344 fix libcmis build with boost 1.68
-
-Change-Id: I80d6ea8ecd001dc02b941c1eb8974c9244316045
-Reviewed-on: https://gerrit.libreoffice.org/59958
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
-
---- a/src/libcmis/xml-utils.cxx
-+++ b/src/libcmis/xml-utils.cxx
-@@ -31,7 +31,12 @@
- #include <sstream>
- #include <stdlib.h>
- 
-+#include <boost/version.hpp>
-+#if (BOOST_VERSION >= 106800)
-+#include <boost/uuid/detail/sha1.hpp>
-+#else
- #include <boost/uuid/sha1.hpp>
-+#endif
- #include <curl/curl.h>
- 
- #include "xml-utils.hxx"
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch
deleted file mode 100644
index 3c19e99a5ba9..000000000000
--- a/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 1effce6d286ba3a9f467e15074b532d2ba4b7c98 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Szymon=20K=C5=82os?= <eszkadev@gmail.com>
-Date: Wed, 29 Mar 2017 17:45:10 +0200
-Subject: [PATCH] Fix 2FA for Google Drive
-
----
- src/libcmis/oauth2-providers.cxx | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/src/libcmis/oauth2-providers.cxx b/src/libcmis/oauth2-providers.cxx
-index 74c0fec..dd872dd 100644
---- a/src/libcmis/oauth2-providers.cxx
-+++ b/src/libcmis/oauth2-providers.cxx
-@@ -37,6 +37,7 @@
- #define CHALLENGE_PAGE_ACTION_LEN sizeof( CHALLENGE_PAGE_ACTION ) - 1
- #define PIN_FORM_ACTION "/signin/challenge/ipp"
- #define PIN_FORM_ACTION_LEN sizeof( PIN_FORM_ACTION ) - 1
-+#define PIN_INPUT_NAME "Pin"
- 
- using namespace std;
- 
-@@ -152,7 +153,7 @@ string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUr
-         }
- 
-         loginChallengeLink = "https://accounts.google.com" + loginChallengeLink;
--        loginChallengePost += "Pin=";
-+        loginChallengePost += string( PIN_INPUT_NAME ) + "=";
-         loginChallengePost += string( pin );
- 
-         istringstream loginChallengeIs( loginChallengePost );
-@@ -291,6 +292,8 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string&
-     if ( reader == NULL ) return 0;
- 
-     bool readInputField = false;
-+    bool bIsRightForm = false;
-+    bool bHasPinField = false;
- 
-     while ( true )
-     {
-@@ -301,6 +304,12 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string&
-         // Find the redirect link
-         if ( xmlStrEqual( nodeName, BAD_CAST( "form" ) ) )
-         {
-+            // 2FA: Don't add fields form other forms not having pin field
-+            if ( bIsRightForm && !bHasPinField )
-+                post = string( "" );
-+            if ( bIsRightForm && bHasPinField )
-+                break;
-+
-             xmlChar* action = xmlTextReaderGetAttribute( reader, 
-                                                          BAD_CAST( "action" ));
- 
-@@ -311,7 +320,7 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string&
-                 bool bChallengePage = ( strncmp( (char*)action,
-                                                  CHALLENGE_PAGE_ACTION,
-                                                  CHALLENGE_PAGE_ACTION_LEN ) == 0 );
--                bool bIsRightForm = ( strncmp( (char*)action,
-+                bIsRightForm = ( strncmp( (char*)action,
-                                                  PIN_FORM_ACTION,
-                                                  PIN_FORM_ACTION_LEN ) == 0 );
-                 if ( ( xmlStrlen( action ) > 0 )
-@@ -332,6 +341,8 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string&
-                                                        BAD_CAST( "name" ));
-             xmlChar* value = xmlTextReaderGetAttribute( reader, 
-                                                         BAD_CAST( "value" ));
-+            if ( name != NULL && strcmp( (char*)name, PIN_INPUT_NAME ) == 0 )
-+                bHasPinField = true;
-             if ( ( name != NULL ) && ( value!= NULL ) )
-             {
-                 if ( ( xmlStrlen( name ) > 0) && ( xmlStrlen( value ) > 0) )
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch
deleted file mode 100644
index c6a99074c502..000000000000
--- a/dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 33f7485dedea90e0f80c6348fa8ac5f27c5052e0 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 4 Sep 2018 16:45:00 +0200
-Subject: Properly encode OAuth2 credentials
-
-Change-Id: Ic3edeae035262309e91fb01e3aca5c2f905bc3e5
-Reviewed-on: https://gerrit.libreoffice.org/59986
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-
---- a/src/libcmis/oauth2-providers.cxx
-+++ b/src/libcmis/oauth2-providers.cxx
-@@ -26,6 +26,8 @@
-  * instead of those above.
-  */
- 
-+#include <cassert>
-+
- #include <libxml/HTMLparser.h>
- #include <libxml/xmlreader.h>
- 
-@@ -45,6 +47,29 @@
- #define HTML_PARSE_RECOVER 0
- #endif
- 
-+namespace {
-+
-+// See <https://url.spec.whatwg.org/#concept-urlencoded-byte-serializer>:
-+void addXWwwFormUrlencoded(std::string * buffer, std::string const & data) {
-+    assert(buffer);
-+    for (string::const_iterator i = data.begin(); i != data.end(); ++i) {
-+        unsigned char c = static_cast<unsigned char>(*i);
-+        if (c == ' ' || c == '*' || c == '-' || c == '.' || (c >= '0' && c <= '9')
-+            || (c >= 'A' && c <= 'Z') || c == '_' || (c >= 'a' && c <= 'z'))
-+        {
-+            *buffer += static_cast<char>(c);
-+        } else {
-+            static const char hex[16] = {
-+                '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-+            *buffer += '%';
-+            *buffer += hex[c >> 4];
-+            *buffer += hex[c & 0xF];
-+        }
-+    }
-+}
-+
-+}
-+
- string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUrl,
-                                       const string& username, const string& password )
- {
-@@ -97,7 +120,7 @@
-         return string( );
- 
-     loginEmailPost += "Email=";
--    loginEmailPost += string( username );
-+    addXWwwFormUrlencoded(&loginEmailPost, username);
- 
-     istringstream loginEmailIs( loginEmailPost );
-     string loginEmailRes;
-@@ -119,7 +142,7 @@
-         return string( );
- 
-     loginPasswdPost += "Passwd=";
--    loginPasswdPost += string( password );
-+    addXWwwFormUrlencoded(&loginPasswdPost, password);
- 
-     istringstream loginPasswdIs( loginPasswdPost );
-     string loginPasswdRes;
diff --git a/dev-cpp/libcmis/libcmis-0.5.2.ebuild b/dev-cpp/libcmis/libcmis-0.5.2.ebuild
index 2598ba450733..bd2e18fadf28 100644
--- a/dev-cpp/libcmis/libcmis-0.5.2.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools flag-o-matic
 
diff --git a/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild
deleted file mode 100644
index 8377602271d8..000000000000
--- a/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
-	SCM_ECLASS="git-r3"
-elif [[ ${PV} = *_pre* ]]; then
-	SCM_ECLASS="vcs-snapshot"
-	snapshot=d2054a12e3f52fff8e96341e8c48f0dcd75e2e2a
-	SRC_URI="https://github.com/tdf/${PN}/archive/${snapshot}.tar.gz -> ${P}.tar.gz"
-	unset snapshot
-else
-	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-inherit alternatives autotools flag-o-matic ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="C++ client library for the CMIS interface"
-HOMEPAGE="https://github.com/tdf/libcmis"
-
-LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
-SLOT="0.5"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="man static-libs test"
-
-COMMON_DEPEND="
-	dev-libs/boost:=
-	dev-libs/libxml2
-	net-misc/curl
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	man? (
-		app-text/docbook2X
-		dev-libs/libxslt
-	)
-	test? (
-		dev-util/cppcheck
-		dev-util/cppunit
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-cpp/libcmis-0.5.0
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.2-fix-gdrive-2fa.patch" )
-
-src_prepare() {
-	default
-	[[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# bug 618778
-	append-cxxflags -std=c++14
-
-	econf \
-		--program-suffix=-${SLOT} \
-		--disable-werror \
-		$(use_with man) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		--enable-client
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
-}
-
-pkg_postrm() {
-	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
-}
diff --git a/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild b/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild
deleted file mode 100644
index 2707ed8b6300..000000000000
--- a/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
-	inherit git-r3
-elif [[ ${PV} = *_pre* ]]; then
-	COMMIT=738528d790b2b1d52d9b72d673842969a852815d
-	SRC_URI="https://github.com/tdf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-inherit autotools flag-o-matic
-
-DESCRIPTION="C++ client library for the CMIS interface"
-HOMEPAGE="https://github.com/tdf/libcmis"
-
-LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
-SLOT="0.5"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="man static-libs test"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/libxml2
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		app-text/docbook2X
-		dev-libs/libxslt
-	)
-	test? (
-		dev-util/cppcheck
-		dev-util/cppunit
-	)
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.5.2-boost-1.68.patch"
-	"${FILESDIR}/${PN}-0.5.2-oauth2-encode.patch"
-)
-
-[[ ${PV} = *_pre* ]] && S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	default
-	[[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# bug 618778
-	append-cxxflags -std=c++14
-
-	econf \
-		--program-suffix=-$(ver_cut 1-2) \
-		--disable-werror \
-		$(use_with man) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		--enable-client
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}