Dropped restriction on <2.30 for evolution-data-server DEPEND, bug 323215, thank Jens-Uwe Peter for report and checks. Improve python-related code, bug #315109, thank Arfrever Frehtes Taifersar Arahesis for report. Also avoid automagick dependency on python (in libgnt) and allow finch be built without linkage with python. Make some USE flags more descriptive, bug #282919, thank Mr. B for report. Small style cleanups.

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

4 files changed, 46 insertions, 28 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 72a82590a0f2..9086b18e0100 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,15 @@
 # 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.166 2010/06/04 00:45:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.167 2010/06/09 16:08:01 pva Exp $
+
+  09 Jun 2010; Peter Volkov <pva@gentoo.org> pidgin-2.7.1.ebuild,
+  metadata.xml:
+  Dropped restriction on <2.30 for evolution-data-server DEPEND, bug 323215,
+  thank Jens-Uwe Peter for report and checks. Improve python-related code,
+  bug #315109, thank Arfrever Frehtes Taifersar Arahesis for report. Also
+  avoid automagick dependency on python (in libgnt) and allow finch be built
+  without linkage with python. Make some USE flags more descriptive, bug
+  #282919, thank Mr. B for report. Small style cleanups.
 
 *pidgin-2.7.1 (04 Jun 2010)
 
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 58dff15ec289..9ae19331cad3 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pidgin-2.7.0-icq-fix.patch 1991 RMD160 7158710b27950bec2d8dec47e02a4494f8dfaac9 SHA1 8589601e86bd8077f8dd50afac49ee38b71cfba1 SHA256 c2e9e1bf1921e2e2e9f1594a348be5103298f28bc4ab5fcbd6c3cb6543fea24e
 DIST pidgin-2.6.6.tar.bz2 9479337 RMD160 6e2ca8fb05b2575c758537d9adc154678b36cd55 SHA1 d74459152f9598139a3fd8aee385e3366722155c SHA256 6ebbe9d339246dfebb244e4c855c4feb678f120d1024ef2ee269e2fde77b2ad9
 DIST pidgin-2.7.1.tar.bz2 9647234 RMD160 5e5deec529b1c8d75cd3f925b3f5e4f5310e42e5 SHA1 b746720cc3e65b3d6da6eab0729f26673f997849 SHA256 f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1
 EBUILD pidgin-2.6.6.ebuild 5214 RMD160 7b8ba0f30aecf8cf62036bfc164ed9632f1d30a3 SHA1 0d3175fa2a0964c86cbacb106cbe3045c8028fc6 SHA256 4bcb6e451bec0f2f19d1d8215adf4943c3ea5d072da66104c88f2955b225a4bb
-EBUILD pidgin-2.7.1.ebuild 5174 RMD160 61145fea459c83451e0af023e2b5a12b6b66f538 SHA1 e71f18a5a35977871d362887a6b36ba5fd06f790 SHA256 ee4bcc82c94d5c422bf8f935738432d02ac7ec03f6f71dc4e8da90d51e864f0d
-MISC ChangeLog 22798 RMD160 0ed00c6d91c9e52843be3e098ffe89c4a5cdf0da SHA1 1ecc1728a1b0ee83c36daa4b196b006b56b40da2 SHA256 697f50cd7ea1056edaa1ac9c22f0dbd459ec310b15d4ecda5625d16cb9f0b1c6
-MISC metadata.xml 996 RMD160 41d69c6dbf62b0f4799be40f8a8cd275e438c4b5 SHA1 a5448c0bbe50de6a1d9d3b8ec13109061310ca48 SHA256 11016ae15bdab77c9defc20530a646fa909a66861ad98d1ec03b5e4d6c194573
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkwITKoACgkQmOfEJZHYOKftmQCZAQXa9TVNf7aEAk+JsHOy6vAc
-MSMAnih+YXT5FrSo2gn9HcU3UTcTtFsF
-=4nqL
------END PGP SIGNATURE-----
+EBUILD pidgin-2.7.1.ebuild 5679 RMD160 43bc20fe64ea154aaaae8a604dcc59b65ae866bb SHA1 2fc0424515baef8c1f80d6bacabede4e22bc6fd8 SHA256 ab2ebc869f8f10d18474e4841e16fb3799e735e553f1c31598f61a92face40ce
+MISC ChangeLog 23311 RMD160 a651008961e7d66f5ae73b9fb3af4acc6fa77972 SHA1 f639eb963b117a9e5e302df7eadb639867513df5 SHA256 a1788f8648c2cab6f04a6d96b4e3a5b40c74adcdcdaabd49860c5b9849c9a1bf
+MISC metadata.xml 1287 RMD160 a4dbdb57292b295718c8925752fd0850056a0393 SHA1 f7ef2c046ed3bfd53a1c3b84e2724e53d3fa823b SHA256 7abefacd8163d7a36506085a0c00f14fcd56eb269e77fda65c81dd5c08fb87e1
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index ca439deabc91..6066374444c8 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -8,9 +8,13 @@ Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes
 <use>
 	<flag name='gadu'>Enable Gadu Gadu protocol support</flag>
 	<flag name='groupwise'>Enable Novell Groupwise protocol support</flag>
+	<flag name='gstreamer'>Enables voice and video sessions</flag>
+	<flag name='gtk'>Builds Pidgin, the GTK+ interface</flag>
 	<flag name='krb4'>Compile Zephyr plugin with Kerberos 4 support</flag>
 	<flag name='meanwhile'>Enable meanwhile support for Sametime protocol</flag>
+	<flag name='ncurses'>Build finch, console interface</flag>
 	<flag name='prediction'>Enable Contact Availability Prediction plugin</flag>
+	<flag name='python'>Build libgnt (GLib Ncurses Toolkit used by finch) with python scripting support</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>
diff --git a/net-im/pidgin/pidgin-2.7.1.ebuild b/net-im/pidgin/pidgin-2.7.1.ebuild
index 28c39d6ad854..dca75b4fc24d 100644
--- a/net-im/pidgin/pidgin-2.7.1.ebuild
+++ b/net-im/pidgin/pidgin-2.7.1.ebuild
@@ -1,11 +1,11 @@
 # 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.ebuild,v 1.1 2010/06/04 00:45:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.1.ebuild,v 1.2 2010/06/09 16:08:01 pva Exp $
 
 EAPI=2
 
 GENTOO_DEPEND_ON_PERL=no
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 autotools
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://pidgin.im/"
@@ -16,19 +16,25 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn krb4 meanwhile"
 IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl +startup-notification"
-IUSE+=" ncurses groupwise prediction +xscreensaver zephyr zeroconf" # mono"
+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] )
+	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-2.30 )
+		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*
@@ -37,9 +43,7 @@ RDEPEND="
 		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 )
+		>=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 )
@@ -60,10 +64,13 @@ DEPEND="$RDEPEND
 	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"
 
@@ -103,6 +110,9 @@ pkg_setup() {
 		elog "Note: xscreensaver USE flag is disabled. Thus pidgin will be unable"
 		elog "to monitor idle/active status based on mouse/keyboard events"
 	fi
+	if use dbus && ! use python; then
+		elog "It's impossible to disable linkage with python in case dbus is enabled."
+	fi
 }
 
 src_configure() {
@@ -125,14 +135,20 @@ src_configure() {
 	use groupwise && DYNAMIC_PRPLS+=",novell"
 	use zephyr && DYNAMIC_PRPLS+=",zephyr"
 
-	if use gnutls ; then
+	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)"
+		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="${myconf} --enable-gnutls=no --enable-nss=yes"
+		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 \
@@ -170,5 +186,4 @@ src_configure() {
 src_install() {
 	gnome2_src_install
 	use perl && fixlocalpod
-	dodoc AUTHORS HACKING INSTALL NEWS README ChangeLog
 }