Update pidgin to 2.7.4.

4 files changed, 58 insertions, 51 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 63a52e9..949d46c 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pidgin-2.7.2-ldflags.patch 1593 RMD160 ade438f25d0af927485523e561ce728762645948 SHA1 6ac16bd019ad048109643af5e3525987c994dbb0 SHA256 64d78b48111345b49216e9678c114f321963393b4fd0aa6046de8aec6f03cb44
+AUX pidgin-2.7.3-ldflags.patch 1332 RMD160 0dd11485e9c990dab1230629faac704835a91ae4 SHA1 7bbb420a206bf6cb366bf501b90c893e896a1f65 SHA256 1f8574a9c2f056ba8c07559623da8c9ce241928f060898752eef5770dd1d081a
 AUX pidgin-gnome-keyring-1.patch 7457 RMD160 0d8345675a073c8585bf0be7678f52d63d14ec95 SHA1 b3dd0d336e4773578cc6e20dc9b317b27f383077 SHA256 f56bc4a1a678ad749848108ecef76f4bb2b16501908197bb645518e1a3027619
-DIST pidgin-2.7.3.tar.bz2 9746117 RMD160 276fb19abf6505f9d56120c7412987002511fcb3 SHA1 81b9b5591ddbdf36aa656ddd90ff935ae090e940 SHA256 8b5788aa7b8c3fa372e6c5f671592731c86e41322bcc09facb6bbe6127e323f2
-EBUILD pidgin-2.7.3.ebuild 6248 RMD160 ffdbbe76387b09d7246e067740feaaec0f1ae10e SHA1 73145f39f2b9aa6a44aabd130c48077efd78c580 SHA256 ed82da4af1922714e05878f1af9c11881d84c407495cde0dd4ade62c6f1e96a5
+DIST pidgin-2.7.4.tar.bz2 9799804 RMD160 900cdcffa34bfc43da803abf5427fdde8bb00b4e SHA1 f7d8d0fcecddda636db642e403280e85b76ea5f2 SHA256 7c6fa2811082bde2dbd0897414f9f8f18e7c3e51159288571af1f1f2ce81f856
+EBUILD pidgin-2.7.4.ebuild 6493 RMD160 3ade0ef52315992061ad1ef62577abda86cab567 SHA1 191881589187566919bb4a5768fa14f6f8ac468c SHA256 d1ee8460ec0d4799b56a2f8ecdce579bdc32364abae09e95f800de82af634a13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMZKbTAAoJEHy/RO9cNQiDXzoP/2B7NultLt6bBJViG32ud7e9
-2FfTREffDfSvNFfhJd2n5Gki7qIB8DOku1FrKbfXCDQg/S4Gp0+JA3C71nv7ZW6R
-fRaonqdQAAgYWFufC8A+O+MftBMUuqVKV+hw2VkAaVi6hm4Ken6IqSqE3M9L8syS
-KVC8INcoxlH8XgHHgRcFpsKrfYWvmbEvXYeRoa3o6KNCVZrGftvaK74O6xFwcEEm
-4Jh/DlTU801juh08MAKPWNL3XxHMPyYW6eNTOR3O+CYk6Yq4Gz5rJ3YjS3tzmWx7
-mysXmcehFRbJn7j04oXviI8ebAay1jjoEY+cYNRgukrE0/Ber9es8Q5sZbXyE521
-CyEB1McKOhMe3OT260Ban1OKgOQ8LMZx6jc1FKkrV77u3SF7pZVpN/gc99rFPuxi
-z1iwcH3z3f145kxKesvCdT7s1p4x/089iToYDiW/9Ps9DRXuTLCcZbUA/vG6LcwB
-zv6ZBmgOiJ57vffL8pq8/hw4f3RQsKRfbvD54sJngH4PjAoAaVnW/T5YcZ5ChG+P
-A0Tshr3q1enrJRowniVLBSF1QJW5D3fATzaWCl7Ywuf9i+tHJt5G9rGokEsfznum
-g8zYGJGsn3i61Y5t3QUREM2ylYUytq4PgDcmVX0xNzH3BwvWoBjT2plvrDNGyKYN
-ls4Wvj1W42KA4YbBKUqf
-=vBV9
+iQIcBAEBAgAGBQJMxdrhAAoJEHy/RO9cNQiD+GQQAMsfA4LMNvHO4kU+XOyj3k7w
+O/gv6Zb176Lhz80/ep4WvWzaOGGzgpH7ptTie/QdVf83LuzZMDvzB0l5rKcrMI0P
+9uGMHZ8FALnjvfGbXxl0IXlBJqeSukahs5duv86QxkzZM3UuwRx+dqC3aRWhOjKN
+5GBmYMUgavAk7p/sCKBzP6clSfwqxIz9lS9dlPiUev0+kCJ9up91MJf5oz8AH2Az
+4A/WnoEzsUqi/vQU+ZOEJE9pQZ5hadgtm7AkcY1jrjAHUpobjFS9KMt9HRA3deCQ
+HQ+8JivRrGTEF2KKFdMwMjk6KqFHn7VyAihaaydiry76hpL8xeD+3R/E3gJnHuJ8
+iedc8Ob6lcy2ZfnWMo+4DF2YXzdZNsnfUC38aX8qrbQohco/ZQERWx1ScsqVhEfQ
+IN7756eyfxJCRllEo4bzmIaoCk/akJEBkbqSPUN9OkNH0Z69YL58rmxxJotlznpY
+csg6W58sTPwDWYWt7Yg2O733zHaIGVHWcIOZA4qMZWf7nzXL9HGosHYTg965YZ7y
+lq828UmowFGKppvqaANznnik+s1b1YRJbKbK7CYDAAiiCX2LQqVlQpUwX4XEwL1y
+x8sRztVvCvq5qJkU4NXgEUbAaLrknCC/RHUv7HnLoAglKbg+5+JiD4S0TRHRGEti
+uXJK6G+cFW0SauXsUESu
+=AmZ0
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.7.2-ldflags.patch b/net-im/pidgin/files/pidgin-2.7.2-ldflags.patch
deleted file mode 100644
index 1a4cd7a..0000000
--- a/net-im/pidgin/files/pidgin-2.7.2-ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: pidgin-2.7.2/libpurple/plugins/perl/common/Makefile.PL.in
-===================================================================
---- pidgin-2.7.2.orig/libpurple/plugins/perl/common/Makefile.PL.in
-+++ pidgin-2.7.2/libpurple/plugins/perl/common/Makefile.PL.in
-@@ -10,6 +10,7 @@ WriteMakefile(
-       (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
-Index: pidgin-2.7.2/pidgin/plugins/perl/common/Makefile.PL.in
-===================================================================
---- pidgin-2.7.2.orig/pidgin/plugins/perl/common/Makefile.PL.in
-+++ pidgin-2.7.2/pidgin/plugins/perl/common/Makefile.PL.in
-@@ -8,7 +8,7 @@ WriteMakefile(
-     ($] >= 5.005 ? ## Add these new keywords supported since 5.005
-       ('ABSTRACT_FROM' => '@srcdir@/Pidgin.pm', # finds $ABSTRACT
-        'AUTHOR'        => 'Pidgin <http://pidgin.im/>') :  ()),
--    'DEFINE'        => '@DEBUG_CFLAGS@',
-+    'DEFINE'        => '@DEBUG_CFLAGS@ @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/files/pidgin-2.7.3-ldflags.patch b/net-im/pidgin/files/pidgin-2.7.3-ldflags.patch
new file mode 100644
index 0000000..145858b
--- /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.3.ebuild b/net-im/pidgin/pidgin-2.7.4.ebuild
index 42edf9d..4343aef 100644
--- a/net-im/pidgin/pidgin-2.7.3.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.3.ebuild,v 1.1 2010/08/12 10:43:18 pva Exp $
+# $Header: $
 
 EAPI=2
 
@@ -60,15 +60,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"
 
@@ -102,13 +105,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
@@ -118,7 +122,7 @@ pkg_setup() {
 
 src_prepare() {
 	gnome2_src_prepare
-	epatch "${FILESDIR}"/${PN}-2.7.2-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-2.7.3-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-gnome-keyring-1.patch
 	eautoreconf
 }
@@ -162,9 +166,10 @@ src_configure() {
 	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) \
@@ -185,7 +190,8 @@ src_configure() {
 		$(use_enable zeroconf avahi) \
 		$(use_enable gnome-keyring) \
 		$(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}
@@ -209,4 +215,6 @@ src_install() {
 		done
 	fi
 	use perl && fixlocalpod
+
+	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }