From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rd1dS-0002jn-1r for garchives@archives.gentoo.org; Tue, 20 Dec 2011 15:29:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCC2221C193; Tue, 20 Dec 2011 15:29:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8D39A21C193 for ; Tue, 20 Dec 2011 15:29:37 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 841551B4026 for ; Tue, 20 Dec 2011 15:29:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F0BA18004C for ; Tue, 20 Dec 2011 15:29:35 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.patch net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild net-libs/libsoup/libsoup-2.37.3.ebuild net-libs/libsoup/libsoup-9999.ebuild X-VCS-Directories: net-libs/libsoup/ net-libs/libsoup-gnome/ net-libs/libsoup-gnome/files/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: e71651437be59778489837c3639c66c2c18a5bc1 Date: Tue, 20 Dec 2011 15:29:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 990606b6-56d7-4194-859b-7e02d333f780 X-Archives-Hash: c0ff08c6febffecf8e35e997a925d413 commit: e71651437be59778489837c3639c66c2c18a5bc1 Author: Priit Laes plaes org> AuthorDate: Tue Dec 20 15:26:43 2011 +0000 Commit: Priit Laes plaes org> CommitDate: Tue Dec 20 15:26:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3De7165143 net-libs/libsoup{-gnome}: Added 2.37.3 to overlay --- ...patch =3D> libsoup-gnome-2.37.3-system-lib.patch} | 130 +++++++++++-= -------- ...ome-9999.ebuild =3D> libsoup-gnome-2.37.3.ebuild} | 14 +-- net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 2 +- .../{libsoup-9999.ebuild =3D> libsoup-2.37.3.ebuild} | 18 +--- net-libs/libsoup/libsoup-9999.ebuild | 2 +- 5 files changed, 81 insertions(+), 85 deletions(-) diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib= .patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.pat= ch similarity index 73% rename from net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.= patch rename to net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.pa= tch index a4e23eb..788107b 100644 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.patch +++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch @@ -1,31 +1,65 @@ -Split support for libsoup-gnome +From 80addbb5745904d0cb822445e6181b8265f518ae Mon Sep 17 00:00:00 2001 +From: Priit Laes +Date: Tue, 20 Dec 2011 15:42:44 +0200 +Subject: [PATCH] Split support for libsoup-gnome =20 Original patch by Romain Perier. --- ---- configure.ac -+++ configure.ac -@@ -72,15 +72,30 @@ + Makefile.am | 12 ++++++++++-- + configure.ac | 42 +++++++++++++++++++++++++++--------------- + libsoup/Makefile.am | 50 +++++++++++++++++++++++++++++++++++++++-----= ------ + 3 files changed, 76 insertions(+), 28 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index bb94238..0562574 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,11 @@ + ## Process this file with automake to produce Makefile.in + ACLOCAL_AMFLAGS =3D -I m4 ${ACLOCAL_FLAGS} +=20 +-SUBDIRS =3D libsoup tests docs ++SUBDIRS =3D libsoup ++ ++if BUILD_LIBSOUP ++SUBDIRS +=3D tests docs ++endif +=20 + EXTRA_DIST =3D \ + libsoup-2.4.pc.in \ +@@ -14,7 +18,11 @@ DISTCHECK_CONFIGURE_FLAGS =3D --enable-gtk-doc --enab= le-introspection +=20 + pkgconfigdir =3D $(libdir)/pkgconfig +=20 +-pkgconfig_DATA =3D libsoup-2.4.pc ++pkgconfig_DATA =3D ++ ++if BUILD_LIBSOUP ++pkgconfig_DATA +=3D libsoup-2.4.pc ++endif +=20 + if BUILD_LIBSOUP_GNOME + pkgconfig_DATA +=3D libsoup-gnome-2.4.pc +diff --git a/configure.ac b/configure.ac +index 5ce2fcf..9126e7c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -72,15 +72,30 @@ dnl *********************** dnl *** Checks for glib *** dnl *********************** =20 --AM_PATH_GLIB_2_0(2.30.0,,,gobject gthread gio) +-AM_PATH_GLIB_2_0(2.31.0,,,gobject gio) -if test "$GLIB_LIBS" =3D ""; then -- AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup) --fi --GLIB_CFLAGS=3D"$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" -- --PKG_CHECK_MODULES(XML, libxml-2.0) --AC_SUBST(XML_CFLAGS) --AC_SUBST(XML_LIBS) +- AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup) +PKG_PROG_PKG_CONFIG +enable_ssl=3Dno +AC_ARG_WITH(libsoup-system, + AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library = to build(default=3Dno)]), + [with_libsoup_system=3D$withval], [with_libsoup_system=3Dno]) +if test "$with_libsoup_system" =3D "no"; then -+ AM_PATH_GLIB_2_0(2.30.0,,,gobject gthread gio) ++ AM_PATH_GLIB_2_0(2.31.0,,,gobject gio) + if test "$GLIB_LIBS" =3D ""; then -+ AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup) ++ AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup) + fi + GLIB_CFLAGS=3D"$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" + @@ -39,12 +73,17 @@ Original patch by Romain Perier. + AC_CHECK_FUNCS(gmtime_r) + AC_CHECK_FUNCS(mmap) + AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) -+fi + fi +-GLIB_CFLAGS=3D"$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" +- +-PKG_CHECK_MODULES(XML, libxml-2.0) +-AC_SUBST(XML_CFLAGS) +-AC_SUBST(XML_LIBS) +AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system =3D no) =20 dnl *********************** dnl *** Check for Win32 *** -@@ -99,13 +114,6 @@ +@@ -99,13 +114,6 @@ esac AC_MSG_RESULT([$os_win32]) AM_CONDITIONAL(OS_WIN32, [test $os_win32 =3D yes]) =20 @@ -58,7 +97,7 @@ Original patch by Romain Perier. dnl ********************* dnl *** GNOME support *** dnl ********************* -@@ -130,6 +138,10 @@ +@@ -130,6 +138,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnom= e !=3D no) if test $with_gnome !=3D no; then AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) =20 @@ -69,9 +108,11 @@ Original patch by Romain Perier. PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl [Could not find sqlite3 devel files: =20 ---- libsoup/Makefile.am -+++ libsoup/Makefile.am -@@ -4,15 +4,18 @@ +diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am +index 096f0fb..416e523 100644 +--- a/libsoup/Makefile.am ++++ b/libsoup/Makefile.am +@@ -4,15 +4,18 @@ if OS_WIN32 LIBWS2_32 =3D -lws2_32 endif =20 @@ -94,7 +135,7 @@ Original patch by Romain Perier. =20 MARSHAL_GENERATED =3D soup-marshal.c soup-marshal.h MKENUMS_GENERATED =3D soup-enum-types.c soup-enum-types.h -@@ -41,7 +44,7 @@ +@@ -41,7 +44,7 @@ soup-enum-types.c: $(libsoupinclude_HEADERS) =20 BUILT_SOURCES =3D $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) =20 @@ -103,7 +144,7 @@ Original patch by Romain Perier. =20 libsoupincludedir =3D $(includedir)/libsoup-2.4/libsoup =20 -@@ -94,7 +97,7 @@ +@@ -94,7 +97,7 @@ libsoupinclude_HEADERS =3D \ $(soup_headers) \ soup-enum-types.h =20 @@ -112,15 +153,15 @@ Original patch by Romain Perier. =20 libsoup_2_4_la_LDFLAGS =3D \ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefin= ed -@@ -178,6 +181,7 @@ - soup-uri-private.h \ +@@ -176,6 +179,7 @@ libsoup_2_4_la_SOURCES =3D \ + soup-uri.c \ soup-value-utils.c \ soup-xmlrpc.c +endif =20 if BUILD_LIBSOUP_GNOME =20 -@@ -191,6 +195,10 @@ +@@ -189,6 +193,10 @@ endif =20 libsoupgnomeincludedir =3D $(includedir)/libsoup-gnome-2.4/libsoup =20 @@ -131,7 +172,7 @@ Original patch by Romain Perier. libsoupgnomeinclude_HEADERS =3D \ soup-cookie-jar-sqlite.h\ soup-gnome.h \ -@@ -198,14 +206,24 @@ +@@ -196,14 +204,24 @@ libsoupgnomeinclude_HEADERS =3D \ =20 lib_LTLIBRARIES +=3D libsoup-gnome-2.4.la =20 @@ -157,7 +198,7 @@ Original patch by Romain Perier. libsoup_gnome_2_4_la_SOURCES =3D \ soup-cookie-jar-sqlite.c \ soup-gnome-features.c \ -@@ -225,6 +243,8 @@ +@@ -223,6 +241,8 @@ INTROSPECTION_COMPILER_ARGS =3D --includedir=3D. =20 if HAVE_INTROSPECTION =20 @@ -165,8 +206,8 @@ Original patch by Romain Perier. + # Core library gi_soup_files =3D \ - $(filter-out soup.h soup-enum-types.% soup-marshal.%,\ -@@ -246,20 +266,28 @@ + $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolv= er.h,\ +@@ -244,20 +264,28 @@ Soup_2_4_gir_FILES =3D \ =20 INTROSPECTION_GIRS +=3D Soup-2.4.gir =20 @@ -199,31 +240,6 @@ Original patch by Romain Perier. SoupGNOME_2_4_gir_FILES =3D $(addprefix $(srcdir)/,$(gi_soup_gnome_file= s)) SoupGNOME_2_4_gir_EXPORT_PACKAGES =3D libsoup-gnome-2.4 =20 ---- Makefile.am -+++ Makefile.am -@@ -1,7 +1,11 @@ - ## Process this file with automake to produce Makefile.in - ACLOCAL_AMFLAGS =3D -I m4 -=20 --SUBDIRS =3D libsoup tests docs -+SUBDIRS =3D libsoup -+ -+if BUILD_LIBSOUP -+SUBDIRS +=3D tests docs -+endif -=20 - EXTRA_DIST =3D \ - libsoup-2.4.pc.in \ -@@ -14,7 +18,11 @@ -=20 - pkgconfigdir =3D $(libdir)/pkgconfig -=20 --pkgconfig_DATA =3D libsoup-2.4.pc -+pkgconfig_DATA =3D -+ -+if BUILD_LIBSOUP -+pkgconfig_DATA +=3D libsoup-2.4.pc -+endif -=20 - if BUILD_LIBSOUP_GNOME - pkgconfig_DATA +=3D libsoup-gnome-2.4.pc +--=20 +1.7.8 + diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/= libsoup-gnome/libsoup-gnome-2.37.3.ebuild similarity index 77% copy from net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild copy to net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild index e2706e2..230e389 100644 --- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild +++ b/net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-= 2.34.2.ebuild,v 1.4 2011/07/15 11:09:36 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-= 2.36.1.ebuild,v 1.1 2011/10/30 02:38:34 tetromino Exp $ =20 EAPI=3D"4" GCONF_DEBUG=3D"yes" @@ -10,10 +10,6 @@ MY_PN=3D${PN/-gnome} MY_P=3D${MY_PN}-${PV} =20 inherit autotools eutils gnome2 -if [[ ${PV} =3D 9999 ]]; then - GNOME_LIVE_MODULE=3D${MY_PN} - inherit gnome2-live -fi =20 DESCRIPTION=3D"GNOME plugin for libsoup" HOMEPAGE=3D"http://live.gnome.org/LibSoup" @@ -21,11 +17,7 @@ SRC_URI=3D"${SRC_URI//-gnome}" =20 LICENSE=3D"LGPL-2" SLOT=3D"2.4" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 = ~x86-fbsd ~amd64-linux ~x86-solaris" -fi +KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~= x86-fbsd ~amd64-linux ~x86-solaris" IUSE=3D"debug doc +introspection" =20 RDEPEND=3D"~net-libs/libsoup-${PV} @@ -60,6 +52,6 @@ src_prepare() { gnome2_src_prepare =20 # Use lib present on the system - epatch "${FILESDIR}"/${PN}-2.36.1-system-lib.patch + epatch "${FILESDIR}"/${PN}-2.37.3-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 e2706e2..1a0fe16 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 =20 # Use lib present on the system - epatch "${FILESDIR}"/${PN}-2.36.1-system-lib.patch + epatch "${FILESDIR}"/${PN}-2.37.3-system-lib.patch eautoreconf } diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libs= oup-2.37.3.ebuild similarity index 78% copy from net-libs/libsoup/libsoup-9999.ebuild copy to net-libs/libsoup/libsoup-2.37.3.ebuild index af23e7e..eaeac3e 100644 --- a/net-libs/libsoup/libsoup-9999.ebuild +++ b/net-libs/libsoup/libsoup-2.37.3.ebuild @@ -1,30 +1,23 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.2.ebuil= d,v 1.5 2011/07/15 11:08:46 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1.ebuil= d,v 1.1 2011/10/30 02:33:50 tetromino Exp $ =20 EAPI=3D"4" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" =20 inherit autotools eutils gnome2 -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi =20 DESCRIPTION=3D"An HTTP library implementation in C" HOMEPAGE=3D"http://live.gnome.org/LibSoup" =20 LICENSE=3D"LGPL-2" SLOT=3D"2.4" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc= ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-maco= s ~x86-macos ~sparc-solaris ~x86-solaris" -fi +KEYWORDS=3D"~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=3D"debug doc +introspection samba ssl test" =20 # glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file -RDEPEND=3D">=3Ddev-libs/glib-2.30.0:2 +RDEPEND=3D">=3Ddev-libs/glib-2.31.0:2 >=3Ddev-libs/libxml2-2:2 >=3Dnet-libs/glib-networking-2.30.0[ssl?] introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) @@ -62,11 +55,6 @@ src_configure() { src_prepare() { gnome2_src_prepare =20 - if [[ ${PV} =3D 9999 ]]; then - # prevent SOUP_MAINTAINER_FLAGS from getting set - mv .git .git-bck || die - fi - if ! use test; then # don't waste time building tests (bug #226271) sed 's/^\(SUBDIRS =3D.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.i= n \ diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libs= oup-9999.ebuild index af23e7e..c5b21b7 100644 --- a/net-libs/libsoup/libsoup-9999.ebuild +++ b/net-libs/libsoup/libsoup-9999.ebuild @@ -24,7 +24,7 @@ fi IUSE=3D"debug doc +introspection samba ssl test" =20 # glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file -RDEPEND=3D">=3Ddev-libs/glib-2.30.0:2 +RDEPEND=3D">=3Ddev-libs/glib-2.31.0:2 >=3Ddev-libs/libxml2-2:2 >=3Dnet-libs/glib-networking-2.30.0[ssl?] introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 )