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 1QmYo3-00035b-3e for garchives@archives.gentoo.org; Thu, 28 Jul 2011 22:11:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1AA721C028; Thu, 28 Jul 2011 22:11:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7C81C21C028 for ; Thu, 28 Jul 2011 22:11:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A70E21B4016 for ; Thu, 28 Jul 2011 22:11:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BC9098003D for ; Thu, 28 Jul 2011 22:11:40 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <494ec4fabc61060bf9175bf563c4f16b7e01503a.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/, ... X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib.patch net-libs/libsoup-gnome/libsoup-gnome-2.35.4.ebuild net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch net-libs/libsoup/libsoup-2.35.4.ebuild net-libs/libsoup/libsoup-9999.ebuild X-VCS-Directories: net-libs/libsoup/ net-libs/libsoup/files/ net-libs/libsoup-gnome/ net-libs/libsoup-gnome/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 494ec4fabc61060bf9175bf563c4f16b7e01503a Date: Thu, 28 Jul 2011 22:11:40 +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: X-Archives-Hash: 7cab135c5dd9608ba7ca56fe88638dee commit: 494ec4fabc61060bf9175bf563c4f16b7e01503a Author: Alexandre Rostovtsev gmail com> AuthorDate: Thu Jul 28 22:09:43 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Thu Jul 28 22:09:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D494ec4fa net-libs/libsoup{,-gnome}: add 2.35.4 and live ebuild Add gnome-3.1.x version and live ebuilds for libsoup and libsoup-gnome. --- .../files/libsoup-gnome-2.34.1-system-lib.patch | 229 ++++++++++++++= ++++++ net-libs/libsoup-gnome/libsoup-gnome-2.35.4.ebuild | 65 ++++++ net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 65 ++++++ ...p-2.34.2-fix-build-without-gnome-with-doc.patch | 58 +++++ net-libs/libsoup/libsoup-2.35.4.ebuild | 79 +++++++ net-libs/libsoup/libsoup-9999.ebuild | 79 +++++++ 6 files changed, 575 insertions(+), 0 deletions(-) diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib= .patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib.pat= ch new file mode 100644 index 0000000..ad12542 --- /dev/null +++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib.patch @@ -0,0 +1,229 @@ +Split support for libsoup-gnome + +Original patch by Romain Perier. +--- +--- configure.ac ++++ configure.ac +@@ -72,15 +72,30 @@ + dnl *** Checks for glib *** + dnl *********************** +=20 +-AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio) +-if test "$GLIB_LIBS" =3D ""; then +- AC_MSG_ERROR(GLIB 2.27.5 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) ++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.27.5,,,gobject gthread gio) ++ if test "$GLIB_LIBS" =3D ""; then ++ AC_MSG_ERROR(GLIB 2.27.5 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) ++ ++ dnl ******************* ++ dnl *** Misc checks *** ++ dnl ******************* ++ AC_CHECK_FUNCS(gmtime_r) ++ AC_CHECK_FUNCS(mmap) ++ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) ++fi ++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system =3D no) +=20 + dnl *********************** + dnl *** Check for Win32 *** +@@ -99,13 +114,6 @@ + AC_MSG_RESULT([$os_win32]) + AM_CONDITIONAL(OS_WIN32, [test $os_win32 =3D yes]) +=20 +-dnl ******************* +-dnl *** Misc checks *** +-dnl ******************* +-AC_CHECK_FUNCS(gmtime_r) +-AC_CHECK_FUNCS(mmap) +-AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) +- + dnl ********************* + dnl *** GNOME support *** + dnl ********************* +@@ -130,6 +138,10 @@ + if test $with_gnome !=3D no; then + AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) +=20 ++ if test $with_libsoup_system !=3D no; then ++ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION =3D $VERSION) ++ fi ++ + 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 @@ + LIBWS2_32 =3D -lws2_32 + endif +=20 +-INCLUDES =3D \ ++INCLUDES =3D ++lib_LTLIBRARIES =3D ++CLEANFILES =3D ++ ++if BUILD_LIBSOUP ++INCLUDES +=3D \ + -DG_LOG_DOMAIN=3D\"libsoup\" \ + -I$(top_srcdir) \ + $(SOUP_DEBUG_FLAGS) \ + $(SOUP_MAINTAINER_FLAGS) \ + $(GLIB_CFLAGS) \ +- $(XML_CFLAGS) \ +- $(SQLITE_CFLAGS) \ +- $(GNOME_KEYRING_CFLAGS) ++ $(XML_CFLAGS) +=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 @@ +=20 + BUILT_SOURCES =3D $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) +=20 +-CLEANFILES =3D $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) ++CLEANFILES +=3D $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) +=20 + libsoupincludedir =3D $(includedir)/libsoup-2.4/libsoup +=20 +@@ -94,7 +97,7 @@ + $(soup_headers) \ + soup-enum-types.h +=20 +-lib_LTLIBRARIES =3D libsoup-2.4.la ++lib_LTLIBRARIES +=3D libsoup-2.4.la +=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 \ + soup-value-utils.c \ + soup-xmlrpc.c ++endif +=20 + if BUILD_LIBSOUP_GNOME +=20 +@@ -191,6 +195,10 @@ +=20 + libsoupgnomeincludedir =3D $(includedir)/libsoup-gnome-2.4/libsoup +=20 ++INCLUDES +=3D $(LIBSOUP_CFLAGS) \ ++ $(SQLITE_CFLAGS) \ ++ $(GNOME_KEYRING_CFLAGS) ++ + libsoupgnomeinclude_HEADERS =3D \ + soup-cookie-jar-sqlite.h\ + soup-gnome.h \ +@@ -198,14 +206,24 @@ +=20 + lib_LTLIBRARIES +=3D libsoup-gnome-2.4.la +=20 ++if BUILD_LIBSOUP + libsoup_gnome_2_4_la_LDFLAGS =3D $(libsoup_2_4_la_LDFLAGS) ++else ++libsoup_gnome_2_4_la_LDFLAGS =3D \ ++ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefin= ed ++endif +=20 + libsoup_gnome_2_4_la_LIBADD =3D \ +- libsoup-2.4.la \ + $(GLIB_LIBS) \ + $(SQLITE_LIBS) \ + $(GNOME_KEYRING_LIBS) +=20 ++if BUILD_LIBSOUP ++libsoup_gnome_2_4_la_LIBADD +=3D libsoup-2.4.la ++else ++libsoup_gnome_2_4_la_LIBADD +=3D $(LIBSOUP_LIBS) ++endif ++ + libsoup_gnome_2_4_la_SOURCES =3D \ + soup-cookie-jar-sqlite.c \ + soup-gnome-features.c \ +@@ -225,6 +243,8 @@ +=20 + if HAVE_INTROSPECTION +=20 ++if BUILD_LIBSOUP ++ + # Core library + gi_soup_files =3D \ + $(filter-out soup.h soup-enum-types.% soup-marshal.%,\ +@@ -246,20 +266,28 @@ +=20 + INTROSPECTION_GIRS +=3D Soup-2.4.gir +=20 ++endif ++ + if BUILD_LIBSOUP_GNOME +=20 ++if BUILD_LIBSOUP ++SOUP_GIR =3D Soup-2.4.gir ++else ++SOUP_GIR =3D ++endif ++ + # GNOME extensions + gi_soup_gnome_files =3D $(filter-out soup-gnome.h,\ + $(libsoupgnomeinclude_HEADERS) \ + $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) +-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir ++SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR) ++SoupGNOME_2_4_gir_INCLUDES =3D Soup-2.4 + SoupGNOME_2_4_gir_SCANNERFLAGS =3D \ + --identifier-prefix=3DSoup \ + --symbol-prefix=3Dsoup \ +- --c-include "libsoup/soup-gnome.h" \ +- --include-uninstalled=3D$(builddir)/Soup-2.4.gir ++ --c-include "libsoup/soup-gnome.h" + SoupGNOME_2_4_gir_CFLAGS =3D $(INCLUDES) +-SoupGNOME_2_4_gir_LIBS =3D libsoup-gnome-2.4.la libsoup-2.4.la ++SoupGNOME_2_4_gir_LIBS =3D libsoup-gnome-2.4.la + 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 diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.35.4.ebuild b/net-lib= s/libsoup-gnome/libsoup-gnome-2.35.4.ebuild new file mode 100644 index 0000000..58ae7ed --- /dev/null +++ b/net-libs/libsoup-gnome/libsoup-gnome-2.35.4.ebuild @@ -0,0 +1,65 @@ +# 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 $ + +EAPI=3D"4" +GCONF_DEBUG=3D"yes" +GNOME2_LA_PUNT=3D"yes" + +MY_PN=3D${PN/-gnome} +MY_P=3D${MY_PN}-${PV} + +inherit autotools eutils gnome2 +if [[ ${PV} =3D 9999 ]]; then + GNOME_LIVE_MODULE=3D${MY_PN} + inherit gnome2-live +fi + +DESCRIPTION=3D"GNOME plugin for libsoup" +HOMEPAGE=3D"http://live.gnome.org/LibSoup" +SRC_URI=3D"${SRC_URI//-gnome}" + +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 +IUSE=3D"debug doc +introspection" + +RDEPEND=3D"~net-libs/libsoup-${PV} + || ( gnome-base/libgnome-keyring =3Ddev-libs/gobject-introspection-0.9.5 )" +DEPEND=3D"${RDEPEND} + >=3Ddev-util/pkgconfig-0.9 + >=3Ddev-util/gtk-doc-am-1.10 + doc? ( >=3Ddev-util/gtk-doc-1.10 )" + +S=3D${WORKDIR}/${MY_P} + +pkg_setup() { + G2CONF=3D"${G2CONF} + --disable-static + --disable-tls-check + $(use_enable introspection) + --with-libsoup-system + --with-gnome" + DOCS=3D"AUTHORS NEWS README" +} + +src_configure() { + # FIXME: we need addpredict to workaround bug #324779 until + # root cause (bug #249496) is solved + addpredict /usr/share/snmp/mibs/.index + gnome2_src_configure +} + +src_prepare() { + gnome2_src_prepare + + # Use lib present on the system + epatch "${FILESDIR}"/${PN}-2.34.1-system-lib.patch + eautoreconf +} diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/= libsoup-gnome/libsoup-gnome-9999.ebuild new file mode 100644 index 0000000..58ae7ed --- /dev/null +++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild @@ -0,0 +1,65 @@ +# 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 $ + +EAPI=3D"4" +GCONF_DEBUG=3D"yes" +GNOME2_LA_PUNT=3D"yes" + +MY_PN=3D${PN/-gnome} +MY_P=3D${MY_PN}-${PV} + +inherit autotools eutils gnome2 +if [[ ${PV} =3D 9999 ]]; then + GNOME_LIVE_MODULE=3D${MY_PN} + inherit gnome2-live +fi + +DESCRIPTION=3D"GNOME plugin for libsoup" +HOMEPAGE=3D"http://live.gnome.org/LibSoup" +SRC_URI=3D"${SRC_URI//-gnome}" + +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 +IUSE=3D"debug doc +introspection" + +RDEPEND=3D"~net-libs/libsoup-${PV} + || ( gnome-base/libgnome-keyring =3Ddev-libs/gobject-introspection-0.9.5 )" +DEPEND=3D"${RDEPEND} + >=3Ddev-util/pkgconfig-0.9 + >=3Ddev-util/gtk-doc-am-1.10 + doc? ( >=3Ddev-util/gtk-doc-1.10 )" + +S=3D${WORKDIR}/${MY_P} + +pkg_setup() { + G2CONF=3D"${G2CONF} + --disable-static + --disable-tls-check + $(use_enable introspection) + --with-libsoup-system + --with-gnome" + DOCS=3D"AUTHORS NEWS README" +} + +src_configure() { + # FIXME: we need addpredict to workaround bug #324779 until + # root cause (bug #249496) is solved + addpredict /usr/share/snmp/mibs/.index + gnome2_src_configure +} + +src_prepare() { + gnome2_src_prepare + + # Use lib present on the system + epatch "${FILESDIR}"/${PN}-2.34.1-system-lib.patch + eautoreconf +} diff --git a/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnom= e-with-doc.patch b/net-libs/libsoup/files/libsoup-2.34.2-fix-build-withou= t-gnome-with-doc.patch new file mode 100644 index 0000000..574b8be --- /dev/null +++ b/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-= doc.patch @@ -0,0 +1,58 @@ +From 4be4806401133389b2413267bc3f8ac58c1eeaf3 Mon Sep 17 00:00:00 2001 +From: Priit Laes +Date: Thu, 25 Feb 2010 20:59:51 +0200 +Subject: [PATCH] Split docs into libsoup and libsoup-gnome. + +Fixes Gentoo Bug 268592, patch adapted from upstream patch. + +Modified to apply to a release tarball (no libsoup-2.4-docs.sgml.in) +Hence, to be applied ONLY when !gnome && doc + +[Alexandre Rostovtsev : adapted patch for libsoup-2= .34.2] +--- + docs/reference/Makefile.am | 4 +++- + docs/reference/libsoup-2.4-docs.sgml | 2 ++ + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am +index 765d27c..07c92e9 100644 +--- a/docs/reference/Makefile.am ++++ b/docs/reference/Makefile.am +@@ -38,6 +38,9 @@ IGNORE_HFILES=3D soup.h soup-marshal.h soup-enum-types= .h \ + soup-proxy-resolver.h soup-proxy-resolver-gnome.h \ + soup-proxy-resolver-static.h +=20 ++IGNORE_HFILES +=3D soup-cookie-jar-sqlite.h \ ++ soup-gnome.h soup-gnome-features.h ++ + # Images to copy into HTML directory. + HTML_IMAGES =3D=20 +=20 +@@ -63,7 +66,6 @@ GTKDOC_CFLAGS =3D \ +=20 + GTKDOC_LIBS =3D \ + $(top_builddir)/libsoup/libsoup-2.4.la \ +- $(top_builddir)/libsoup/libsoup-gnome-2.4.la \ + $(GLIB_LIBS) +=20 + # include common portion ... +diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libso= up-2.4-docs.sgml +index c52208f..7117849 100644 +--- a/docs/reference/libsoup-2.4-docs.sgml ++++ b/docs/reference/libsoup-2.4-docs.sgml +@@ -52,11 +52,13 @@ + + +=20 ++ +=20 + + Low-level Networking API +--=20 +1.7.5.3 \ No newline at end of file diff --git a/net-libs/libsoup/libsoup-2.35.4.ebuild b/net-libs/libsoup/li= bsoup-2.35.4.ebuild new file mode 100644 index 0000000..9927f58 --- /dev/null +++ b/net-libs/libsoup/libsoup-2.35.4.ebuild @@ -0,0 +1,79 @@ +# 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 $ + +EAPI=3D"4" +GCONF_DEBUG=3D"yes" +GNOME2_LA_PUNT=3D"yes" + +inherit autotools eutils gnome2 +if [[ ${PV} =3D 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION=3D"An HTTP library implementation in C" +HOMEPAGE=3D"http://live.gnome.org/LibSoup" + +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 +IUSE=3D"debug doc +introspection ssl test" + +RDEPEND=3D">=3Ddev-libs/glib-2.27.5:2 + >=3Ddev-libs/libxml2-2:2 + net-libs/glib-networking[ssl?] + introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 )" +DEPEND=3D"${RDEPEND} + >=3Ddev-util/pkgconfig-0.9 + >=3Ddev-util/gtk-doc-am-1.10 + doc? ( >=3Ddev-util/gtk-doc-1.10 )" +# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_mod= ules_alias,apache2_modules_auth_basic, +# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules= _authz_user,apache2_modules_dir, +# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http= ,apache2_modules_proxy_connect] +# dev-lang/php[apache2,xmlrpc] +# net-misc/curl +# net-libs/glib-networking[ssl])" + +pkg_setup() { + # Set invalid apache module dir until apache tests are ready, bug #3269= 57 + DOCS=3D"AUTHORS NEWS README" + G2CONF=3D"${G2CONF} + --disable-static + --disable-tls-check + --without-gnome + --with-apache-module-dir=3D"${T}" + $(use_enable introspection)" +} + +src_configure() { + # FIXME: we need addpredict to workaround bug #324779 until + # root cause (bug #249496) is solved + addpredict /usr/share/snmp/mibs/.index + gnome2_src_configure +} + +src_prepare() { + gnome2_src_prepare + + 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 \ + || die "sed failed" + fi + + # Patch *must* be applied conditionally (see patch for details) + if use doc; then + # Fix bug 268592 (upstream #573685) (build fails without gnome && doc) + epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patc= h" + eautoreconf + fi +} diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libs= oup-9999.ebuild new file mode 100644 index 0000000..9927f58 --- /dev/null +++ b/net-libs/libsoup/libsoup-9999.ebuild @@ -0,0 +1,79 @@ +# 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 $ + +EAPI=3D"4" +GCONF_DEBUG=3D"yes" +GNOME2_LA_PUNT=3D"yes" + +inherit autotools eutils gnome2 +if [[ ${PV} =3D 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION=3D"An HTTP library implementation in C" +HOMEPAGE=3D"http://live.gnome.org/LibSoup" + +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 +IUSE=3D"debug doc +introspection ssl test" + +RDEPEND=3D">=3Ddev-libs/glib-2.27.5:2 + >=3Ddev-libs/libxml2-2:2 + net-libs/glib-networking[ssl?] + introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 )" +DEPEND=3D"${RDEPEND} + >=3Ddev-util/pkgconfig-0.9 + >=3Ddev-util/gtk-doc-am-1.10 + doc? ( >=3Ddev-util/gtk-doc-1.10 )" +# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_mod= ules_alias,apache2_modules_auth_basic, +# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules= _authz_user,apache2_modules_dir, +# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http= ,apache2_modules_proxy_connect] +# dev-lang/php[apache2,xmlrpc] +# net-misc/curl +# net-libs/glib-networking[ssl])" + +pkg_setup() { + # Set invalid apache module dir until apache tests are ready, bug #3269= 57 + DOCS=3D"AUTHORS NEWS README" + G2CONF=3D"${G2CONF} + --disable-static + --disable-tls-check + --without-gnome + --with-apache-module-dir=3D"${T}" + $(use_enable introspection)" +} + +src_configure() { + # FIXME: we need addpredict to workaround bug #324779 until + # root cause (bug #249496) is solved + addpredict /usr/share/snmp/mibs/.index + gnome2_src_configure +} + +src_prepare() { + gnome2_src_prepare + + 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 \ + || die "sed failed" + fi + + # Patch *must* be applied conditionally (see patch for details) + if use doc; then + # Fix bug 268592 (upstream #573685) (build fails without gnome && doc) + epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patc= h" + eautoreconf + fi +}