gentoo resync : 12.08.2018

4 files changed, 97 insertions, 9 deletions

diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 176e435c77da..a922e18ee3d6 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,3 +1,5 @@
 DIST owncloudclient-2.4.1.tar.xz 15403164 BLAKE2B 0ab1ffbe2179fe04efc7977972d5941a32bc20cd73e310fa72e2a3cf341f7223911fd430f4d34f7e265819acb68d8576e2687a7bfe4ab7140b4c9e9381ea863b SHA512 5b0ceea299078efbc92c1abe22210a93df44bf98094bf4cf8a0c5138f0b69a6719fdc88ef2d5674d49c0ec18ffb12493319eb84616c3e4b8666171cb1a52f0b7
-EBUILD owncloud-client-2.4.1.ebuild 2138 BLAKE2B 2fd7cc230f5f55334603d550ba700a42c4387931b6446765dfb982bdd81b1a48f78833d5209a299d030434b506849fd1491aaa307cadc9685440ce485593768a SHA512 45620d1ef30809dece06130559231f49f88a831823dc91bd3844612cfbe00bb722c3990a83c2fafca8e0b32fc2d6631a0027f50e23351c2bdd10588d0253f723
-MISC metadata.xml 595 BLAKE2B c5e1e40ab739c9c5713804647af8dde5f46743686da261d81523cda8e8f0c89eafd70f59b1b65d165febed25db03f6565a0bc5b345a56cd647476605745170b5 SHA512 3c79d7e86cdd5451171bc649488559cb028dfafbda29e260bb92af2db3ae0c60a486c4643bbe8685b8499be07b51424223b57f8da6437eac948ede96dffc12cc
+DIST owncloudclient-2.4.2.tar.xz 15409188 BLAKE2B 89ae891479f29c8637843e14e3aa58d91769393dcfedcfaa415a601962eabd4d1760250fa57166fde215e5c0c5b5799b72dc4f1b52814e59149b778d92d5eb93 SHA512 17f857354b270ecde75cae81557adb78dab830589b32df0b3cf96667010f02501d793609cddf57223d1dd3d9cdb493f1f55bcb04a09d05c467afaddfeb2210b0
+EBUILD owncloud-client-2.4.1.ebuild 1977 BLAKE2B ce1731892cab01d405f6ed07d94cbaf567b85c8bb94b0d49b6eedd158a0721efb821a3f4fa2385b3c5f500d5755c29bbc2b6dbb92d0bb7d65996bb5afad150c0 SHA512 74259af9e1679515592c929687a92dcbde906da7d14c4d6bf5949bfb7d38acb60827e9705b11d1cf37380794bf47976390b862cf457c3df5f33c10da50a86af2
+EBUILD owncloud-client-2.4.2.ebuild 1977 BLAKE2B ce1731892cab01d405f6ed07d94cbaf567b85c8bb94b0d49b6eedd158a0721efb821a3f4fa2385b3c5f500d5755c29bbc2b6dbb92d0bb7d65996bb5afad150c0 SHA512 74259af9e1679515592c929687a92dcbde906da7d14c4d6bf5949bfb7d38acb60827e9705b11d1cf37380794bf47976390b862cf457c3df5f33c10da50a86af2
+MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
diff --git a/net-misc/owncloud-client/metadata.xml b/net-misc/owncloud-client/metadata.xml
index ba2b9becc10a..c4baadc214ca 100644
--- a/net-misc/owncloud-client/metadata.xml
+++ b/net-misc/owncloud-client/metadata.xml
@@ -9,6 +9,5 @@
 		<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>
-		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild
index d35a8f1964b6..3966ff822847 100644
--- a/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp shibboleth test"
+IUSE="doc dolphin nautilus shibboleth test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-libs/qtkeychain[qt5(+)]
@@ -30,8 +30,6 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 		kde-frameworks/kio:5
 	)
 	nautilus? ( dev-python/nautilus-python )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
 	shibboleth? ( dev-qt/qtwebkit:5 )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -71,10 +69,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
 		-DNO_SHIBBOLETH=$(usex !shibboleth)
 		-DUNIT_TESTING=$(usex test)
 	)
diff --git a/net-misc/owncloud-client/owncloud-client-2.4.2.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.2.ebuild
new file mode 100644
index 000000000000..3966ff822847
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.4.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="http://owncloud.org/"
+SRC_URI="http://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}
+	!net-misc/ocsync
+	!net-misc/nextcloud-client
+"
+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
+	)
+"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
+
+	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
+}