commit: 25f8b856e18bb98d4e5c4e6f1755c17e16d4de6f Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Sat Oct 20 09:03:32 2018 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sat Oct 20 09:03:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f8b856
net-irc/quassel: Version bump 0.13_rc2 Closes: https://bugs.gentoo.org/661656 Signed-off-by: Johannes Huber <johu <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 net-irc/quassel/Manifest | 1 + net-irc/quassel/{quassel-9999.ebuild => quassel-0.13_rc2.ebuild} | 9 ++++++--- net-irc/quassel/quassel-9999.ebuild | 7 +++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest index 10920a057c5..05fdd7eba45 100644 --- a/net-irc/quassel/Manifest +++ b/net-irc/quassel/Manifest @@ -1,2 +1,3 @@ DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685 DIST quassel-0.13-rc1.tar.bz2 4114806 BLAKE2B 609d994c676b9e930884e738fb008a35e603e03fa0890b5119ffe91d7fbfd8d593eeefc903610309f360ca4c5cc985895e0e532c45d5eeafe1700f9de6735c9e SHA512 13cbaeae83673fc476b8e1f59ca1b6eb929b9bb6dddf15ca248d0fc9535cc8d98a02d194dc16e5c18197c9bacbe7142d1a4712d79133226f979fa9aa7a7813aa +DIST quassel-0.13-rc2.tar.bz2 4260661 BLAKE2B 083fb6b832dc7297405fb5cb4e36b1d831ff000ef302627f798944bf242c87d4c9a78a797f0997fe1a8db9def23633af27de0c7c571c4051d039431043cb4363 SHA512 3444cf03250a1b0fd26563575e1b3fbabff382b6307e122a933b7f892250222d7277f5aaf0ceb7f53fb0924076d09a328f15e81b0fd7ff7483b54b8d0dac302c diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-0.13_rc2.ebuild similarity index 95% copy from net-irc/quassel/quassel-9999.ebuild copy to net-irc/quassel/quassel-0.13_rc2.ebuild index 5db02b583e6..f6ff727068b 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-0.13_rc2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user if [[ ${PV} != *9999* ]]; then MY_P=${PN}-${PV/_/-} SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"; - KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris" + KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris" S="${WORKDIR}/${MY_P}" else EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; "git://git.${PN}-irc.org/${PN}" ) @@ -106,7 +106,6 @@ src_configure() { -DEMBED_DATA=OFF -DWITH_WEBKIT=OFF -DWITH_BUNDLED_ICONS=$(usex bundled-icons) - $(cmake-utils_use_find_package crypt QCA2-QT5) $(cmake-utils_use_find_package dbus dbusmenu-qt5) $(cmake-utils_use_find_package dbus Qt5DBus) -DWITH_KDE=$(usex kde) @@ -119,6 +118,10 @@ src_configure() { -DWANT_QTCLIENT=$(usex X) ) + if use server || use monolithic; then + mycmakeargs+=( $(cmake-utils_use_find_package crypt QCA2-QT5) ) + fi + cmake-utils_src_configure } diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index 5db02b583e6..e80faf93513 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -106,7 +106,6 @@ src_configure() { -DEMBED_DATA=OFF -DWITH_WEBKIT=OFF -DWITH_BUNDLED_ICONS=$(usex bundled-icons) - $(cmake-utils_use_find_package crypt QCA2-QT5) $(cmake-utils_use_find_package dbus dbusmenu-qt5) $(cmake-utils_use_find_package dbus Qt5DBus) -DWITH_KDE=$(usex kde) @@ -119,6 +118,10 @@ src_configure() { -DWANT_QTCLIENT=$(usex X) ) + if use server || use monolithic; then + mycmakeargs+=( $(cmake-utils_use_find_package crypt QCA2-QT5) ) + fi + cmake-utils_src_configure }
