Add qt5 use flag.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 90 insertions, 40 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 73b22f550de3..014f97bb9ab1 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.174 2014/08/25 17:00:24 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.175 2014/09/13 15:18:11 johu Exp $
+
+  13 Sep 2014; Johannes Huber <johu@gentoo.org> quassel-9999.ebuild:
+  Add qt5 use flag.
 
   25 Aug 2014; Manuel Rüger <mrueg@gentoo.org> quassel-0.10.0-r1.ebuild:
   Mark amd64 stable. Bug #516836.
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index a68f512c4ba4..fd118c8e308d 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX missing-bsd-includes.patch 1138 SHA256 0e63c51f5816c266b027c88952d4901d25ba250b1934bbb2e966727ac76b6537 SHA512 8e4f32af8ccc57b053bd6133e3a37944605fe4d17879bf151afe1d6d9102c89747a20b63c00ff683573f2df6a41684d49463d3ef69b57f23eb1d1295bfbdd34e WHIRLPOOL ff53c5418e4fd276881c6ed3bb5abb6554e13fd7f7f814cbe98b66477f02651350103cd225f7078ad42280dd7d0672493eb6574806e4c0cf661206a623705d4a
 AUX quassel.logrotate 105 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780 WHIRLPOOL 5b5185a6a68c12ce08ec5b41bb10644e487308f81b3e5d554524b05f70573410e31b299ac5fcec8806390deb37d0529ac69c435d0fcbaac005e59aec5a4095c5
 AUX quasselcore.conf 714 SHA256 16cfaf919268ee3c3281fc4ad0dfc128b1c98f5edfc5cc522addd512f36d293c SHA512 e03df342f47945f948106883a7757262ab7a8a7d21f0b4dd01cfcc95e836c2e00f2e0177a353b4f7a4b6f80ffa970be06d49aa9a42cad1f3834382267e5a0d7f WHIRLPOOL d1054f5ee635579b0a41fbbf025ba5202d57288a236afb62230da165b91499598f88b7fbbbe46560843338fb2a0fa30b38eb0205b71e8f0e8894a6c53e5b92ec
@@ -9,6 +12,23 @@ DIST quassel-0.9.3.tar.bz2 2783132 SHA256 ec29df5c55a02f91d15fa23618b42fc82b0bb9
 EBUILD quassel-0.10.0-r1.ebuild 4952 SHA256 f48d924e6a88b7f184909fa63ffaa59fab4a5e3cc8d6e5def6320e7b313b1f9c SHA512 808eced8dd1adfb4d867cb267d0dd64093c879f04b469aadc6306f80724f6fb4cb3ca004b76def73b88a4d9f6abcda493d734a8eff523b8b72c6760ee377d22e WHIRLPOOL 86eb316f5020b268e9b9c8b41e5d4261ced63abd22e8ed506fb7e19fcc014ee03b68c5e4c2b224f087c2599ba7ad2fe1a6ecb78a35f971c34ee71538d04cb74e
 EBUILD quassel-0.9.2.ebuild 5190 SHA256 f4e3399fe1a2d3ae14c7f4294498ee88aa5228e3e93f9c04db0da8f22525604a SHA512 6b081fdae1de4b60081549d6444e438b650df6a573c897c7dbfc660e44a96315175313c54700bb8a56d51506eb0edab1f7c9123049e5d721b5b46a936d565338 WHIRLPOOL 37a6c7aa1cfc8b88866d59cbcb41d77f07c25b43ec70e2bbaafc6e3313230cbc5ba601ab24b58c732bddb57712195518baa0e2ee925445c3e0751c196d3f9cb9
 EBUILD quassel-0.9.3.ebuild 5097 SHA256 1b0e6ecea841358b6fa78215bc522a6bd0c3a0ba490a009ce1b63bbf1485a980 SHA512 774e04fb8c2bb1a15f62bd2799d6db87a7a689d1dd8495df81b96c4047cc514bc1c783be88ada6527c22d7886bda6025133c3b7abc1baea88f5190b34d10cf39 WHIRLPOOL 8bc52bc44fa0384e7093eca9450879fcc27ed7a375ab72bc2f807fbc251830d2be919c9b61b1681e7846dbd01c1989e74c5514c72fb54f5032a411af6ebc5802
-EBUILD quassel-9999.ebuild 4899 SHA256 64067d1ec6c9897e78119a63db845c7b02edf3b15d2bcdd8539b4e5454ab1175 SHA512 2e0fdc714eb6af19cbf7296b3270d4391772306ada15d951e5e6ca1b3aade1dfc6dcc091f36206287492d35caa57c91c15f3b422bb0945db35cc63bece69f20d WHIRLPOOL 84dfe996582fcfc3fd55cb8afdbdf162c1b1029b584860bff5a68203ffe4157f62558e59f4970f9e480d20fd9140af31d85f1e6e5202f9c0e23a6861e0f8e861
-MISC ChangeLog 27413 SHA256 c37add81a638888c40d3d4b24d261611a4b9e13858f50251b84598ed9870c191 SHA512 a77252add2d9d1e54bc51868a35f640193256e3615379075efcdd407821c51db4d2cfee7ee2f314a9af49a0a09cb6f9c6219cb2e16d4a07f3c971dcb214c57fa WHIRLPOOL 7f5c5fbd3bca41fd7298ca66fe588feca78cbe59744a355103ec8bbc0f5ebaba4d961bc016be8a0b6add9ebaf3f4265811a5aaaac35fe52acfd0a459e31f1e2a
+EBUILD quassel-9999.ebuild 5556 SHA256 4858cc455e891b8b4889b789292e51419ef989ef94d8d0641e4e93887ddc2799 SHA512 7d794b73bfe08ba2e2d6fa999be7d03f3a62ada7ae393f6fb1ede58967b81d6af60de2b3eb82d3f45ca5060edc0ed1504dda03c32a22c58beafb2d3909aafbf5 WHIRLPOOL 54d908ca6b48bd0e8f159bb434ab580ca11a5fc1c2ea6dbd33915bdf948ec390ec064c6a55ea7b8fc72767c5aab6161485180eb2bc335e6ebb1b7d5e882737fa
+MISC ChangeLog 27502 SHA256 a143336f9207f10c6f4a90bf186d09597cbef8ed50d87cc3402db0323ecd0274 SHA512 490dca8b6309906d72646bb7ef057032744d58f86ba61f8390ea2d2461c4296730ff6196d549b6ae16d21fbde15dbb9cc9422158b15023b8f2bfcd56cf457ab8 WHIRLPOOL 042a2db632564899fe7f7801ec1e5dff4d217b17ae01611af3fbf35e47adc6b32ecfe115ff93741f7ce8766bee4bd48f555197fe2a0f716b5fe103951120f899
 MISC metadata.xml 1687 SHA256 20a821b954973d1f6c42184c6ca474b972896e6649ab37a44f093a7b3964e3c5 SHA512 7586fd9fa8552ae40e9294819bd56365e8e97eda8c5669519b57e8712e801c3513937effb716bd3e2cb75f47c3d180947b5a7a20107a8292f92d7c4c2837684a WHIRLPOOL 165eb876fc157171ac2d25ead567fce5ecd4d8ccab275591c0d9d18b8cb4e2f104a6a1b63c3bde76c0afdeee5651f13668ee30fe98a9bdc1b28e6f6fa2dcbc33
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUFGA3AAoJEGVpnaTzz9K9WwwP/3bwJHt+SipkCMaaNvlMqOhw
+OAxRF/SPm5Ra9qVJUsEOOH5Cy9b5MgkIQWv+SPxtpy3mbF/YK8kFeWREK1VGcolC
+ZZXn19/3t4+4k0ONZwu2CAgufNZZuCURaYupjqXSZbc01H7FdtsiSDbTZoVClK89
+qldQhH66duKBKi3Wj+YdSiFBvKXDfqoYn5+IeZpuqneN6nm5k99pV/qVxHSDEdf3
+qnjGHS1RCrNgvlNo8VIsOYlRBd4tSonnlmRIcD1e2/bVGd5fXJ83NNr5sJGSH1My
+gFXKumHf56wzToKqDGltkzZEH9/yjv6W453+cOBgD1OU3hF0G5wnHXsTO/sZLCf6
+CebsqB3xxUolLM1/b6yllz8Kudts3mj9O4keBjvQCMTENskgO9fNfMmCP3Tsy3vj
+J4bJk7drj5//HTxiLC8kZ/Cbx2Ls59ckgAV40NJ46aHoak3vOTYFPvdLbdLIs6H4
+Vn5Yzj+zbEMWDpsSobCq9kaRfNDNesHjTEyMQuFxZnveVptzQam3wXY2aUc1jWPC
+HBXKxsfs40K9wvZpzL3FkP56dri0lB9h8UByWTuk2vDH4Bqlrobxhmd1W6rbNv/d
+aDF3iLUpmagIXKy3EQ1a+//aMo2zo1n2ex1dOuLTn0wWeSW3kr7O7GA1cVHhcd5D
+jRp6r0Y4tXYamRhkw97P
+=4+Us
+-----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 08b07c73171c..2e9b8cbfd0c0 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.71 2014/05/03 18:39:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.72 2014/09/13 15:18:11 johu Exp $
 
 EAPI=5
 
@@ -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:4
+		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"
 	)