gentoo resync : 25.11.2020

6 files changed, 16 insertions, 111 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index d7a6b0ab679b..dfe76fb50596 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,10 +1,8 @@
 AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c301b4be62c495f059c81fcd1f3d8a5a85c579400fd97b86bb057c82bfb790588c9faa6f302a239b1c043ab53530713cb75a88179654c SHA512 c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f
 DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45ccccabc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462
-DIST nextcloud-client-3.0.0.tar.gz 19060293 BLAKE2B 80c53e2db30c9a3a8bae8673a937448915010f9d736836a99660c498c0afe0f3e5d78faf80df4c2214f452c41c9d92357a341f00ecb8f4720f6c459a9d2ccb30 SHA512 5b03ad99feeb16dd7d22399df624da98bf6f2e758337aad5b4ff21f25e39e44d94fe0451101cbc8100e43adbd4a39f8d1bac64881d9e39ef3de58b018ccd35d6
-DIST nextcloud-client-3.0.1.tar.gz 19059671 BLAKE2B c85f9d1627a75745c5a450b1c59799716c17dad3ba5ce277a62bebbbb80f243236cb4d529ff8ce4af9371c7ab1948b5a86dfaa3fbeb9de8681c9df0f397044f7 SHA512 9d6f3d8977f411942703a2dea8990a5b37ef8892b142292720915f5d1937b0443e9cb8c17562eb30a16c31abf30efc023bbb9199079f3a9ca47bdfa51ea5f3a5
 DIST nextcloud-client-3.0.2.tar.gz 19114545 BLAKE2B a6aa041708d110fbdca082476e65ccc8fec189948aa64020a27beabe2d7b3df474ae3313b5aef0e15f3498cf974cf414eb4934417cea206b021e4e212351a088 SHA512 188f878457baba14f01ca6c0f83100bcc64feaf5e3da86903d59d8b7c553c89f88252c1410cd153952950f91429af680b1901f3f9de951bfd06a06c176d44e7d
-EBUILD nextcloud-client-2.6.5.ebuild 2013 BLAKE2B d2108ce06b9c25a56a13852fa5c8809217db7537346bb803311f5c034f483bcd050b8cb617c9bacde98b9e012cd91a2f130aa471b4190e013dca263080bef290 SHA512 338a289d30bbfb89619805425032142052860d86f415338d5e66e13ca05d6ca02d0ef0a41a41e5d889ce7ced734dc9a5ac50bfad6d00ed8b1e9fdaa0fc05df4d
-EBUILD nextcloud-client-3.0.0.ebuild 2022 BLAKE2B 7ee522c834b3e1ce046177e40c071cb15fdd940fd55b9124e22d9849f8ebf5c70c7a2a97003e1c707508b532c6c551dc7c6a11989182a2ad51b22fbdc07de1db SHA512 33858e8b186394ec736534eda2f972ce72c2c4fa57e489c2aeb78f70115d8f0bbb05ebf66c8fc5084af4539cd383981ce4264987297eed689dc3497e7e271a41
-EBUILD nextcloud-client-3.0.1.ebuild 2022 BLAKE2B 7ee522c834b3e1ce046177e40c071cb15fdd940fd55b9124e22d9849f8ebf5c70c7a2a97003e1c707508b532c6c551dc7c6a11989182a2ad51b22fbdc07de1db SHA512 33858e8b186394ec736534eda2f972ce72c2c4fa57e489c2aeb78f70115d8f0bbb05ebf66c8fc5084af4539cd383981ce4264987297eed689dc3497e7e271a41
-EBUILD nextcloud-client-3.0.2.ebuild 2088 BLAKE2B ad2d12f37cfc2d314b9b5a310eef4772874da94bf21385c1361d9cc1be8b9c6ff4787d94c1d7ea8b3dc1f015d68ff8acf21c8e894727413ae04e728fff683a36 SHA512 3e9d8be0cedb7549051b33b80aa85f17599e5cdd67d32b42aae1e17b223c9a0eb55c5eac14102ee4474e921ebb7aed3b43b100fb9d267c40b3ba91a96361b450
-MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
+DIST nextcloud-client-3.0.3.tar.gz 19202718 BLAKE2B b5e09be514ede6e323e9624df38aad10969c0fdae7bc7baaeb9da4628dfa1c44a4fb6b5f6b4b83ff92b0eedbbe1ffbcf54da43d5e71923979b8649db54b05d7c SHA512 aa9e9897dae74919f11817f8aad139378a2a26df6663f3c9ee9c9e1d229b537daa9e9ed9f3ba292f8e299017f7ef5d863257a26858af159e7e76c7247d7c244d
+EBUILD nextcloud-client-2.6.5.ebuild 1951 BLAKE2B bbb143e83a235f27cdd65c5cbbeb3b4bf40938a79e9295802f9d892609c5980ccde188d88a1b482295a40be96e856bce9e4d615dbd93cb65aefc4904924216e6 SHA512 0e1567e43e28299f27c633d7c828a1422aeea689f46422fb10a6a80ae02d4b75dec6542460d86d800fdb9c2dfcf4815a2c69575ecc5db8ff9ab3e863ab0120b6
+EBUILD nextcloud-client-3.0.2.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
+EBUILD nextcloud-client-3.0.3.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
+MISC metadata.xml 513 BLAKE2B d5a3d3a3faf76e1c3dd481e295deea3ce56d8bca523229e2e68942bc268a09e22221efd27c1dec2decaaf999992600fb0a039ccdd376bbe9a70c55879a09221c SHA512 7b3888d4f38948547620650c253e511772de59d259fb1a9211f88ce2612a6373838820e3827ebda5d2f8ff969ec3851dea30512fd433b87480b27f49da8738fb
diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
index 4342ef68dc63..dfcd23fb500c 100644
--- a/net-misc/nextcloud-client/metadata.xml
+++ b/net-misc/nextcloud-client/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
 		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
-		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">nextcloud/desktop</remote-id>
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
index 52cdf94f2165..43b18edfd8e8 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc dolphin nautilus shibboleth test"
+IUSE="doc dolphin nautilus test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	>=dev-libs/openssl-1.1.0:0=
@@ -31,8 +31,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 		kde-frameworks/kcoreaddons:5
 		kde-frameworks/kio:5
 	)
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )"
+	nautilus? ( dev-python/nautilus-python )"
 
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
@@ -74,8 +73,8 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
 		-DUNIT_TESTING=$(usex test)
+		-DNO_SHIBBOLETH=yes
 	)
 
 	cmake_src_configure
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.0.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.1.ebuild
deleted file mode 100644
index b6dc27e09eaa..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.0.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/desktop-${PV/_/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
index 2c3d246de4b1..a3dd780f6e5f 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin libressl nautilus shibboleth test"
+IUSE="doc dolphin libressl nautilus test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-libs/qtkeychain[qt5(+)]
@@ -35,8 +35,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	)
 	!libressl? ( >=dev-libs/openssl-1.1.0:0= )
 	libressl? ( >=dev-libs/libressl-3.1:0= )
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )"
+	nautilus? ( dev-python/nautilus-python )"
 
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
@@ -75,7 +74,7 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DNO_SHIBBOLETH=yes
 		-DUNIT_TESTING=$(usex test)
 	)
 
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.0.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.3.ebuild
index b6dc27e09eaa..a3dd780f6e5f 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.0.0.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.0.3.ebuild
@@ -12,10 +12,9 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus shibboleth test"
+IUSE="doc dolphin libressl nautilus test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	>=dev-libs/openssl-1.1.0:0=
 	dev-libs/qtkeychain[qt5(+)]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -34,8 +33,9 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 		kde-frameworks/kcoreaddons:5
 		kde-frameworks/kio:5
 	)
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )"
+	!libressl? ( >=dev-libs/openssl-1.1.0:0= )
+	libressl? ( >=dev-libs/libressl-3.1:0= )
+	nautilus? ( dev-python/nautilus-python )"
 
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
@@ -74,7 +74,7 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DNO_SHIBBOLETH=yes
 		-DUNIT_TESTING=$(usex test)
 	)