Version bump, bug #187192

Package-Manager: portage-2.1.2.11

7 files changed, 60 insertions, 346 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index f7a7e144cd98..7e50c2e623ce 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2007/08/03 14:19:09 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.20 2007/08/07 02:19:41 tester Exp $
+
+*pidgin-2.1.0 (07 Aug 2007)
+
+  07 Aug 2007; Olivier Crête <tester@gentoo.org> -pidgin-2.0.0.ebuild,
+  -pidgin-2.0.1.ebuild, +pidgin-2.1.0.ebuild:
+  Version bump, bug #187192
 
   03 Aug 2007; Tristan Heaven <nyhm@gentoo.org> pidgin-2.0.0.ebuild,
   pidgin-2.0.1.ebuild, pidgin-2.0.2.ebuild:
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 97b5995a1d8a..f66f7a62b3fa 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -13,42 +13,34 @@ AUX pidgin-2.0.1-purple-remote-syntax-fix.patch 403 RMD160 e2f3a38a25b9a1a5493c7
 MD5 1afebb41f11e4fa398bc4212a7229f2c files/pidgin-2.0.1-purple-remote-syntax-fix.patch 403
 RMD160 e2f3a38a25b9a1a5493c7ef94e86f5467cd522f1 files/pidgin-2.0.1-purple-remote-syntax-fix.patch 403
 SHA256 0ba68c5452a18bb25c1d4b60bd66d836313b22ed00eb357ad4004dca869c54da files/pidgin-2.0.1-purple-remote-syntax-fix.patch 403
-DIST pidgin-2.0.0.tar.bz2 2965237 RMD160 22c37dc80102dcddd0f19cead5e0624a0efcc5a2 SHA1 0708965fc17da69770bd6fd14ea8426073fedc8c SHA256 a142827964333ae318e749942f6fba55e7028bd82e7893585b25bd99a7a1698e
-DIST pidgin-2.0.1.tar.bz2 7682458 RMD160 ea3d3a29bdad659a9a8c07a66365be51b42bcef8 SHA1 1b88284bbe89300a4c7227b4ea0a6f907d36dea3 SHA256 80f9908a604600950de8894e8107ba8f449543034e0220382d0c9f7361d151fc
 DIST pidgin-2.0.2.tar.bz2 7838262 RMD160 d1b6d30b5c8e68c55c8ef8b8118c7041b6d67348 SHA1 7f5cdc3e8fb8b8af9646bb0635b2852c24f7e059 SHA256 e2d8d48b00d42cf935e3a7c8ed2d83d559be65cf3eca7cc88a8d0b7e4ba15a41
-EBUILD pidgin-2.0.0.ebuild 7440 RMD160 c053e1918d6681acb535b3d7db976cfb329a6373 SHA1 401b51c1f3d09496cb478984b6d6c7194f991258 SHA256 d0901f908246f515581039ab5b997ccb53aa9fd85483fad9f11044f1f5585254
-MD5 ec5d9dd70b131adf41dc48f15f6b4e60 pidgin-2.0.0.ebuild 7440
-RMD160 c053e1918d6681acb535b3d7db976cfb329a6373 pidgin-2.0.0.ebuild 7440
-SHA256 d0901f908246f515581039ab5b997ccb53aa9fd85483fad9f11044f1f5585254 pidgin-2.0.0.ebuild 7440
-EBUILD pidgin-2.0.1.ebuild 7653 RMD160 1197b7ebcfe0414501c485eb7639fb0e301b22ae SHA1 d780b9050446f823245380fefe0211b9fa5bc436 SHA256 f3640541fad067ec30551b671f8d664b43c9d42762219d157bde9f1abcea7fce
-MD5 1a2f979537981a0fa031a8196a906748 pidgin-2.0.1.ebuild 7653
-RMD160 1197b7ebcfe0414501c485eb7639fb0e301b22ae pidgin-2.0.1.ebuild 7653
-SHA256 f3640541fad067ec30551b671f8d664b43c9d42762219d157bde9f1abcea7fce pidgin-2.0.1.ebuild 7653
+DIST pidgin-2.1.0.tar.bz2 7772942 RMD160 d04437251fbea8a1902621ebdf98f6fdc826a6d4 SHA1 33f78d07c3c7797a710bb7d2032a8d0bd89a6ab3 SHA256 79be69cccca6cb25d6c1ba0360864da8a0c043f5ded55babcd99dc5b8e15a5f8
 EBUILD pidgin-2.0.2.ebuild 7609 RMD160 79fd4d85770cfb08d9b2938a7ed16be74b033b1b SHA1 621de16931e4a7384a8621dfd9fea74288abdc18 SHA256 dfa0074c758a481c9b58709b02da776c512eddd0edf7cb2b91f51e36838ca303
 MD5 5eb3a3938d0832043fe95a444a7c3ed3 pidgin-2.0.2.ebuild 7609
 RMD160 79fd4d85770cfb08d9b2938a7ed16be74b033b1b pidgin-2.0.2.ebuild 7609
 SHA256 dfa0074c758a481c9b58709b02da776c512eddd0edf7cb2b91f51e36838ca303 pidgin-2.0.2.ebuild 7609
-MISC ChangeLog 2792 RMD160 09f1fc5bddd093d43b55ec0f510c3cd5f7e6d900 SHA1 9047c7f9b2beb070ab93cae84938c1a34d02921a SHA256 7ee7baaa695b0cb32bfbf237bb2815a285eeb5553299a0bf68fa83007dcc0c0f
-MD5 62f374bc9097d3ff743cd71c4a910b06 ChangeLog 2792
-RMD160 09f1fc5bddd093d43b55ec0f510c3cd5f7e6d900 ChangeLog 2792
-SHA256 7ee7baaa695b0cb32bfbf237bb2815a285eeb5553299a0bf68fa83007dcc0c0f ChangeLog 2792
+EBUILD pidgin-2.1.0.ebuild 7484 RMD160 6ed978930ebebcbd16b50f502d32077181cea121 SHA1 fc0729e3b4447c20db121e141789c64e065c4592 SHA256 742d05ab2375be97577a782999d9929902d439b2f333ed39f6828b7eaf909c9b
+MD5 a8fddc5f627bb26090916e86baf41277 pidgin-2.1.0.ebuild 7484
+RMD160 6ed978930ebebcbd16b50f502d32077181cea121 pidgin-2.1.0.ebuild 7484
+SHA256 742d05ab2375be97577a782999d9929902d439b2f333ed39f6828b7eaf909c9b pidgin-2.1.0.ebuild 7484
+MISC ChangeLog 2970 RMD160 1cf3fdcffdf2e232cf7e87927fd2cb894705a3ec SHA1 93f2447fb8e55de455bcc86cd5442d2b2eea49be SHA256 f297c62a4c5cf288e1ec63d9c3bb9d1b6c69a28e4404e218fb6a911661ad587b
+MD5 9e6da752d60b665faa067cbcc9da992a ChangeLog 2970
+RMD160 1cf3fdcffdf2e232cf7e87927fd2cb894705a3ec ChangeLog 2970
+SHA256 f297c62a4c5cf288e1ec63d9c3bb9d1b6c69a28e4404e218fb6a911661ad587b ChangeLog 2970
 MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
 MD5 bba7b9e682937ac5182b872b00b19d93 metadata.xml 458
 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd metadata.xml 458
 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9 metadata.xml 458
-MD5 13c012f7519179f1139bc6a67b20f7ce files/digest-pidgin-2.0.0 244
-RMD160 60c81b7342c4c473fcb591e5299a1707717c16f6 files/digest-pidgin-2.0.0 244
-SHA256 bc0c93dcaa55f3abe8843715f197af3c181609729b3ba532fe1c29210e5ef48e files/digest-pidgin-2.0.0 244
-MD5 8625234e10b93d02c0a52b604e76aa56 files/digest-pidgin-2.0.1 244
-RMD160 5959d54d422c8908183f7f4f148e4eb4c79dcf23 files/digest-pidgin-2.0.1 244
-SHA256 4497649139e101148737beee7286ec99251c0f212d04d0870ff7b4b467b7e34a files/digest-pidgin-2.0.1 244
 MD5 20d2e5c31a250ab41decc02c3ca57fe2 files/digest-pidgin-2.0.2 244
 RMD160 1ea26f933a03474796cd0606dbaa89fadcc9fbdc files/digest-pidgin-2.0.2 244
 SHA256 27d66066811cc55863a0fa30b3fdb0d94ab65f7a3dae2c1b1062a4893b6f91bb files/digest-pidgin-2.0.2 244
+MD5 04dff9a5dba46adcbf2b44ec303833fd files/digest-pidgin-2.1.0 244
+RMD160 a8781e42e65cef1475de205b50bce09002e323f9 files/digest-pidgin-2.1.0 244
+SHA256 5dee037d90f0e13e1a9c2995d0a8ea52774390806556bac19bfe9c954797b098 files/digest-pidgin-2.1.0 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGszlkdz7hIScOURERApQ5AKDDCzRZKn9YByrOtsQTp3kjklNtswCg6TPx
-svQ9VjDvpyxWG9dlu3UkdXs=
-=E8TC
+iD8DBQFGt9kP+IXOQtHLm/gRAi3rAJ4yfn6lRFe2KHftPGrQTd0AHCIJfACfZ3Dv
+YdqGejTjmaoLpIVT0y+rC8w=
+=0eJ6
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/digest-pidgin-2.0.0 b/net-im/pidgin/files/digest-pidgin-2.0.0
deleted file mode 100644
index 8dd6af06b3e3..000000000000
--- a/net-im/pidgin/files/digest-pidgin-2.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-pidgin-2.0.1 b/net-im/pidgin/files/digest-pidgin-2.0.1
deleted file mode 100644
index 17f520409632..000000000000
--- a/net-im/pidgin/files/digest-pidgin-2.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 51062e232c1ba5429d8be43623983fdf pidgin-2.0.1.tar.bz2 7682458
-RMD160 ea3d3a29bdad659a9a8c07a66365be51b42bcef8 pidgin-2.0.1.tar.bz2 7682458
-SHA256 80f9908a604600950de8894e8107ba8f449543034e0220382d0c9f7361d151fc pidgin-2.0.1.tar.bz2 7682458
diff --git a/net-im/pidgin/files/digest-pidgin-2.1.0 b/net-im/pidgin/files/digest-pidgin-2.1.0
new file mode 100644
index 000000000000..009971c1e665
--- /dev/null
+++ b/net-im/pidgin/files/digest-pidgin-2.1.0
@@ -0,0 +1,3 @@
+MD5 83f44bf9c076595967f7374c50250176 pidgin-2.1.0.tar.bz2 7772942
+RMD160 d04437251fbea8a1902621ebdf98f6fdc826a6d4 pidgin-2.1.0.tar.bz2 7772942
+SHA256 79be69cccca6cb25d6c1ba0360864da8a0c043f5ded55babcd99dc5b8e15a5f8 pidgin-2.1.0.tar.bz2 7772942
diff --git a/net-im/pidgin/pidgin-2.0.0.ebuild b/net-im/pidgin/pidgin-2.0.0.ebuild
deleted file mode 100644
index 65b7c3e0000b..000000000000
--- a/net-im/pidgin/pidgin-2.0.0.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# 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.0.ebuild,v 1.8 2007/08/03 14:19:09 nyhm Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib autotools perl-app gnome2
-
-MY_PV=${P/_beta/beta}
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-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 cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver spell ssl qq msn gadu"
-IUSE="${IUSE} gtk sasl ncurses groupwise prediction" # mono"
-IUSE="${IUSE} krb4"
-
-RDEPEND="
-	bonjour? ( !avahi? ( net-misc/howl )
-		   avahi? ( net-dns/avahi ) )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/dbus-0.90
-		>=dev-lang/python-2.4 )
-	gtk? (
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		>=x11-libs/gtk+-2.0
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		xscreensaver? (	x11-libs/libXScrnSaver )
-		eds? ( gnome-extra/evolution-data-server ) 	)
-	>=dev-libs/glib-2.0
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		     =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 )
-	)
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	doc? ( app-doc/doxygen )
-	dev-libs/libxml2
-	networkmanager? ( net-misc/networkmanager )
-	prediction? ( =dev-db/sqlite-3* )"
-	#mono? ( dev-lang/mono )"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-# PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )"
-
-S="${WORKDIR}/${MY_PV}"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
-
-# List of plugins yet to be ported (will be removed at some point)
-#   app-accessibility/festival-gaim
-#   net-im/gaim-blogger
-#   net-im/gaim-bnet
-#   net-im/gaim-meanwhile (integrated in gaim)
-#   net-im/gaim-snpp (will soon be net-im/pidgin-snpp)
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-assistant
-#   x11-plugins/gaim-latex
-#   x11-plugins/gaim-otr
-#   x11-plugins/gaimosd
-#   x11-plugins/gaim-xfire
-
-# List of plugins
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/gaim-rhythmbox
-#   x11-plugins/guifications
-#   x11-plugins/pidgin-encryption
-
-print_pidgin_warning() {
-	ewarn
-	ewarn "We strongly recommend that you backup your ~/.gaim directory"
-	ewarn "before running Pidgin for the first time. Things you should be"
-	ewarn "on the lookout for include problems with preferences being lost"
-	ewarn "or forgotten, buddy icons not working as you expect, plugins or"
-	ewarn "other external files not properly being found."
-	ewarn
-	ewarn "If you are merging ${MY_P} from an earlier version of gaim,"
-	ewarn "you may need to re-merge any plugins like gaim-encryption or"
-	ewarn " gaim-snpp (when they are ported to pidgin!)."
-	ewarn
-	ewarn "If you experience problems with pidgin, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with pidgin's bug tracker, and by all means DO NOT"
-	ewarn "seek help in #pidgin."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://developer.pidgin.im/wiki/GetABacktrace for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the pidgin FAQ at http://developer.pidgin.im/wiki/FAQ"
-	ewarn
-	einfo
-}
-
-pkg_setup() {
-	print_pidgin_warning
-
-	if use bonjour && use avahi && ! built_with_use net-dns/avahi howl-compat ; then
-	eerror
-	eerror "You need to rebuild net-dns/avahi with USE=howl-compat in order"
-	eerror  "to enable howl support for the bonjour protocol in pidgin."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use gadu && built_with_use net-libs/libgadu ssl ; then
-	eerror
-	eerror "You need to rebuild net-libs/libgadu with USE=-ssl in order"
-	eerror "enable gadu gadu support in pidgin."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use ncurses &&  ! built_with_use sys-libs/ncurses unicode; then
-		eerror
-		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
-		eerror "to build finch the console client of pidgin."
-		eerror
-		die "Configure failed"
-	fi
-
-	if ! use gtk && ! use ncurses; then
-		einfo
-		elog "As you did not pick gtk or ncurses use flag, building"
-		elog "console only."
-		einfo
-	fi
-
-	if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then
-		eerror
-		eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to
-		eerror enable krb4 support for the zephyr protocol in gaim.
-		eerror
-		die "Configure failed"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-cchar_t-undeclared.patch"
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[[ "`gcc-version`" == "3.2" ]] && filter-flags -msse2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	if use silc; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc"
-	fi
-
-	if use qq; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq"
-	fi
-
-	if use meanwhile; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime"
-	fi
-
-	if use bonjour; then
-		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
-
-	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
-	else
-		einfo "No SSL support selected"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=no"
-	fi
-
-	if use xscreensaver ; then
-			myconf="${myconf} --x-includes=/usr/include/X11"
-	fi
-
-	if ! use ncurses && ! use gtk; then
-		myconf="${myconf} --enable-consoleui"
-	else
-		myconf="${myconf} $(use_enable ncurses consoleui) $(use_enable gtk gtkui)"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable startup-notification) \
-		$(use_enable tcl) \
-		$(use_enable gtk sm) \
-		$(use_enable spell gtkspell) \
-		$(use_enable tk) \
-		$(use_enable xscreensaver screensaver) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable eds gevolution) \
-		$(use_enable gstreamer) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable prediction cap) \
-		$(use_enable networkmanager nm) \
-		$(use_with krb4) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		${myconf} || die "Configuration failed"
-		#$(use_enable mono) \
-
-		emake || die "make failed"
-}
-
-src_install() {
-	gnome2_src_install
-	use perl && fixlocalpod
-	dodoc AUTHORS COPYING HACKING INSTALL NEWS README ChangeLog
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	print_pidgin_warning
-}
diff --git a/net-im/pidgin/pidgin-2.0.1.ebuild b/net-im/pidgin/pidgin-2.1.0.ebuild
index 9d96c893cf56..ac529f956c85 100644
--- a/net-im/pidgin/pidgin-2.0.1.ebuild
+++ b/net-im/pidgin/pidgin-2.1.0.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.1.ebuild,v 1.5 2007/08/03 14:19:09 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.1.0.ebuild,v 1.1 2007/08/07 02:19:41 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 cjk 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 )
@@ -62,31 +56,43 @@ DEPEND="$RDEPEND
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-# PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )"
-
 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)
-#   app-accessibility/festival-gaim
-#   net-im/gaim-blogger
 #   net-im/gaim-bnet
-#   net-im/gaim-meanwhile (integrated in gaim)
-#   net-im/gaim-snpp (will soon be net-im/pidgin-snpp)
 #   x11-plugins/autoprofile
+#   x11-plugins/gaim-xfire
+#   x11-plugins/gaim-galago
+#   x11-themes/gaim-smileys (get liquidx to fix it)
+
+# Abandonned
+#   x11-plugins/ignorance
+#   x11-plugins/bangexec
 #   x11-plugins/gaim-assistant
-#   x11-plugins/gaim-otr
+# Last release in 2004
+#   net-im/gaim-blogger
 #   x11-plugins/gaimosd
-#   x11-plugins/gaim-xfire
+# Last release in 2005
+#   app-accessibility/festival-gaim
+# Merged into something else
+#   net-im/gaim-meanwhile (integrated in gaim)
+#   net-im/gaim-snpp (merged into the plugin pack)
+#   x11-plugins/gaim-slashexec (integrated into plugin pack)
 
 # List of plugins
-#   x11-plugins/pidgin-extprefs
+#   net-im/librvp
 #   x11-plugins/gaim-rhythmbox
 #   x11-plugins/guifications
 #   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
 #   x11-plugins/pidgin-latex
+#   x11-plugins/pidgin-libnotify
+#   x11-plugins/pidgin-otr
+#   x11-plugins/purple-plugin_pack
 
 print_pidgin_warning() {
 	ewarn
@@ -157,17 +163,6 @@ pkg_setup() {
 
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-2.0.0-cchar_t-undeclared.patch"
-	epatch "${FILESDIR}/pidgin-2.0.1-purple-remote-syntax-fix.patch"
-	epatch "${FILESDIR}/${P}-desktop.patch"
-
-	eautomake
-}
-
 src_compile() {
 	# Stabilize things, for your own good
 	strip-flags
@@ -200,10 +195,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
@@ -212,19 +203,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
@@ -232,7 +218,7 @@ src_compile() {
 	fi
 
 	if ! use ncurses && ! use gtk; then
-		myconf="${myconf} --enable-consoleui"
+		myconf="${myconf} --enable-consoleui --disable-gtkui"
 	else
 		myconf="${myconf} $(use_enable ncurses consoleui) $(use_enable gtk gtkui)"
 	fi