Fix build with USE=kerberos and krb5 dependency

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 43 insertions, 47 deletions

diff --git a/x11-plugins/pidgin-sipe/ChangeLog b/x11-plugins/pidgin-sipe/ChangeLog
index 1630c3a41dc5..15045218ea08 100644
--- a/x11-plugins/pidgin-sipe/ChangeLog
+++ b/x11-plugins/pidgin-sipe/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/pidgin-sipe
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.14 2012/06/26 21:47:46 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.15 2012/06/30 22:00:30 thev00d00 Exp $
+
+*pidgin-sipe-1.13.2-r1 (30 Jun 2012)
+
+  30 Jun 2012; Ian Whyman <thev00d00@gentoo.org> -pidgin-sipe-1.13.2.ebuild,
+  +pidgin-sipe-1.13.2-r1.ebuild, -files/pidgin-sipe-1.13.2-fix-sandbox.patch,
+  +files/pidgin-sipe-1.13.2-fix-sandbox-r1.patch:
+  Fix build with USE="kerberos" and krb5 dependency
 
 *pidgin-sipe-1.13.2 (26 Jun 2012)
 
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index d9bd78d70f15..bac9cd3ddfb9 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,7 +1,7 @@
-AUX pidgin-sipe-1.13.2-fix-sandbox.patch 1240 RMD160 b75531d89b9f55953973ac3331bfc19daf7c8fcd SHA1 d229ee6db8cfcdab2c4527435db5929227abf6a5 SHA256 8555d8ec344b56e39af3a682a6e4d1068911dfeaa18253b373c9a1ae2fd7cb1e
+AUX pidgin-sipe-1.13.2-fix-sandbox-r1.patch 855 RMD160 a015d75df3b0cf367aba5fb6e490e9c8619a22dd SHA1 ca5457cd4e258ce743fa09a0069e353cafaec6df SHA256 69fc95e9e05cfa17d7d12fc8330df658542ea5a4cd86a13bb0819074987dcdb8
 DIST pidgin-sipe-1.13.1.tar.gz 924317 RMD160 15bbafc4346dbb5179af5ddcc60c691530596453 SHA1 e030fd3842350f2f29ac62b8a74c40018f67fc05 SHA256 111f4c5703353816b884acc4536f0f2afa3c1ec3c92cfb9d7786587ce03c9bcb
 DIST pidgin-sipe-1.13.2.tar.gz 927016 RMD160 4ac51a4d45087378ed64d3a25d2dc5b7d8c6f375 SHA1 30b8dcc8904009da22c949a5a6f826d04844fe71 SHA256 7ca4ce6e7ad9be5e55ce9084a54634ad23dcc6873fece9c9237f0e9f158b8a91
 EBUILD pidgin-sipe-1.13.1.ebuild 1011 RMD160 1ef4c9f48332c7b8939bff51ae9f5e3f7acfb051 SHA1 c2d355d7ffc511d4c4befe02ac512872bb10509f SHA256 4942130f78bdc2fdaa19a567302394825bf23e0fb92f1d007b7ae051556873ac
-EBUILD pidgin-sipe-1.13.2.ebuild 1253 RMD160 ad132b92cec317b05dc5cdd457e117418744af41 SHA1 f0bdc64b6ae989c3f43411a8f57f167b7bbb17d0 SHA256 c4ede6aab1af9a6a767bc575560a41176dad64cebdea8dcd4852638e3a6ea405
-MISC ChangeLog 2447 RMD160 b7b73d1694589473019328d39f571b92bb16fe98 SHA1 e474deae3a4f76a11b49771b4c51f9b3d3922577 SHA256 2057e9e3dc680a62ea524498c27cd309a0aed83b151930e067641562ace57e10
+EBUILD pidgin-sipe-1.13.2-r1.ebuild 1253 RMD160 c04ad4f9009871f67c5a616a226c070ad436bacf SHA1 a04ce96e4227efcce3122beb17eb1445d43925a8 SHA256 3cac21f72ba89dc2a22efe13a5f5938c6ee668f5f6b9c353228ff2e12439e0ef
+MISC ChangeLog 2743 RMD160 9955b1f308067eccea76567167c587e445497c0a SHA1 668848df81f3e138a247610fad78aea7248b93c4 SHA256 243ed3bd80b0436b65dea535c7f2583345644a584ac5d15ccf5cfc684bb75d83
 MISC metadata.xml 608 RMD160 71422ec102cb4f59f67b75d5c52aa3c981f8635a SHA1 3e5d2c50b2a63f8077bf4438c83d0d52a7da731f SHA256 5d1a710cf8336c68b7401959efa14672401599fcbd0c40c58e3920bceee31023
diff --git a/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.13.2-fix-sandbox-r1.patch b/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.13.2-fix-sandbox-r1.patch
new file mode 100644
index 000000000000..a5628b3cd59a
--- /dev/null
+++ b/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.13.2-fix-sandbox-r1.patch
@@ -0,0 +1,29 @@
+# Fix possible sandbox violation when snippet tries to probe for plugins
+# Gentoo Bug 409559
+
+--- pidgin-sipe-1.13.2/configure.ac	2012-03-14 21:53:10.000000000 +0000
++++ pidgin-sipe-1.13.2.new2/configure.ac	2012-06-30 22:48:40.081115371 +0100
+@@ -309,23 +309,6 @@
+ 			 AC_MSG_CHECKING([for purple SSL support])
+ 			 ac_save_LIBS=$LIBS
+ 			 LIBS="$PURPLE_LIBS"
+-			 AC_RUN_IFELSE(
+-				[AC_LANG_PROGRAM([[
+-#include <glib.h>
+-#include <plugin.h>
+-#include <sslconn.h>
+-						]],
+-						[[
+-	purple_plugins_init();
+-	purple_plugins_probe(G_MODULE_SUFFIX);
+-	purple_ssl_init();
+-	return(purple_ssl_is_supported()?0:1);
+-						]])],
+-				[AC_MSG_RESULT(ok)],
+-				[AC_MSG_FAILURE([your purple hasn't been compiled with SSL support.
+-])
+-				],
+-				[AC_MSG_WARN([cross compiling: not checking])])
+ 		 ])
+ 
+ 		 dnl check whether enable voice and video support
diff --git a/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.13.2-fix-sandbox.patch b/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.13.2-fix-sandbox.patch
deleted file mode 100644
index cb30c63c375b..000000000000
--- a/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.13.2-fix-sandbox.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# Fix possible sandbox violation when snippet tries to probe for plugins
-# Gentoo Bug 409559
-
---- pidgin-sipe-1.13.2.orig/configure.ac	2012-03-14 21:53:10.000000000 +0000
-+++ pidgin-sipe-1.13.2/configure.ac	2012-06-26 22:13:48.710870016 +0100
-@@ -300,34 +300,6 @@
- ])
- 			])
- 
--		 dnl on windows
--		 dnl test program needs to be in the same location as libpurple
--		 dnl installation for latter to load ssl plugin referenced by
--		 dnl RELATIVE path.
--		 AS_IF([test "x${os_win32}" != xyes],
--			[dnl purple SSL support is mandatory
--			 AC_MSG_CHECKING([for purple SSL support])
--			 ac_save_LIBS=$LIBS
--			 LIBS="$PURPLE_LIBS"
--			 AC_RUN_IFELSE(
--				[AC_LANG_PROGRAM([[
--#include <glib.h>
--#include <plugin.h>
--#include <sslconn.h>
--						]],
--						[[
--	purple_plugins_init();
--	purple_plugins_probe(G_MODULE_SUFFIX);
--	purple_ssl_init();
--	return(purple_ssl_is_supported()?0:1);
--						]])],
--				[AC_MSG_RESULT(ok)],
--				[AC_MSG_FAILURE([your purple hasn't been compiled with SSL support.
--])
--				],
--				[AC_MSG_WARN([cross compiling: not checking])])
--		 ])
--
- 		 dnl check whether enable voice and video support
- 		 AS_IF([test "x$with_vv" = xno], [], dnl disabled by user
- 		       [test "x$with_vv" = xcheck],  dnl autodetect
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.2.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.2-r1.ebuild
index 1b9fffc22b0d..0aaf425bc5bc 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.2.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.2.ebuild,v 1.1 2012/06/26 21:47:46 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.13.2-r1.ebuild,v 1.1 2012/06/30 22:00:30 thev00d00 Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ IUSE="debug kerberos ocs2005-message-hack voice"
 RDEPEND="net-im/pidgin[gnutls]
 	>=dev-libs/gmime-2.4.16
 	dev-libs/libxml2
-	kerberos? ( app-crypt/mit-krb5 )
+	kerberos? ( virtual/krb5 )
 	voice? (
 		>=dev-libs/glib-2.28.0
 		>=net-libs/libnice-0.1.0
@@ -37,7 +37,7 @@ DEPEND="dev-util/intltool
 "
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-sandbox.patch"
+	epatch "${FILESDIR}/${P}-fix-sandbox-r1.patch"
 	eautoreconf
 }