gentoo resync : 19.01.2018

4 files changed, 13 insertions, 102 deletions

diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 43c7435ffb3e..50326905610f 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,5 @@
-DIST owncloudclient-2.3.2.tar.xz 12266008 BLAKE2B 53d08aec4971ae309b4fd07cea4e6ed9643411d4f6921c82213d55ec757abcd61ee64abc81e359ea0808b54d8447e3742fdec5394ed55b2e09805616f5430a75 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c
-DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
 DIST owncloudclient-2.3.4.tar.xz 33796736 BLAKE2B 3792be4f534c3424a58e83bfacef30a20d089df55de79dbaa51cfc9d20e7558ab65b65bda4ebf691276de050436253ffdb69dcdf7bad397c3dd4a074124e3053 SHA512 2a66182c1f679f4bb6d13c8b21d280dd6b530b8ef82e71a4fa0fecfed9a3f1a55f181ae3d96b24ff040a6f3c0b12777df035ee951264186ad3409e66da05b87b
-EBUILD owncloud-client-2.3.2-r2.ebuild 2091 BLAKE2B 02bb1c906e7ba3a77e5291b3612548875843ba21c3d6904e30b2ff5d1d3205803ca84328cda2c29a0694cea59c60e4c23dba89cde188457d2a82ca13af0ed30a SHA512 2932984e45006b625032674bf5d38d2b3f8decdd70f6c3a307492fc9cafbdf197b03388189d25c7fb848fa019470aa7cd5d65957a01b8ffd0ece20b0c88b5d00
-EBUILD owncloud-client-2.3.3-r1.ebuild 2109 BLAKE2B dc55fa9753dbb3d4c9ece2906d6ee9c9770611912ef4a55524bde25163d3694cbc11a4c040993f53e737e6a783181ac79bc373bba9cbff9c293c2cc0c188d857 SHA512 3723864eddf5fb24d52c778287ed68c5d8f262dd4358bfc484307af5267cfdcd0a89de2d2a48d8dd3cdecffb797a5fd190cd852cad0a372f55eaa0b02bc1b88a
-EBUILD owncloud-client-2.3.4.ebuild 2192 BLAKE2B 2194301f6f5dfb951cdcb57c54bc146724d739bcfca6d19b2cd85e7d983e97e964e1a1df042128fb24b4b4e061e5eaf4f40072f5804554ee0052f0aef302dcb1 SHA512 dab8e6d7ee5d2f5dc529135ba0dbaaecbb0c0140da0f5e37974982baba44e78d69bfa61e2b22a2659c09cb7f042ce4fc48b3f912bb76b82c0198eaa068209522
+DIST owncloudclient-2.4.0.tar.xz 15385568 BLAKE2B 616c4d5ca58a5c7fb4900a7b46df81a13f477c623e590e74be3b14fae2bf51f3f00154707aebb22fe839cba896c41caa6c71aa9d0f481bb8cf2b2b79dc648060 SHA512 b2e8bcc12e4f087d868244e1e453d7d81ab076dfe8b14965d37ef9e4cb05f2237254edd2c261a28bd5ddd9534bd80f0491d476844f4f0a5a69dd42ec52f450f0
+EBUILD owncloud-client-2.3.4.ebuild 2197 BLAKE2B d20496e997884021a7dc5f1fc607691204f81726a77a1a52dac7bb454158d9d0af23ae37fc3505a8a5e7cc40f7fabdfb163072a32a426f613e09e7d631319a59 SHA512 620899cccfee444bb7782cb85821b48c762682519a59c0a11fdd3d3734682e4167980eeef304dfbae7c4327f41d2a6e4db005316d7d55a157a52f125957ddf65
+EBUILD owncloud-client-2.4.0.ebuild 2197 BLAKE2B d20496e997884021a7dc5f1fc607691204f81726a77a1a52dac7bb454158d9d0af23ae37fc3505a8a5e7cc40f7fabdfb163072a32a426f613e09e7d631319a59 SHA512 620899cccfee444bb7782cb85821b48c762682519a59c0a11fdd3d3734682e4167980eeef304dfbae7c4327f41d2a6e4db005316d7d55a157a52f125957ddf65
 MISC metadata.xml 595 BLAKE2B c5e1e40ab739c9c5713804647af8dde5f46743686da261d81523cda8e8f0c89eafd70f59b1b65d165febed25db03f6565a0bc5b345a56cd647476605745170b5 SHA512 3c79d7e86cdd5451171bc649488559cb028dfafbda29e260bb92af2db3ae0c60a486c4643bbe8685b8499be07b51424223b57f8da6437eac948ede96dffc12cc
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild
deleted file mode 100644
index 6c54b7309917..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-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 samba +sftp 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
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	virtual/libiconv
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		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}
-	!net-misc/ocsync
-	!net-misc/nextcloud-client
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		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}
-		-DWITH_ICONV=ON
-		-DWITH_DOC=$(usex doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-		-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
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
index ea90ebbbe5e6..d8fb3b873c2d 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.3-r1.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.0.ebuild
index 4652bd7a7a88..d8fb3b873c2d 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.3-r1.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils gnome2-utils
 
 DESCRIPTION="Synchronize files from ownCloud Server with your computer"
 HOMEPAGE="http://owncloud.org/"
@@ -20,7 +20,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
@@ -90,4 +90,9 @@ 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
 }