trinity-base/kopete: Add missing IUSE metadata

- Sort IUSE, PLUGINS, PROTOCOLS
- local mycmakeargs

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 39 insertions, 34 deletions

diff --git a/trinity-base/kopete/kopete-9999.ebuild b/trinity-base/kopete/kopete-9999.ebuild
index c81d2cc9..e07887e8 100644
--- a/trinity-base/kopete/kopete-9999.ebuild
+++ b/trinity-base/kopete/kopete-9999.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-TRINITY_MODULE_NAME="tdenetwork"
 
+TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity multi-protocol IM client"
 
-IUSE="jingle gsmlib netmeeting speex kernel_linux"
-PLUGINS="latex autoreplace history contactnotes crypt connectionstatus
-	translator nowlistening webpresence texteffect highlight alias
-	motionautoaway netmeeting addbookmarks statistics smpppdcs"
-PROTOCOLS="gadu groupwise irc xmpp oscar msn sms sametime winpopup yahoo"
+IUSE="gsmlib jingle kernel_linux netmeeting speex"
+PLUGINS="addbookmarks alias autoreplace connectionstatus contactnotes crypt
+	highlight history latex motionautoaway netmeeting nowlistening smpppdcs
+	statistics texteffect translator webpresence"
+PROTOCOLS="gadu groupwise irc msn oscar sametime sms winpopup xmpp yahoo"
 # unsupported USE="v4l2 opengl xscreensaver ssl emoticons-manager "
 # USE=xmms works only with xmms1
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
@@ -23,19 +23,20 @@ REQUIRED_USE="
 	netmeeting? ( msn )
 	speex? ( jingle xmpp )"
 
-# MISSING BOTH_DEPEND
+# MISSING COMMON_DEPEND
 #	x11-libs/libXrender
 #	xmpp? ( net-dns/libidn )
 #	kernel_linux? ( virtual/opengl )
 #	opengl? ( dev-qt/qt-meta[opengl] )
 #	xscreensaver? ( x11-libs/libXScrnSaver )
 #	xmpp|groupwice? =app-crypt/qca-1.0*
-BOTH_DEPEND="
+COMMON_DEPEND="
 	jingle? ( dev-libs/glib )
 	netmeeting? ( dev-libs/glib )
 	webpresence? (
 		dev-libs/libxml2
-		dev-libs/libxslt )
+		dev-libs/libxslt
+	)
 	jingle? (
 		dev-libs/expat
 		speex? ( media-libs/speex )
@@ -52,27 +53,27 @@ BOTH_DEPEND="
 #		x11-libs/libXv
 #	)
 #	xscreensaver? ( x11-proto/scrnsaverproto )
-DEPEND="${BOTH_DEPEND}
-	kernel_linux? (
-		virtual/os-headers
-	)
+DEPEND="${COMMON_DEPEND}
+	kernel_linux? ( virtual/os-headers )
 "
 
 # MISSING RDEPEND
 #     netmeeting? ( net-voip/ekiga )
 #     ssl? ( =app-crypt/qca-tls-1.0* )
-RDEPEND="${BOTH_DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	crypt? ( app-crypt/gnupg )
 	latex? (
 		media-gfx/imagemagick
-		virtual/latex-base )
+		virtual/latex-base
+	)
 	sms? ( !gsmlib? ( || (
-				app-mobilephone/smsclient
-				app-mobilephone/smssend	) ) )
+		app-mobilephone/smsclient
+		app-mobilephone/smssend
+	) ) )
 "
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_JINGLE="$(usex jingle)"
 		-DWITH_GSM="$(usex gsmlib)"
 		-DWITH_WEBCAM="$(usex netmeeting)"
diff --git a/trinity-base/kopete/metadata.xml b/trinity-base/kopete/metadata.xml
index 14d4a468..ad3ffb00 100644
--- a/trinity-base/kopete/metadata.xml
+++ b/trinity-base/kopete/metadata.xml
@@ -6,27 +6,31 @@
 		<name>Alexander Golubev</name>
 	</maintainer>
 	<use>
-		<flag name="gsmlib">Add <pkg>app-mobilephone/gsmlib</pkg> support to sms plugin.</flag>
-		<flag name="netmeeting">Add Netmeeting plugin and support to the msn protocol.</flag>
+		<flag name="addbookmarks">Build addbookmarks plugin that automatically adds incoming urls to bookmarks.</flag>
+		<flag name="alias">Build alias plugin.</flag>
 		<flag name="autoreplace">Build autoreplace plugin.</flag>
-		<flag name="history">Build history plugin.</flag>
-		<flag name="contactnotes">Build contactnotes plugin.</flag>
 		<flag name="connectionstatus">Build connectionstatus plugin.</flag>
-		<flag name="translator">Build history plugin that automaticaly translates incoming and outgoing messages.</flag>
-		<flag name="nowlistening">Build nowlistening plugin.</flag>
-		<flag name="webpresence">Build webpresence plugin that shows your status and some more information on web..</flag>
-		<flag name="texteffect">Build texteffect plugin.</flag>
-		<flag name="highlight">Build highlight plugin that allows you to specify highlights on specific events.</flag>
-		<flag name="alias">Build alias plugin.</flag>
-		<flag name="motionautoaway">Build motionautoaway plugin.</flag>
-		<flag name="addbookmarks">Build addbookmarks plugin that automatically adds incoming urls to bookmarks.</flag>
-		<flag name="statistics">Build statistics plugin.</flag>
-		<flag name="smpppdcs">Build smpppdsc plugin.</flag>
+		<flag name="contactnotes">Build contactnotes plugin.</flag>
 		<flag name="gadu">Enaple Gadu protocol support with <pkg>net-libs/libgadu</pkg>.</flag>
 		<flag name="groupwise">Enable Groupwise protocol support.</flag>
+		<flag name="gsmlib">Add <pkg>app-mobilephone/gsmlib</pkg> support to sms plugin.</flag>
+		<flag name="highlight">Build highlight plugin that allows you to specify highlights on specific events.</flag>
+		<flag name="history">Build history plugin.</flag>
 		<flag name="irc">Enable IRC protocol support.</flag>
-		<flag name="sms">Enable sms sending functionality.</flag>
+		<flag name="jingle">Enable voice calls for jabber</flag>
+		<flag name="motionautoaway">Build motionautoaway plugin.</flag>
+		<flag name="msn">Enable "Windows live messenger" protocol support</flag>
+		<flag name="netmeeting">Add Netmeeting plugin and support to the msn protocol.</flag>
+		<flag name="nowlistening">Build nowlistening plugin.</flag>
+		<flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag>
 		<flag name="sametime">Add sametime protocol support with <pkg>net-libs/meanwhile</pkg>.</flag>
+		<flag name="smpppdcs">Build smpppdsc plugin.</flag>
+		<flag name="sms">Enable sms sending functionality.</flag>
+		<flag name="statistics">Build statistics plugin.</flag>
+		<flag name="texteffect">Build texteffect plugin.</flag>
+		<flag name="translator">Build history plugin that automaticaly translates incoming and outgoing messages.</flag>
+		<flag name="webpresence">Build webpresence plugin that shows your status and some more information on web..</flag>
 		<flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
+		<flag name="yahoo">Enable yahoo protocol support.</flag>
 	</use>
 </pkgmetadata>