Version bump, bug #342017 by tman. Fixes remote crash, security bug #342059 by Tim Sammut. Respect LDFLAGS in perl bindings, bug #331851, thank Diego E. 'Flameeyes' Pettenò for report and Markos Chandras for initial patch. Should fix crash reported in bug #339938 by Wu, Shanliang. Force nls if gtk enabled to have desktop entry, bug #322717, thank Marcin Deranek for report. Remove .la files. Drop old.

Package-Manager: portage-2.1.9.21/cvs/Linux x86_64

7 files changed, 61 insertions, 473 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 2e4e3ae88dbd..4fb056875e35 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.192 2010/10/15 16:29:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.193 2010/10/25 10:59:05 pva Exp $
+
+*pidgin-2.7.4 (25 Oct 2010)
+
+  25 Oct 2010; Peter Volkov <pva@gentoo.org>
+  -files/pidgin-2.7.0-icq-fix.patch, -pidgin-2.7.1-r1.ebuild,
+  -pidgin-2.7.2.ebuild, -pidgin-2.7.2-r1.ebuild,
+  +files/pidgin-2.7.3-ldflags.patch, +pidgin-2.7.4.ebuild:
+  Version bump, bug #342017 by tman. Fixes remote crash, security bug
+  #342059 by Tim Sammut. Respect LDFLAGS in perl bindings, bug #331851,
+  thank Diego E. 'Flameeyes' Pettenò for report and Markos Chandras for
+  initial patch. Should fix crash reported in bug #339938 by Wu, Shanliang.
+  Force nls if gtk enabled to have desktop entry, bug #322717, thank Marcin
+  Deranek for report. Remove .la files. Drop old.
 
   15 Oct 2010; Jeroen Roovers <jer@gentoo.org> pidgin-2.7.3.ebuild:
   Stable for HPPA (bug #338022).
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 094cab37a5c5..cc3f89a2e5d6 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,11 +1,8 @@
-AUX pidgin-2.7.0-icq-fix.patch 1991 RMD160 7158710b27950bec2d8dec47e02a4494f8dfaac9 SHA1 8589601e86bd8077f8dd50afac49ee38b71cfba1 SHA256 c2e9e1bf1921e2e2e9f1594a348be5103298f28bc4ab5fcbd6c3cb6543fea24e
 AUX pidgin-2.7.2-ldflags.patch 1593 RMD160 ade438f25d0af927485523e561ce728762645948 SHA1 6ac16bd019ad048109643af5e3525987c994dbb0 SHA256 64d78b48111345b49216e9678c114f321963393b4fd0aa6046de8aec6f03cb44
-DIST pidgin-2.7.1.tar.bz2 9647234 RMD160 5e5deec529b1c8d75cd3f925b3f5e4f5310e42e5 SHA1 b746720cc3e65b3d6da6eab0729f26673f997849 SHA256 f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1
-DIST pidgin-2.7.2.tar.bz2 9681708 RMD160 c277e26f5fe91425033cb8fe6c8913d965dffec0 SHA1 03232f7befcfbe1c457d50d697493924fe5f9b49 SHA256 8ab5f126f384197727db8f61306663325c2779c25e54e61ff95366448a0861c0
+AUX pidgin-2.7.3-ldflags.patch 1332 RMD160 0dd11485e9c990dab1230629faac704835a91ae4 SHA1 7bbb420a206bf6cb366bf501b90c893e896a1f65 SHA256 1f8574a9c2f056ba8c07559623da8c9ce241928f060898752eef5770dd1d081a
 DIST pidgin-2.7.3.tar.bz2 9746117 RMD160 276fb19abf6505f9d56120c7412987002511fcb3 SHA1 81b9b5591ddbdf36aa656ddd90ff935ae090e940 SHA256 8b5788aa7b8c3fa372e6c5f671592731c86e41322bcc09facb6bbe6127e323f2
-EBUILD pidgin-2.7.1-r1.ebuild 5963 RMD160 39723d94d3eee63e2fb626a61925ec05e8092d90 SHA1 dfa1d302e8e97735caeacaa80c0e445e3c2e2403 SHA256 c1a894845aaaf1b837eeae1c581a149163a0bd57079e76edbdb95eeca178c92a
-EBUILD pidgin-2.7.2-r1.ebuild 6073 RMD160 2996832d5fe0d3b98bf9233eb9234304f595ae90 SHA1 2097c068d2b679a21edbb64aee6bb9769128da50 SHA256 0165a0de1af704b355e69d9112655b04c42f591ba1a5846bcdfb18bea5ea839a
-EBUILD pidgin-2.7.2.ebuild 5956 RMD160 388324cc15fb12abf5eac4e7c3f4af36cb0b486f SHA1 d2705eb880b742dc424f21cc6c7de39edd253ad9 SHA256 bc54a37582e096030fd8cc94d164bb6535f20178a38c2c5a90c2f8ea68914d00
+DIST pidgin-2.7.4.tar.bz2 9799804 RMD160 900cdcffa34bfc43da803abf5427fdde8bb00b4e SHA1 f7d8d0fcecddda636db642e403280e85b76ea5f2 SHA256 7c6fa2811082bde2dbd0897414f9f8f18e7c3e51159288571af1f1f2ce81f856
 EBUILD pidgin-2.7.3.ebuild 6091 RMD160 1868ed5daea32ceedb25193db0a764c87bbcb0d3 SHA1 83f5bc5375536f1b3ec29a76a84a764af1976d45 SHA256 6b9188507315dc07f84e1665c7c2f2d8053c09300965899fb404bbdf1af87680
-MISC ChangeLog 26579 RMD160 d1f262b46d98e7c5ebe01dbed303bc12d93d8f6b SHA1 f536bfc7ec13bfe8745b6b9b2c66bd9917d92580 SHA256 23ce70cfdd253c0c0cd228f0de4ddc1f1398d932289c614b97f253aef3ace3d4
+EBUILD pidgin-2.7.4.ebuild 6436 RMD160 f03308cb405088f9960f0d73f398c7785f4d489f SHA1 e88b5e96cf9ed52dd2e932c64a7f95a432023ea1 SHA256 9c7e385ae7517f01b5a02620dbfaf08aeb7ba81f12de214d59a9c2e55ef9b4db
+MISC ChangeLog 27241 RMD160 e338e0b8ddd7a1621b74fe64bb32095506108880 SHA1 e748e039068be298db98dbb4a789a7f0dbe844e0 SHA256 b88742f41ccc7468294ed2993b4f0a5ec505c991aae7033e393b0e8d0e2e8018
 MISC metadata.xml 1347 RMD160 ab118b33da598ea43ea4adb8cd07d269faf19528 SHA1 d68aea7e02d1fa45f1a71eb34c98259d61c935ca SHA256 b1b9067810378483188a403fb85f8ff76bc5260cb4bb811179eed1088dd6f5ba
diff --git a/net-im/pidgin/files/pidgin-2.7.0-icq-fix.patch b/net-im/pidgin/files/pidgin-2.7.0-icq-fix.patch
deleted file mode 100644
index b6cdc6f1dc3a..000000000000
--- a/net-im/pidgin/files/pidgin-2.7.0-icq-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#
-# patch "libpurple/protocols/oscar/oscar.c"
-#  from [ec79d8d9fcba376be091b363977e8f23c748eff2]
-#    to [c8cc188e64cc6b466711a5b56454ce70615b0eea]
-#
-============================================================
---- libpurple/protocols/oscar/oscar.c	ec79d8d9fcba376be091b363977e8f23c748eff2
-+++ libpurple/protocols/oscar/oscar.c	c8cc188e64cc6b466711a5b56454ce70615b0eea
-@@ -2486,32 +2486,6 @@ static int incomingim_chan1(OscarData *o
- 	tmp = g_string_free(message, FALSE);
- 
- 	/*
--	 * If the message is from an ICQ user and to an ICQ user then escape any HTML,
--	 * because HTML is not sent over ICQ as a means to format a message.
--	 * So any HTML we receive is intended to be displayed.  Also, \r\n must be
--	 * replaced with <br>
--	 *
--	 * Note: There *may* be some clients which send messages as HTML formatted -
--	 *       they need to be special-cased somehow.
--	 *
--	 * Update: Newer ICQ clients have started sending IMs as HTML.  We can
--	 * distinguish HTML IMs from non-HTML IMs by looking at the features.  If
--	 * the features are "0x 01 06" then the message is plain text.  If the
--	 * features are "0x 01" then the message is HTML.
--	 */
--	if (od->icq && oscar_util_valid_name_icq(userinfo->bn)
--			&& (args->featureslen != 1 || args->features[0] != 0x01))
--	{
--		/* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */
--		gchar *tmp2 = g_markup_escape_text(tmp, -1);
--		g_free(tmp);
--		tmp = tmp2;
--		tmp2 = purple_strreplace(tmp, "\r\n", "<br>");
--		g_free(tmp);
--		tmp = tmp2;
--	}
--
--	/*
- 	 * Convert iChat color tags to normal font tags.
- 	 */
- 	if (purple_markup_find_tag("body", tmp, &start, &end, &attribs))
-@@ -4787,7 +4761,8 @@ oscar_send_im(PurpleConnection *gc, cons
- 			tmp2 = purple_markup_strip_html(tmp1);
- 			is_html = FALSE;
- 		} else {
--			tmp2 = g_strdup(tmp1);
-+			/* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */
-+			tmp2 = g_strdup_printf("<HTML><BODY>%s</BODY></HTML>", tmp1);
- 			is_html = TRUE;
- 		}
- 		g_free(tmp1);
diff --git a/net-im/pidgin/files/pidgin-2.7.3-ldflags.patch b/net-im/pidgin/files/pidgin-2.7.3-ldflags.patch
new file mode 100644
index 000000000000..145858b187ba
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.7.3-ldflags.patch
@@ -0,0 +1,24 @@
+http://developer.pidgin.im/ticket/12638
+
+--- libpurple/plugins/perl/common/Makefile.PL.in	2010-08-31 07:25:25 +0000
++++ libpurple/plugins/perl/common/Makefile.PL.in	2010-08-31 07:25:52 +0000
+@@ -10,6 +10,7 @@
+       (ABSTRACT_FROM    => '@srcdir@/Purple.pm', # finds $ABSTRACT
+        AUTHOR           => 'Purple <http://pidgin.im/>') : ()),
+     'DEFINE'            => '@DEBUG_CFLAGS@',
++    'dynamic_lib'       => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
+     'INC'               => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple @GLIB_CFLAGS@',
+     'OBJECT'            => '$(O_FILES)', # link all the C files too
+ #    'OPTIMIZE'          => '-g', # For debugging
+
+--- pidgin/plugins/perl/common/Makefile.PL.in	2010-08-31 07:25:25 +0000
++++ pidgin/plugins/perl/common/Makefile.PL.in	2010-08-31 07:26:10 +0000
+@@ -9,6 +9,7 @@
+       ('ABSTRACT_FROM' => '@srcdir@/Pidgin.pm', # finds $ABSTRACT
+        'AUTHOR'        => 'Pidgin <http://pidgin.im/>') :  ()),
+     'DEFINE'        => '@DEBUG_CFLAGS@',
++    'dynamic_lib'       => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
+     'INC'           => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple -I@top_srcdir@/pidgin @GTK_CFLAGS@',
+     'OBJECT'        => '$(O_FILES)', # link all the C files too
+     'TYPEMAPS'      => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"],
+
diff --git a/net-im/pidgin/pidgin-2.7.1-r1.ebuild b/net-im/pidgin/pidgin-2.7.1-r1.ebuild
deleted file mode 100644
index 6c8bb9a373a1..000000000000
--- a/net-im/pidgin/pidgin-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.1-r1.ebuild,v 1.10 2010/08/05 16:15:09 ssuominen Exp $
-
-EAPI=2
-
-GENTOO_DEPEND_ON_PERL=no
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
-IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl +startup-notification"
-IUSE+=" ncurses groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-RDEPEND="
-	>=dev-libs/glib-2.12
-	>=dev-libs/libxml2-2.6.18
-	ncurses? ( sys-libs/ncurses[unicode]
-		dbus? ( <dev-lang/python-3 )
-		python? ( <dev-lang/python-3 ) )
-	gtk? (
-		>=x11-libs/gtk+-2.10:2
-		x11-libs/libSM
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		eds? ( gnome-extra/evolution-data-server )
-		prediction? ( >=dev-db/sqlite-3.3:3 ) )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10*
-		>=net-libs/farsight2-0.0.14
-		media-plugins/gst-plugins-meta
-		media-plugins/gst-plugins-gconf )
-	zeroconf? ( net-dns/avahi )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90 )
-	perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
-	gadu?  ( >=net-libs/libgadu-1.9.0[-ssl] )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-1.0.1 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn )"
-	# Mono support crashes pidgin
-	#mono? ( dev-lang/mono )"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	gtk? ( x11-proto/scrnsaverproto )
-	dbus? ( <dev-lang/python-3 )
-	doc? ( app-doc/doxygen )
-	nls? ( >=dev-util/intltool-0.41.1
-		sys-devel/gettext )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgimpd
-#	x11-plugins/pidgin-birthday
-#	x11-plugins/pidgin-botsentry
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-mbpurple
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		einfo
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-		einfo
-	fi
-	if use dbus && ! use python; then
-		elog "It's impossible to disable linkage with python in case dbus is enabled."
-	fi
-	if use dbus || { use ncurses && use python; }; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	use silc && DYNAMIC_PRPLS+=",silc"
-	use qq && DYNAMIC_PRPLS+=",qq"
-	use meanwhile && DYNAMIC_PRPLS+=",sametime"
-	use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-	use groupwise && DYNAMIC_PRPLS+=",novell"
-	use zephyr && DYNAMIC_PRPLS+=",zephyr"
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=" --enable-nss=no --enable-gnutls=yes"
-		myconf+=" --with-gnutls-includes=/usr/include/gnutls"
-		myconf+=" --with-gnutls-libs=/usr/$(get_libdir)"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=" --enable-gnutls=no --enable-nss=yes"
-	fi
-
-	if use dbus || { use ncurses && use python; }; then
-		myconf+=" --with-python=$(PYTHON)"
-	else
-		myconf+=" --without-python"
-	fi
-
-	econf \
-		$(use_enable ncurses consoleui) \
-		$(use_enable nls) \
-		$(use_enable gtk gtkui) \
-		$(use_enable gtk sm) \
-		$(use gtk && use_enable startup-notification) \
-		$(use gtk && use_enable xscreensaver screensaver) \
-		$(use gtk && use_enable prediction cap) \
-		$(use gtk && use_enable eds gevolution) \
-		$(use gtk && use_enable spell gtkspell) \
-		$(use_enable perl) \
-		$(use_enable tk) \
-		$(use_enable tcl) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable gstreamer) \
-		$(use_enable gstreamer farsight) \
-		$(use_enable gstreamer vv) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable networkmanager nm) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable idn) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes=/usr/include/X11 \
-		${myconf}
-		#$(use_enable mono) \
-}
-
-src_install() {
-	gnome2_src_install
-	if use gtk; then
-		# Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
-		# implementations that are not complient with new hicolor theme yet, #323355
-		local pixmapdir
-		for d in 16 22 32 48; do
-			pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null
-		done
-	fi
-	use perl && fixlocalpod
-}
diff --git a/net-im/pidgin/pidgin-2.7.2.ebuild b/net-im/pidgin/pidgin-2.7.2.ebuild
deleted file mode 100644
index be82108e15dd..000000000000
--- a/net-im/pidgin/pidgin-2.7.2.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.2.ebuild,v 1.8 2010/08/10 16:08:17 ranger Exp $
-
-EAPI=2
-
-GENTOO_DEPEND_ON_PERL=no
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
-IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl +startup-notification"
-IUSE+=" ncurses groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-RDEPEND="
-	>=dev-libs/glib-2.12
-	>=dev-libs/libxml2-2.6.18
-	ncurses? ( sys-libs/ncurses[unicode]
-		dbus? ( <dev-lang/python-3 )
-		python? ( <dev-lang/python-3 ) )
-	gtk? (
-		>=x11-libs/gtk+-2.10:2
-		x11-libs/libSM
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		eds? ( gnome-extra/evolution-data-server )
-		prediction? ( >=dev-db/sqlite-3.3:3 ) )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10*
-		>=net-libs/farsight2-0.0.14
-		media-plugins/gst-plugins-meta
-		media-plugins/gst-plugins-gconf )
-	zeroconf? ( net-dns/avahi )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90 )
-	perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
-	gadu?  ( >=net-libs/libgadu-1.9.0[-ssl] )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-1.0.1 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn )"
-	# Mono support crashes pidgin
-	#mono? ( dev-lang/mono )"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	gtk? ( x11-proto/scrnsaverproto )
-	dbus? ( <dev-lang/python-3 )
-	doc? ( app-doc/doxygen )
-	nls? ( >=dev-util/intltool-0.41.1
-		sys-devel/gettext )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgimpd
-#	x11-plugins/pidgin-birthday
-#	x11-plugins/pidgin-botsentry
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-mbpurple
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		einfo
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-		einfo
-	fi
-	if use dbus && ! use python; then
-		elog "It's impossible to disable linkage with python in case dbus is enabled."
-	fi
-	if use dbus || { use ncurses && use python; }; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	use silc && DYNAMIC_PRPLS+=",silc"
-	use qq && DYNAMIC_PRPLS+=",qq"
-	use meanwhile && DYNAMIC_PRPLS+=",sametime"
-	use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-	use groupwise && DYNAMIC_PRPLS+=",novell"
-	use zephyr && DYNAMIC_PRPLS+=",zephyr"
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=" --enable-nss=no --enable-gnutls=yes"
-		myconf+=" --with-gnutls-includes=/usr/include/gnutls"
-		myconf+=" --with-gnutls-libs=/usr/$(get_libdir)"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=" --enable-gnutls=no --enable-nss=yes"
-	fi
-
-	if use dbus || { use ncurses && use python; }; then
-		myconf+=" --with-python=$(PYTHON)"
-	else
-		myconf+=" --without-python"
-	fi
-
-	econf \
-		$(use_enable ncurses consoleui) \
-		$(use_enable nls) \
-		$(use_enable gtk gtkui) \
-		$(use_enable gtk sm) \
-		$(use gtk && use_enable startup-notification) \
-		$(use gtk && use_enable xscreensaver screensaver) \
-		$(use gtk && use_enable prediction cap) \
-		$(use gtk && use_enable eds gevolution) \
-		$(use gtk && use_enable spell gtkspell) \
-		$(use_enable perl) \
-		$(use_enable tk) \
-		$(use_enable tcl) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable gstreamer) \
-		$(use_enable gstreamer farsight) \
-		$(use_enable gstreamer vv) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable networkmanager nm) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable idn) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes=/usr/include/X11 \
-		${myconf}
-		#$(use_enable mono) \
-}
-
-src_install() {
-	gnome2_src_install
-	if use gtk; then
-		# Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
-		# implementations that are not complient with new hicolor theme yet, #323355
-		local pixmapdir
-		for d in 16 22 32 48; do
-			pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null
-		done
-	fi
-	use perl && fixlocalpod
-}
diff --git a/net-im/pidgin/pidgin-2.7.2-r1.ebuild b/net-im/pidgin/pidgin-2.7.4.ebuild
index 67f6a27da913..a6fb3940d060 100644
--- a/net-im/pidgin/pidgin-2.7.2-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.2-r1.ebuild,v 1.1 2010/08/05 23:53:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.4.ebuild,v 1.1 2010/10/25 10:59:05 pva Exp $
 
 EAPI=2
 
@@ -58,15 +58,18 @@ RDEPEND="
 	# Mono support crashes pidgin
 	#mono? ( dev-lang/mono )"
 
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
 DEPEND="$RDEPEND
 	dev-lang/perl
 	dev-perl/XML-Parser
 	dev-util/pkgconfig
-	gtk? ( x11-proto/scrnsaverproto )
+	gtk? ( x11-proto/scrnsaverproto 
+		${NLS_DEPEND} )
 	dbus? ( <dev-lang/python-3 )
 	doc? ( app-doc/doxygen )
-	nls? ( >=dev-util/intltool-0.41.1
-		sys-devel/gettext )"
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
 
 DOCS="AUTHORS HACKING NEWS README ChangeLog"
 
@@ -100,13 +103,14 @@ DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
 
 pkg_setup() {
 	if ! use gtk && ! use ncurses ; then
-		einfo
 		elog "You did not pick the ncurses or gtk use flags, only libpurple"
 		elog "will be built."
-		einfo
+	fi
+	if use gtk && ! use nls; then
+		ewarn "gtk build => nls is enalbed!"
 	fi
 	if use dbus && ! use python; then
-		elog "It's impossible to disable linkage with python in case dbus is enabled."
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
 	fi
 	if use dbus || { use ncurses && use python; }; then
 		python_set_active_version 2
@@ -116,9 +120,8 @@ pkg_setup() {
 
 src_prepare() {
 	gnome2_src_prepare
-	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-2.7.3-ldflags.patch
 	eautoreconf
-
 }
 
 src_configure() {
@@ -158,10 +161,12 @@ src_configure() {
 	fi
 
 	econf \
+		--disable-silent-rules \
 		$(use_enable ncurses consoleui) \
-		$(use_enable nls) \
 		$(use_enable gtk gtkui) \
 		$(use_enable gtk sm) \
+		$(use gtk || use_enable nls) \
+		$(use gtk && echo "--enable-nls") \
 		$(use gtk && use_enable startup-notification) \
 		$(use gtk && use_enable xscreensaver screensaver) \
 		$(use gtk && use_enable prediction cap) \
@@ -181,7 +186,8 @@ src_configure() {
 		$(use_enable networkmanager nm) \
 		$(use_enable zeroconf avahi) \
 		$(use_enable idn) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
+		--with-system-ssl-certs="/etc/ssl/certs/" \
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}" \
 		--disable-mono \
 		--x-includes=/usr/include/X11 \
 		${myconf}
@@ -205,4 +211,6 @@ src_install() {
 		done
 	fi
 	use perl && fixlocalpod
+
+	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }