Add back netmeeting USE flag, really fix bug #272678

Package-Manager: portage-2.1.6.13/cvs/Linux i686
RepoMan-Options: --force

3 files changed, 17 insertions, 18 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 6d8647e6a37a..9916119e29f5 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,9 @@
 # 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.200 2009/06/12 11:45:33 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.201 2009/06/12 23:53:05 gengor Exp $
+
+  12 Jun 2009; Gordon Malm <gengor@gentoo.org> kopete-3.5.10-r4.ebuild:
+  Add back netmeeting USE flag, really fix bug #272678
 
   12 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   kopete-3.5.10-r4.ebuild:
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 35f961bf0c54..58bc964321f2 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX emoticon-manager.patch 7734 RMD160 cc5dc562c52a5829ff185b48b91d567a14a4d5e0 SHA1 30a72897bc6b6ab61eeae0ddb948d8f0f6be6c94 SHA256 e7bc3893cf5883c1f28434d70dcd11f0776f79d8bb835fa7b85c1fd5a07edc22
 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
@@ -20,18 +17,11 @@ DIST kdenetwork-4.2.3.tar.bz2 7038337 RMD160 428c5356e716d3d0f60b766f3ad362b0599
 DIST kdenetwork-4.2.4.tar.bz2 7038448 RMD160 2ea29be5b112af974add898419403c9d8cea9436 SHA1 31f3f1c44690339ce523c309a3d2c131563d9f97 SHA256 e6e7e86d2a1d73e39bda57e4be88194cd400353ae7d3420613af4636da61f3e5
 EBUILD kopete-3.5.10-r2.ebuild 4119 RMD160 b024a6b17a68b96e0209d8ab66172017d4129538 SHA1 9fa9816c772ecb5c4349190afb6d6fb1f32c95e8 SHA256 4bb57afc0292fae18849b58aa5deefca3a0ee8cf661a747bd600e4847f0d9d68
 EBUILD kopete-3.5.10-r3.ebuild 4124 RMD160 798886d67892e7f1e128b250ea7910dc454e9081 SHA1 c924985eb2314c213ef6d66a6376d0b9c2e671b9 SHA256 748dc08969de40e24ef0a418a2732a79402119d3b18dac671b72b8964b5b6cb2
-EBUILD kopete-3.5.10-r4.ebuild 4405 RMD160 5a909a0d1ab2839a91f1d8c3a89a758ee9e2b570 SHA1 fa1c50cdf8bc9191928b8f21ab5e06b5bba8a648 SHA256 3611e6bb0c534d041a9d57ea648c19ed12505d58d3108b43c7170afb21298b38
+EBUILD kopete-3.5.10-r4.ebuild 4685 RMD160 906ab91efeb9eb86bdd8ce516274a7c1b66ba791 SHA1 1b78aaf121a676d14827ced494431db97261935e SHA256 1e7f15890d7c573073f17554e8ee150af2816dcb0a62cae468e0dafcc18ddb60
 EBUILD kopete-3.5.10.ebuild 4059 RMD160 351d646a33eab02cd9b7d6b6a589f5da0e3c0766 SHA1 c8d11f59fce543b3f9e96fde40b908be5dd08f66 SHA256 2f41468272f57ecc391354dfbcb7f16a3308923a0e6e3615038f3246859c7071
 EBUILD kopete-3.5.9-r2.ebuild 4209 RMD160 a0833a4579ebd3d7053018fcab6019ab8029de70 SHA1 a87e06d671a73b8be426cc095d58d9313045ab94 SHA256 3e5e102e57f5add8ad215192c40ae64b4bcda8b1dd2704fdf181286212283e36
 EBUILD kopete-3.5.9.ebuild 4176 RMD160 cf1327ab6f51b56d533aa0807975477027c76aa2 SHA1 64cd84aceda4987fcbcc38c433e11329aaa4ff7e SHA256 7e95a6a931c2d80e0896e38ef1a40d498a7ffc54d6cb1624a1aeb9a7aeccebeb
 EBUILD kopete-4.2.3.ebuild 3597 RMD160 20be5f1971ae05da999c68a63115f839e53feba5 SHA1 6e57e3834b1a3f8eb1ba28dafdb9256f6a50274d SHA256 3de9470cd03ce7887757319db0105436b55454a0e176c837c1137141c9c0346f
 EBUILD kopete-4.2.4.ebuild 3603 RMD160 3bd86378c0ffbe78b2ca8e2cfa85ca199b280809 SHA1 daad56aff317a5cd5edb463e2b70cac22549523a SHA256 d97872acc31a2f4a89f48a4df869d3519a42c2046adb581639aa3db25cd11274
-MISC ChangeLog 29462 RMD160 b321ad5e9464c0e0b4fad9ba28624ccbf0329f8c SHA1 cb8a4e8053ad6959028546232842dc195bf12d8a SHA256 1d2cc521551a5145014bf71d9973f6471deb2ba5c059d25e850830314f570a22
+MISC ChangeLog 29587 RMD160 9461280fc6c5acf1efd20e192cca514595d25c9a SHA1 ced40566b2767077628ba8a8ad566437ca3b1008 SHA256 1497e6979730351e0cfede8b45f7513ad969ab766d07bbcd0a68a370f96a52c3
 MISC metadata.xml 2775 RMD160 5a49e29c4f90ad4151651ea9294ed14fb536bf7e SHA1 b37e2d8e9157df1ed5f025ff0a05711ddf55aa30 SHA256 e3e8c7e442f6589de2c11a8713f53915706cf6d23c4787bd85f486f471172c51
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoyP+gACgkQjDdoMVfcAHiBXACgsA0H7Peg1fr23UkL2tA1Zi0p
-HBAAnRb1Fen0UIvL8L/bLTCBWIlvISse
-=agXR
------END PGP SIGNATURE-----
diff --git a/kde-base/kopete/kopete-3.5.10-r4.ebuild b/kde-base/kopete/kopete-3.5.10-r4.ebuild
index 2546d13764a4..e32c091ff909 100644
--- a/kde-base/kopete/kopete-3.5.10-r4.ebuild
+++ b/kde-base/kopete/kopete-3.5.10-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-3.5.10-r4.ebuild,v 1.8 2009/06/12 11:45:33 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.10-r4.ebuild,v 1.9 2009/06/12 23:53:05 gengor Exp $
 
 KMNAME=kdenetwork
 EAPI="1"
@@ -12,7 +12,7 @@ HOMEPAGE="http://kopete.kde.org/"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 
 IUSE="emoticons-manager jingle ssl xscreensaver slp kernel_linux kdehiddenvisibility"
-PLUGINS="addbookmarks alias autoreplace connectionstatus contactnotes crypt highlight history latex nowlistening
+PLUGINS="addbookmarks alias autoreplace connectionstatus contactnotes crypt highlight history latex netmeeting nowlistening
 	statistics texteffect translator webpresence"
 PROTOCOLS="gadu groupwise irc jabber oscar msn sametime sms v4l2 winpopup yahoo"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
@@ -50,12 +50,10 @@ RDEPEND="
 		media-gfx/imagemagick
 		virtual/latex-base
 	)
+	netmeeting? ( net-voip/ekiga )
 	ssl? ( =app-crypt/qca-tls-1.0* )
 "
 #	!kde-base/kdenetwork is handled by the eclass.
-#	gnomemeeting is deprecated and ekiga is not yet ~ppc64
-#	only needed for calling
-#	netmeeting? ( net-im/gnomemeeting )"
 
 DEPEND="
 	${BOTH_DEPEND}
@@ -74,6 +72,13 @@ pkg_setup() {
 		eerror "Please reemerge x11-libs/qt:3 with USE=\"opengl\"."
 		die "Please reemerge x11-libs/qt:3 with USE=\"opengl\"."
 	fi
+
+	if use netmeeting && ! use msn; then
+		eerror "Netmeeting support (USE=\"netmeeting\") for the MSN module has"
+		eerror "been requested, but the MSN module (USE=\"msn\") is not enabled."
+		eerror "Enable the \"msn\" USE flag or disable the \"netmeeting\" USE flag."
+		die "Invalid USE flag combination."
+	fi
 }
 
 kopete_disable() {
@@ -107,6 +112,7 @@ src_unpack() {
 	use highlight || kopete_disable plugin highlight
 	use history || kopete_disable plugin history
 	use latex || kopete_disable plugin latex
+	use netmeeting || kopete_disable plugin netmeeting
 	use nowlistening || kopete_disable plugin nowlistening
 	use statistics || kopete_disable plugin statistics
 	use texteffect || kopete_disable plugin texteffect