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/
Date: Fri, 23 Oct 2020 21:16:08
Message-Id: 1603487712.206d152259312650ad2f6611d5ee4f634565a33f.voyageur@gentoo
1 commit: 206d152259312650ad2f6611d5ee4f634565a33f
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 23 21:14:49 2020 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 23 21:15:12 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=206d1522
7
8 net-misc/nextcloud-client: drop USE=shibboleth flag
9
10 It needs deprecated dev-qt/qtwebkit:5
11
12 Closes: https://bugs.gentoo.org/750884
13 Package-Manager: Portage-3.0.8, Repoman-3.0.2
14 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
15
16 net-misc/nextcloud-client/metadata.xml | 1 -
17 net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild | 7 +++----
18 net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild | 7 +++----
19 3 files changed, 6 insertions(+), 9 deletions(-)
20
21 diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
22 index 4342ef68dc6..dfcd23fb500 100644
23 --- a/net-misc/nextcloud-client/metadata.xml
24 +++ b/net-misc/nextcloud-client/metadata.xml
25 @@ -8,7 +8,6 @@
26 <use>
27 <flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
28 <flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
29 - <flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
30 </use>
31 <upstream>
32 <remote-id type="github">nextcloud/desktop</remote-id>
33
34 diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
35 index 52cdf94f216..43b18edfd8e 100644
36 --- a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
37 +++ b/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
38 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
39 LICENSE="CC-BY-3.0 GPL-2"
40 SLOT="0"
41 KEYWORDS="amd64 ~arm64 x86"
42 -IUSE="doc dolphin nautilus shibboleth test"
43 +IUSE="doc dolphin nautilus test"
44
45 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
46 >=dev-libs/openssl-1.1.0:0=
47 @@ -31,8 +31,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
48 kde-frameworks/kcoreaddons:5
49 kde-frameworks/kio:5
50 )
51 - nautilus? ( dev-python/nautilus-python )
52 - shibboleth? ( dev-qt/qtwebkit:5 )"
53 + nautilus? ( dev-python/nautilus-python )"
54
55 RDEPEND="${COMMON_DEPEND}"
56 DEPEND="${COMMON_DEPEND}
57 @@ -74,8 +73,8 @@ src_configure() {
58 -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
59 -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
60 -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
61 - -DNO_SHIBBOLETH=$(usex !shibboleth)
62 -DUNIT_TESTING=$(usex test)
63 + -DNO_SHIBBOLETH=yes
64 )
65
66 cmake_src_configure
67
68 diff --git a/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
69 index 2c3d246de4b..a3dd780f6e5 100644
70 --- a/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
71 +++ b/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
72 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
73 LICENSE="CC-BY-3.0 GPL-2"
74 SLOT="0"
75 KEYWORDS="~amd64 ~arm64 ~x86"
76 -IUSE="doc dolphin libressl nautilus shibboleth test"
77 +IUSE="doc dolphin libressl nautilus test"
78
79 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
80 dev-libs/qtkeychain[qt5(+)]
81 @@ -35,8 +35,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
82 )
83 !libressl? ( >=dev-libs/openssl-1.1.0:0= )
84 libressl? ( >=dev-libs/libressl-3.1:0= )
85 - nautilus? ( dev-python/nautilus-python )
86 - shibboleth? ( dev-qt/qtwebkit:5 )"
87 + nautilus? ( dev-python/nautilus-python )"
88
89 RDEPEND="${COMMON_DEPEND}"
90 DEPEND="${COMMON_DEPEND}
91 @@ -75,7 +74,7 @@ src_configure() {
92 -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
93 -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
94 -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
95 - -DNO_SHIBBOLETH=$(usex !shibboleth)
96 + -DNO_SHIBBOLETH=yes
97 -DUNIT_TESTING=$(usex test)
98 )