[gentoo-commits] repo/gentoo:master commit in: net-misc/seafile-client/files/, net-misc/seafile-client/

[Michał Górny]

commit:     d43b862402e6ae9002a3e178039e2e24b788af87
Author:     Moritz Schlarb <moschlar <AT> metalabs <DOT> de>
AuthorDate: Tue Jun 27 18:12:25 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul  1 21:11:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43b8624

net-misc/seafile-client: Version bump to 6.0.7

Closes: https://github.com/gentoo/gentoo/pull/4998

 net-misc/seafile-client/Manifest                   |  3 +-
 ...client-6.0.4-only-use-qttest-where-needed.patch | 24 ----------
 .../seafile-client/seafile-client-6.0.4-r3.ebuild  | 51 ----------------------
 ...nt-6.0.6.ebuild => seafile-client-6.0.7.ebuild} |  0
 4 files changed, 1 insertion(+), 77 deletions(-)

diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 2c23a17f80d..a2db26abdeb 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,2 +1 @@
-DIST seafile-client-6.0.4.tar.gz 2173354 SHA256 530c9f12176b69117f319fb3cfd5d2624825df20a44ea6760530a47bf60ba535 SHA512 2572750d3b5bf7444b4c4ec300b1b54ba7eafec2393b8b6d6923eb5c16d1b96f411891d072aac23b1c4bb9e1834a263bd11283216759a34c3456bf3533967552 WHIRLPOOL 89614f915c7b65877282288c6ecd97b555262335261c8c7b45f8e64c628533848a5fb9c76a36fad1f7571388ca01abca242b71f3a873d4ed5cd9528d63628101
-DIST seafile-client-6.0.6.tar.gz 2183317 SHA256 df3a587c5e93c4f53768b0724115889be2bead65d7910a31e637c3075690ea6b SHA512 a7e389ac90ea07dade2a596c3c7ef41b5037ccffafb379d0af606a1fb6bc4838b20a10343e8e2b4a55f6d5da0d290e9827f628e2a1bdd92d4a6e1047a85ece5c WHIRLPOOL dc37e55b851a91ac4c0927ab4a12a6a2585622db0f86714741d7eb2dac45ec29dab69a740bc982af639048dd25fcb3803000eef66477900a5476aae2262d6af3
+DIST seafile-client-6.0.7.tar.gz 2191540 SHA256 f6d8b841772fe734fc7809cd447881b925f64243625bc62e62abdc7311abedd8 SHA512 6c927feda9e83efed28dcb1771ce8fda4b367f83a59c1554a3bf5cfcc72f4d0f0cead5b7bb3e3f57811e5e9764c1aa67c6c15f265ec533ad1898c8e6d9d81352 WHIRLPOOL dce871a60e09372976692315311f9c09c81dfc56504186d5140d1193f930ed845824092a81a92f3d16369c5b3c31d7ac8938f2aa09b0e900460c6b7533c07b95

diff --git a/net-misc/seafile-client/files/seafile-client-6.0.4-only-use-qttest-where-needed.patch b/net-misc/seafile-client/files/seafile-client-6.0.4-only-use-qttest-where-needed.patch
deleted file mode 100644
index c9dfea1d2f9..00000000000
--- a/net-misc/seafile-client/files/seafile-client-6.0.4-only-use-qttest-where-needed.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 20860a6..4261fba 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -176,7 +176,7 @@ ELSE()
- ENDIF()
- 
- SET(USE_QT_LIBRARIES
--    Core Gui Widgets LinguistTools Network Test
-+    Core Gui Widgets LinguistTools Network
-     )
- IF (BUILD_SHIBBOLETH_SUPPORT)
-     SET(USE_QT_LIBRARIES ${USE_QT_LIBRARIES} ${WEBENGINE_CORE} ${WEBKIT_NAME} ${WEBKIT_WIDGETS_NAME})
-@@ -814,7 +814,9 @@ IF (BUILD_TESTING)
-         SET_TARGET_PROPERTIES(${testname} PROPERTIES
-           RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests )
- 
--        QT5_USE_MODULES(${testname} ${USE_QT_LIBRARIES})
-+        INCLUDE_DIRECTORIES(${Qt5Test_INCLUDE_DIRS})
-+
-+        QT5_USE_MODULES(${testname} ${USE_QT_LIBRARIES} Test)
- 
-         ADD_TEST(${testname} ${CMAKE_CURRENT_BINARY_DIR}/tests/${testname})
- 

diff --git a/net-misc/seafile-client/seafile-client-6.0.4-r3.ebuild b/net-misc/seafile-client/seafile-client-6.0.4-r3.ebuild
deleted file mode 100644
index df361f9dff9..00000000000
--- a/net-misc/seafile-client/seafile-client-6.0.4-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
-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"
-
-RDEPEND="net-libs/libsearpc
-	=net-libs/ccnet-${PV}
-	=net-misc/seafile-${PV}
-	>=dev-libs/libevent-2.0
-	>=dev-libs/jansson-2.0
-	dev-libs/openssl:0=
-	dev-db/sqlite:3
-
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	eapply "${FILESDIR}/${P}-only-use-qttest-where-needed.patch"
-	cmake-utils_src_prepare
-	if use shibboleth ; then
-		if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
-			sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}

diff --git a/net-misc/seafile-client/seafile-client-6.0.6.ebuild b/net-misc/seafile-client/seafile-client-6.0.7.ebuild
similarity index 100%
rename from net-misc/seafile-client/seafile-client-6.0.6.ebuild
rename to net-misc/seafile-client/seafile-client-6.0.7.ebuild