Use global USE-flags, where it is possible, fix description for old flags, wrt bug #402833

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 19 insertions, 14 deletions

diff --git a/net-im/leechcraft-azoth/ChangeLog b/net-im/leechcraft-azoth/ChangeLog
index 37e55f09c556..34bdfa690cd6 100644
--- a/net-im/leechcraft-azoth/ChangeLog
+++ b/net-im/leechcraft-azoth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/leechcraft-azoth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/leechcraft-azoth/ChangeLog,v 1.35 2012/11/10 17:23:03 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/leechcraft-azoth/ChangeLog,v 1.36 2012/11/27 13:57:14 pinkbyte Exp $
+
+  27 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> leechcraft-azoth-9999.ebuild,
+  metadata.xml:
+  Use global USE-flags, where it is possible, fix description for old flags,
+  wrt bug #402833
 
   10 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> leechcraft-azoth-9999.ebuild,
   metadata.xml:
diff --git a/net-im/leechcraft-azoth/leechcraft-azoth-9999.ebuild b/net-im/leechcraft-azoth/leechcraft-azoth-9999.ebuild
index d1fa8750351f..48f6a6630f9d 100644
--- a/net-im/leechcraft-azoth/leechcraft-azoth-9999.ebuild
+++ b/net-im/leechcraft-azoth/leechcraft-azoth-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/leechcraft-azoth/leechcraft-azoth-9999.ebuild,v 1.17 2012/11/10 17:23:03 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/leechcraft-azoth/leechcraft-azoth-9999.ebuild,v 1.18 2012/11/27 13:57:14 pinkbyte Exp $
 
 EAPI="4"
 
@@ -12,8 +12,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug astrality +acetamide +adiumstyles +autoidler +autopaste +birthdaynotifier
 		+chathistory +crypt	+depester +embedmedia +herbicide +hili +isterique
-		+juick +keeso +lastseen	+metacontacts media +modnok +nativeemoticons
-		+otroid +p100q +rosenthal shx +standardstyles +xoox +xtazy +zheet"
+		+juick +keeso +lastseen	+metacontacts media +latex +nativeemoticons
+		+otroid +p100q +spell shx +standardstyles +xmpp +xtazy +zheet"
 
 DEPEND="~net-misc/leechcraft-core-${PV}
 		x11-libs/qt-webkit:4
@@ -22,8 +22,8 @@ DEPEND="~net-misc/leechcraft-core-${PV}
 		astrality? ( net-libs/telepathy-qt )
 		otroid? ( net-libs/libotr )
 		media? ( x11-libs/qt-multimedia:4 )
-		rosenthal? ( app-text/hunspell )
-		xoox? ( =net-libs/qxmpp-9999 media-libs/speex )
+		spell? ( app-text/hunspell )
+		xmpp? ( =net-libs/qxmpp-9999 media-libs/speex )
 		xtazy? ( x11-libs/qt-dbus:4 )
 		crypt? ( app-crypt/qca app-crypt/qca-gnupg )
 		zheet? ( net-libs/libmsn )"
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
 		net-im/telepathy-mission-control
 		net-voip/telepathy-haze
 	)
-	modnok? (
+	latex? (
 		|| (
 			media-gfx/imagemagick
 			media-gfx/graphicsmagick[imagemagick]
@@ -62,14 +62,14 @@ src_configure() {
 		$(cmake-utils_use_enable lastseen AZOTH_LASTSEEN)
 		$(cmake-utils_use_enable metacontacts AZOTH_LASTSEEN)
 		$(cmake-utils_use_enable media MEDIACALLS)
-		$(cmake-utils_use_enable modnok AZOTH_MODNOK)
+		$(cmake-utils_use_enable latex AZOTH_MODNOK)
 		$(cmake-utils_use_enable nativeemoticons AZOTH_NATIVEEMOTICONS)
 		$(cmake-utils_use_enable otroid AZOTH_OTROID)
 		$(cmake-utils_use_enable p100q AZOTH_P100Q)
-		$(cmake-utils_use_enable rosenthal AZOTH_ROSENTHAL)
+		$(cmake-utils_use_enable spell AZOTH_ROSENTHAL)
 		$(cmake-utils_use_enable shx AZOTH_SHX)
 		$(cmake-utils_use_enable standardstyles AZOTH_STANDARDSTYLES)
-		$(cmake-utils_use_enable xoox AZOTH_XOOX)
+		$(cmake-utils_use_enable xmpp AZOTH_XOOX)
 		$(cmake-utils_use_enable xtazy AZOTH_XTAZY)
 		$(cmake-utils_use_enable zheet AZOTH_ZHEET)
 	)
@@ -78,7 +78,7 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if use rosenthal; then
+	if use spell; then
 		elog "You have enabled the Azoth Rosenthal plugin for"
 		elog "spellchecking. It uses Hunspell/Myspell dictionaries,"
 		elog "so install the ones for languages you use to enable"
diff --git a/net-im/leechcraft-azoth/metadata.xml b/net-im/leechcraft-azoth/metadata.xml
index 064a7a2f241b..84df73febfee 100644
--- a/net-im/leechcraft-azoth/metadata.xml
+++ b/net-im/leechcraft-azoth/metadata.xml
@@ -20,14 +20,14 @@
 	<flag name="lastseen">Build plugin for client-side recording of the last online/available time</flag>
 	<flag name="metacontacts">Build plugin for metacontacts support</flag>
 	<flag name="media">Enable media calls</flag>
-	<flag name="modnok">Build Modnok for in-chat LaTeX formulae rendering</flag>
+	<flag name="modnok">Build Modnok for in-chat LaTeX formulae rendering (deprecated, use 'latex' for new versions)</flag>
 	<flag name="nativeemoticons">Build support for native Azoth's emoticons packs</flag>
 	<flag name="otroid">Build OTRoid, plugin for the Off-the-Record deniable encryption system</flag>
 	<flag name="p100q">Build p100q, plugin for psto.net microblogging service</flag>
-	<flag name="rosenthal">Build Rosenthal, the spellchecker plugin</flag>
+	<flag name="rosenthal">Build Rosenthal, the spellchecker plugin (deprecated, use 'spell' for new versions)</flag>
 	<flag name="shx">Build shell command executor plugin</flag>
 	<flag name="standardstyles">Build support for standard Azoth styles engine</flag>
-	<flag name="xoox">Build Xoox, gloox-based plugin for XMPP support</flag>
+	<flag name="xoox">Build Xoox, gloox-based plugin for XMPP support (deprecated, use 'xmpp' for new versions)</flag>
 	<flag name="xtazy">Build Xtazy for publishing currently playing tune</flag>
 	<flag name="zheet">Build Zheet, libmsn-based plugin for Windows Live Messenger support</flag>
 </use>