summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Nickschas <sputnick@quassel-irc.org>2018-06-16 19:51:36 +0200
committerJohannes Huber <johu@gentoo.org>2018-06-22 08:36:50 +0200
commit00df61c6e1c33f7c12cc04405d3f4a95940a28df (patch)
treebe1423b3d3b3e792f14392ede1c969869f63e10e
parentapp-office/libreoffice: 6.0.5.2 version bump (diff)
downloadgentoo-00df61c6e1c33f7c12cc04405d3f4a95940a28df.tar.gz
gentoo-00df61c6e1c33f7c12cc04405d3f4a95940a28df.tar.bz2
gentoo-00df61c6e1c33f7c12cc04405d3f4a95940a28df.zip
net-irc/quassel: Adapt live ebuild to upstream
Closes: https://github.com/gentoo/gentoo/pull/8859 Package-Manager: Portage-2.3.40, Repoman-2.3.9 Signed-off-by: Johannes Huber <johu@gentoo.org>
-rw-r--r--net-irc/quassel/metadata.xml4
-rw-r--r--net-irc/quassel/quassel-9999.ebuild20
2 files changed, 12 insertions, 12 deletions
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 973e5423b38..a343c531e40 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -10,8 +10,8 @@
<name>Johannes Huber</name>
</maintainer>
<use>
- <flag name="breeze">
- Support the Breeze and Breeze-Dark icon sets (default for Plasma 5).
+ <flag name="bundled-icons">
+ Use icon themes bundled with Quassel, rather than depending on system packages.
</flag>
<flag name="crypt">
Support core-&gt;network per-channel and per-query blowfish
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 1c3e58249a7..a5038bf8a0a 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
HOMEPAGE="http://quassel-irc.org/"
LICENSE="GPL-3"
SLOT="0"
-IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
snorenotify +ssl syslog urlpreview X"
SERVER_RDEPEND="
@@ -33,7 +33,10 @@ GUI_RDEPEND="
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtwidgets:5
- breeze? ( kde-frameworks/breeze-icons:5 )
+ !bundled-icons? (
+ kde-frameworks/breeze-icons:5
+ oxygen? ( kde-frameworks/oxygen-icons:5 )
+ )
dbus? (
>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
dev-qt/qtdbus:5
@@ -48,7 +51,6 @@ GUI_RDEPEND="
kde-frameworks/kxmlgui:5
kde-frameworks/sonnet:5
)
- oxygen? ( kde-frameworks/oxygen-icons:5 )
snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
urlpreview? ( dev-qt/qtwebengine:5[widgets] )
"
@@ -78,11 +80,9 @@ REQUIRED_USE="
crypt? ( || ( server monolithic ) )
kde? ( || ( X monolithic ) dbus )
ldap? ( || ( server monolithic ) )
- monolithic? ( || ( breeze oxygen ) )
postgres? ( || ( server monolithic ) )
snorenotify? ( || ( X monolithic ) )
syslog? ( || ( server monolithic ) )
- X? ( || ( breeze oxygen ) )
"
pkg_setup() {
@@ -99,18 +99,18 @@ src_configure() {
local mycmakeargs=(
-DUSE_QT4=OFF
-DUSE_QT5=ON
- -DWITH_BREEZE=OFF
- -DWITH_WEBKIT=OFF
- -DWITH_BREEZE_DARK=OFF
- -DWITH_OXYGEN=OFF
- -DEMBED_DATA=OFF
+ -DUSE_CCACHE=OFF
-DCMAKE_SKIP_RPATH=ON
+ -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)
-DWITH_LDAP=$(usex ldap)
-DWANT_MONO=$(usex monolithic)
+ -DWITH_OXYGEN_ICONS=$(usex oxygen)
-DWANT_CORE=$(usex server)
$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
-DWITH_WEBENGINE=$(usex urlpreview)