Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
Date: Wed, 02 Sep 2020 20:56:54
Message-Id: 1599080196.a69ef334f691d2ec0fdd0a4fc92c816680c4bc70.voyageur@gentoo
1 commit: a69ef334f691d2ec0fdd0a4fc92c816680c4bc70
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 20:53:20 2020 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 20:56:36 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69ef334
7
8 net-misc/nextcloud-client: drop old
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
12
13 net-misc/nextcloud-client/Manifest | 2 -
14 .../files/nextcloud-client-2.6.4-qt515.patch | 22 ------
15 .../nextcloud-client/nextcloud-client-2.5.2.ebuild | 91 ----------------------
16 .../nextcloud-client/nextcloud-client-2.6.4.ebuild | 91 ----------------------
17 4 files changed, 206 deletions(-)
18
19 diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
20 index 37ed90a4acb..e7b73d5b526 100644
21 --- a/net-misc/nextcloud-client/Manifest
22 +++ b/net-misc/nextcloud-client/Manifest
23 @@ -1,5 +1,3 @@
24 -DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
25 -DIST nextcloud-client-2.6.4.tar.gz 19035129 BLAKE2B 8721737a4e2515996de1910219c2d36b545e068ed5c66b2df85166646c25488f401563e113674254d9d1b1a70c19435c7c0728718e1633e8036ac1e415925b97 SHA512 849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1
26 DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45ccccabc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462
27 DIST nextcloud-client-3.0.0.tar.gz 19060293 BLAKE2B 80c53e2db30c9a3a8bae8673a937448915010f9d736836a99660c498c0afe0f3e5d78faf80df4c2214f452c41c9d92357a341f00ecb8f4720f6c459a9d2ccb30 SHA512 5b03ad99feeb16dd7d22399df624da98bf6f2e758337aad5b4ff21f25e39e44d94fe0451101cbc8100e43adbd4a39f8d1bac64881d9e39ef3de58b018ccd35d6
28 DIST nextcloud-client-3.0.1.tar.gz 19059671 BLAKE2B c85f9d1627a75745c5a450b1c59799716c17dad3ba5ce277a62bebbbb80f243236cb4d529ff8ce4af9371c7ab1948b5a86dfaa3fbeb9de8681c9df0f397044f7 SHA512 9d6f3d8977f411942703a2dea8990a5b37ef8892b142292720915f5d1937b0443e9cb8c17562eb30a16c31abf30efc023bbb9199079f3a9ca47bdfa51ea5f3a5
29
30 diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
31 deleted file mode 100644
32 index 5c59cf46bf3..00000000000
33 --- a/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
34 +++ /dev/null
35 @@ -1,22 +0,0 @@
36 -From 0fe7a657386b107ae498e7749ff4c20116b9752a Mon Sep 17 00:00:00 2001
37 -From: Michael Schuster <michael@××××××××.ms>
38 -Date: Sun, 7 Jun 2020 02:43:45 +0200
39 -Subject: [PATCH] Fix Qt 5.15.0 build error (missing include)
40 -
41 -Signed-off-by: Michael Schuster <michael@××××××××.ms>
42 ----
43 - src/libsync/networkjobs.cpp | 1 +
44 - 1 file changed, 1 insertion(+)
45 -
46 -diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
47 -index fd63b9606..bb5786ea9 100644
48 ---- a/src/libsync/networkjobs.cpp
49 -+++ b/src/libsync/networkjobs.cpp
50 -@@ -31,6 +31,7 @@
51 - #include <QJsonDocument>
52 - #include <QJsonObject>
53 - #include <QPainter>
54 -+#include <QPainterPath>
55 -
56 - #include "networkjobs.h"
57 - #include "account.h"
58
59 diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
60 deleted file mode 100644
61 index 64e9dfd92b7..00000000000
62 --- a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
63 +++ /dev/null
64 @@ -1,91 +0,0 @@
65 -# Copyright 1999-2019 Gentoo Authors
66 -# Distributed under the terms of the GNU General Public License v2
67 -
68 -EAPI=6
69 -
70 -inherit cmake-utils gnome2-utils
71 -
72 -DESCRIPTION="Desktop Syncing Client for Nextcloud"
73 -HOMEPAGE="https://github.com/nextcloud/desktop"
74 -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
75 -
76 -LICENSE="CC-BY-3.0 GPL-2"
77 -SLOT="0"
78 -KEYWORDS="amd64 ~arm64 x86"
79 -IUSE="doc dolphin nautilus shibboleth test"
80 -
81 -COMMON_DEPEND=">=dev-db/sqlite-3.4:3
82 - >=dev-libs/openssl-1.1.0:0=
83 - dev-libs/qtkeychain[qt5(+)]
84 - dev-qt/qtconcurrent:5
85 - dev-qt/qtcore:5
86 - dev-qt/qtdbus:5
87 - dev-qt/qtgui:5
88 - dev-qt/qtnetwork:5[ssl]
89 - dev-qt/qtsql:5
90 - dev-qt/qtwebengine:5[widgets]
91 - dev-qt/qtwidgets:5
92 - dev-qt/qtxml:5
93 - sys-fs/inotify-tools
94 - dolphin? (
95 - kde-frameworks/kcoreaddons:5
96 - kde-frameworks/kio:5
97 - )
98 - nautilus? ( dev-python/nautilus-python )
99 - shibboleth? ( dev-qt/qtwebkit:5 )"
100 -
101 -RDEPEND="${COMMON_DEPEND}"
102 -DEPEND="${COMMON_DEPEND}
103 - dev-qt/linguist-tools:5
104 - doc? (
105 - dev-python/sphinx
106 - dev-tex/latexmk
107 - dev-texlive/texlive-latexextra
108 - virtual/latex-base
109 - )
110 - dolphin? ( kde-frameworks/extra-cmake-modules )
111 - test? (
112 - dev-util/cmocka
113 - dev-qt/qttest:5
114 - )"
115 -
116 -RESTRICT="!test? ( test )"
117 -
118 -S=${WORKDIR}/desktop-${PV/_/-}
119 -
120 -src_prepare() {
121 - # Keep tests in ${T}
122 - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
123 -
124 - if ! use nautilus; then
125 - pushd shell_integration > /dev/null || die
126 - cmake_comment_add_subdirectory nautilus
127 - popd > /dev/null || die
128 - fi
129 - cmake-utils_src_prepare
130 -}
131 -
132 -src_configure() {
133 - local mycmakeargs=(
134 - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
135 - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
136 - -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
137 - -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
138 - -DNO_SHIBBOLETH=$(usex !shibboleth)
139 - -DUNIT_TESTING=$(usex test)
140 - )
141 -
142 - cmake-utils_src_configure
143 -}
144 -
145 -pkg_postinst() {
146 - if ! use doc ; then
147 - elog "Documentation and man pages not installed"
148 - elog "Enable doc USE-flag to generate them"
149 - fi
150 - gnome2_icon_cache_update
151 -}
152 -
153 -pkg_postrm() {
154 - gnome2_icon_cache_update
155 -}
156
157 diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
158 deleted file mode 100644
159 index c8d32ee60c1..00000000000
160 --- a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
161 +++ /dev/null
162 @@ -1,91 +0,0 @@
163 -# Copyright 1999-2020 Gentoo Authors
164 -# Distributed under the terms of the GNU General Public License v2
165 -
166 -EAPI=7
167 -
168 -inherit cmake-utils xdg
169 -
170 -DESCRIPTION="Desktop Syncing Client for Nextcloud"
171 -HOMEPAGE="https://github.com/nextcloud/desktop"
172 -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
173 -
174 -LICENSE="CC-BY-3.0 GPL-2"
175 -SLOT="0"
176 -KEYWORDS="amd64 ~arm64 x86"
177 -IUSE="doc dolphin nautilus shibboleth test"
178 -
179 -COMMON_DEPEND=">=dev-db/sqlite-3.4:3
180 - >=dev-libs/openssl-1.1.0:0=
181 - dev-libs/qtkeychain[qt5(+)]
182 - dev-qt/qtconcurrent:5
183 - dev-qt/qtcore:5
184 - dev-qt/qtdbus:5
185 - dev-qt/qtgui:5
186 - dev-qt/qtnetwork:5[ssl]
187 - dev-qt/qtsql:5
188 - dev-qt/qtwebengine:5[widgets]
189 - dev-qt/qtwidgets:5
190 - dev-qt/qtxml:5
191 - sys-fs/inotify-tools
192 - dolphin? (
193 - kde-frameworks/kcoreaddons:5
194 - kde-frameworks/kio:5
195 - )
196 - nautilus? ( dev-python/nautilus-python )
197 - shibboleth? ( dev-qt/qtwebkit:5 )"
198 -
199 -RDEPEND="${COMMON_DEPEND}"
200 -DEPEND="${COMMON_DEPEND}
201 - dev-qt/linguist-tools:5
202 - doc? (
203 - dev-python/sphinx
204 - dev-tex/latexmk
205 - dev-texlive/texlive-latexextra
206 - virtual/latex-base
207 - )
208 - dolphin? ( kde-frameworks/extra-cmake-modules )
209 - test? (
210 - dev-util/cmocka
211 - dev-qt/qttest:5
212 - )"
213 -
214 -RESTRICT="!test? ( test )"
215 -
216 -PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch
217 - "${FILESDIR}"/${P}-qt515.patch
218 - )
219 -
220 -S=${WORKDIR}/desktop-${PV/_/-}
221 -
222 -src_prepare() {
223 - # Keep tests in ${T}
224 - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
225 -
226 - if ! use nautilus; then
227 - pushd shell_integration > /dev/null || die
228 - cmake_comment_add_subdirectory nautilus
229 - popd > /dev/null || die
230 - fi
231 - cmake-utils_src_prepare
232 -}
233 -
234 -src_configure() {
235 - local mycmakeargs=(
236 - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
237 - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
238 - -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
239 - -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
240 - -DNO_SHIBBOLETH=$(usex !shibboleth)
241 - -DUNIT_TESTING=$(usex test)
242 - )
243 -
244 - cmake-utils_src_configure
245 -}
246 -
247 -pkg_postinst() {
248 - xdg_pkg_postinst
249 - if ! use doc ; then
250 - elog "Documentation and man pages not installed"
251 - elog "Enable doc USE-flag to generate them"
252 - fi
253 -}