Applied upstream patch wrt bug #193034.

Thanks to deadhead for reporting.

Package-Manager: portage-2.1.3.9

5 files changed, 300 insertions, 9 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index df70645f0295..f5b1224f6116 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.30 2007/09/16 18:51:46 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.31 2007/09/20 20:11:42 drizzt Exp $
+
+*pidgin-2.2.0-r1 (20 Sep 2007)
+
+  20 Sep 2007; Timothy Redaelli <drizzt@gentoo.org>
+  +files/pidgin-2.2.0-proxy.patch, +pidgin-2.2.0-r1.ebuild:
+  Applied upstream patch wrt bug #193034.
+  Thanks to deadhead for reporting.
 
   16 Sep 2007; Olivier Crête <tester@gentoo.org> pidgin-2.2.0.ebuild:
   Add MyspaceIM, fixes bug #192713
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 55c11ac1f76d..b27bfedf5b40 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pidgin-2.2.0-proxy.patch 931 RMD160 38b355ecfc2fa2b175af93e882b68c07c7dbe68e SHA1 fbbf37e464d13e0499bd5ead7c3161d5d714e488 SHA256 c7a3c3449f18c26c81cc6d9984d3caa98e7c4dadcc721acee6daf393f8674512
+MD5 127f42b06b602651201559bbb8d39b86 files/pidgin-2.2.0-proxy.patch 931
+RMD160 38b355ecfc2fa2b175af93e882b68c07c7dbe68e files/pidgin-2.2.0-proxy.patch 931
+SHA256 c7a3c3449f18c26c81cc6d9984d3caa98e7c4dadcc721acee6daf393f8674512 files/pidgin-2.2.0-proxy.patch 931
 DIST pidgin-2.1.0.tar.bz2 7772942 RMD160 d04437251fbea8a1902621ebdf98f6fdc826a6d4 SHA1 33f78d07c3c7797a710bb7d2032a8d0bd89a6ab3 SHA256 79be69cccca6cb25d6c1ba0360864da8a0c043f5ded55babcd99dc5b8e15a5f8
 DIST pidgin-2.1.1.tar.bz2 7829592 RMD160 77a9f06446c1056c3ad54018e78e450cda3ac66e SHA1 da6b7dda67b14aa1837ca48895eedcee215f0818 SHA256 cfeb66d224acc574d9545eb52af685c43e0627db5abc2df04089245d181440de
 DIST pidgin-2.2.0.tar.bz2 8101465 RMD160 7b99cee79cfcd3cd1536636f381830cc18d0b8f9 SHA1 b6762d5d7865587bfe0d87f95285d60cd8c667a1 SHA256 4cb6c1b1b4d3e3b792ef5c4770df4a70585a4c593171e1b0a7e66a21598b3aba
@@ -12,14 +16,18 @@ EBUILD pidgin-2.1.1.ebuild 6984 RMD160 7a3a2b2eaa2051c632e20455c2546ce3d5c24d22
 MD5 fba0ab60a3d6ff7f7bd5a03c5e5162f6 pidgin-2.1.1.ebuild 6984
 RMD160 7a3a2b2eaa2051c632e20455c2546ce3d5c24d22 pidgin-2.1.1.ebuild 6984
 SHA256 c3d92b3b3b0d41090f85bd11ff534f3d104506b6355e6f4a067ee2ed2313fc41 pidgin-2.1.1.ebuild 6984
+EBUILD pidgin-2.2.0-r1.ebuild 7047 RMD160 a427caf33dd5a6954f47bb3ff632156bf39ce969 SHA1 64d27b2697cc4ce896a482173763875407a18197 SHA256 55a80f77a115cda89ada8ce5050f54ebd73cc5fc0b71a117649484b58da2c0a7
+MD5 77cddcdb9b5d2d496b96f94e43d6b1e4 pidgin-2.2.0-r1.ebuild 7047
+RMD160 a427caf33dd5a6954f47bb3ff632156bf39ce969 pidgin-2.2.0-r1.ebuild 7047
+SHA256 55a80f77a115cda89ada8ce5050f54ebd73cc5fc0b71a117649484b58da2c0a7 pidgin-2.2.0-r1.ebuild 7047
 EBUILD pidgin-2.2.0.ebuild 6991 RMD160 7001f380e6a25a7ad54c4547d4f812110d84cdaa SHA1 8dddd1bc2920fd1bbe79f69c794a078ecf9c1ad6 SHA256 c9b2a3bc59e6ffdd76ae8aa58d4982ab53fa80e87a0d7ac6c7f4c8cd9c85d352
 MD5 7fef71df0c6769aab94e7fe0718c4668 pidgin-2.2.0.ebuild 6991
 RMD160 7001f380e6a25a7ad54c4547d4f812110d84cdaa pidgin-2.2.0.ebuild 6991
 SHA256 c9b2a3bc59e6ffdd76ae8aa58d4982ab53fa80e87a0d7ac6c7f4c8cd9c85d352 pidgin-2.2.0.ebuild 6991
-MISC ChangeLog 4447 RMD160 c5b7b6c0db60210fd96ff9a030ccf0e934cb5194 SHA1 4d46f2f592a206a00517961cc1fd6ad5e6e56366 SHA256 8fb7c4ae460859fd96e99ad5f8e4e3710ae229d3dd491b8a4834af15bb7f6f6c
-MD5 815984ac93887d29b65fc4609340c9c6 ChangeLog 4447
-RMD160 c5b7b6c0db60210fd96ff9a030ccf0e934cb5194 ChangeLog 4447
-SHA256 8fb7c4ae460859fd96e99ad5f8e4e3710ae229d3dd491b8a4834af15bb7f6f6c ChangeLog 4447
+MISC ChangeLog 4670 RMD160 8510643ab71a6db786e0e0caef1afa5835e20af9 SHA1 d1b31a397ae984933577db1e65f494f6bca28625 SHA256 9c2d09a88bf459ed4ef114858bf081ab7158064f7c9f3133b9bd264b0dff151c
+MD5 0aceea929486a5a024cf13557c6e7789 ChangeLog 4670
+RMD160 8510643ab71a6db786e0e0caef1afa5835e20af9 ChangeLog 4670
+SHA256 9c2d09a88bf459ed4ef114858bf081ab7158064f7c9f3133b9bd264b0dff151c ChangeLog 4670
 MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
 MD5 bba7b9e682937ac5182b872b00b19d93 metadata.xml 458
 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd metadata.xml 458
@@ -33,10 +41,13 @@ SHA256 0a3d5ab03c4a5242d59126e3a25a885b6a2477c0441aac396afc77ea52bcfa24 files/di
 MD5 c842bc61c600b3dc788cff34079567da files/digest-pidgin-2.2.0 244
 RMD160 3eb711a2f27611a432a6686bed945f9286bbc6eb files/digest-pidgin-2.2.0 244
 SHA256 0ef5865238ca7eb4cea37dc0b532d6c444b5c991c2b9e596b73ba50e77e130cc files/digest-pidgin-2.2.0 244
+MD5 c842bc61c600b3dc788cff34079567da files/digest-pidgin-2.2.0-r1 244
+RMD160 3eb711a2f27611a432a6686bed945f9286bbc6eb files/digest-pidgin-2.2.0-r1 244
+SHA256 0ef5865238ca7eb4cea37dc0b532d6c444b5c991c2b9e596b73ba50e77e130cc files/digest-pidgin-2.2.0-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG7Xt9+IXOQtHLm/gRAs5EAJ4qi91OlCamtcqLn+XFDw3xVYbnRgCeP/A+
-rv8CnngJJRkP2YytVa2P+I8=
-=6pxR
+iD8DBQFG8tQFjJyKLBkBVroRAp20AKC0UwBzUUVjiQoMxrFRtUHCRQEc1wCfXAtC
+eF2p/WFIJjYwqDCh5iFNDtI=
+=E7Zx
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/digest-pidgin-2.2.0-r1 b/net-im/pidgin/files/digest-pidgin-2.2.0-r1
new file mode 100644
index 000000000000..4968a942ef6c
--- /dev/null
+++ b/net-im/pidgin/files/digest-pidgin-2.2.0-r1
@@ -0,0 +1,3 @@
+MD5 d71cd4de6ef1459ba9b504d0c06d8d04 pidgin-2.2.0.tar.bz2 8101465
+RMD160 7b99cee79cfcd3cd1536636f381830cc18d0b8f9 pidgin-2.2.0.tar.bz2 8101465
+SHA256 4cb6c1b1b4d3e3b792ef5c4770df4a70585a4c593171e1b0a7e66a21598b3aba pidgin-2.2.0.tar.bz2 8101465
diff --git a/net-im/pidgin/files/pidgin-2.2.0-proxy.patch b/net-im/pidgin/files/pidgin-2.2.0-proxy.patch
new file mode 100644
index 000000000000..1ab3041b05d7
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.2.0-proxy.patch
@@ -0,0 +1,16 @@
+--- libpurple/proxy.c	fa08e3c184837ae16e5f4bb65aaec0ab56096c93
++++ libpurple/proxy.c	395c4f16647a81960a1ac1430df4ae9fe64d05df
+@@ -1992,6 +1992,13 @@ purple_proxy_init(void)
+ 		proxy_pref_cb, NULL);
+ 	purple_prefs_connect_callback(handle, "/purple/proxy/password",
+ 		proxy_pref_cb, NULL);
++
++	/* Load the initial proxy settings */
++	proxy_pref_cb("/purple/proxy/type", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/type"), NULL);
++	proxy_pref_cb("/purple/proxy/host", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/host"), NULL);
++	proxy_pref_cb("/purple/proxy/port", PURPLE_PREF_STRING, GINT_TO_POINTER(purple_prefs_get_int("/purple/proxy/port")), NULL);
++	proxy_pref_cb("/purple/proxy/username", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/username"), NULL);
++	proxy_pref_cb("/purple/proxy/password", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/password"), NULL);
+ }
+
+ void
diff --git a/net-im/pidgin/pidgin-2.2.0-r1.ebuild b/net-im/pidgin/pidgin-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..a91c6fa42f8c
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.2.0-r1.ebuild
@@ -0,0 +1,254 @@
+# 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.2.0-r1.ebuild,v 1.1 2007/09/20 20:11:42 drizzt Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib 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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bonjour dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc tcl tk spell qq gadu"
+IUSE="${IUSE} gtk sasl ncurses groupwise prediction zephyr" # mono"
+
+RDEPEND="
+	bonjour? ( 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
+		>=x11-libs/startup-notification-0.5
+		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 )
+	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 )
+	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 )"
+
+S="${WORKDIR}/${MY_PV}"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple,msn,myspace"
+
+# List of plugins yet to be ported (will be removed at some point)
+#   net-im/gaim-bnet
+#   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
+# Last release in 2004
+#   net-im/gaim-blogger
+#   x11-plugins/gaimosd
+# 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
+#   net-im/librvp
+#   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/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+
+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."
+	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
+}
+
+pkg_setup() {
+	print_pidgin_warning
+
+	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 zephyr && ! 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 pidgin"
+		eerror
+		die "Configure failed"
+	fi
+
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-proxy.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 groupwise; then
+		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
+	fi
+
+	if use zephyr; then
+		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},zephyr"
+	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 "Disabling GnuTLS, using NSS"
+		myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
+	fi
+
+	if ! use ncurses && ! use gtk; then
+		myconf="${myconf} --enable-consoleui --disable-gtkui"
+	else
+		myconf="${myconf} $(use_enable ncurses consoleui) $(use_enable gtk gtkui)"
+	fi
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable perl) \
+		$(use_enable gtk startup-notification) \
+		$(use_enable gtk screensaver) \
+		$(use_enable gtk sm) \
+		$(use_enable tcl) \
+		$(use_enable spell gtkspell) \
+		$(use_enable tk) \
+		$(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 zephyr krb4) \
+		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
+		--disable-mono \
+		--x-includes=/usr/include/X11 \
+		${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
+}