Use our brand new added libindicate-qt.

Package-Manager: portage-2.2_rc46/cvs/Linux i686

4 files changed, 24 insertions, 14 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 72e1354ab419..d5bf5c234de2 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.67 2009/10/28 19:24:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.68 2009/10/30 00:17:28 scarabeus Exp $
+
+  30 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild,
+  metadata.xml:
+  Use our brand new added libindicate-qt.
 
   28 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild,
   metadata.xml:
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 518cd0a41a6e..d74ab9178c1f 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -9,13 +9,13 @@ DIST quassel-0.5.0.tar.bz2 3288293 RMD160 6c29690449aa740b1ef781536426795f2e06b6
 EBUILD quassel-0.4.3-r50.ebuild 3635 RMD160 703662785bd975effcd63861f17da8393a2b0332 SHA1 d2e074d2cc8896c8265a0b012082ffc70b7be245 SHA256 451048d3d5bdc29015fee1170f9d4b05c660df2ccaad357751b9c17bec5de8a4
 EBUILD quassel-0.4.3.ebuild 3536 RMD160 0d3875b042bc87e48a659d5d52b0d8e546671303 SHA1 04aab028c72b6d9722f655298fb94ad5c55687a4 SHA256 43fc8a8492238f49737817a129f976c3e9ebd227b4c9904e00b7dd9f17be491e
 EBUILD quassel-0.5.0.ebuild 3218 RMD160 15df1bddf83cf31a8bf1178adbc7e12badc93078 SHA1 27b378ccfb052baae5cc25607b3d677594d9471d SHA256 dcd946447395444bec4e1993a92ce9bbebb1b515ac777ae49899fdf3a7cbfeab
-EBUILD quassel-9999.ebuild 2974 RMD160 aa1bd2e14f60644411f3731d88daf5e635c8a171 SHA1 733eed882f0e8e9fcbfce63ed42cfc33f1ef40ae SHA256 1af0443042fe64be4cc48dda807c75c1177818a53ff18403746b5568ac7f2658
-MISC ChangeLog 12498 RMD160 f78c0ce4b424c5a5a6f32e6b0eaa50c534e3be0b SHA1 a7177a7e9318c5bc3329ae287bf3c89c9b18b72a SHA256 3cfc963d4020ff23e2c7d64630c5420b28d8570302954f1962ab5ad3dafb9028
-MISC metadata.xml 1789 RMD160 8b5848fb56807d9d00cbcc3d7e9d88dc173017c9 SHA1 bcc2e56264ac27a43ce2f092ee704569acc6ded7 SHA256 3fc302a01667d6b24513f5582c7b8b52e1967c9a216a36d6144b5cbcd353d7d4
+EBUILD quassel-9999.ebuild 3059 RMD160 43146d9c66716f814e964ea07b0bd76924bf2ee6 SHA1 4effa0066c29c998d182d0907da5746a57d1f7b9 SHA256 9430826e96e7e0308062b42bebb75ca95bacf46eafc64a9c2ac85baa496571d9
+MISC ChangeLog 12633 RMD160 d3f03e829e8f329fc8e4d9e0a5e911e5a69136f3 SHA1 f79387ca5b3db6a3ca5c17a4306d54c04dfed0fd SHA256 b172d4d1e355bef7545141df27fde8dcb1de1e9eedf4db4f5540e78b0dc23283
+MISC metadata.xml 1904 RMD160 0d6920637ae95ecf65ddeed89b533f7d38c2a9e7 SHA1 1184f2d819596ca938d3528b9db95c93bdd264dd SHA256 b3e24e86bcd423d041692bd6f18dbc72729444eb4a484adc6b3bab77ded76741
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkromnEACgkQHB6c3gNBRYdsAQCferzV0QT2yLzFKKKU8ii5e7hc
-7MIAoM2nsbfywGWLHv9DIu/YLXcyiwXs
-=Upqj
+iEUEARECAAYFAkrqMKcACgkQHB6c3gNBRYd9PACfaBtcCLp0np43vBhxcR5weTop
+dXYAmIId5oErFHEDwGrATAXKHL6St30=
+=5g+F
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index acdf3bd3c1fc..36ed66aba7df 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -48,5 +48,9 @@
 			want to disable this on the server, but you need it enabled on
 			the client.
 		</flag>
+		<flag name="ayatana">
+			Build in support for Ayatana notification using the libindicate-qt
+			plugin.
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index a037d101aa4b..2406f7faf714 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.26 2009/10/28 19:24:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.27 2009/10/30 00:17:28 scarabeus Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="0"
-IUSE="dbus debug kde monolithic phonon postgres +server +ssl webkit +X"
+IUSE="ayatana dbus debug kde monolithic phonon postgres +server +ssl webkit +X"
 
 RDEPEND="
 	dbus? ( x11-libs/qt-dbus:4 )
@@ -24,6 +24,7 @@ RDEPEND="
 		postgres? ( x11-libs/qt-sql:4[postgres] >=virtual/postgresql-base-8.3 )
 		x11-libs/qt-script:4
 		x11-libs/qt-gui:4
+		ayatana? ( dev-libs/libindicate-qt )
 		kde? ( >=kde-base/kdelibs-4.3 )
 		phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
 		webkit? ( x11-libs/qt-webkit:4 )
@@ -36,6 +37,7 @@ RDEPEND="
 		)
 		X? (
 			x11-libs/qt-gui:4
+			ayatana? ( dev-libs/libindicate-qt )
 			kde? ( >=kde-base/kdelibs-4.1 )
 			phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
 			webkit? ( x11-libs/qt-webkit:4 )
@@ -57,16 +59,16 @@ 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 WEBKIT)
-		$(cmake-utils_use_with phonon PHONON)
-		$(cmake-utils_use_with kde KDE)
-		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use_with webkit)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with kde)
+		$(cmake-utils_use_with dbus)
 		$(cmake-utils_use_with ssl OPENSSL)
 		$(cmake-utils_use_with !kde OXYGEN)
-		-DWITH_LIBINDICATE=OFF
 		-DEMBED_DATA=OFF
 	"