[gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/

["Priit Laes" <plaes@plaes.org>]

commit:     1ee9237f12841b545724e2866bbd5580b501a61c
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan 17 12:38:08 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan 17 12:45:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1ee9237f

net-libs/libsoup{,-gnome}: 2.37.3 -> 2.37.4

---
 ...b.patch => libsoup-gnome-2.37-system-lib.patch} |   27 ++++++++++---------
 ...e-2.37.3.ebuild => libsoup-gnome-2.37.4.ebuild} |    2 +-
 net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild   |    2 +-
 ...libsoup-2.37.3.ebuild => libsoup-2.37.4.ebuild} |    3 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.37-system-lib.patch
similarity index 90%
rename from net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch
rename to net-libs/libsoup-gnome/files/libsoup-gnome-2.37-system-lib.patch
index 788107b..101c906 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.37-system-lib.patch
@@ -1,4 +1,4 @@
-From 80addbb5745904d0cb822445e6181b8265f518ae Mon Sep 17 00:00:00 2001
+From 57588fea518799c2cb69d44772a4ee7799c24eca Mon Sep 17 00:00:00 2001
 From: Priit Laes <plaes@plaes.org>
 Date: Tue, 20 Dec 2011 15:42:44 +0200
 Subject: [PATCH] Split support for libsoup-gnome
@@ -6,9 +6,9 @@ Subject: [PATCH] Split support for libsoup-gnome
 Original patch by Romain Perier.
 ---
  Makefile.am         |   12 ++++++++++--
- configure.ac        |   42 +++++++++++++++++++++++++++---------------
+ configure.ac        |   43 +++++++++++++++++++++++++++----------------
  libsoup/Makefile.am |   50 +++++++++++++++++++++++++++++++++++++++-----------
- 3 files changed, 76 insertions(+), 28 deletions(-)
+ 3 files changed, 76 insertions(+), 29 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index bb94238..0562574 100644
@@ -41,25 +41,26 @@ index bb94238..0562574 100644
  if BUILD_LIBSOUP_GNOME
  pkgconfig_DATA += libsoup-gnome-2.4.pc
 diff --git a/configure.ac b/configure.ac
-index 5ce2fcf..9126e7c 100644
+index 6394974..5229544 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -72,15 +72,30 @@ dnl ***********************
+@@ -72,16 +72,30 @@ dnl ***********************
  dnl *** Checks for glib ***
  dnl ***********************
  
--AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
+-GLIB_REQUIRED=2.31.7
+-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
 -if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
+-   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
 +PKG_PROG_PKG_CONFIG
-+enable_ssl=no
 +AC_ARG_WITH(libsoup-system,
 +   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
 +   [with_libsoup_system=$withval], [with_libsoup_system=no])
 +if test "$with_libsoup_system" = "no"; then
-+	AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
++	GLIB_REQUIRED=2.31.7
++	AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
 +	if test "$GLIB_LIBS" = ""; then
-+	   AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
++	   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
 +	fi
 +	GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 +
@@ -83,7 +84,7 @@ index 5ce2fcf..9126e7c 100644
  
  dnl ***********************
  dnl *** Check for Win32 ***
-@@ -99,13 +114,6 @@ esac
+@@ -100,13 +114,6 @@ esac
  AC_MSG_RESULT([$os_win32])
  AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
  
@@ -97,7 +98,7 @@ index 5ce2fcf..9126e7c 100644
  dnl *********************
  dnl *** GNOME support ***
  dnl *********************
-@@ -130,6 +138,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+@@ -131,6 +138,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
  if test $with_gnome != no; then
  	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
  
@@ -241,5 +242,5 @@ index 096f0fb..416e523 100644
  SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
  
 -- 
-1.7.8
+1.7.8.3
 

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.37.4.ebuild
similarity index 96%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.37.4.ebuild
index 230e389..3ce4451 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.37.4.ebuild
@@ -52,6 +52,6 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.37.3-system-lib.patch
+	epatch "${FILESDIR}"/${PN}-2.37-system-lib.patch
 	eautoreconf
 }

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
index 1a0fe16..a5a4a47 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
@@ -60,6 +60,6 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.37.3-system-lib.patch
+	epatch "${FILESDIR}"/${PN}-2.37-system-lib.patch
 	eautoreconf
 }

diff --git a/net-libs/libsoup/libsoup-2.37.3.ebuild b/net-libs/libsoup/libsoup-2.37.4.ebuild
similarity index 95%
rename from net-libs/libsoup/libsoup-2.37.3.ebuild
rename to net-libs/libsoup/libsoup-2.37.4.ebuild
index eaeac3e..198fc6f 100644
--- a/net-libs/libsoup/libsoup-2.37.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.37.4.ebuild
@@ -16,8 +16,7 @@ SLOT="2.4"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc +introspection samba ssl test"
 
-# glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file
-RDEPEND=">=dev-libs/glib-2.31.0:2
+RDEPEND=">=dev-libs/glib-2.31.7:2
 	>=dev-libs/libxml2-2:2
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )