diff options
| -rw-r--r-- | net-libs/libsoup-gnome/ChangeLog | 9 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/Manifest | 25 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib.patch | 229 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/libsoup-gnome-2.34.1.ebuild | 57 |
4 files changed, 318 insertions, 2 deletions
diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog index 344ff00e1d26..0a1093037ed0 100644 --- a/net-libs/libsoup-gnome/ChangeLog +++ b/net-libs/libsoup-gnome/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-libs/libsoup-gnome # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.47 2011/03/22 19:42:53 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.48 2011/04/29 17:58:25 nirbheek Exp $ + +*libsoup-gnome-2.34.1 (29 Apr 2011) + + 29 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org> + +libsoup-gnome-2.34.1.ebuild, + +files/libsoup-gnome-2.34.1-system-lib.patch: + Move libsoup-gnome-2.34.1 from the gnome overlay, introspection unmasked 22 Mar 2011; Brent Baude <ranger@gentoo.org> libsoup-gnome-2.32.2.ebuild: Marking libsoup-gnome-2.32.2 ppc stable for bug 353436 diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest index 7326737620a8..e8687331fbb9 100644 --- a/net-libs/libsoup-gnome/Manifest +++ b/net-libs/libsoup-gnome/Manifest @@ -1,9 +1,32 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX libsoup-gnome-2.30.1-system-lib.patch 6488 RMD160 c20086bbeae0e1f0c595a50eacfa188cacfb6790 SHA1 0ea3053a92cf6c2245f4cd840e269836811df02b SHA256 fc523f1b566aa954ed84928ec18e74a22a062e1e322901f788a9679d2d0b61ec AUX libsoup-gnome-2.31.92-system-lib.patch 5433 RMD160 931b001ac5e94f9decbc8a589358bbee6e89b97a SHA1 e550960904d370c8c4d9ba3c3b3a73ca8ef5b8ce SHA256 de4fd6dd04a6972fe63e4214fc4b0d55eb8aec1503261d1cfdd3f11d1970425b +AUX libsoup-gnome-2.34.1-system-lib.patch 5725 RMD160 f723e514ba9e410a25a76ceea35d35f2ff6b3ee9 SHA1 87a08cfce699eb530d362d2b419afc24a15eaa19 SHA256 e79bd7a13b97313e03c6658ed24d254fcdf0173911e69941a73a23362cd12726 DIST libsoup-2.30.1-build-gir-patches.tar.bz2 8678 RMD160 2043a4847d1d5830e1f2f204aa33d2027c39ead7 SHA1 30c54c319484e17512c66e0f1b0124bc51021176 SHA256 880de0050e92dbab2d9d94735fc3abce0d1ad1996810a0875b3a81c3d0d3fd25 DIST libsoup-2.30.2.tar.bz2 644337 RMD160 e714287d93cf10d0775bfcb48676b4a4c487bff3 SHA1 bf3ce2efb5452f79758a05b010d21bdaa1ba985c SHA256 78ccbce84fccc74a49fb8168eeb409a6429a8a5854f197261d4108b8bb106bf6 DIST libsoup-2.32.2.tar.bz2 668131 RMD160 641d52bfbb9772cf9e69f3050f59b42783851926 SHA1 d93cfbd8a44c8b8759c98bfc83d2e3a003973708 SHA256 96e6973c8b7459523c0f44e7aec69528ff2fbd388e8ddc415f91bcc42f50777f +DIST libsoup-2.34.1.tar.bz2 683473 RMD160 2897f60c2ad94308cb1dfc40ddd55f800c4f656a SHA1 29186d5de0afb916b0da46f18548f666e890ea3e SHA256 a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b EBUILD libsoup-gnome-2.30.2.ebuild 1871 RMD160 e8e10600f17cf0ee9d803d9c7020d7d2142088ab SHA1 fc4e0bc69cfd1d3fe6e85821dee4a5334e17cfa9 SHA256 4644209f4c8a26a6618fa3cd309df1eff81eb80c47c43d794566ac3c804200c2 EBUILD libsoup-gnome-2.32.2.ebuild 1420 RMD160 87fbda2a1ddaf19619a761deea168bf22241be7e SHA1 18d13f5dfd59ed39bf56292f995a3aa30b113640 SHA256 93331d48d8da62f5efffd539a3c13f4e2c239112e3e0a6f455ec06113da73842 -MISC ChangeLog 7923 RMD160 0576d44299f4d0cd01c584d5711b60befb9d7dc2 SHA1 7c5a9ef0299071daf0f11f20b462facc1e792650 SHA256 d9ba8d702cafc9e340927519a411a54952df0eb1d0a9f2dbf06fb28368a958c6 +EBUILD libsoup-gnome-2.34.1.ebuild 1432 RMD160 13e99dc0cf9436b290c627c2e0beb92a35b9e8e9 SHA1 113056003bc0e712c1a1f922d1287907568dc7b1 SHA256 52c325b9578a11e26cde0226bd4f28054f7881519ad5ce1046402b0fd330587c +MISC ChangeLog 8172 RMD160 d279a3d72b058fe747fa55ee55a94d7192d8c686 SHA1 385e19eb8f84796b6d888a2c0ac22bae7ed62a26 SHA256 23d72917c69fb20e5c614d83905b30cfeb41d9b9f00674444c16266ce4750750 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBAgAGBQJNuvxHAAoJEO/kOhxWD91kJj4P/3W2GEbb6411tUa2iIkuf33l +B23IgMyxbrHu4/tFbaZRS+00oVJ/WD6JyVLgpYL627Xx4MybLIrPsqc5LewiIgHD +Y8He4Cg/gnfAgz+Vmo3q9qwOHTy6sjekLQhoBqE7Viz/kU0FdJwBrrpFugmyM7kp +z8iRgKVxgQey1++2O2CYcb1bgUc1SlC+IGIMFvcGwgO3amCdcrO8npCelL1ljZQg +0e08VckndlyLBcgXHLmmbfXCdZYR0bagAGCWZF7w7lgr06wTUNBHiyg/8mTAgKvY +xn5pot6s8Zi7BWL4T+VuDy3SJoKNUB1BvoPEz6R6roQcrUVh1Fafte1PHB6KSWEd +k/o5iztAv+OJQfEe19SGl7fi/hNjYgStVUhsGsKeRUyhTX7ZabFyCnmqb0HVXAjk +4+PxVw4Vx6WncJRj5O2rDVbjUMtXQVOS/PuUiU2jmvjgyDsezps0zvYmCaYEds9l +LTSjFEHtz54U5WJV5pAOUYvucC23j/KxLddewzjuoKVLmC2DoeEhlQalWmLp/Ixz +djfIGUwqkgh/cVXJuKqHiRt0Op15UXHC4MTn0Lta4iTRBJiC7MMhgGAaWWUvpSut +Wq4lXb2XZIw/6shswlTBIuTM65F3mZniXS3IYRME6p2HCxKd6YI60xCYYabis5Z0 +b3uz2BcJ5VV6e2rMJZqD +=eiIJ +-----END PGP SIGNATURE----- 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.patch new file mode 100644 index 000000000000..ad12542571e5 --- /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 *********************** + +-AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio) +-if test "$GLIB_LIBS" = ""; then +- AC_MSG_ERROR(GLIB 2.27.5 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.27.5,,,gobject gthread gio) ++ if test "$GLIB_LIBS" = ""; then ++ AC_MSG_ERROR(GLIB 2.27.5 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/libsoup-gnome-2.34.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.34.1.ebuild new file mode 100644 index 000000000000..7776a69d1812 --- /dev/null +++ b/net-libs/libsoup-gnome/libsoup-gnome-2.34.1.ebuild @@ -0,0 +1,57 @@ +# 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.1.ebuild,v 1.1 2011/04/29 17:58:25 nirbheek Exp $ + +EAPI="3" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 + +MY_PN=${PN/-gnome} +MY_P=${MY_PN}-${PV} + +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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris" +IUSE="debug doc +introspection" + +RDEPEND="~net-libs/libsoup-${PV} + || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) + dev-db/sqlite:3 + introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + >=dev-util/gtk-doc-am-1.10 + doc? ( >=dev-util/gtk-doc-1.10 )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + G2CONF="${G2CONF} + --disable-static + --disable-tls-check + $(use_enable introspection) + --with-libsoup-system + --with-gnome" + 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() { + gnome2_src_prepare + + # Use lib present on the system + epatch "${FILESDIR}"/${PN}-2.34.1-system-lib.patch + eautoreconf +} |