Fixed build issue with USE="-zephyr krb4", bug 320167, thank Martin Jansa for report.

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

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index b4a98c8f78d941c766faa59dbd2e2443c85d1ecc..da93d584941d840830051ceee65fe2a49dfe703b 100644 (file)
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.164 2010/05/26 20:50:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.165 2010/05/27 12:21:11 pva Exp $
+
+  27 May 2010; Peter Volkov <pva@gentoo.org> pidgin-2.7.0-r1.ebuild:
+  Fixed build issue with USE="-zephyr krb4", bug 320167, thank Martin Jansa
+  for report.
 
 *pidgin-2.7.0-r1 (26 May 2010)
 

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 78b9f884d081c37a3dd8fa773e1a218b097ff4fc..e4816522ef68555060f0a0d9e562dbae03501323 100644 (file)
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -3,7 +3,7 @@ DIST pidgin-2.6.6.tar.bz2 9479337 RMD160 6e2ca8fb05b2575c758537d9adc154678b36cd5
 DIST pidgin-2.7.0-mtn20100526.patch.bz2 41359 RMD160 4293d87cd285fb9ae24a2dcc9729510af17bbf3a SHA1 ea2e2d0c57cef56a446670d98d5b17420e51be23 SHA256 4d5080b256f653d9b49bf1bba6de750cd7d4ca5c7533417650bd170d93efaa3e
 DIST pidgin-2.7.0.tar.bz2 9795914 RMD160 45e4b5a9acb9c4080ce6b33cedbf9b962883ca25 SHA1 7170aaae5e6f4039870eb5e0c5837d55285b758f SHA256 dc59cbae75db8ecf2850c35e82fc11ac33bbf2542e901e6e1e4525688635783d
 EBUILD pidgin-2.6.6.ebuild 5214 RMD160 7b8ba0f30aecf8cf62036bfc164ed9632f1d30a3 SHA1 0d3175fa2a0964c86cbacb106cbe3045c8028fc6 SHA256 4bcb6e451bec0f2f19d1d8215adf4943c3ea5d072da66104c88f2955b225a4bb
-EBUILD pidgin-2.7.0-r1.ebuild 5334 RMD160 e7c9b525c8287317929e283783d0188b9b98dc32 SHA1 0ff8bda7dcd8d76f0da15b3d98fccc01fa749330 SHA256 ef96a93675720e9a542649861669945a44837fc52fbbe4af8425a2e78e8f3ed3
+EBUILD pidgin-2.7.0-r1.ebuild 5348 RMD160 8bd106e768b44dc0888db967b75b619af81f0737 SHA1 b89749cd8ed5538076ae83363021243c493d9594 SHA256 25a272d905b3a3a27cc8f11420ad1352912f482bfa39792481412fb0b7936223
 EBUILD pidgin-2.7.0.ebuild 5167 RMD160 40e3e27b7479740016931379f9331a575f6b5e4f SHA1 ddb9920a588cc16243622d17dcc277e7359645e0 SHA256 03da54e3635d08dcbda03379f095ece2aa613aae70697b95ddbd44f80c8d62e6
-MISC ChangeLog 22456 RMD160 3f1b3628e19669165086b1dc71408bfb5f21d538 SHA1 cd69b4baa6f8ca64a3d87beeca353aad02e08895 SHA256 56b03683778d8593c6992ad4538dcfcd6b859c83d03ca24a64308e2370883951
+MISC ChangeLog 22616 RMD160 85b79bb31522630b19d204545c26bfdcd9e7856d SHA1 e97be553a141b1d8e40888b6f069742e8d406244 SHA256 44af6a0b7b15322022a93dd461cec254c55d066ed00df4fbff3c6f3f22d063bc
 MISC metadata.xml 1059 RMD160 5eec7f28ed25333a09308d8adbfd0ac1d84e48a2 SHA1 3565bbc2706c38986aa7e877b6efcd89e7c84c1e SHA256 92a6981b2286f302a8cff1e2a2b18550e2cb7221b66302f572947da277447f58

diff --git a/net-im/pidgin/pidgin-2.7.0-r1.ebuild b/net-im/pidgin/pidgin-2.7.0-r1.ebuild
index 868f3ccb928ef0e1063748ab81a50f184b4ade51..5bf3137aa9fa1ccad277cc1d46d1013bb0a06742 100644 (file)
--- a/net-im/pidgin/pidgin-2.7.0-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.7.0-r1.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.0-r1.ebuild,v 1.1 2010/05/26 20:50:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.0-r1.ebuild,v 1.2 2010/05/27 12:21:11 pva Exp $
 
 EAPI=2
 
@@ -164,7 +164,7 @@ src_configure() {
                $(use_enable sasl cyrus-sasl ) \
                $(use_enable doc doxygen) \
                $(use_enable networkmanager nm) \
-               $(use_with krb4) \
+               $(use zephyr && use_with krb4) \
                $(use_enable zeroconf avahi) \
                $(use_enable idn) \
                "--with-dynamic-prpls=${DYNAMIC_PRPLS}" \