gentoo resync : 05.02.2020

3 files changed, 10 insertions, 107 deletions

diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index a658d414c664..39a501bceb1d 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,5 @@
-DIST owncloudclient-2.5.3.11470.tar.xz 16719780 BLAKE2B 0c10d95ef2d851ba3f728dfe1c55c4143cf9d1542c1f9e77904324f598ecbfa29e54119d12ebef78b8eafa1188e7359ce11d01034ff34a55a80d31d1d3b1db35 SHA512 331d8e8e71d64cf9c958f9391001c6fdff45795e7caad2ce7bf6802c4f0959adf694712cd298fb8702cd4e93577282957cabc61ccc5f4f3a57edc9ddf1c7c2a0
-DIST owncloudclient-2.5.4.11654.tar.xz 16720764 BLAKE2B f970e3ed5fbe465f93e9c4f4c2106604a08ada765f8692e1287878b7deb44ac92c53608f34b24a9c913510a5625c4e980c9ac2646689700e38e78822d3e98d21 SHA512 70b687d7ace4d1335388ebf60bf65137943ff0cadfefdcaffb09539c656889233100033f28db7d03f3d48f4b956aeed476bb458f8ef16ac5461287cf02e226d9
 DIST owncloudclient-2.6.0.13018.tar.xz 17311396 BLAKE2B b0c76b2fea51ca9e71f918ada2b99ce20b9b62494c41608e804c4ca0c8aafe59897fea31d28bed1ec61feefca4b4b6e783c6fa777ea56524e7c18d1a460ab954 SHA512 b8eb9dc6f9c061a74fee3f31926a3fb7f5093277955fe327d1169c84f929d1e1ad8da472a7098c1c10399f395c6bfc3b2684cf4c85cddc5e45b733abfb8e4046
-EBUILD owncloud-client-2.5.3.11470-r1.ebuild 1943 BLAKE2B 62f7abcd01c755da4f088a363d4b9d7d0f4cfe64a9beb76e20746d657c50c1f8918864a2b63fdf449720af08162a43fb5bb95cea38df29970780a7070991f585 SHA512 d93b89fa803a994b9fc87ea6e90ca5e0f9034f6b3e4c5fdcf8ce9822d7027fc0e523df1c153adba5371b1b6811a8a46c9748a9dffbf0a9e239a351f3cdf2c3a7
-EBUILD owncloud-client-2.5.4.11654.ebuild 1943 BLAKE2B 62f7abcd01c755da4f088a363d4b9d7d0f4cfe64a9beb76e20746d657c50c1f8918864a2b63fdf449720af08162a43fb5bb95cea38df29970780a7070991f585 SHA512 d93b89fa803a994b9fc87ea6e90ca5e0f9034f6b3e4c5fdcf8ce9822d7027fc0e523df1c153adba5371b1b6811a8a46c9748a9dffbf0a9e239a351f3cdf2c3a7
+DIST owncloudclient-2.6.1.13407.tar.xz 17317284 BLAKE2B b88bfc987aca036b6269e094cee5b91a3516db7b899df4cfde4961ba6eb3bb24329de103b154f0a21e5778997659cfb9b53be2f88affe03251aa9c747276d517 SHA512 40e0b607ac6cd5437682cd40e125404472c5ad63520e1dde19729760c0b7612451b3a34ede74e988d8fd09a6fae7d17a3dd6c5b0cfa6563dab7245e5f67c52bf
 EBUILD owncloud-client-2.6.0.13018.ebuild 1943 BLAKE2B 62f7abcd01c755da4f088a363d4b9d7d0f4cfe64a9beb76e20746d657c50c1f8918864a2b63fdf449720af08162a43fb5bb95cea38df29970780a7070991f585 SHA512 d93b89fa803a994b9fc87ea6e90ca5e0f9034f6b3e4c5fdcf8ce9822d7027fc0e523df1c153adba5371b1b6811a8a46c9748a9dffbf0a9e239a351f3cdf2c3a7
+EBUILD owncloud-client-2.6.1.13407-r1.ebuild 1828 BLAKE2B b58064a7d7aea0fd070d1807e088bcce962acd628b9b9af8cea4eeb8f011824d82a639c8b25650210e23695c3cd2942c519f95e68ae0603e6a29a64024442afb SHA512 c3e07a9973d05adb0413185a2b68bc34fa1844df0a458850d05bee15540e1cab7bbd825703ca31676e94efc81dc947f1c3ee1b75df2daee6ee65ed007ba6dbbb
 MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild
deleted file mode 100644
index 406a7f288f9f..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/"
-SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	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}/${P/-}
-
-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-utils_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-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.3.11470-r1.ebuild b/net-misc/owncloud-client/owncloud-client-2.6.1.13407-r1.ebuild
index 406a7f288f9f..a084b55ed744 100644
--- a/net-misc/owncloud-client/owncloud-client-2.5.3.11470-r1.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.6.1.13407-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="Synchronize files from ownCloud Server with your computer"
 HOMEPAGE="https://owncloud.org/"
@@ -12,10 +12,10 @@ SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus shibboleth test"
+IUSE="doc dolphin gnome-keyring nautilus test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
+	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -29,8 +29,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}
@@ -69,8 +68,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)
-		-DUNIT_TESTING=$(usex test)
+		-DBUILD_TESTING=$(usex test)
 	)
 
 	cmake-utils_src_configure
@@ -81,9 +79,5 @@ pkg_postinst() {
 		elog "Documentation and man pages not installed"
 		elog "Enable doc USE-flag to generate them"
 	fi
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 }