Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/
Date: Sat, 20 Oct 2018 09:05:05
Message-Id: 1540026212.25f8b856e18bb98d4e5c4e6f1755c17e16d4de6f.johu@gentoo
1 commit: 25f8b856e18bb98d4e5c4e6f1755c17e16d4de6f
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 20 09:03:32 2018 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 20 09:03:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f8b856
7
8 net-irc/quassel: Version bump 0.13_rc2
9
10 Closes: https://bugs.gentoo.org/661656
11 Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 net-irc/quassel/Manifest | 1 +
15 net-irc/quassel/{quassel-9999.ebuild => quassel-0.13_rc2.ebuild} | 9 ++++++---
16 net-irc/quassel/quassel-9999.ebuild | 7 +++++--
17 3 files changed, 12 insertions(+), 5 deletions(-)
18
19 diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
20 index 10920a057c5..05fdd7eba45 100644
21 --- a/net-irc/quassel/Manifest
22 +++ b/net-irc/quassel/Manifest
23 @@ -1,2 +1,3 @@
24 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
25 DIST quassel-0.13-rc1.tar.bz2 4114806 BLAKE2B 609d994c676b9e930884e738fb008a35e603e03fa0890b5119ffe91d7fbfd8d593eeefc903610309f360ca4c5cc985895e0e532c45d5eeafe1700f9de6735c9e SHA512 13cbaeae83673fc476b8e1f59ca1b6eb929b9bb6dddf15ca248d0fc9535cc8d98a02d194dc16e5c18197c9bacbe7142d1a4712d79133226f979fa9aa7a7813aa
26 +DIST quassel-0.13-rc2.tar.bz2 4260661 BLAKE2B 083fb6b832dc7297405fb5cb4e36b1d831ff000ef302627f798944bf242c87d4c9a78a797f0997fe1a8db9def23633af27de0c7c571c4051d039431043cb4363 SHA512 3444cf03250a1b0fd26563575e1b3fbabff382b6307e122a933b7f892250222d7277f5aaf0ceb7f53fb0924076d09a328f15e81b0fd7ff7483b54b8d0dac302c
27
28 diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-0.13_rc2.ebuild
29 similarity index 95%
30 copy from net-irc/quassel/quassel-9999.ebuild
31 copy to net-irc/quassel/quassel-0.13_rc2.ebuild
32 index 5db02b583e6..f6ff727068b 100644
33 --- a/net-irc/quassel/quassel-9999.ebuild
34 +++ b/net-irc/quassel/quassel-0.13_rc2.ebuild
35 @@ -1,4 +1,4 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 +# Copyright 1999-2018 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39
40 EAPI=6
41 @@ -8,7 +8,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user
42 if [[ ${PV} != *9999* ]]; then
43 MY_P=${PN}-${PV/_/-}
44 SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
45 - KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
46 + KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
47 S="${WORKDIR}/${MY_P}"
48 else
49 EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
50 @@ -106,7 +106,6 @@ src_configure() {
51 -DEMBED_DATA=OFF
52 -DWITH_WEBKIT=OFF
53 -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
54 - $(cmake-utils_use_find_package crypt QCA2-QT5)
55 $(cmake-utils_use_find_package dbus dbusmenu-qt5)
56 $(cmake-utils_use_find_package dbus Qt5DBus)
57 -DWITH_KDE=$(usex kde)
58 @@ -119,6 +118,10 @@ src_configure() {
59 -DWANT_QTCLIENT=$(usex X)
60 )
61
62 + if use server || use monolithic; then
63 + mycmakeargs+=( $(cmake-utils_use_find_package crypt QCA2-QT5) )
64 + fi
65 +
66 cmake-utils_src_configure
67 }
68
69
70 diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
71 index 5db02b583e6..e80faf93513 100644
72 --- a/net-irc/quassel/quassel-9999.ebuild
73 +++ b/net-irc/quassel/quassel-9999.ebuild
74 @@ -1,4 +1,4 @@
75 -# Copyright 1999-2018 Gentoo Foundation
76 +# Copyright 1999-2018 Gentoo Authors
77 # Distributed under the terms of the GNU General Public License v2
78
79 EAPI=6
80 @@ -106,7 +106,6 @@ src_configure() {
81 -DEMBED_DATA=OFF
82 -DWITH_WEBKIT=OFF
83 -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
84 - $(cmake-utils_use_find_package crypt QCA2-QT5)
85 $(cmake-utils_use_find_package dbus dbusmenu-qt5)
86 $(cmake-utils_use_find_package dbus Qt5DBus)
87 -DWITH_KDE=$(usex kde)
88 @@ -119,6 +118,10 @@ src_configure() {
89 -DWANT_QTCLIENT=$(usex X)
90 )
91
92 + if use server || use monolithic; then
93 + mycmakeargs+=( $(cmake-utils_use_find_package crypt QCA2-QT5) )
94 + fi
95 +
96 cmake-utils_src_configure
97 }