Adding some USE-flags to live ebuild. Thanks to Nikoli

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

3 files changed, 27 insertions, 5 deletions

diff --git a/net-im/vacuum/ChangeLog b/net-im/vacuum/ChangeLog
index 31e48473a081..54bc246872f0 100644
--- a/net-im/vacuum/ChangeLog
+++ b/net-im/vacuum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/vacuum
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/ChangeLog,v 1.7 2012/08/01 07:49:23 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/ChangeLog,v 1.8 2012/10/08 17:44:54 pinkbyte Exp $
+
+  08 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> vacuum-9999.ebuild,
+  metadata.xml:
+  Adding some USE-flags to live ebuild. Thanks to Nikoli
 
 *vacuum-1.2.0 (01 Aug 2012)
 
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
index a274b6cd2b50..b95ce7dffece 100644
--- a/net-im/vacuum/metadata.xml
+++ b/net-im/vacuum/metadata.xml
@@ -35,6 +35,7 @@
     <flag name="iqauth">Enable logging on Jabber servers withous SASL authentication support</flag>
     <flag name="jabbersearch">Enable searching contacts in Jabber networks</flag>
     <flag name="messagearchiver">Enable saving the communication history both locally and on the server</flag>
+    <flag name="messagecarbons">Allows to keep all user IM clients engaged in a conversation</flag>
     <flag name="multiuserchat">Enable Jabber multi-user conferences</flag>
     <flag name="pepmanager">Allows other plugins to recieve and publish PEP events</flag>
     <flag name="privacylists">Enable blocking the undesirable contacts</flag>
@@ -52,5 +53,8 @@
     <flag name="vcard">Enable obtaining peer's personal contact information</flag>
     <flag name="xmppuriqueries">Allow other plugins to handle XMPP URI queries</flag>
     <flag name="vcs-revision">Add VCS revision to version number, INSECURE.</flag>
+    <flag name="aspell">Select <pkg>app-text/aspell</pkg> spell checker backend</flag>
+    <flag name="enchant">Select <pkg>app-text/enchant</pkg> spell checker backend</flag>
+    <flag name="hunspell">Select <pkg>app-text/hunspell</pkg> spell checker backend</flag>
   </use>
 </pkgmetadata>
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
index 3720f06f411f..d81166fc2c9c 100644
--- a/net-im/vacuum/vacuum-9999.ebuild
+++ b/net-im/vacuum/vacuum-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-9999.ebuild,v 1.5 2012/08/01 07:49:23 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-9999.ebuild,v 1.6 2012/10/08 17:44:54 pinkbyte Exp $
 
 EAPI="4"
 LANGS="de pl ru uk"
@@ -14,8 +14,9 @@ ESVN_REPO_URI="http://vacuum-im.googlecode.com/svn/trunk"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-PLUGINS=" adiummessagestyle annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver multiuserchat pepmanager privacylists privatestorage registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries"
-IUSE="${PLUGINS// / +} vcs-revision"
+PLUGINS=" adiummessagestyle annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries"
+SPELLCHECKER_BACKENDS="aspell +enchant hunspell"
+IUSE="${PLUGINS// / +} ${SPELLCHECKER_BACKENDS} +spell vcs-revision"
 for x in ${LANGS}; do
 	IUSE+=" linguas_${x}"
 done
@@ -31,11 +32,13 @@ REQUIRED_USE="
 	filemessagearchive? ( messagearchiver )
 	filestreamsmanager? ( datastreamsmanager )
 	filetransfer? ( filestreamsmanager datastreamsmanager )
+	messagecarbons? ( servicediscovery )
 	pepmanager? ( servicediscovery )
 	registration? ( dataforms )
 	remotecontrol? ( commands dataforms )
 	servermessagearchive? ( messagearchiver )
 	sessionnegotiation? ( dataforms )
+	spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) )
 "
 
 RDEPEND="
@@ -43,9 +46,15 @@ RDEPEND="
 	>=x11-libs/qt-gui-4.5:4
 	>=dev-libs/openssl-0.9.8k
 	adiummessagestyle? ( >=x11-libs/qt-webkit-4.5:4 )
+	spell? (
+		aspell? ( app-text/aspell )
+		enchant? ( app-text/enchant )
+		hunspell? ( app-text/hunspell )
+	)
 	net-dns/libidn
 	x11-libs/libXScrnSaver
 	sys-libs/zlib[minizip]
+	!net-im/vacuum-spellchecker
 "
 DEPEND="${RDEPEND}"
 
@@ -53,7 +62,7 @@ DOCS="AUTHORS CHANGELOG README TRANSLATORS"
 
 src_prepare() {
 	# Force usage of system libraries
-	rm -rf src/thirdparty/{idn,minizip,zlib}
+	rm -rf src/thirdparty/{idn,hunspell,minizip,zlib}
 }
 
 src_configure() {
@@ -74,6 +83,11 @@ src_configure() {
 	for x in ${PLUGINS}; do
 		mycmakeargs+=( "$(cmake-utils_use ${x} PLUGIN_${x})" )
 	done
+	mycmakeargs+=( "$(cmake-utils_use spell PLUGIN_spellchecker)" )
+
+	for i in ${SPELLCHECKER_BACKENDS//+/}; do
+		use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" )
+	done
 
 	if use vcs-revision; then
 		subversion_wc_info # eclass is broken