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

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

4 files changed, 30 insertions, 22 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/Manifest b/net-im/vacuum/Manifest
index b71e7935b5ca..ee9d08fe39e7 100644
--- a/net-im/vacuum/Manifest
+++ b/net-im/vacuum/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vacuum-1.1.1-minizip.patch 1723 SHA256 b93dd50385a9b0739253a84b0e17d0686b4807e574a7065a8c95d690ae1ce596 SHA512 2da6420c3790a3bf39e2c500c911a66758c0941b7c3ca58653f62d79b84541dadb9b0aa15c26695380150dd357bdfebecf39ec53b22aca1bceca465b47e6611f WHIRLPOOL 55b0ed1d570962cdddaf1323e83df0ec7070c811da7b1246094ea6d791e92fe547cab71629bcf12394c6593608f4134009ab76cd776702fe2d0b7f16d18191e4
 AUX vacuum-1.1.1-zlib.patch 1506 SHA256 9f74f3f54ec82715b919ce6ade4c8f121c1d80238847484653d19ac766d2126e SHA512 67c6ae391ab6778ca5ddac5074f9e3cc98530b3934d8a0cb11fb5ccbe138ae66ef4408e41aae5e3d01afab08e76d8dd37300dfd83137ec6f753ad9163e98330b WHIRLPOOL fdaf76378520e5a211a344d92e799dd48a9a1488e054ea785b468c812b6e31ac3ec0babab80cf3ec5029a1fe8182738e6c12d2e24aaf353f7d08860bf677e266
 DIST vacuum-1.1.1.tar.xz 1507204 SHA256 9158c69915e0f35116b6a994070bb98c1cd45c14e3672bcfd21da19eb2204ee2
@@ -9,17 +6,6 @@ DIST vacuum-1.2.0.tar.xz 1609488 SHA256 55a2c27aaaf79c7a4de127c22d3845ede3597028
 EBUILD vacuum-1.1.1.ebuild 2159 SHA256 8f457a4c2a879eb36d24747d9e4cf2c1aa7bdccb96ab6e82053a77853fbfd450 SHA512 a750e2f20bb169eccfa297e511802459078b2fb26458aee0bdd98dc2d69febf1ccb26d58ed3e392f4540e74f489ba3e6d63696f42d3f46e3e4914bc0bdf248cb WHIRLPOOL c24408728edb7d89643973b12fd1e07fa2f0aa0f80363200bbeaaa102919232069d6070a6cfff53abf031db17801ad329547c4ae38b428c7bf67d2fa016ca7a4
 EBUILD vacuum-1.1.2.ebuild 2217 SHA256 596e01c02260fe68e8036138d1d9c0e0ea1474af5cea120480d0385d214eed02 SHA512 9560c601b97a761e7cd2fcef67c1d8b958fd885c1a7d7bf5a5917915a220d7df1dec425e89cd2b025c41ffa5ee5de857c60c010cfe9c000df1002a24d0ad5c2a WHIRLPOOL 8e8606d93e26d99d5109a07d0063873b4f714385fb5bf8cdcab0109584307d7bd4b123b50e7220eab30f9ae79ef761cdbcedf143e40d1c1de3ba891e042216c1
 EBUILD vacuum-1.2.0.ebuild 2392 SHA256 60e18f627cb9e12c32819acc984b7b576affa9cf0a3721afbc0205f303f04d6d SHA512 35306f129f982a06b281191e833325295025bf7620eee4d082a65664935a6c85ccd2e12c18d93ab8dfbd5b419a8cfe9713b632f71e8d2fe6ece524a989d9f7e1 WHIRLPOOL d9a271fb60244d44ef69c82238fbdce33c14096b65213fe0de21242a1eb57943bd17d3f544a399f24ea8a2c7097ef0ba04185f2464b5cc43a460ceb977040a26
-EBUILD vacuum-9999.ebuild 2528 SHA256 2df8256d63a23e58d030a8d41343b1b5f51c660394a2be68188c4fabe5577707 SHA512 ae28ee71e858a2d25b6f81690a2af0904e5370d62a302edf8231bb1e89d9e8c1714c4ea1b4bfe738438c0c97bb6d808578b1253498f2a59114b433f29f5bd0fc WHIRLPOOL a757679e85aa8547fec1126b116be5b64e73791340fe4a9c1de67a000c8de51bd3a34e914125128dd487ccb30c0e16da46dc12ce8e15a28e42e608e0c1ee11c9
-MISC ChangeLog 1556 SHA256 8967e3ad044fd88a5a3bdd78bfffaadda2acb99293d6d6c919f16b679192b0ef SHA512 e8b5e909dc6d066d1b7d1a48fcf5ae5eeac720f26fb6a6205aeb68651d8980cfdcace622c2b4f0c58cfb72f6918b8a0917b2a308642edda6a05ff2b6e70d45bf WHIRLPOOL fcb6d833bd7cfc4015145acb1dbf3928b993cbef61e623d8fc2435e7a0cee72c80a82795e007edb94fb8c1391b72ffad4380f465608afb54e161da525ac1c743
-MISC metadata.xml 4078 SHA256 4647d9e574bb0832059479d9e5d7c465ab02a2ac443d1abdae50a81ca6b81c52 SHA512 0226c6ca6b5847ce7244458c1555cd08cc21dea0abf25f90298921ce8855c3ca670218ffcee3a7bba3d4d334cddc20a3bb465fa0e1f4e352c15a635bd824ca12 WHIRLPOOL 4580411ef128504114879cca485d44fbdd10aca485c60915b7ccb15fa1eb74c95a1293f03cbbb75c9aa737ce95faed773ee48282e3a2b2ac0d85c92636d85096
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBAgAGBQJQGN+WAAoJEAmJmMX429rebuwIAJMSsaRgD7E/ZiYhhp3PKV4D
-Bccw3TEOFDZDfNB5BbsaZ0M5PPCSpEs/qmi7nMxsqgXTUVxLglvrHcMpYpzmeQpS
-OimroUNXUdumiAu76pdt0/afOeEZnDLEvnozjI8OuVgjMRn4AEI+RfugbaaVRmbN
-Laf1C5swwZEphm2p3Dj7gueEHF4PasVu0rbOK/9h3+4BAyzBZnTfiAyhWzxY9APU
-amDIMubqF2BFku3fIoR8sjtVCMVU4Shx58oWyAWNWk15uPZWvSkz05q0Let7HGUY
-tF3xdnCE/CLkszDYZ2KgD62uYQcvj98qrPv2647/+10pNjH0GhLAt/B8HR5h6rg=
-=rRnh
------END PGP SIGNATURE-----
+EBUILD vacuum-9999.ebuild 3034 SHA256 8d3153a863e9a3ef48b9b27b031279d7b5d0c9e9c79888cc66ba5a99f7806e53 SHA512 05311c56d0d655dc18ceb939bcca40d0642e0922c9a1b8aa78f962548ffcb4e5a88678757a5e129d528b0875cae81ac38dec3137315130bea7765c4e9ff3c91f WHIRLPOOL e483411fc3ccb3cd66b69f9a1d9cafffdede62452b5ed145164a5f3ac90fb7a8b1d90bf5a96ad92a5c87f96c3c4692728bf5daefe1bee935696db55fd19c9efb
+MISC ChangeLog 1699 SHA256 6211c4c77c00adaf4ef9e0c9686eba82d36a7e16cabd0b34d0c75cda56c731fb SHA512 0c33e98f03682373567ccaf4fc933c38aaec304c311ea239dbc7efdf1138604d9f66402c0eedbff8e491d8d498eef6b7c4675023f00ca078000dcd52539ba1b2 WHIRLPOOL 97b2fa7dac1c7a7a95ed6e39d56d7ba7594674d7b69b43c23231db2eed220d9e473b521bb071c11fac96561652919949c9b0c629a6bc2f332c713bb74e8cf976
+MISC metadata.xml 4445 SHA256 54d868a386991e978e4cae5c4f5ca92b8736369c124d2eaa3afbc61861235739 SHA512 ff5af6ad271b48b1fe904602304035e6a2af1a8f4d8e84d259b98c98d1d1d93f30c283ff41a64bfa237924ebb7147641bb751fff62dcf89525653d2943f6e9f9 WHIRLPOOL c1f9bd199043af685a471c65d06198e3d355a409cde6f77b21592e388a942d5a4a243749d7c19e4dac4ecad79fcee2f69b0d850e3eaab5a6e26564d4563e159e
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