Make check for libsoup non-mandatory, as provided by Ted Tanberry on bug 469014

(Portage version: 2.1.11.62/cvs/Linux i686, signed Manifest commit with key 2B859DE3)

3 files changed, 41 insertions, 2 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index f7380fa75b72..70d25c20ad21 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.229 2013/05/10 19:26:16 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.230 2013/05/10 19:46:28 fauli Exp $
+
+  10 May 2013; Christian Faulhammer <fauli@gentoo.org> claws-mail-3.9.1.ebuild,
+  +files/claws-mail-3.9.1_libsoup-check-fix.patch:
+  Make check for libsoup non-mandatory, as provided by Ted Tanberry on bug
+  469014
 
   08 May 2013; Christian Faulhammer <fauli@gentoo.org> claws-mail-3.9.1.ebuild:
   split out valgrind part for USE=debug as proposed on bug 468984
diff --git a/mail-client/claws-mail/claws-mail-3.9.1.ebuild b/mail-client/claws-mail/claws-mail-3.9.1.ebuild
index c3532705b26f..4e5b950744e1 100644
--- a/mail-client/claws-mail/claws-mail-3.9.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.1.ebuild,v 1.2 2013/05/10 19:26:16 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.1.ebuild,v 1.3 2013/05/10 19:46:28 fauli Exp $
 
 EAPI="5"
 
@@ -89,6 +89,10 @@ RDEPEND="${COMMONDEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}_libsoup-check-fix.patch"
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug crash-dialog)
diff --git a/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch b/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
new file mode 100644
index 000000000000..3b5c452b7652
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
@@ -0,0 +1,30 @@
+
+libsoup is not obligatory, but nonetheless a mandatory check existed.
+Fixed in releases >3.9.1
+
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=469014
+Upstream commit: http://git.claws-mail.org/?p=claws.git;a=commitdiff;h=d04c724c9e74f7c5d1f247e41a21e472790d9992
+
+
+--- configure.ac.orig
++++ configure.ac
+@@ -1107,14 +1107,17 @@
+ AC_SUBST(WEBKIT_CFLAGS)
+ 
+ dnl libsoup ********************************************************************
+-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4)
++PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
++if test x"$HAVE_LIBSOUP" = xyes; then
++	AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
++fi
+ AC_SUBST(LIBSOUP_CFLAGS)
+ AC_SUBST(LIBSOUP_LIBS)
+ 
+ dnl libsoup-gnome **************************************************************
+ PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, HAVE_LIBSOUP_GNOME=yes, HAVE_LIBSOUP_GNOME=no)
+ if test x"$HAVE_LIBSOUP_GNOME" = xyes; then
+-	AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup is available])
++	AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup_gnome is available])
+ fi
+ AC_SUBST(LIBSOUP_GNOME_CFLAGS)
+ AC_SUBST(LIBSOUP_GNOME_LIBS)