Version bump, update ICQ patch, remove gnome2.eclass EAPI 2 compat code

Package-Manager: portage-2.1.6.7/cvs/Linux i686

6 files changed, 221 insertions, 35 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 3dd7bfe7ef25..1229b4d5e5cf 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.85 2009/02/20 17:23:27 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.86 2009/03/04 23:53:29 tester Exp $
+
+*pidgin-2.5.5 (04 Mar 2009)
+
+  04 Mar 2009; Olivier Crête <tester@gentoo.org>
+  files/pidgin-2.5.4-icq.patch, pidgin-2.5.4.ebuild, pidgin-2.5.4-r1.ebuild,
+  +pidgin-2.5.5.ebuild:
+  Version bump, update ICQ patch, remove gnome2.eclass EAPI 2 compat code
 
   20 Feb 2009; Olivier Crête <tester@gentoo.org>
   +files/pidgin-2.5.4-icq-messages-magic.patch, pidgin-2.5.4-r1.ebuild:
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index b791aec75d60..daeaabab41fa 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -3,22 +3,24 @@ Hash: SHA1
 
 AUX pidgin-2.5.2-asneeded.patch 381 RMD160 e00a6f9c275e0d845f80b1a61b4483ddef13a14a SHA1 4bf4ff9da6b10ddc0038087f6003dd2b6fcf26c4 SHA256 ebc882a6d188803cd74484b9d4bffd52c853e49c652ed4a818acf8f0b7004a29
 AUX pidgin-2.5.4-icq-messages-magic.patch 2978 RMD160 fa89104830608f368ed8fa23013d936e1b5e2fab SHA1 88e03f43981376858530d048568af8a67788377c SHA256 d05c053a994911028fc04fd9557f3dec82c43d5291ca14389260a7ee13322cf3
-AUX pidgin-2.5.4-icq.patch 1039 RMD160 d39faa3b9a19e306c57a2e425e4e446c47efde3a SHA1 c9cb8785f3d8386ecf2003060b7381126be0be6c SHA256 c6076c3bca9b5aec2081917d2feb3d9c15934b680a402db8a5ea8ab172130540
+AUX pidgin-2.5.4-icq.patch 833 RMD160 fa1813c84006d0e6f10c37b84a51bb856797e01b SHA1 d57523cfe93ac77964e347ce418ebd796997c879 SHA256 816a80b180bb1ea51a9332777620f99e1539d7373e5e0f3c653908f20e381487
 DIST pidgin-2.5.1.tar.bz2 8952067 RMD160 d9f927db55ecc55a2e66b064612774575b82b062 SHA1 8b7be1be4d549d9c0e34c820c8a285aab5e116d7 SHA256 13e87a88b43804be72f8566402afa4c1c3756396aed4ef6b6b9d86d384e75b77
 DIST pidgin-2.5.2.tar.bz2 8059006 RMD160 fe27ecce5ada1664de9e260b863b9b4940de75a8 SHA1 aa555099806cc3e9019a9e9bb9f05c5c11c43641 SHA256 2013410352bbbab949cbaa71b0b751a39597b3710845a34e62fcb0e1f9b669dc
 DIST pidgin-2.5.3.tar.bz2 8393073 RMD160 c139b2746f2557f5f132e6460f5bff7009fd8259 SHA1 bd3f6eca0a0c9b221be8a664e904450db8589314 SHA256 912c934425fc40535fc79eb9082f6f823808d8ea8ecdd370d0b8ceec4b97ad82
 DIST pidgin-2.5.4.tar.bz2 8398610 RMD160 13f9e27e00e73a02b18f967fcf722a0c511569e5 SHA1 80f7a9e311d4ed6f2438f2ee16a4bdc66edcc2ad SHA256 c6bebef97b8b337cd2bc8107b3714dedf60d02db70487d0aafdd8b5b7ada1b63
+DIST pidgin-2.5.5.tar.bz2 8357209 RMD160 b7d37b73b9cced0f399cbc233c7ee0cdcf33e582 SHA1 a99ef50504b2b5f4014bfad232957322829d568f SHA256 cb5a13b99c2868b61d7f790678e1b3d3055eb9bf56c369a0eab90aa3fa7723e8
 EBUILD pidgin-2.5.1.ebuild 5257 RMD160 191422a18058b1b2f946f2e7cfc50f94c8d13444 SHA1 d815a51713a185e999ef9a8f9c72c3b6019532a3 SHA256 ed49ce3c83b90c2faae18ddafeb5f72777872dc6c815d019b9a13d3bac92d17d
 EBUILD pidgin-2.5.2.ebuild 5384 RMD160 a8921cf29b4756294748577561c0afd8a89ee65d SHA1 6dc295f3313107a1e1018eb49ee3d684fe23ae1d SHA256 62b847ce460b8c0f14e232b64fde73ac99e1d30512e7d4b396fab6710d885acf
 EBUILD pidgin-2.5.3.ebuild 5298 RMD160 2d150a98536012118834f60eed3fd189be341886 SHA1 7ce7cd9c1e6eef07692827d5b4185d6568410733 SHA256 f9036f9177f7d2bd16e2153a92fc6861a5a023e286f46ca5eb37f7550c21113d
-EBUILD pidgin-2.5.4-r1.ebuild 4659 RMD160 fd53cc975ef4538923a2dc8699ae1fba7423b638 SHA1 305ba1c548972409168bcbf928a4966174b209c1 SHA256 1fef31506a198fe704eba5af31e4b4751ce709fb2a58543fddf59c314c17028e
-EBUILD pidgin-2.5.4.ebuild 4548 RMD160 ea40324f30c535f0dc3901cead3dab794393ae12 SHA1 7ecc91ef1b09acb1c7f49defa2996dc3228b5cbd SHA256 3cc2068de314399b51c65c358a637a002c9804efecec8308b347963421415da5
-MISC ChangeLog 11685 RMD160 cca510841b7996e668f9625a5b329f1141d67069 SHA1 3c7f3437540135e890bcb0d0e558bd13355d7098 SHA256 113b41b06c10f8d93c1a07ed43d8a0ad324ce89bce4628b88d33e320f05ced3b
+EBUILD pidgin-2.5.4-r1.ebuild 4612 RMD160 ad5c6bbe11cf93a5c4cc7bbc61c24bb2037b5849 SHA1 4fe399f49276d3a06027f31924418f36d22ad625 SHA256 a543b76bd2c3948d0c54a50a563395cc2cbc65cd225df191f05fb1416b4edd86
+EBUILD pidgin-2.5.4.ebuild 4501 RMD160 f52da936e00c5aafd7953150ed4fad32b1cdb956 SHA1 b3f88e58da2b84129e6972fa5270f54dac16c200 SHA256 ffed4027dccd26c7b5e622615355288a75893fabee380b2cdb01ea74cf119231
+EBUILD pidgin-2.5.5.ebuild 4564 RMD160 73dc3b19d35ee08d25bce08d28a3414efe925685 SHA1 464a004a650be5503a69753672fd82da963f446f SHA256 71a406c92efe3ba5daa8a4be93b9ef74f5faccbd5b512038e0f61c2bc43256fb
+MISC ChangeLog 11940 RMD160 6f496079711fad4fcea218cadd3daab94ab89d82 SHA1 ebde84398e284de49f9b747b3430518a62c00907 SHA256 20d51005ca6311cef1d38faa16a5da7e6f0e309e0a820474c5ccac53b028779a
 MISC metadata.xml 989 RMD160 7d97c83fcb6e8189dabc908c7c4b12ebf16b7ccc SHA1 a0faafa7c0d1c8835141709e61c6205c503481bb SHA256 4f5d2e541300302662d3fcec49b74723ff00c4803cf88e522545dc9f3e0cad0f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkme5xUACgkQmOfEJZHYOKdfcQCgjzwg7WJqKhDL2GHdxra0pnN2
-FfEAoJuESitaqL8JonRPO4CneSQIiqbx
-=zQM3
+iEYEARECAAYFAkmvFIIACgkQmOfEJZHYOKczEgCg4UGy0T8Nq4H+cSYkM9pzM0Qw
+4YMAn2vQhtrLbUgCeK+m0XrDh3ITM041
+=LwqZ
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.5.4-icq.patch b/net-im/pidgin/files/pidgin-2.5.4-icq.patch
index 3af838499c79..77f128059df1 100644
--- a/net-im/pidgin/files/pidgin-2.5.4-icq.patch
+++ b/net-im/pidgin/files/pidgin-2.5.4-icq.patch
@@ -1,19 +1,31 @@
-diff -urN pidgin-2.5.4.orig/libpurple/protocols/oscar/flap_connection.c pidgin-2.5.4/libpurple/protocols/oscar/flap_connection.c
---- pidgin-2.5.4.orig/libpurple/protocols/oscar/flap_connection.c	2009-02-04 10:58:55.000000000 +0300
-+++ pidgin-2.5.4/libpurple/protocols/oscar/flap_connection.c	2009-02-04 11:13:55.000000000 +0300
-@@ -317,12 +317,15 @@
- {
- 	FlapConnection *conn;
+--- pidgin-2.5.4/libpurple/protocols/oscar/flap_connection.c.orig	2009-01-23 00:09:41.000000000 +0500
++++ pidgin-2.5.4/libpurple/protocols/oscar/flap_connection.c	2009-01-23 16:12:00.000000000 +0500
+@@ -1052,10 +1052,27 @@
+ 	byte_stream_destroy(&bs);
+ }
  
-+	static const guint FlapLoginSeqs[] = { 5695, 23595, 23620, 23049, 0x2886, 0x2493, 23620, 23049, 2853, 17372, 1255, 1796, 1657, 13606, 1930,  23918, 31234,  30120, 0x1BEA, 0x5342, 0x30CC, 0x2294, 0x5697,0x25FA, 0x3303, 0x078A, 0x0FC5, 0x25D6, 0x26EE,0x7570, 0x7F33, 0x4E94, 0x07C9, 0x7339, 0x42A8 };
++guint16
++generate_flap_sequence()
++{
++	guint32 n = g_random_int(), s = 0, i;
++	for (i = n; i >>= 3; s += i);
++	return (((0 - s) ^ (guint)n) & 7 ^ n) + 3;
++}
 +
- 	conn = g_new0(FlapConnection, 1);
- 	conn->od = od;
- 	conn->buffer_outgoing = purple_circ_buffer_new(0);
- 	conn->fd = -1;
- 	conn->subtype = -1;
- 	conn->type = type;
-+	conn->seqnum_out = FlapLoginSeqs[g_random_int_range(0, (sizeof FlapLoginSeqs) / (sizeof FlapLoginSeqs[0]))] - 1;
- 
- 	od->oscar_connections = g_slist_prepend(od->oscar_connections, conn);
- 
+ void
+ flap_connection_send(FlapConnection *conn, FlapFrame *frame)
+ {
+-	frame->seqnum = ++(conn->seqnum_out);
++	if (frame->channel == 0x01)
++	{
++		frame->seqnum = generate_flap_sequence();
++		conn->seqnum_out = frame->seqnum;
++	} else
++		frame->seqnum = ++(conn->seqnum_out);
++
++	purple_debug_info("oscar", "Sent FLAP seqid=%d\n",
++			frame->seqnum);
++
+ 	sendframe_flap(conn, frame);
+ 	flap_frame_destroy(frame);
+ }
diff --git a/net-im/pidgin/pidgin-2.5.4-r1.ebuild b/net-im/pidgin/pidgin-2.5.4-r1.ebuild
index e81b8fc2d26b..9add6a2b7aad 100644
--- a/net-im/pidgin/pidgin-2.5.4-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.4-r1.ebuild,v 1.2 2009/02/20 17:23:27 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.4-r1.ebuild,v 1.3 2009/03/04 23:53:29 tester Exp $
 
 EAPI=2
 
@@ -167,10 +167,6 @@ src_configure() {
 		#$(use_enable mono) \
 }
 
-src_compile() {
-	emake || die "make failed"
-}
-
 src_install() {
 	gnome2_src_install
 	use perl && fixlocalpod
diff --git a/net-im/pidgin/pidgin-2.5.4.ebuild b/net-im/pidgin/pidgin-2.5.4.ebuild
index b3d825a279bf..9fd5fb42f0bf 100644
--- a/net-im/pidgin/pidgin-2.5.4.ebuild
+++ b/net-im/pidgin/pidgin-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.4.ebuild,v 1.4 2009/01/21 01:12:51 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.4.ebuild,v 1.5 2009/03/04 23:53:29 tester Exp $
 
 EAPI=2
 
@@ -162,10 +162,6 @@ src_configure() {
 		#$(use_enable mono) \
 }
 
-src_compile() {
-	emake || die "make failed"
-}
-
 src_install() {
 	gnome2_src_install
 	use perl && fixlocalpod
diff --git a/net-im/pidgin/pidgin-2.5.5.ebuild b/net-im/pidgin/pidgin-2.5.5.ebuild
new file mode 100644
index 000000000000..c9666d561bd3
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.5.5.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.5.ebuild,v 1.1 2009/03/04 23:53:29 tester Exp $
+
+EAPI=2
+
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2
+
+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 ~sparc ~x86 ~x86-fbsd"
+IUSE="bonjour dbus debug doc eds gadu gnutls +gstreamer meanwhile"
+IUSE="${IUSE} 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[ssl] )
+	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[krb4] )
+	tcl? ( dev-lang/tcl )
+	tk? ( dev-lang/tk )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	dev-libs/libxml2
+	networkmanager? ( net-misc/networkmanager )
+	prediction? ( =dev-db/sqlite-3* )
+	ncurses? ( sys-libs/ncurses[unicode] )"
+	# Mono support crashes pidgin
+	#mono? ( dev-lang/mono )"
+
+DEPEND="$RDEPEND
+	dev-lang/perl
+	dev-perl/XML-Parser
+	dev-util/pkgconfig
+	gtk? ( x11-proto/scrnsaverproto )
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+# 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/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
+#   x11-themes/pidgin-smileys
+
+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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.5.4-icq.patch
+}
+
+src_configure() {
+	# 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
+
+	econf \
+		$(use_enable ncurses consoleui) \
+		$(use_enable nls) \
+		$(use_enable perl) \
+		$(use_enable gtk gtkui) \
+		$(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) \
+		$(use_enable bonjour avahi) \
+		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
+		--disable-mono \
+		--x-includes=/usr/include/X11 \
+		${myconf} || die "Configuration failed"
+		#$(use_enable mono) \
+}
+
+src_install() {
+	gnome2_src_install
+	use perl && fixlocalpod
+	dodoc AUTHORS HACKING INSTALL NEWS README ChangeLog
+}