From 1d4a6c7bb464be0a25da075b31370a26cbaa4fcd Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 17 Dec 2012 05:15:19 +0000 Subject: Version bump for gnome-3.6. Switch to global introspection flag. Drop old. (Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) --- net-libs/libsoup-gnome/ChangeLog | 10 +- .../files/libsoup-gnome-2.36.1-system-lib.patch | 229 ------------------ .../files/libsoup-gnome-2.40.2-system-lib.patch | 259 +++++++++++++++++++++ net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild | 57 ----- net-libs/libsoup-gnome/libsoup-gnome-2.40.2.ebuild | 56 +++++ net-libs/libsoup-gnome/metadata.xml | 4 - 6 files changed, 324 insertions(+), 291 deletions(-) delete mode 100644 net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.patch create mode 100644 net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch delete mode 100644 net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild create mode 100644 net-libs/libsoup-gnome/libsoup-gnome-2.40.2.ebuild (limited to 'net-libs') diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog index bf0e395a4d07..cc0d53c7dea7 100644 --- a/net-libs/libsoup-gnome/ChangeLog +++ b/net-libs/libsoup-gnome/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-libs/libsoup-gnome # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.82 2012/10/28 16:28:49 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.83 2012/12/17 05:15:18 tetromino Exp $ + +*libsoup-gnome-2.40.2 (17 Dec 2012) + + 17 Dec 2012; Alexandre Rostovtsev + -libsoup-gnome-2.36.1.ebuild, -files/libsoup-gnome-2.36.1-system-lib.patch, + +libsoup-gnome-2.40.2.ebuild, +files/libsoup-gnome-2.40.2-system-lib.patch, + metadata.xml: + Version bump for gnome-3.6. Switch to global introspection flag. Drop old. 28 Oct 2012; Raúl Porcel libsoup-gnome-2.38.1.ebuild: ia64/sh/sparc stable wrt #427544 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.36.1-system-lib.patch deleted file mode 100644 index a4e23ebe9cee..000000000000 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.patch +++ /dev/null @@ -1,229 +0,0 @@ -Split support for libsoup-gnome - -Original patch by Romain Perier. ---- ---- configure.ac -+++ configure.ac -@@ -72,15 +72,30 @@ - dnl *** Checks for glib *** - dnl *********************** - --AM_PATH_GLIB_2_0(2.30.0,,,gobject gthread gio) --if test "$GLIB_LIBS" = ""; then -- AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup) --fi --GLIB_CFLAGS="$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=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.30.0,,,gobject gthread gio) -+ if test "$GLIB_LIBS" = ""; then -+ AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup) -+ fi -+ GLIB_CFLAGS="$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 = no) - - dnl *********************** - dnl *** Check for Win32 *** -@@ -99,13 +114,6 @@ - AC_MSG_RESULT([$os_win32]) - AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) - --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 != no; then - AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) - -+ if test $with_libsoup_system != no; then -+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) -+ fi -+ - PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl - [Could not find sqlite3 devel files: - ---- libsoup/Makefile.am -+++ libsoup/Makefile.am -@@ -4,15 +4,18 @@ - LIBWS2_32 = -lws2_32 - endif - --INCLUDES = \ -+INCLUDES = -+lib_LTLIBRARIES = -+CLEANFILES = -+ -+if BUILD_LIBSOUP -+INCLUDES += \ - -DG_LOG_DOMAIN=\"libsoup\" \ - -I$(top_srcdir) \ - $(SOUP_DEBUG_FLAGS) \ - $(SOUP_MAINTAINER_FLAGS) \ - $(GLIB_CFLAGS) \ -- $(XML_CFLAGS) \ -- $(SQLITE_CFLAGS) \ -- $(GNOME_KEYRING_CFLAGS) -+ $(XML_CFLAGS) - - MARSHAL_GENERATED = soup-marshal.c soup-marshal.h - MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h -@@ -41,7 +44,7 @@ - - BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) - --CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) -+CLEANFILES += $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) - - libsoupincludedir = $(includedir)/libsoup-2.4/libsoup - -@@ -94,7 +97,7 @@ - $(soup_headers) \ - soup-enum-types.h - --lib_LTLIBRARIES = libsoup-2.4.la -+lib_LTLIBRARIES += libsoup-2.4.la - - libsoup_2_4_la_LDFLAGS = \ - -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined -@@ -178,6 +181,7 @@ - soup-uri-private.h \ - soup-value-utils.c \ - soup-xmlrpc.c -+endif - - if BUILD_LIBSOUP_GNOME - -@@ -191,6 +195,10 @@ - - libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup - -+INCLUDES += $(LIBSOUP_CFLAGS) \ -+ $(SQLITE_CFLAGS) \ -+ $(GNOME_KEYRING_CFLAGS) -+ - libsoupgnomeinclude_HEADERS = \ - soup-cookie-jar-sqlite.h\ - soup-gnome.h \ -@@ -198,14 +206,24 @@ - - lib_LTLIBRARIES += libsoup-gnome-2.4.la - -+if BUILD_LIBSOUP - libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) -+else -+libsoup_gnome_2_4_la_LDFLAGS = \ -+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined -+endif - - libsoup_gnome_2_4_la_LIBADD = \ -- libsoup-2.4.la \ - $(GLIB_LIBS) \ - $(SQLITE_LIBS) \ - $(GNOME_KEYRING_LIBS) - -+if BUILD_LIBSOUP -+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la -+else -+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) -+endif -+ - libsoup_gnome_2_4_la_SOURCES = \ - soup-cookie-jar-sqlite.c \ - soup-gnome-features.c \ -@@ -225,6 +243,8 @@ - - if HAVE_INTROSPECTION - -+if BUILD_LIBSOUP -+ - # Core library - gi_soup_files = \ - $(filter-out soup.h soup-enum-types.% soup-marshal.%,\ -@@ -246,20 +266,28 @@ - - INTROSPECTION_GIRS += Soup-2.4.gir - -+endif -+ - if BUILD_LIBSOUP_GNOME - -+if BUILD_LIBSOUP -+SOUP_GIR = Soup-2.4.gir -+else -+SOUP_GIR = -+endif -+ - # GNOME extensions - gi_soup_gnome_files = $(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 = Soup-2.4 - SoupGNOME_2_4_gir_SCANNERFLAGS = \ - --identifier-prefix=Soup \ - --symbol-prefix=soup \ -- --c-include "libsoup/soup-gnome.h" \ -- --include-uninstalled=$(builddir)/Soup-2.4.gir -+ --c-include "libsoup/soup-gnome.h" - SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) --SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la -+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la - SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) - SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 - ---- Makefile.am -+++ Makefile.am -@@ -1,7 +1,11 @@ - ## Process this file with automake to produce Makefile.in - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = libsoup tests docs -+SUBDIRS = libsoup -+ -+if BUILD_LIBSOUP -+SUBDIRS += tests docs -+endif - - EXTRA_DIST = \ - libsoup-2.4.pc.in \ -@@ -14,7 +18,11 @@ - - pkgconfigdir = $(libdir)/pkgconfig - --pkgconfig_DATA = libsoup-2.4.pc -+pkgconfig_DATA = -+ -+if BUILD_LIBSOUP -+pkgconfig_DATA += libsoup-2.4.pc -+endif - - if BUILD_LIBSOUP_GNOME - pkgconfig_DATA += libsoup-gnome-2.4.pc diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch new file mode 100644 index 000000000000..d236e0c92823 --- /dev/null +++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch @@ -0,0 +1,259 @@ +From 41200f48909dbf48fd2c96f305b71797634aca3e 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 + +https://bugzilla.gnome.org/show_bug.cgi?id=595065 + +Original patch by Romain Perier. +--- + Makefile.am | 12 ++++++++-- + configure.ac | 35 +++++++++++++++++++---------- + libsoup/Makefile.am | 63 ++++++++++++++++++++++++++++++++++++++--------------- + 3 files changed, 79 insertions(+), 31 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 18bf80a..046f945 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,11 @@ + ## Process this file with automake to produce Makefile.in + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + +-SUBDIRS = libsoup po tests docs ++SUBDIRS = libsoup ++ ++if BUILD_LIBSOUP ++SUBDIRS += po tests docs ++endif + + EXTRA_DIST = \ + data/effective_tld_names.dat \ +@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection + + pkgconfigdir = $(libdir)/pkgconfig + +-pkgconfig_DATA = libsoup-2.4.pc ++pkgconfig_DATA = ++ ++if BUILD_LIBSOUP ++pkgconfig_DATA += libsoup-2.4.pc ++endif + + if BUILD_LIBSOUP_GNOME + pkgconfig_DATA += libsoup-gnome-2.4.pc +diff --git a/configure.ac b/configure.ac +index 95410de..1f00bdd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -71,20 +71,27 @@ LT_INIT([win32-dll]) + dnl *********************** + dnl *** Checks for glib *** + dnl *********************** ++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 ++ GLIB_REQUIRED=2.33.1 ++ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) ++ if test "$GLIB_LIBS" = ""; then ++ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) ++ fi ++ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34" ++ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' ++ AC_SUBST(GLIB_MAKEFILE) + +-GLIB_REQUIRED=2.33.1 +-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) +-if test "$GLIB_LIBS" = ""; then +- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) +-fi +-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34" +- +-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' +-AC_SUBST(GLIB_MAKEFILE) ++ PKG_CHECK_MODULES(XML, libxml-2.0) ++ AC_SUBST(XML_CFLAGS) ++ AC_SUBST(XML_LIBS) + +-PKG_CHECK_MODULES(XML, libxml-2.0) +-AC_SUBST(XML_CFLAGS) +-AC_SUBST(XML_LIBS) ++fi ++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) + + dnl *********************** + dnl *** Check for Win32 *** +@@ -143,6 +150,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]) + ++ if test $with_libsoup_system != no; then ++ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) ++ fi ++ + PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl + [Could not find sqlite3 devel files: + +diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am +index cc99e75..f9b25fc 100644 +--- a/libsoup/Makefile.am ++++ b/libsoup/Makefile.am +@@ -1,23 +1,26 @@ + ## Process this file with automake to produce Makefile.in + + EXTRA_DIST = +- ++BUILT_SOURCES = + include $(GLIB_MAKEFILE) + + if OS_WIN32 + LIBWS2_32 = -lws2_32 + endif + +-INCLUDES = \ ++INCLUDES = ++lib_LTLIBRARIES = ++CLEANFILES = ++ ++if BUILD_LIBSOUP ++INCLUDES += \ + -DG_LOG_DOMAIN=\"libsoup\" \ + -DLOCALEDIR=\"$(localedir)\" \ + -I$(top_srcdir) \ + $(SOUP_DEBUG_FLAGS) \ + $(SOUP_MAINTAINER_FLAGS) \ + $(GLIB_CFLAGS) \ +- $(XML_CFLAGS) \ +- $(SQLITE_CFLAGS) \ +- $(GNOME_KEYRING_CFLAGS) ++ $(XML_CFLAGS) + + libsoupincludedir = $(includedir)/libsoup-2.4/libsoup + +@@ -72,7 +75,7 @@ libsoupinclude_HEADERS = \ + $(soup_headers) \ + soup-enum-types.h + +-lib_LTLIBRARIES = libsoup-2.4.la ++lib_LTLIBRARIES += libsoup-2.4.la + + libsoup_2_4_la_LDFLAGS = \ + -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined +@@ -173,14 +176,17 @@ libsoup_2_4_la_SOURCES = \ + soup-value-utils.c \ + soup-xmlrpc.c + +-# TLD rules +-EXTRA_DIST += tld-parser.py +- ++BUILT_SOURCES = tld_data.inc + TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat + + tld_data.inc: tld-parser.py $(TLD_DATA_FILE) + $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc + ++# TLD rules ++EXTRA_DIST += tld-parser.py ++ ++endif ++ + if BUILD_LIBSOUP_GNOME + + if OS_WIN32 +@@ -193,6 +199,10 @@ endif + + libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup + ++INCLUDES += $(LIBSOUP_CFLAGS) \ ++ $(SQLITE_CFLAGS) \ ++ $(GNOME_KEYRING_CFLAGS) ++ + libsoupgnomeinclude_HEADERS = \ + soup-cookie-jar-sqlite.h\ + soup-gnome.h \ +@@ -200,14 +210,24 @@ libsoupgnomeinclude_HEADERS = \ + + lib_LTLIBRARIES += libsoup-gnome-2.4.la + ++if BUILD_LIBSOUP + libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) ++else ++libsoup_gnome_2_4_la_LDFLAGS = \ ++ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined ++endif + + libsoup_gnome_2_4_la_LIBADD = \ +- libsoup-2.4.la \ + $(GLIB_LIBS) \ + $(SQLITE_LIBS) \ + $(GNOME_KEYRING_LIBS) + ++if BUILD_LIBSOUP ++libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la ++else ++libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) ++endif ++ + libsoup_gnome_2_4_la_SOURCES = \ + soup-cookie-jar-sqlite.c \ + soup-gnome-features.c \ +@@ -219,9 +239,8 @@ endif + + GLIB_GENERATED = soup-marshal.c soup-marshal.h + GLIB_GENERATED += soup-enum-types.c soup-enum-types.h +-BUILT_SOURCES = \ +- $(GLIB_GENERATED) \ +- tld_data.inc ++BUILT_SOURCES += \ ++ $(GLIB_GENERATED) + + soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES) + soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS) +@@ -237,6 +256,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=. + + if HAVE_INTROSPECTION + ++if BUILD_LIBSOUP ++ + # Core library + gi_soup_files = \ + $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\ +@@ -258,20 +279,28 @@ Soup_2_4_gir_FILES = \ + + INTROSPECTION_GIRS += Soup-2.4.gir + ++endif ++ + if BUILD_LIBSOUP_GNOME + ++if BUILD_LIBSOUP ++SOUP_GIR = Soup-2.4.gir ++else ++SOUP_GIR = ++endif ++ + # GNOME extensions + gi_soup_gnome_files = $(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 = Soup-2.4 + SoupGNOME_2_4_gir_SCANNERFLAGS = \ + --identifier-prefix=Soup \ + --symbol-prefix=soup \ +- --c-include "libsoup/soup-gnome.h" \ +- --include-uninstalled=$(builddir)/Soup-2.4.gir ++ --c-include "libsoup/soup-gnome.h" + SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) +-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la ++SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la + SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) + SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 + +-- +1.7.12 + diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild deleted file mode 100644 index 9cf789d9bc5c..000000000000 --- a/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 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.36.1.ebuild,v 1.11 2012/10/20 06:06:42 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -MY_PN=${PN/-gnome} -MY_P=${MY_PN}-${PV} - -inherit autotools eutils gnome2 - -DESCRIPTION="GNOME plugin for libsoup" -HOMEPAGE="http://live.gnome.org/LibSoup" -SRC_URI="${SRC_URI//-gnome}" - -LICENSE="LGPL-2+" -SLOT="2.4" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-solaris" -IUSE="debug +introspection" - -RDEPEND="~net-libs/libsoup-${PV}[introspection?] - || ( gnome-base/libgnome-keyring =dev-libs/gobject-introspection-0.9.5 )" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=dev-util/gtk-doc-am-1.10" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - # Disable apache tests until they are usable on Gentoo, bug #326957 - G2CONF="${G2CONF} - --disable-static - --disable-tls-check - $(use_enable introspection) - --with-libsoup-system - --with-gnome - --without-apache-httpd" - DOCS="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() { - # Use lib present on the system - epatch "${FILESDIR}"/${PN}-2.36.1-system-lib.patch - eautoreconf - gnome2_src_prepare -} diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.40.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.40.2.ebuild new file mode 100644 index 000000000000..c3ba9b217cc3 --- /dev/null +++ b/net-libs/libsoup-gnome/libsoup-gnome-2.40.2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2012 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.40.2.ebuild,v 1.1 2012/12/17 05:15:18 tetromino Exp $ + +EAPI="5" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +MY_PN=${PN/-gnome} +MY_P=${MY_PN}-${PV} + +inherit autotools eutils gnome2 + +DESCRIPTION="GNOME plugin for libsoup" +HOMEPAGE="http://live.gnome.org/LibSoup" +SRC_URI="${SRC_URI//-gnome}" + +LICENSE="LGPL-2+" +SLOT="2.4" +IUSE="debug +introspection" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-solaris" + +RDEPEND="~net-libs/libsoup-${PV}[introspection?] + || ( gnome-base/libgnome-keyring =dev-libs/gobject-introspection-0.9.5 )" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.10 + >=dev-util/intltool-0.35 + sys-devel/gettext + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + # Use lib present on the system + epatch "${FILESDIR}"/${PN}-2.40.2-system-lib.patch + eautoreconf + gnome2_src_prepare +} + +src_configure() { + # Disable apache tests until they are usable on Gentoo, bug #326957 + G2CONF="${G2CONF} + --disable-static + --disable-tls-check + $(use_enable introspection) + --with-libsoup-system + --with-gnome + --without-apache-httpd" + + # FIXME: we need addpredict to workaround bug #324779 until + # root cause (bug #249496) is solved + addpredict /usr/share/snmp/mibs/.index + gnome2_src_configure +} diff --git a/net-libs/libsoup-gnome/metadata.xml b/net-libs/libsoup-gnome/metadata.xml index 44825d13c084..dad9001338dc 100644 --- a/net-libs/libsoup-gnome/metadata.xml +++ b/net-libs/libsoup-gnome/metadata.xml @@ -2,8 +2,4 @@ gnome - - Use dev-libs/gobject-introspection - for introspection - -- cgit v1.2.3-65-gdbad