Update metadata.xml to reflect useflag changes.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 10 insertions, 161 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index e90011477a22..ac84258d45ad 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.181 2009/04/17 07:55:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.182 2009/04/28 14:17:24 scarabeus Exp $
+
+  28 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml,
+  -kopete-4.2.2.ebuild:
+  Update metadata.xml to reflect useflag changes.
 
   17 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org> -kopete-4.2.1.ebuild,
   kopete-4.2.2, kopete-4.2.2-r1:
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 79da0bb09e90..32501107f387 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnomemeeting-ekiga.patch 2073 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 SHA1 13cdedb9087de6757a11f8bf03dd2a992ae37ffe SHA256 5f908d8491a286db761d4c7e0bc07da05ad0ec7cc5c94bc69533706bbd8d552c
 AUX kdenetwork-3.5.5-linux-headers-2.6.18.patch 799 RMD160 1e12373bef6f0a69d9b5d453c9a63b84f7b48645 SHA1 642a54568612c62543759eab4550b4db03a42bb0 SHA256 1e282677beb1bec1c32e12c2c289e498b487b9f0bd0fa9c7b38a4944d48d6e9a
 AUX kopete-0.12_alpha1-xscreensaver.patch 778 RMD160 d188f074982191f6f961c7e32ec97a79746e73df SHA1 85dea3f727af4393740bacb237c80ee666f1bdae SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d
@@ -14,13 +11,5 @@ DIST kdenetwork-4.2.2.tar.bz2 7174894 RMD160 e9bcf31475785ed2ecc7148cba7e1650cdc
 EBUILD kopete-3.5.10.ebuild 4059 RMD160 351d646a33eab02cd9b7d6b6a589f5da0e3c0766 SHA1 c8d11f59fce543b3f9e96fde40b908be5dd08f66 SHA256 2f41468272f57ecc391354dfbcb7f16a3308923a0e6e3615038f3246859c7071
 EBUILD kopete-3.5.9.ebuild 4176 RMD160 cf1327ab6f51b56d533aa0807975477027c76aa2 SHA1 64cd84aceda4987fcbcc38c433e11329aaa4ff7e SHA256 7e95a6a931c2d80e0896e38ef1a40d498a7ffc54d6cb1624a1aeb9a7aeccebeb
 EBUILD kopete-4.2.2-r1.ebuild 3597 RMD160 d856b853cee36adeba65a99eae63529c1404db02 SHA1 3f4bdcedad862db10469a02c45148a69f2b3369f SHA256 975bc003e3b29b9a248f5f5a749f9e619d94cb7f93d456785a9088caabe51315
-EBUILD kopete-4.2.2.ebuild 3643 RMD160 29d6e2e2ed88fab733e04c96880527ffd0ef9595 SHA1 d6a0087365991cd7fb3a3da2d37f04a2fc54b94d SHA256 080afc430e77a5ee297bc7574ff486c5b90f022ba957d23154b837128abcac52
-MISC ChangeLog 26277 RMD160 8422e0927498e490612c9051317fd3292c6fe770 SHA1 f434e0beff7c6993538665d0a874237108a79d35 SHA256 fc617ff84810ba547309aecb3e2351fa40cf440449128ae4dfa7d20196a1c712
-MISC metadata.xml 2800 RMD160 fdb882ded429bc5293542dd2966e7a3c89069dff SHA1 dd9934ac1bcb1f16ccb2df28af89e25f864c062b SHA256 a1dcbe33f16ff33a1a9359d7cc43ad0a5f972ca893310d0767cd295a98b42a4d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknoNfYACgkQ5BmOA85PVLjJIQCdFIW2fPIYKokhweaLbAxjqlYd
-5gQAn2eTwuGYiYvSLfLyaGuIPxjN3N7n
-=jY6q
------END PGP SIGNATURE-----
+MISC ChangeLog 26421 RMD160 1980a2a21615e9265cf5780adfe14903db140d0c SHA1 bacde37619b35e36fea5cc34dc7ef5841dabed3b SHA256 f367c35caa8ad24f3f8a934e19c20eebb37be923eb4fa699d31fb1a7053e02c6
+MISC metadata.xml 2835 RMD160 9a4402c8eef6a1efdc008d1d9426416b726869df SHA1 7e8b595cedf98437a968dba617df7ec9763242a7 SHA256 93026c8a7560edae518615c15803ebdb8786ec415cbfb83d3214a144cd0e13e0
diff --git a/kde-base/kopete/kopete-4.2.2.ebuild b/kde-base/kopete/kopete-4.2.2.ebuild
deleted file mode 100644
index b6cf8da3e27e..000000000000
--- a/kde-base/kopete/kopete-4.2.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.2.2.ebuild,v 1.2 2009/04/17 07:55:28 alexxy Exp $
-
-EAPI="2"
-
-KMNAME="kdenetwork"
-inherit kde4-meta
-
-DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug doc ssl"
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +alias +autoreplace +contactnotes +highlight +history latex
-+nowlistening otr +pipes +privacy +statistics +texteffect +translator +urlpicpreview webpresence"
-
-# Available protocols
-#
-#	bonjour: NO DEPS
-#	gadu: openssl
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	jabber: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	jingle: media-libs/speex net-libs/ortp
-#	meanwhile: net-libs/meanwhile
-#	msn: libmsn
-#	oscar: NO DEPS
-#	qq: NO DEPS
-#	sms: NO DEPS
-#   telepathy: net-libs/decibel
-#   testbed: NO DEPS
-#	winpopup: NO DEPS
-#	wlm: libmsn
-#	yahoo: NO DEPS
-PROTOCOLS="bonjour gadu groupwise +jabber jingle meanwhile msn oscar qq
-testbed winpopup wlm yahoo"
-
-# disabled protocols
-#   telepathy: net-libs/decibel
-#   irc: NO DEPS
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-# Tests are KDE-ish.
-RESTRICT="test"
-
-COMMONDEPEND="
-	dev-libs/libpcre
-	x11-libs/libXScrnSaver
-	>=x11-libs/qt-gui-4.4.0:4[mng]
-	gadu? ( dev-libs/openssl )
-	groupwise? ( app-crypt/qca:2 )
-	jabber? (
-		app-crypt/qca:2
-		net-dns/libidn
-		jingle? (
-			>=media-libs/speex-1.2_rc1
-			>=net-libs/ortp-0.13
-		)
-	)
-	meanwhile? ( net-libs/meanwhile )
-	msn? ( net-libs/libmsn )
-	otr? ( >=net-libs/libotr-3.2.0 )
-	statistics? ( dev-db/sqlite:3 )
-	webpresence? ( dev-libs/libxml2 dev-libs/libxslt )
-	wlm? ( net-libs/libmsn )
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		media-gfx/imagemagick
-		virtual/latex-base
-	)
-"
-#	telepathy? ( net-libs/decibel )"
-DEPEND="${COMMONDEPEND}
-	x11-proto/scrnsaverproto
-"
-PDEPEND="
-	ssl? ( app-crypt/qca-ossl )
-"
-
-src_configure() {
-	local x
-	# Xmms isn't in portage, thus forcefully disabled.
-	mycmakeargs="${mycmakeargs} -DWITH_Xmms=OFF"
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_with ${x/+/})"
-	done
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_with ${x/+/})"
-	done
-	# additional defines
-	if use jingle && ! use jabber; then
-		elog "You enabled jingle but not jabber useflag. Jingle is integral part of"
-		elog "jabber protocol."
-	fi
-	if use jabber; then
-		mycmakeargs="${mycmakeargs} -DNO_JINGLE=$(use jingle && echo OFF || echo ON)"
-	fi
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	#if use telepathy; then
-	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
-	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
-	#	elog "export TELEPATHY_DATA_PATH=/usr/share/telepathy/managers/"
-	#fi
-
-	elog "The messenger plugin has been renamed to wlm - adjust your use flags accordingly."
-
-	if ! use ssl; then
-		if use jabber || use wlm; then # || use irc; then
-			echo
-			elog "In order to use ssl in jabber, wlm and irc you'll need to"
-			elog "install app-crypt/qca-ossl package."
-			echo
-		fi
-	fi
-}
diff --git a/kde-base/kopete/metadata.xml b/kde-base/kopete/metadata.xml
index 3dd3a92d4583..c2549a5d8186 100644
--- a/kde-base/kopete/metadata.xml
+++ b/kde-base/kopete/metadata.xml
@@ -27,15 +27,15 @@
 	<flag name="irc">Enable the IRC protocol handler.</flag>
 	<flag name="jabber">Enable XMPP protocol handler (this is also gmail).</flag>
 	<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
-	<flag name="msn">Enable support for MSN (old microsoft protocol).</flag>
+	<flag name="messenger">Enable support for MSN and Windows live protocols (old implementation).</flag>
+	<flag name="msn">Enable "Windows live messenger" protocol support.</flag>
 	<flag name="netmeeting">Builds netmeeting plugin (require gnomemeeting)</flag>
-	<flag name="oscar">Enable support for AIM and ICQ protocols.</flag>
 	<flag name="qq">enable support for the chinese network protocol.</flag>
 	<flag name="sametime">Enables support for the Sametime protocol for instant messaging</flag>
 	<flag name="sms">Enable the sms sending plugin.</flag>
+	<flag name="telepathy">Enable support for the realtime communication framework telepathy.</flag>
 	<flag name="testbed">Enable the testbed protocol.</flag>
 	<flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
-	<flag name="wlm">Enable "Windows live messenger" protocol support (New protocol from MS).</flag>
 	<flag name="yahoo">Enable yahoo protocol support.</flag>
 </use>
 <herd>kde</herd>