gentoo resync : 25.11.2020

6 files changed, 134 insertions, 12 deletions

diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index e332019e410c..3f0f8ce1a0e3 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,4 +1,8 @@
+AUX seafile-client-7.0.9-libressl.patch 558 BLAKE2B 92ab8e75e83a3693861e3b1c4f390fe5287140520867940b2bfa0615f65294cfc0328fd0a285c6e66941e040dc09b8164fb58ab092f5645628811227a30993fc SHA512 67cbcddb7d8610d29fcb308ebd0bc648ad0526101a2540e743232500880f276b0c07f50f20bcdf31d49f422057f99e310a84384ef47f52abe90be8ef0b8b6e6f
+AUX seafile-client-7.0.9-qt-5.15.patch 1036 BLAKE2B dc81224ff712d12c19dc90edb0371853dac4a7c6604f40ae2cc82fbbe59c36d91b776a0e05e31b874b6b5abad84687009d82461e708faa98a3c399b8e0acac11 SHA512 f4a06d788682ccb13ed10485a20322ec074b40dbe4f6f7b9b88f199d6fe64f2dfbaf7f9f7575bbfdd5f309eb58aa9a03453c679b56c52582cdd99ce22b9df57f
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
-DIST seafile-client-7.0.5.tar.gz 2359779 BLAKE2B 58fa532668859c4413bb931146a58eb51ede7c1faa3ea2a9cafb94be44a8819261570ef16cc9f62f584f9ff483aa0832a63a99bb53380dd9efa4f82d25dea553 SHA512 b79cde3f98ebb1a0cb1035131cf95735f01c63bcb4bb658d5c40c36cdf85705d2c6fd2f7787fbdb3d965a25d60ee98e020e33c4f9423295c7ef1ab36ee5c7c27
-EBUILD seafile-client-7.0.5.ebuild 1062 BLAKE2B 6554b553c116a436521026bac9e4d5bd45eea8f919dec85b9e55b4e9ff629523d0ae4076c12c94e8f1af135fa314b927d37cc739b571b92c377cc03b18f30f80 SHA512 f6a0e1ca65fb6d673fbbb3beb384b4d689335d65af051de610fa2a7cb8fabeff5d3db2e5a30014dbf911566eeda9b084901dc50c74e72f4adc49008a8a8b5400
-MISC metadata.xml 345 BLAKE2B 5bb1b4c7f29473d3796c8c466c2ed836b01251edcbabe2b1800e19be723e206810ea9fd9f1ae9426d7bade242c31c677c9ccffb9c0fa2874c0f852c194980710 SHA512 6365751dd09e9f9caf9441e3c9235e39a47c80daa36697aa8c96ab9015029565ac0ae308916625549115a9a8ed0e5544e584e46928ae44a55aa9d88e5d00c1cb
+DIST seafile-client-7.0.10.tar.gz 2368056 BLAKE2B 8b446a818cc3a238bd92831843f1991632e9417ba92d043065aaf43e2a4d74aa00d331e32136a195558dc780ae124c8b1e7b2b2969f3cff8169635df7470f876 SHA512 cab11292ab1957b1682e0d3ee1ddd8e794c52bba7cf08ed39e8f598d3549247c20214d907d1e3792c06a36d8bea55c0bd25ce9aa3a802c262f9af785da7cb340
+DIST seafile-client-7.0.9.tar.gz 2367747 BLAKE2B 60a488a22e094d4783c7da50e8852d7204e16791613d113f729bacc21a40883edc25469f8ce1a8dab52b4ed0ea73b691a831fb0c01a885aeeae7bd276e2781ff SHA512 665a252a321744cd84b96230f5318528aad23a0a089e5049913c34a6c254356c7cc996e45e2a50d432d114f13b089b8d12062b3a1a4d1a0b6f1cbf9688ad32b6
+EBUILD seafile-client-7.0.10.ebuild 1209 BLAKE2B 2543c25fe156d1b337ba19bbbe5250a46a42e84a58384a1e0e02c23253da75fa98adab3d155089ef9b8edbee01e3a878e3646a2538c38758267d0a81df6608a2 SHA512 67ed286ace247497a574cac503617d20e18b01d3eb848f02dd78fecbaa7112456d0d2b2c2ab475a4ed26586d2f9b77a96c122262e8ef67d70a78c3e9d4fa76be
+EBUILD seafile-client-7.0.9-r1.ebuild 1195 BLAKE2B 4e5370331f2bfdc0007b62203fa167f7cfb3f35369d491fe0eac51375fe01b2714814e7b8a154f0110ea980da0bc487c8efbde77c45b75240a75002c5393bd33 SHA512 457f1bd1be04819ae66a0b097c3df4532497d84bf1ea7a3b903d830ba4e754f8a26959607a0717c0cc98cfed106b58a3905a21b03b91f32e9d7d6b7f94c1c840
+MISC metadata.xml 546 BLAKE2B 26e43bd101f64bdfae0d36dad1035e71f5a0ef31ea3bf5c5bc4b82a9208c892cb7241f50133fa969291e390bbdbd3b9473dc346c65f53d13d4483224e07484c8 SHA512 818714efd9851b566058ae6aba37a7860f0971f54e944f3386e14e9cd2053bca1d18d70ad653051a2c705af6807e5eea656d99eab52263055622c073384e9f83
diff --git a/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch b/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch
new file mode 100644
index 000000000000..d7fdc2201d12
--- /dev/null
+++ b/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch
@@ -0,0 +1,14 @@
+Upstream pull request: https://github.com/haiwen/seafile-client/pull/1314
+diff --git a/src/utils/rsa.cpp b/src/utils/rsa.cpp
+index 350b790..513733d 100644
+--- a/src/utils/rsa.cpp
++++ b/src/utils/rsa.cpp
+@@ -13,7 +13,7 @@ namespace {
+ 
+ /* Forward compatibility functions if libssl < 1.1.0. */
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ 
+ int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+ {
diff --git a/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch b/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch
new file mode 100644
index 000000000000..ef9c2f7449b5
--- /dev/null
+++ b/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch
@@ -0,0 +1,37 @@
+https://github.com/haiwen/seafile-client/pull/1297
+
+From 86ebea086c6b78738b3140c922c909331d2b9a94 Mon Sep 17 00:00:00 2001
+From: Joffrey <j-off@live.fr>
+Date: Fri, 29 May 2020 15:59:11 +0000
+Subject: [PATCH] Fix build with Qt5 v5.15.0
+
+---
+ src/ui/events-list-view.cpp     | 1 +
+ src/ui/private-share-dialog.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/ui/events-list-view.cpp b/src/ui/events-list-view.cpp
+index b1d04abb..09536b9e 100644
+--- a/src/ui/events-list-view.cpp
++++ b/src/ui/events-list-view.cpp
+@@ -1,4 +1,5 @@
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QApplication>
+ #include <QPixmap>
+ #include <QToolTip>
+diff --git a/src/ui/private-share-dialog.cpp b/src/ui/private-share-dialog.cpp
+index 511d476b..284cc043 100644
+--- a/src/ui/private-share-dialog.cpp
++++ b/src/ui/private-share-dialog.cpp
+@@ -2,6 +2,7 @@
+ #include <QCompleter>
+ #include <QLineEdit>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QResizeEvent>
+ #include <QStringList>
+ #include <QStringListModel>
+-- 
+2.26.2
+
diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml
index f8cd338dfd6d..1c36e673cace 100644
--- a/net-misc/seafile-client/metadata.xml
+++ b/net-misc/seafile-client/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@retornaz.com</email>
+		<name>Quentin Retornaz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
 	</use>
diff --git a/net-misc/seafile-client/seafile-client-7.0.10.ebuild b/net-misc/seafile-client/seafile-client-7.0.10.ebuild
new file mode 100644
index 000000000000..e869695c7c6f
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-7.0.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl shibboleth test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/libevent
+	dev-libs/jansson
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	net-libs/libsearpc
+	~net-misc/seafile-${PV}
+	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-select-qt5.patch"
+	"${FILESDIR}/${PN}-7.0.9-libressl.patch"
+	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/seafile-client/seafile-client-7.0.5.ebuild b/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
index c5ac2c442603..649db5f1322d 100644
--- a/net-misc/seafile-client/seafile-client-7.0.5.ebuild
+++ b/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
@@ -12,26 +12,31 @@ SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
+IUSE="libressl shibboleth test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="net-libs/libsearpc
-	~net-misc/seafile-${PV}
+RDEPEND="dev-db/sqlite:3
 	dev-libs/libevent
 	dev-libs/jansson
-	dev-libs/openssl
-	dev-db/sqlite:3
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
 	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
+	dev-qt/qtwidgets:5
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	net-libs/libsearpc
+	~net-misc/seafile-${PV}
 	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )"
 BDEPEND="dev-qt/linguist-tools:5"
 
-PATCHES=("${FILESDIR}/${PN}-select-qt5.patch")
+PATCHES=(
+	"${FILESDIR}/${PN}-select-qt5.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(