Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/
Date: Thu, 24 Dec 2020 23:43:02
Message-Id: 1608853343.f54af463d4d9e96041d3cb529c061d29453d7fd2.asturm@gentoo
1 commit: f54af463d4d9e96041d3cb529c061d29453d7fd2
2 Author: Manuel Nickschas <sputnick <AT> quassel-irc <DOT> org>
3 AuthorDate: Thu Dec 17 12:29:39 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 24 23:42:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54af463
7
8 net-irc/quassel: Remove 'ssl' from use flags
9
10 Upstream has made SSL support in Qt mandatory, so the USE flag
11 no longer makes sense.
12
13 Package-Manager: Portage-3.0.12, Repoman-3.0.2
14 Signed-off-by: Manuel Nickschas <sputnick <AT> quassel-irc.org>
15 Closes: https://github.com/gentoo/gentoo/pull/18693
16 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
17
18 net-irc/quassel/quassel-9999.ebuild | 10 +++++-----
19 1 file changed, 5 insertions(+), 5 deletions(-)
20
21 diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
22 index a8492974412..7f80a1f4bf3 100644
23 --- a/net-irc/quassel/quassel-9999.ebuild
24 +++ b/net-irc/quassel/quassel-9999.ebuild
25 @@ -20,7 +20,7 @@ HOMEPAGE="https://quassel-irc.org/"
26 LICENSE="GPL-3"
27 SLOT="0"
28 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
29 -snorenotify +ssl syslog urlpreview X"
30 +snorenotify syslog urlpreview X"
31
32 SERVER_DEPEND="
33 acct-group/quassel
34 @@ -60,7 +60,7 @@ GUI_DEPEND="
35
36 DEPEND="
37 dev-qt/qtcore:5
38 - dev-qt/qtnetwork:5[ssl?]
39 + dev-qt/qtnetwork:5[ssl]
40 sys-libs/zlib
41 monolithic? (
42 ${SERVER_DEPEND}
43 @@ -118,7 +118,7 @@ src_configure() {
44 src_install() {
45 cmake_src_install
46
47 - if use server ; then
48 + if use server; then
49 # needs PAX marking wrt bug#346255
50 pax-mark m "${ED}/usr/bin/quasselcore"
51
52 @@ -134,7 +134,7 @@ src_install() {
53 }
54
55 pkg_postinst() {
56 - if use monolithic && use ssl ; then
57 + if use monolithic; then
58 elog "Information on how to enable SSL support for client/core connections"
59 elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
60 fi
61 @@ -157,7 +157,7 @@ pkg_postrm() {
62 }
63
64 pkg_config() {
65 - if use server && use ssl; then
66 + if use server; then
67 # generate the pem file only when it does not already exist
68 QUASSEL_DIR=/var/lib/${PN}
69 if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then