Always enable msn protocol and remove ssl use flag since its not compulsory

(Portage version: 2.1.2.9)

3 files changed, 19 insertions, 31 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 712ea38d314b..4c89df618fd1 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.17 2007/06/30 16:37:51 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.18 2007/07/20 21:48:53 tester Exp $
+
+  20 Jul 2007; <tester@gentoo.org> pidgin-2.0.2.ebuild:
+  Always enable msn protocol and remove ssl use flag since its not compulsory
 
   30 Jun 2007; Olivier Crête <tester@gentoo.org> pidgin-2.0.2.ebuild:
   Disable gtk ui if neither gtk or ncurses use flags are present
diff --git a/net-im/pidgin/files/digest-pidgin-2.0.0 b/net-im/pidgin/files/digest-pidgin-2.0.0
index 4590cd5b4dbe..8dd6af06b3e3 100644
--- a/net-im/pidgin/files/digest-pidgin-2.0.0
+++ b/net-im/pidgin/files/digest-pidgin-2.0.0
@@ -1,3 +1,3 @@
-MD5 132355d7e236d9c2820a2668621eef43 pidgin-2.0.0.tar.bz2 7521328
-RMD160 1e387bb098bb985c5aa46deedc5eb4450579ae4e pidgin-2.0.0.tar.bz2 7521328
-SHA256 d700a95fbce796b4a9e5c2fb07aad8c24402f38a795c8eb51a44e000a8400cff pidgin-2.0.0.tar.bz2 7521328
+MD5 255535d16427f56c9fc9ce8a9fb794bd pidgin-2.0.0.tar.bz2 2965237
+RMD160 22c37dc80102dcddd0f19cead5e0624a0efcc5a2 pidgin-2.0.0.tar.bz2 2965237
+SHA256 a142827964333ae318e749942f6fba55e7028bd82e7893585b25bd99a7a1698e pidgin-2.0.0.tar.bz2 2965237
diff --git a/net-im/pidgin/pidgin-2.0.2.ebuild b/net-im/pidgin/pidgin-2.0.2.ebuild
index e18816efc2b0..82881b56696b 100644
--- a/net-im/pidgin/pidgin-2.0.2.ebuild
+++ b/net-im/pidgin/pidgin-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.2.ebuild,v 1.3 2007/07/01 06:24:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.2.ebuild,v 1.4 2007/07/20 21:48:53 tester Exp $
 
 WANT_AUTOMAKE=1.9
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi bonjour crypt dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver spell ssl qq msn gadu"
+IUSE="avahi bonjour crypt dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver spell qq gadu"
 IUSE="${IUSE} gtk sasl ncurses groupwise prediction zephyr" # mono"
 
 RDEPEND="
@@ -36,14 +36,8 @@ RDEPEND="
 		     =media-libs/gst-plugins-good-0.10* )
 	perl? ( >=dev-lang/perl-5.8.2-r1 )
 	gadu?  ( net-libs/libgadu )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/nss-3.11 )
-	)
-	msn? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/nss-3.11 )
-	)
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( >=dev-libs/nss-3.11 )
 	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
 	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1 )
@@ -65,7 +59,7 @@ DEPEND="$RDEPEND
 S="${WORKDIR}/${MY_PV}"
 
 # Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple,msn"
 
 # List of plugins yet to be ported (will be removed at some point)
 #   net-im/gaim-bnet
@@ -208,10 +202,6 @@ src_compile() {
 		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour"
 	fi
 
-	if use msn; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},msn"
-	fi
-
 	if use groupwise; then
 		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
 	fi
@@ -220,19 +210,14 @@ src_compile() {
 		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},zephyr"
 	fi
 
-	if use ssl || use msn ; then
-		if use gnutls ; then
-			einfo "Disabling NSS, using GnuTLS"
-			myconf="${myconf} --enable-nss=no --enable-gnutls=yes"
-			myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-			myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
-		else
-			einfo "Disabling GnuTLS, using NSS"
-			myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
-		fi
+	if use gnutls ; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf="${myconf} --enable-nss=no --enable-gnutls=yes"
+		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
+		myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
 	else
-		einfo "No SSL support selected"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=no"
+		einfo "Disabling GnuTLS, using NSS"
+		myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
 	fi
 
 	if use xscreensaver ; then