[gentoo-commits] dev/johu:master commit in: net-irc/quassel/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2014-04-01  9:11 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2014-04-01  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     2c4e82dcea499fc945af8746d4847226f10e84c9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  1 09:11:22 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr  1 09:11:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=2c4e82dc

[net-irc/quassel] Cleanup header

Package-Manager: portage-2.2.10

---
 net-irc/quassel/quassel-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index b0c8647..0ccf283 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.69 2014/03/27 00:44:32 mrueg Exp $
+# $Header: $
 
 EAPI=5
 


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2014-04-01  9:15 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2014-04-01  9:15 UTC (permalink / raw
  To: gentoo-commits

commit:     15204e821ac436790c742820166571c032a305c0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  1 09:15:36 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr  1 09:15:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=15204e82

[net-irc/quassel] Drop ancient {QT,KDE}_MINIMAL vars

Package-Manager: portage-2.2.10

---
 net-irc/quassel/quassel-9999.ebuild | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 0ccf283..645e2f8 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -10,9 +10,6 @@ EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 EGIT_BRANCH="master"
 [[ "${PV}" == "9999" ]] && inherit git-2
 
-QT_MINIMAL="4.6.0"
-KDE_MINIMAL="4.4"
-
 DESCRIPTION="Qt4/KDE4 IRC client supporting a remote daemon for 24/7 connectivity."
 HOMEPAGE="http://quassel-irc.org/"
 [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
@@ -23,34 +20,34 @@ SLOT="0"
 IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X"
 
 SERVER_RDEPEND="
-	>=dev-qt/qtscript-${QT_MINIMAL}:4
+	dev-qt/qtscript:4
 	crypt? (
 		app-crypt/qca:2
 		app-crypt/qca-ossl
 	)
-	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
+	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	postgres? ( dev-qt/qtsql:4[postgres] )
 	syslog? ( virtual/logger )
 "
 
 GUI_RDEPEND="
-	>=dev-qt/qtgui-${QT_MINIMAL}:4
+	dev-qt/qtgui:4
 	ayatana? ( dev-libs/libindicate-qt )
 	dbus? (
-		>=dev-qt/qtdbus-${QT_MINIMAL}:4
+		dev-qt/qtdbus:4
 		dev-libs/libdbusmenu-qt
 	)
 	kde? (
-		>=kde-base/kdelibs-${KDE_MINIMAL}
-		>=kde-base/oxygen-icons-${KDE_MINIMAL}
+		kde-base/kdelibs:4
+		kde-base/oxygen-icons:4
 		ayatana? ( kde-misc/plasma-widget-message-indicator )
 	)
-	phonon? ( || ( media-libs/phonon >=dev-qt/qtphonon-${QT_MINIMAL}:4 ) )
-	webkit? ( >=dev-qt/qtwebkit-${QT_MINIMAL}:4 )
+	phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) )
+	webkit? ( dev-qt/qtwebkit:4 )
 "
 
 RDEPEND="
-	>=dev-qt/qtcore-${QT_MINIMAL}:4[ssl?]
+	dev-qt/qtcore:4[ssl?]
 	monolithic? (
 		${SERVER_RDEPEND}
 		${GUI_RDEPEND}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2014-04-01  9:18 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2014-04-01  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     bc0283e44b7ad2dc032752c045e12a1613464f5f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  1 09:17:52 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr  1 09:17:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=bc0283e4

[net-irc/quassel] Update DESCRIPTION

Package-Manager: portage-2.2.10

---
 net-irc/quassel/quassel-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 645e2f8..3cabe2b 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 EGIT_BRANCH="master"
 [[ "${PV}" == "9999" ]] && inherit git-2
 
-DESCRIPTION="Qt4/KDE4 IRC client supporting a remote daemon for 24/7 connectivity."
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
 HOMEPAGE="http://quassel-irc.org/"
 [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
 


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2014-04-01  9:21 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2014-04-01  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     e725ce4991f9678a47cec5d76219e01c955a5f36
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  1 09:21:26 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr  1 09:21:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=e725ce49

[net-irc/quassel] Move to git-r3 eclass

Package-Manager: portage-2.2.10

---
 net-irc/quassel/quassel-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 3cabe2b..9382642 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -6,9 +6,9 @@ EAPI=5
 
 inherit cmake-utils eutils pax-utils user versionator
 
-EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
+EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
 EGIT_BRANCH="master"
-[[ "${PV}" == "9999" ]] && inherit git-2
+[[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
 HOMEPAGE="http://quassel-irc.org/"


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2014-04-01  9:24 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2014-04-01  9:24 UTC (permalink / raw
  To: gentoo-commits

commit:     954090862d68ac203f6832fd01aac8c88086a1cc
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  1 09:24:28 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr  1 09:24:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=95409086

[net-irc/quassel] Remove redundant git branch declaration

Package-Manager: portage-2.2.10

---
 net-irc/quassel/quassel-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 9382642..797ee43 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -7,7 +7,6 @@ EAPI=5
 inherit cmake-utils eutils pax-utils user versionator
 
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
-EGIT_BRANCH="master"
 [[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2014-04-02 17:25 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2014-04-02 17:25 UTC (permalink / raw
  To: gentoo-commits

commit:     d35b5a988f24b95d045fd7fba49b407a9f7e72de
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  2 17:25:47 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr  2 17:25:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=d35b5a98

[net-irc/quassel] Add qt5 USE flag

Package-Manager: portage-2.2.10

---
 net-irc/quassel/quassel-9999.ebuild | 99 +++++++++++++++++++++++--------------
 1 file changed, 63 insertions(+), 36 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 797ee43..006e4d4 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -16,37 +16,61 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X"
+IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X"
 
 SERVER_RDEPEND="
-	dev-qt/qtscript:4
-	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
+	qt5? (
+		dev-qt/qtscript:5
+		postgres? ( dev-qt/qtsql:5[postgres] )
+		!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	)
+	!qt5? (
+		dev-qt/qtscript:4
+		crypt? (
+			app-crypt/qca:2
+			app-crypt/qca-ossl
+		)
+		postgres? ( dev-qt/qtsql:4[postgres] )
+		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	)
-	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	postgres? ( dev-qt/qtsql:4[postgres] )
 	syslog? ( virtual/logger )
 "
 
 GUI_RDEPEND="
-	dev-qt/qtgui:4
-	ayatana? ( dev-libs/libindicate-qt )
-	dbus? (
-		dev-qt/qtdbus:4
-		dev-libs/libdbusmenu-qt
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dbus? (
+			dev-libs/libdbusmenu-qt[qt5(+)]
+			dev-qt/qtdbus:5
+		)
+		phonon? ( media-libs/phonon[qt5] )
+		webkit? ( dev-qt/qtwebkit:5[widgets] )
 	)
-	kde? (
-		kde-base/kdelibs:4
-		kde-base/oxygen-icons:4
-		ayatana? ( kde-misc/plasma-widget-message-indicator )
+	!qt5? (
+		dev-qt/qtgui:5
+		ayatana? ( dev-libs/libindicate-qt )
+		dbus? (
+			dev-libs/libdbusmenu-qt[qt4(+)]
+			dev-qt/qtdbus:4
+			kde? (
+				kde-base/kdelibs:4
+				kde-base/oxygen-icons:4
+				ayatana? ( kde-misc/plasma-widget-message-indicator )
+			)
+		)
+		phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
+		webkit? ( dev-qt/qtwebkit:4 )
 	)
-	phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) )
-	webkit? ( dev-qt/qtwebkit:4 )
 "
 
 RDEPEND="
-	dev-qt/qtcore:4[ssl?]
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5[ssl?]
+	)
+	!qt5? ( dev-qt/qtcore:4[ssl?] )
 	monolithic? (
 		${SERVER_RDEPEND}
 		${GUI_RDEPEND}
@@ -55,23 +79,25 @@ RDEPEND="
 		server? ( ${SERVER_RDEPEND} )
 		X? ( ${GUI_RDEPEND} )
 	)
-	"
+"
 DEPEND="${RDEPEND}
-	kde? ( dev-util/automoc )"
+	qt5? ( dev-qt/linguist-tools:5 )
+"
 
-DOCS="AUTHORS ChangeLog README"
+DOCS=( AUTHORS ChangeLog README )
 
 S="${WORKDIR}/${P/_/-}"
 
 REQUIRED_USE="
 	|| ( X server monolithic )
+	ayatana? ( || ( X monolithic ) )
 	crypt? ( || ( server monolithic ) )
-	postgres? ( || ( server monolithic ) )
-	syslog? ( || ( server monolithic ) )
+	dbus? ( || ( X monolithic ) )
 	kde? ( || ( X monolithic ) )
 	phonon? ( || ( X monolithic ) )
-	dbus? ( || ( X monolithic ) )
-	ayatana? ( || ( X monolithic ) )
+	postgres? ( || ( server monolithic ) )
+	qt5? ( !ayatana !crypt !kde phonon )
+	syslog? ( || ( server monolithic ) )
 	webkit? ( || ( X monolithic ) )
 "
 
@@ -87,18 +113,19 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with ayatana LIBINDICATE)
-		$(cmake-utils_use_want X QTCLIENT)
-		$(cmake-utils_use_want server CORE)
-		$(cmake-utils_use_want monolithic MONO)
-		$(cmake-utils_use_with webkit)
-		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_find_package ayatana IndicateQt)
+		$(cmake-utils_use_find_package crypt QCA2)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
 		$(cmake-utils_use_with kde)
-		$(cmake-utils_use_with dbus)
-		$(cmake-utils_use_with ssl OPENSSL)
-		$(cmake-utils_use_with syslog)
 		$(cmake-utils_use_with !kde OXYGEN)
-		$(cmake-utils_use_with crypt)
+		$(cmake-utils_use_want monolithic MONO)
+		$(cmake-utils_use_find_package phonon)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_use qt5)
+		$(cmake-utils_use_want server CORE)
+		$(cmake-utils_use_with webkit)
+		$(cmake-utils_use_want X QTCLIENT)
 		"-DEMBED_DATA=OFF"
 	)
 


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2014-09-13 14:45 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2014-09-13 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     c47e9b16edec5349046f87eda912d3907616fd46
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 13 14:45:19 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Sep 13 14:45:19 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=c47e9b16

[net-irc/quassel] Use SLOT 4 on dev-qt/qtgui for !qt5 build

Package-Manager: portage-2.2.12

---
 net-irc/quassel/quassel-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index f2f17d6..c9155c2 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -48,7 +48,7 @@ GUI_RDEPEND="
 		webkit? ( dev-qt/qtwebkit:5[widgets] )
 	)
 	!qt5? (
-		dev-qt/qtgui:5
+		dev-qt/qtgui:4
 		ayatana? ( dev-libs/libindicate-qt )
 		dbus? (
 			dev-libs/libdbusmenu-qt[qt4(+)]


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2015-01-24 19:36 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2015-01-24 19:36 UTC (permalink / raw
  To: gentoo-commits

commit:     5177494c1f630b332922e62b103c972ea6db91c2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 24 19:36:02 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 24 19:36:02 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=5177494c

[net-irc/quasel] Sync with tree

Package-Manager: portage-2.2.15

---
 net-irc/quassel/quassel-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index c9155c2..5b6e27e 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -41,11 +41,11 @@ GUI_RDEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 		dbus? (
-			dev-libs/libdbusmenu-qt[qt5(+)]
+			dev-libs/libdbusmenu-qt[qt5]
 			dev-qt/qtdbus:5
 		)
 		phonon? ( media-libs/phonon[qt5] )
-		webkit? ( dev-qt/qtwebkit:5[widgets] )
+		webkit? ( dev-qt/qtwebkit:5 )
 	)
 	!qt5? (
 		dev-qt/qtgui:4
@@ -55,7 +55,7 @@ GUI_RDEPEND="
 			dev-qt/qtdbus:4
 			kde? (
 				kde-base/kdelibs:4
-				kde-base/oxygen-icons:4
+				|| ( kde-apps/oxygen-icons kde-base/oxygen-icons:4 )
 				ayatana? ( kde-misc/plasma-widget-message-indicator )
 			)
 		)


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2015-02-11 21:13 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2015-02-11 21:13 UTC (permalink / raw
  To: gentoo-commits

commit:     62622d7b4ba539c8a4e530edc7f6e75a00df84a7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 11 21:12:23 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Feb 11 21:12:36 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=62622d7b

[net-irc/quassel] Restore crypt + kde for qt5 build

Package-Manager: portage-2.2.16

---
 net-irc/quassel/quassel-9999.ebuild | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 5b6e27e..33bf5bd 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -21,14 +21,15 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl s
 SERVER_RDEPEND="
 	qt5? (
 		dev-qt/qtscript:5
+		crypt? ( app-crypt/qca:2[openssl,qt5] )
 		postgres? ( dev-qt/qtsql:5[postgres] )
 		!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	)
 	!qt5? (
 		dev-qt/qtscript:4
 		crypt? (
-			app-crypt/qca:2
-			app-crypt/qca-ossl
+			app-crypt/qca:2[qt4(+)]
+			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 		)
 		postgres? ( dev-qt/qtsql:4[postgres] )
 		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
@@ -44,6 +45,13 @@ GUI_RDEPEND="
 			dev-libs/libdbusmenu-qt[qt5]
 			dev-qt/qtdbus:5
 		)
+		kde? (
+			kde-frameworks/kconfigwidgets:5
+			kde-frameworks/kcoreaddons:5
+			kde-frameworks/ktextwidgets:5
+			kde-frameworks/kxmlgui:5
+			kde-frameworks/sonnet:5
+		)
 		phonon? ( media-libs/phonon[qt5] )
 		webkit? ( dev-qt/qtwebkit:5 )
 	)
@@ -81,7 +89,10 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
+	qt5? (
+		dev-libs/extra-cmake-modules
+		dev-qt/linguist-tools:5
+	)
 "
 
 DOCS=( AUTHORS ChangeLog README )
@@ -96,7 +107,7 @@ REQUIRED_USE="
 	kde? ( || ( X monolithic ) )
 	phonon? ( || ( X monolithic ) )
 	postgres? ( || ( server monolithic ) )
-	qt5? ( !ayatana !crypt !kde phonon )
+	qt5? ( !ayatana phonon )
 	syslog? ( || ( server monolithic ) )
 	webkit? ( || ( X monolithic ) )
 "
@@ -115,6 +126,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package ayatana IndicateQt)
 		$(cmake-utils_use_find_package crypt QCA2)
+		$(cmake-utils_use_find_package crypt QCA2-QT5)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
 		$(cmake-utils_use_with kde)


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2015-02-15 22:05 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2015-02-15 22:05 UTC (permalink / raw
  To: gentoo-commits

commit:     1d2c6cc096084d893405752badcca0133172884d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 15 22:04:20 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Feb 15 22:04:20 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=1d2c6cc0

[net-irc/quassel] Update dependencies for Qt5 based kde support

Package-Manager: portage-2.2.17

---
 net-irc/quassel/quassel-9999.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 33bf5bd..3f8843f 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -48,6 +48,8 @@ GUI_RDEPEND="
 		kde? (
 			kde-frameworks/kconfigwidgets:5
 			kde-frameworks/kcoreaddons:5
+			kde-frameworks/knotifications:5
+			kde-frameworks/knotifyconfig:5
 			kde-frameworks/ktextwidgets:5
 			kde-frameworks/kxmlgui:5
 			kde-frameworks/sonnet:5


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2015-02-16 22:02 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2015-02-16 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     61aa3368c858e85b004db0ce4f3edb0293940e74
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 16 22:02:34 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Feb 16 22:02:34 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=61aa3368

[net-irc/quassel] Sync with tree

Package-Manager: portage-2.2.17

---
 net-irc/quassel/quassel-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 3f8843f..429b821 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -51,6 +51,7 @@ GUI_RDEPEND="
 			kde-frameworks/knotifications:5
 			kde-frameworks/knotifyconfig:5
 			kde-frameworks/ktextwidgets:5
+			kde-frameworks/kwidgetsaddons:5
 			kde-frameworks/kxmlgui:5
 			kde-frameworks/sonnet:5
 		)


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2015-02-22 21:59 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2015-02-22 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     54ab315af500f19e24d9747f8542d02c0f379363
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 21:58:05 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 21:58:05 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=54ab315a

[net-irc/quassel] Sync with tree

Package-Manager: portage-2.2.17

---
 net-irc/quassel/quassel-9999.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 429b821..b72c848 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -27,10 +27,7 @@ SERVER_RDEPEND="
 	)
 	!qt5? (
 		dev-qt/qtscript:4
-		crypt? (
-			app-crypt/qca:2[qt4(+)]
-			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-		)
+		crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 		postgres? ( dev-qt/qtsql:4[postgres] )
 		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	)


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2015-06-19 22:33 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2015-06-19 22:33 UTC (permalink / raw
  To: gentoo-commits

commit:     07d8373a60bbc90d4e1912740840274365ccfce0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 22:32:10 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 22:32:10 2015 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=07d8373a

[net-irc/quassel] Sync with tree

Package-Manager: portage-2.2.20

 net-irc/quassel/quassel-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index b72c848..c2029a7 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -63,7 +63,7 @@ GUI_RDEPEND="
 			dev-qt/qtdbus:4
 			kde? (
 				kde-base/kdelibs:4
-				|| ( kde-apps/oxygen-icons kde-base/oxygen-icons:4 )
+				kde-apps/oxygen-icons
 				ayatana? ( kde-misc/plasma-widget-message-indicator )
 			)
 		)
@@ -90,8 +90,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	qt5? (
-		dev-libs/extra-cmake-modules
 		dev-qt/linguist-tools:5
+		kde-frameworks/extra-cmake-modules
 	)
 "
 
@@ -107,7 +107,7 @@ REQUIRED_USE="
 	kde? ( || ( X monolithic ) )
 	phonon? ( || ( X monolithic ) )
 	postgres? ( || ( server monolithic ) )
-	qt5? ( !ayatana phonon )
+	qt5? ( !ayatana )
 	syslog? ( || ( server monolithic ) )
 	webkit? ( || ( X monolithic ) )
 "


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2015-08-16 21:30 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2015-08-16 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     a54b6c9370fc967f100ea669763b9b9387061425
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 21:33:22 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 21:33:22 2015 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=a54b6c93

net-irc/quassel: Sync with tree

Package-Manager: portage-2.2.20.1

 net-irc/quassel/quassel-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 9ce915c..884fd4b 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -136,7 +136,8 @@ src_configure() {
 		$(cmake-utils_use_want server CORE)
 		$(cmake-utils_use_with webkit)
 		$(cmake-utils_use_want X QTCLIENT)
-		"-DEMBED_DATA=OFF"
+		-DEMBED_DATA=OFF
+		-DCMAKE_SKIP_RPATH=ON
 	)
 
 	# Something broke upstream detection since Qt 5.5


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2015-08-25 19:06 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2015-08-25 19:06 UTC (permalink / raw
  To: gentoo-commits

commit:     e1ee4f03dc858d9c783e95a421ea5ea3fe8c7f88
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 19:06:48 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 19:06:48 2015 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=e1ee4f03

net-irc/quassel: Sync with tree

Package-Manager: portage-2.2.20.1

 net-irc/quassel/quassel-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 884fd4b..0b96116 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -39,7 +39,7 @@ GUI_RDEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 		dbus? (
-			dev-libs/libdbusmenu-qt[qt5]
+			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5]
 			dev-qt/qtdbus:5
 		)
 		kde? (
@@ -59,7 +59,7 @@ GUI_RDEPEND="
 		dev-qt/qtgui:4
 		ayatana? ( dev-libs/libindicate-qt )
 		dbus? (
-			dev-libs/libdbusmenu-qt[qt4(+)]
+			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4(+)]
 			dev-qt/qtdbus:4
 			kde? (
 				kde-base/kdelibs:4


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2016-03-09 22:39 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2016-03-09 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     c9743f829d44b139c2123e1366379b9f9bdf1a6a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 22:39:04 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 22:39:04 2016 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=c9743f82

net-irc/quassel: Sync with tree

Package-Manager: portage-2.2.27

 net-irc/quassel/quassel-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 630a871..77b5ec2 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -63,7 +63,7 @@ GUI_RDEPEND="
 			dev-qt/qtdbus:4
 			kde? (
 				kde-base/kdelibs:4
-				kde-apps/oxygen-icons
+				kde-frameworks/oxygen-icons:*
 				ayatana? ( kde-misc/plasma-widget-message-indicator )
 			)
 		)


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2016-03-12 13:36 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2016-03-12 13:36 UTC (permalink / raw
  To: gentoo-commits

commit:     3978d51dcbe2a078beaf8d96dd4d381c3d1059d7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 13:35:59 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 13:35:59 2016 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=3978d51d

net-irc/quassel: Sync with tree

Package-Manager: portage-2.2.28

 net-irc/quassel/metadata.xml        | 3 +++
 net-irc/quassel/quassel-9999.ebuild | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index f6e13ea..096fe54 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -26,6 +26,9 @@
 			used. You need this enabled on the server, but you might want to
 			disable it on the client.
 		</flag>
+		<flag name="snorenotify">
+			Support for snore notification framework.
+		</flag>
 		<flag name="webkit">
 			Use qt-webkit rendering engine for showing URL thumbnails and
 			for other things that need web browser integration.

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 77b5ec2..cdca48c 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -16,7 +16,8 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X"
+IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server
+snorenotify +ssl syslog webkit X"
 
 SERVER_RDEPEND="
 	qt5? (
@@ -53,6 +54,7 @@ GUI_RDEPEND="
 			kde-frameworks/sonnet:5
 		)
 		phonon? ( media-libs/phonon[qt5] )
+		snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
 		webkit? ( dev-qt/qtwebkit:5 )
 	)
 	!qt5? (
@@ -106,6 +108,7 @@ REQUIRED_USE="
 	phonon? ( || ( X monolithic ) )
 	postgres? ( || ( server monolithic ) )
 	qt5? ( !ayatana )
+	snorenotify? ( qt5 || ( X monolithic ) )
 	syslog? ( || ( server monolithic ) )
 	webkit? ( || ( X monolithic ) )
 "
@@ -134,6 +137,7 @@ src_configure() {
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
 		$(cmake-utils_use_use qt5)
 		$(cmake-utils_use_want server CORE)
+		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
 		$(cmake-utils_use_with webkit)
 		$(cmake-utils_use_want X QTCLIENT)
 		-DEMBED_DATA=OFF


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2016-03-28 16:03 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2016-03-28 16:03 UTC (permalink / raw
  To: gentoo-commits

commit:     d2793ad0c7cb5de23f852ac387ee48d9c1fb6e88
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 16:02:04 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 16:02:04 2016 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=d2793ad0

net-irc/quassel: EAPI 6

Package-Manager: portage-2.2.28

 net-irc/quassel/quassel-9999.ebuild | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index cdca48c..ddd1fea 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils eutils pax-utils systemd user versionator
 
@@ -130,16 +130,16 @@ src_configure() {
 		$(cmake-utils_use_find_package crypt QCA2-QT5)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		$(cmake-utils_use_with kde)
-		$(cmake-utils_use_with !kde OXYGEN)
-		$(cmake-utils_use_want monolithic MONO)
-		$(cmake-utils_use_find_package phonon)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_OXYGEN=$(usex !kde)
+		-DWANT_MONO=$(usex monolithic)
+		$(cmake-utils_use_find_package phonon Phonon)
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_use qt5)
-		$(cmake-utils_use_want server CORE)
+		-DUSE_QT5=$(usex qt5)
+		-DWANT_CORE=$(usex server)
 		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
-		$(cmake-utils_use_with webkit)
-		$(cmake-utils_use_want X QTCLIENT)
+		-DWITH_WEBKIT=$(usex webkit)
+		-DWANT_QTCLIENT=$(usex X)
 		-DEMBED_DATA=OFF
 		-DCMAKE_SKIP_RPATH=ON
 	)


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2016-06-21 19:44 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2016-06-21 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     f0610279bd96a389ca77792ea7b504fa97f3b326
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 19:44:14 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 19:44:14 2016 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=f0610279

net-irc/quassel: Update use phonon

Upstream commit 680565f39c50f27cc339cb3e96bbd0abc6f47144

Package-Manager: portage-2.3.0_rc1

 net-irc/quassel/quassel-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index ddd1fea..1638c24 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -54,6 +54,7 @@ GUI_RDEPEND="
 			kde-frameworks/sonnet:5
 		)
 		phonon? ( media-libs/phonon[qt5] )
+		!phonon? ( dev-qt/qtmultimedia:5 )
 		snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
 		webkit? ( dev-qt/qtwebkit:5 )
 	)
@@ -104,7 +105,7 @@ REQUIRED_USE="
 	ayatana? ( || ( X monolithic ) )
 	crypt? ( || ( server monolithic ) )
 	dbus? ( || ( X monolithic ) )
-	kde? ( || ( X monolithic ) phonon )
+	kde? ( || ( X monolithic ) )
 	phonon? ( || ( X monolithic ) )
 	postgres? ( || ( server monolithic ) )
 	qt5? ( !ayatana )
@@ -135,6 +136,7 @@ src_configure() {
 		-DWANT_MONO=$(usex monolithic)
 		$(cmake-utils_use_find_package phonon Phonon)
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_find_package !phonon Qt5Multimedia)
 		-DUSE_QT5=$(usex qt5)
 		-DWANT_CORE=$(usex server)
 		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2016-07-24  9:48 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2016-07-24  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     dff3055cd4815bb4f13d401064d5d62feb628539
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 09:47:45 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 09:47:45 2016 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=dff3055c

net-irc/quassel: Drop ancient upgrade info

Fixes wrong use of REPLACING_VERSIONS does not account for multiple values.

Gentoo-bug: 589492

Package-Manager: portage-2.3.0

 net-irc/quassel/quassel-9999.ebuild | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 1638c24..bd6c558 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -191,18 +191,6 @@ pkg_postinst() {
 		einfo "Quassel can use net-misc/oidentd package if installed on your system."
 		einfo "Consider installing it if you want to run quassel within identd daemon."
 	fi
-
-	# temporary info mesage
-	if use server && [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]]; then
-		echo
-		ewarn "Please note that all configuration moved from"
-		ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/"
-		ewarn "to: ${QUASSEL_DIR}."
-		echo
-		ewarn "For migration, stop the core, move quasselcore files (pretty much"
-		ewarn "everything apart from quasselclient.conf and settings.qss) into"
-		ewarn "new location and then start server again."
-	fi
 }
 
 pkg_config() {


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
@ 2016-10-12 19:33 Johannes Huber
  0 siblings, 0 replies; 21+ messages in thread
From: Johannes Huber @ 2016-10-12 19:33 UTC (permalink / raw
  To: gentoo-commits

commit:     d55dce5c82eebff86058fda85075d6b16ec5b4fb
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 19:33:02 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 19:33:02 2016 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=d55dce5c

net-irc/quassel: Sync with gentoo main tree

Package-Manager: portage-2.3.0

 net-irc/quassel/metadata.xml        |  33 +++++----
 net-irc/quassel/quassel-9999.ebuild | 134 +++++++++++++-----------------------
 2 files changed, 66 insertions(+), 101 deletions(-)

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 66081eb..bb0defe 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -10,15 +10,25 @@
 		<name>Johannes Huber</name>
 	</maintainer>
 	<use>
+		<flag name="breeze">
+			Support the Breeze and Breeze-Dark icon sets (default for Plasma 5).
+		</flag>
+		<flag name="crypt">
+			Support core-&gt;network per-channel and per-query blowfish
+			encryption via <pkg>app-crypt/qca</pkg> SLOT 2.
+		</flag>
+		<flag name="dbus">
+			Support desktop notifications via the StatusNotifier D-Bus service
+			(used by most modern desktop environments).
+		</flag>
 		<flag name="monolithic">
-			Build Standalone client with integrated core, no external
-			quasselcore needed. Only useful if you don't want to use quassels
+			Build standalone client with integrated core, no external
+			quasselcore needed. Only useful if you don't want to use Quassel's
 			client/server model. The server and X flags are not needed in this
 			case but it is possible to enable them too.
 		</flag>
-		<flag name="phonon">
-			Build client with phonon backend support. This enables sound
-			playback in client.
+		<flag name="oxygen">
+			Support the Oxygen icon set that was the default for KDE4.
 		</flag>
 		<flag name="server">
 			Build the server binary. If this USE flag is disabled, the
@@ -27,21 +37,16 @@
 			disable it on the client.
 		</flag>
 		<flag name="snorenotify">
-			Support for snore notification framework.
+			Support for Snore notification framework.
 		</flag>
-		<flag name="webkit">
-			Use qt-webkit rendering engine for showing URL thumbnails and
-			for other things that need web browser integration.
+		<flag name="urlpreview">
+			Use QtWebEngine rendering engine for showing URL thumbnails.
 		</flag>
 		<flag name="X">
-			Build the Qt 4 GUI client for quassel. If this USE flag is
+			Build the Qt5 GUI client for quassel. If this USE flag is
 			disabled, the GUI is not built, and cannot be used. You might
 			want to disable this on the server, but you need it enabled on
 			the client.
 		</flag>
-		<flag name="crypt">
-			Support core-&gt;network per-channel and per-query blowfish
-			encryption via <pkg>app-crypt/qca</pkg> SLOT 2.
-		</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index bd6c558..3a862b1 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit cmake-utils eutils pax-utils systemd user versionator
+inherit cmake-utils eutils pax-utils systemd user
 
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
 [[ "${PV}" == "9999" ]] && inherit git-r3
@@ -14,74 +14,46 @@ HOMEPAGE="http://quassel-irc.org/"
 [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS=""
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server
-snorenotify +ssl syslog webkit X"
+KEYWORDS=""
+IUSE="+breeze crypt +dbus debug kde monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X"
 
 SERVER_RDEPEND="
-	qt5? (
-		dev-qt/qtscript:5
-		crypt? ( app-crypt/qca:2[openssl,qt5] )
-		postgres? ( dev-qt/qtsql:5[postgres] )
-		!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	)
-	!qt5? (
-		dev-qt/qtscript:4
-		crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
-		postgres? ( dev-qt/qtsql:4[postgres] )
-		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	)
+	dev-qt/qtscript:5
+	crypt? ( app-crypt/qca:2[openssl,qt5] )
+	postgres? ( dev-qt/qtsql:5[postgres] )
+	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	syslog? ( virtual/logger )
 "
 
 GUI_RDEPEND="
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dbus? (
-			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5]
-			dev-qt/qtdbus:5
-		)
-		kde? (
-			kde-frameworks/kconfigwidgets:5
-			kde-frameworks/kcoreaddons:5
-			kde-frameworks/knotifications:5
-			kde-frameworks/knotifyconfig:5
-			kde-frameworks/ktextwidgets:5
-			kde-frameworks/kwidgetsaddons:5
-			kde-frameworks/kxmlgui:5
-			kde-frameworks/sonnet:5
-		)
-		phonon? ( media-libs/phonon[qt5] )
-		!phonon? ( dev-qt/qtmultimedia:5 )
-		snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-		webkit? ( dev-qt/qtwebkit:5 )
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	breeze? ( kde-frameworks/breeze-icons:5 )
+	dbus? (
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5]
+		dev-qt/qtdbus:5
 	)
-	!qt5? (
-		dev-qt/qtgui:4
-		ayatana? ( dev-libs/libindicate-qt )
-		dbus? (
-			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4(+)]
-			dev-qt/qtdbus:4
-			kde? (
-				kde-base/kdelibs:4
-				kde-frameworks/oxygen-icons:*
-				ayatana? ( kde-misc/plasma-widget-message-indicator )
-			)
-		)
-		phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
-		webkit? ( dev-qt/qtwebkit:4 )
+	kde? (
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/knotifyconfig:5
+		kde-frameworks/ktextwidgets:5
+		kde-frameworks/kwidgetsaddons:5
+		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] )
 "
 
 RDEPEND="
 	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5[ssl?]
-	)
-	!qt5? ( dev-qt/qtcore:4[ssl?] )
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl?]
 	monolithic? (
 		${SERVER_RDEPEND}
 		${GUI_RDEPEND}
@@ -92,26 +64,21 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	qt5? (
-		dev-qt/linguist-tools:5
-		kde-frameworks/extra-cmake-modules
-	)
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
 "
 
-DOCS=( AUTHORS ChangeLog README )
+DOCS=( AUTHORS ChangeLog README.md )
 
 REQUIRED_USE="
 	|| ( X server monolithic )
-	ayatana? ( || ( X monolithic ) )
 	crypt? ( || ( server monolithic ) )
-	dbus? ( || ( X monolithic ) )
 	kde? ( || ( X monolithic ) )
-	phonon? ( || ( X monolithic ) )
+	monolithic? ( || ( breeze oxygen ) )
 	postgres? ( || ( server monolithic ) )
-	qt5? ( !ayatana )
-	snorenotify? ( qt5 || ( X monolithic ) )
+	snorenotify? ( || ( X monolithic ) )
 	syslog? ( || ( server monolithic ) )
-	webkit? ( || ( X monolithic ) )
+	X? ( || ( breeze oxygen ) )
 "
 
 pkg_setup() {
@@ -126,31 +93,24 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package ayatana IndicateQt)
-		$(cmake-utils_use_find_package crypt QCA2)
-		$(cmake-utils_use_find_package crypt QCA2-QT5)
-		$(cmake-utils_use_find_package dbus dbusmenu-qt)
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		-DWITH_KDE=$(usex kde)
-		-DWITH_OXYGEN=$(usex !kde)
-		-DWANT_MONO=$(usex monolithic)
-		$(cmake-utils_use_find_package phonon Phonon)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package !phonon Qt5Multimedia)
-		-DUSE_QT5=$(usex qt5)
+		-DUSE_QT4=OFF
+		-DUSE_QT5=ON
 		-DWANT_CORE=$(usex server)
-		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
-		-DWITH_WEBKIT=$(usex webkit)
+		-DWANT_MONO=$(usex monolithic)
 		-DWANT_QTCLIENT=$(usex X)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_WEBKIT=OFF
+		-DWITH_WEBENGINE=$(usex urlpreview)
+		-DWITH_BREEZE=OFF
+		-DWITH_BREEZE_DARK=OFF
+		-DWITH_OXYGEN=OFF
 		-DEMBED_DATA=OFF
 		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use_find_package crypt QCA2-QT5)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
 	)
 
-	# Something broke upstream detection since Qt 5.5
-	if use ssl ; then
-		mycmakeargs+=("-DHAVE_SSL=TRUE")
-	fi
-
 	cmake-utils_src_configure
 }
 
@@ -179,7 +139,7 @@ src_install() {
 pkg_postinst() {
 	if use monolithic && use ssl ; then
 		elog "Information on how to enable SSL support for client/core connections"
-		elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
+		elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
 	fi
 
 	if use server; then


^ permalink raw reply related	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2016-10-12 19:33 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-01  9:24 [gentoo-commits] dev/johu:master commit in: net-irc/quassel/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2016-10-12 19:33 Johannes Huber
2016-07-24  9:48 Johannes Huber
2016-06-21 19:44 Johannes Huber
2016-03-28 16:03 Johannes Huber
2016-03-12 13:36 Johannes Huber
2016-03-09 22:39 Johannes Huber
2015-08-25 19:06 Johannes Huber
2015-08-16 21:30 Johannes Huber
2015-06-19 22:33 Johannes Huber
2015-02-22 21:59 Johannes Huber
2015-02-16 22:02 Johannes Huber
2015-02-15 22:05 Johannes Huber
2015-02-11 21:13 Johannes Huber
2015-01-24 19:36 Johannes Huber
2014-09-13 14:45 Johannes Huber
2014-04-02 17:25 Johannes Huber
2014-04-01  9:21 Johannes Huber
2014-04-01  9:18 Johannes Huber
2014-04-01  9:15 Johannes Huber
2014-04-01  9:11 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox