Small cleanup: use += syntax, SLOT deps and terse DYNAMIC_PRPLS handling. bonjour -> zeroconf USE flag change as discussed on -dev. Dependencies: up some versions to match configure.ac, some depend on gtk. Back startup-notification and xscreensaver USE flags. Fixed automagic dep on farsight, bug #295810, thank Alexis Ballier for report. Fixes dep on perl, bug #269741, thank Maksim 'max_posedon' Melnikau for report.

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

4 files changed, 185 insertions, 13 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 9d03e8c2d473..09726051a252 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,17 @@
 # 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.140 2009/10/25 17:00:52 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.141 2009/12/20 20:25:41 pva Exp $
+
+*pidgin-2.6.4-r1 (20 Dec 2009)
+
+  20 Dec 2009; Peter Volkov <pva@gentoo.org> +pidgin-2.6.4-r1.ebuild,
+  metadata.xml:
+  Small cleanup: use += syntax, SLOT deps and terse DYNAMIC_PRPLS handling.
+  bonjour -> zeroconf USE flag change as discussed on -dev. Dependencies: up
+  some versions to match configure.ac, some depend on gtk. Back
+  startup-notification and xscreensaver USE flags. Fixed automagic dep on
+  farsight, bug #295810, thank Alexis Ballier for report. Fixes dep on perl,
+  bug #269741, thank Maksim 'max_posedon' Melnikau for report.
 
   25 Oct 2009; nixnut <nixnut@gentoo.org> pidgin-2.6.3.ebuild:
   ppc stable #289298
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 8bde2809ed0c..66fadd7bd11d 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -4,6 +4,7 @@ DIST pidgin-2.6.3.tar.bz2 9093452 RMD160 3768e30abb54aca6c80343d4fc0f11da0d54d8f
 DIST pidgin-2.6.4.tar.bz2 9325043 RMD160 3b5edf2cecb72149f2cd01a723070b2c417a1b12 SHA1 1b67a5bef64d0bbe9576b3b2c9356df276cc5e6c SHA256 fa907ace507708e4a4bae32cc81a6271fb6da8bc0458fd8fc97cc4429ec8be11
 EBUILD pidgin-2.5.9-r1.ebuild 4502 RMD160 0da18ffe460ca89a9b4c41db7e271f0923a4f766 SHA1 9b46fce89acf41c0d8d018a11b161d603946b470 SHA256 b8b3b8df1d21f93e3408e6ff38730bdf058cfbfb5bc84e27fd6cee4fd965c3ae
 EBUILD pidgin-2.6.3.ebuild 4644 RMD160 462a31b9104094d7fd6ded3f536ff6590c665b8d SHA1 60864bbb2b13e664356eded0324c68f1dd02a742 SHA256 5cfd007a1e7ab70bb902fa4d5e87c441ef2595bc253fcc0b13e102959532578c
+EBUILD pidgin-2.6.4-r1.ebuild 4695 RMD160 c5b1f46f5f79b4003f6bb18ac08843b7a04b0c97 SHA1 78b0e49f8c8670bf6358eb6b96597f2c9d6b1528 SHA256 bf2aeeba5bc8adac5eeecbe7de4546481d25a2632675ec7ac8237845c0b0a99a
 EBUILD pidgin-2.6.4.ebuild 4652 RMD160 d3b8f23cc016920bc91293e2d3c7ccb6cd4fdc93 SHA1 fde8e2e1e66244777289c3fdce6d5612df50c99b SHA256 08e818f55f04aa53f6dc61685850989ca5e3b684b267d043e2d02416fe609d8b
-MISC ChangeLog 18623 RMD160 1cdfcbfd9d79529486f65e7981f261fd71217870 SHA1 cd495d0770b0e793725e6ae8cc0284492a07696a SHA256 02efea936e0f4c5388519bf24f51f09f4c44c049cfef5bbc5532ae18edc55e8e
-MISC metadata.xml 989 RMD160 7d97c83fcb6e8189dabc908c7c4b12ebf16b7ccc SHA1 a0faafa7c0d1c8835141709e61c6205c503481bb SHA256 4f5d2e541300302662d3fcec49b74723ff00c4803cf88e522545dc9f3e0cad0f
+MISC ChangeLog 19170 RMD160 05376710c4a02a63cf4a91c972d6611ed3991341 SHA1 5853ae5a075aacdfc8f11e699d3af83a462f1660 SHA256 9263e1e3e46d28f154c64fbf413cfdb3a18c772cd3cddb1aef7270984f732796
+MISC metadata.xml 987 RMD160 a83ec75f557b2b49e5916dcb1f7a555aaf4643e5 SHA1 1885706fc2f6c48d7bdfb77eedf8805ef9d26842 SHA256 62409a470ac0f5f12e37edaaead6b7d184878d20cf317320fa629b2fbf6dfd31
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 4d414b6bfbb5..e5295ee3cd10 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -6,16 +6,12 @@
 Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SILC, SIMPLE, and Zephyr.
 </longdescription>
 <use>
-	<flag name='bonjour'>Enable bonjour support</flag>
-	<flag name='gadu'>Enable Gadu Gadu protocol support.</flag>
-	<flag name='groupwise'>Enable Novell Groupwise protocol support.</flag>
-	<flag name='meanwhile'>Enable meanwhile support for Sametime
-		protocol.
-	</flag>
-	<flag name='prediction'>Enable Contact Availability Prediction
-		plugin.
-	</flag>
-	<flag name='qq'>Enable QQ protocol support.</flag>
+	<flag name='bonjour'>Enable bonjour (zeroconf) support</flag>
+	<flag name='gadu'>Enable Gadu Gadu protocol support</flag>
+	<flag name='groupwise'>Enable Novell Groupwise protocol support</flag>
+	<flag name='meanwhile'>Enable meanwhile support for Sametime protocol</flag>
+	<flag name='prediction'>Enable Contact Availability Prediction plugin</flag>
+	<flag name='qq'>Enable QQ protocol support</flag>
 	<flag name='silc'>Enable SILC protocol support</flag>
 	<flag name='zephyr'>Enable Zephyr protocol support</flag>
 </use>
diff --git a/net-im/pidgin/pidgin-2.6.4-r1.ebuild b/net-im/pidgin/pidgin-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..330cb058e8f6
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.6.4-r1.ebuild
@@ -0,0 +1,164 @@
+# 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.6.4-r1.ebuild,v 1.1 2009/12/20 20:25:41 pva Exp $
+
+EAPI=2
+
+GENTOO_DEPEND_ON_PERL=no
+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 ~ppc ~x86"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer idn meanwhile networkmanager"
+IUSE+=" nls perl silc tcl tk spell qq gadu +gtk sasl startup-notification"
+IUSE+=" ncurses groupwise prediction xscreensaver zephyr zeroconf" # mono"
+
+RDEPEND="
+	>=dev-libs/glib-2.4
+	>=dev-libs/libxml2-2.6.18
+	ncurses? ( sys-libs/ncurses[unicode] )
+	gtk? (
+		>=x11-libs/gtk+-2.4: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
+		>=dev-python/dbus-python-0.71
+		>=sys-apps/dbus-0.90
+		>=dev-lang/python-2.4 )
+	perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
+	gadu?  ( net-libs/libgadu[-ssl] )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( >=dev-libs/nss-3.11 )
+	meanwhile? ( net-libs/meanwhile )
+	silc? ( >=net-im/silc-toolkit-1.0.1 )
+	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4] )
+	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
+	dev-util/intltool
+	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/pidgintex
+#   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() {
+	intltoolize --automake --copy --force
+}
+
+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="${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 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_with zephyr krb4) \
+		$(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
+	use perl && fixlocalpod
+	dodoc AUTHORS HACKING INSTALL NEWS README ChangeLog
+}