aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-06-08 23:25:25 -0700
committerGregory M. Tuner <gmt@be-evil.net>2014-06-08 23:25:25 -0700
commitb192e0f978e8427996a32048f6913444ec50e250 (patch)
tree4966be47b7d3bef255c18d8eef9b682c44840c41 /net-libs
parentgnome-base/orbit-2.14.19-r4: inherit gtk-doc (diff)
downloadgmt-b192e0f978e8427996a32048f6913444ec50e250.tar.gz
gmt-b192e0f978e8427996a32048f6913444ec50e250.tar.bz2
gmt-b192e0f978e8427996a32048f6913444ec50e250.zip
net-libs/libsoup-2.46.0-r1: revbump/merge
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/libsoup/ChangeLog80
-rw-r--r--net-libs/libsoup/Manifest7
-rw-r--r--net-libs/libsoup/files/libsoup-2.42.1-ipv6-tests.patch29
-rw-r--r--net-libs/libsoup/libsoup-2.46.0-r1.ebuild (renamed from net-libs/libsoup/libsoup-2.42.3.1-r1.ebuild)12
4 files changed, 89 insertions, 39 deletions
diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index ce0a047..e7d4d62 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,82 @@
# ChangeLog for net-libs/libsoup
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.309 2013/09/05 19:01:33 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.331 2014/04/27 17:45:03 eva Exp $
+
+*libsoup-2.46.0 (27 Apr 2014)
+
+ 27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +libsoup-2.46.0.ebuild:
+ Version bump for Gnome 3.12.
+
+ 27 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+ -files/libsoup-2.42.1-ipv6-tests.patch, -libsoup-2.38.1.ebuild,
+ -libsoup-2.40.3.ebuild, -libsoup-2.42.3.1.ebuild:
+ drop old
+
+ 21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-2.44.2.ebuild:
+ Stable for arm, wrt bug #507568
+
+ 19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-2.44.2.ebuild:
+ Stable for sparc, wrt bug #507568
+
+ 18 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-2.44.2.ebuild:
+ Stable for alpha, wrt bug #507568
+
+ 17 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-2.44.2.ebuild:
+ Stable for ia64, wrt bug #507568
+
+ 16 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-2.44.2.ebuild:
+ Stable for ppc64, wrt bug #507568
+
+ 14 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-2.44.2.ebuild:
+ Stable for ppc, wrt bug #507568
+
+ 28 Mar 2014; Jeroen Roovers <jer@gentoo.org> libsoup-2.44.2.ebuild:
+ Stable for HPPA (bug #499954).
+
+ 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> libsoup-2.44.2.ebuild:
+ x86 stable, bug 499954
+
+ 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> libsoup-2.44.2.ebuild:
+ amd64 stable, bug 499954
+
+ 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> libsoup-2.44.2.ebuild:
+ Fix wrong commit, bug 502160
+
+ 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> libsoup-2.44.2.ebuild:
+ arch stable, bug 888
+
+ 24 Dec 2013; Pacho Ramos <pacho@gentoo.org> libsoup-2.44.2.ebuild:
+ Fix homepage
+
+*libsoup-2.44.2 (24 Dec 2013)
+
+ 24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +libsoup-2.44.2.ebuild:
+ Version bump for Gnome 3.10
+
+ 22 Dec 2013; Jeroen Roovers <jer@gentoo.org> libsoup-2.42.3.1.ebuild:
+ Stable for HPPA (bug #478252).
+
+ 08 Dec 2013; Pacho Ramos <pacho@gentoo.org> libsoup-2.42.3.1.ebuild:
+ x86 stable, bug #478252
+
+ 30 Nov 2013; Pacho Ramos <pacho@gentoo.org> libsoup-2.42.3.1.ebuild:
+ amd64 stable, bug #478252
+
+ 29 Nov 2013; Pacho Ramos <pacho@gentoo.org> -libsoup-2.42.2-r1.ebuild,
+ libsoup-2.42.3.1.ebuild:
+ Try to prevent more test failures, bug #413233#c7 by Markus Oehme, drop old.
+
+*libsoup-2.42.3.1 (15 Nov 2013)
+
+ 15 Nov 2013; Pacho Ramos <pacho@gentoo.org> +libsoup-2.42.3.1.ebuild:
+ Version bump
+
+ 17 Oct 2013; Markus Meier <maekke@gentoo.org> libsoup-2.40.3.ebuild:
+ arm stable, bug #476364
+
+ 12 Oct 2013; Pacho Ramos <pacho@gentoo.org> -libsoup-2.42.1.ebuild,
+ -libsoup-2.42.2.ebuild:
+ Drop old
05 Sep 2013; Michał Górny <mgorny@gentoo.org> libsoup-2.40.3.ebuild,
libsoup-2.42.1.ebuild, libsoup-2.42.2-r1.ebuild, libsoup-2.42.2.ebuild:
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 48bceed..522842f 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,7 +1,6 @@
-AUX libsoup-2.42.1-ipv6-tests.patch 869 SHA256 95ec662c9d7ad6a006f83b1b6ea341c8b31d4396eea8784a63bf0b033c9f19d0 SHA512 170d2026542f4b6a1eb064efdeea1b26320fe68d94418c088aef0bc9902babfd25bef3b4b88a2464c6d20e032602c9a66d3afae6c62f6eee429b12d5bc0d7f1c WHIRLPOOL 65e30dc864a7a1412c3b7d1678f51d9b3b0d20503ed06a06b142db06665e8faa8fdf0008461250d97f61c6e0468070633b0d295f464e007491a01abc30c810c1
-DIST libsoup-2.42.3.1.tar.xz 740164 SHA256 97a6be94daabd21fcfba7bde4939c44d0f260bb123d7e260fb71551458da6651 SHA512 3d4dabc989f02b11b4f1f4994b0dab2fc069b4997f59bf90e43062fcda1e3b6741b7f25ac5460004916ba7101c853dd2a44345a1d7caaefc6d867ffaa5494f6b WHIRLPOOL 21cd761c98f6176263cf605e6958eea373848b51aedbc21c7528ee4710a0bfa4fdbcac8ee63b46b8f7c9f8b0f858aaadf4b9bcba5f030ba2e52ead3f4164fe0d
DIST libsoup-2.44.2.tar.xz 748592 SHA256 e7e4b5ab74a6c00fc267c9f5963852d28759ad3154dab6388e2d6e1962d598f3 SHA512 f24c318d11aaf0f98d05a673ab87e17da391f1da9d22c63d32532304473ac77a9cc324978346a42a9a21165abd182c11122a33dd7e5d81c8953ba4b0b8e5ae30 WHIRLPOOL 87f201adf26caca64002943e788cf80b07d0fd95b1917a34b90188ae3f0c514cdf41cd1f1e928b0c1083ec7f89a19d031bef014d02fb4f1d9e399c159e2eec1d
-EBUILD libsoup-2.42.3.1-r1.ebuild 2117 SHA256 39eb2c5c0b8dc41d358106efb8a5acf10d82c422defaf80c51853d76176b20d1 SHA512 d8d49b4d026b30922fbcee17358bee59d029016b73571dc43ffd9ae305ad4c26ce9fd24f8b4ae94a11c383d031d5526c0b44a552583f483c96db54846964bbf0 WHIRLPOOL 9e871ea9215bf774fbf128a399b0543f64f528849583d9aa97f131b0ef10656c0ba4cb1371f732dc376c8d7e0be4024eb29d5ef435e123dffbf98b7586a3a4fc
+DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
EBUILD libsoup-2.44.2-r1.ebuild 2090 SHA256 af84fd1e3f2723ed51267c8b5a2a4a960defb346f889d8d6fe3a335ed4dd6935 SHA512 90018a9ebcceeefba2a79c2bce5dde4622f50a056fecf3cab9d90f922a180b4e40db93b3ff2901ba1b853cc9c8322618ea636ac7369b0055470563c607f008d5 WHIRLPOOL cc251d311b6ec71b84de57a88f54e15acf0bc4cd325a1f410055bc17590930b455e3113a72d3eb712d8fdcc583a62ff9bc33973cec267e1dc2c1fdc1f88ad29d
-MISC ChangeLog 41250 SHA256 3f516d0e2bf98b10810e3092c3891569d38cc8c235972847a7f31bfcf8468f5a SHA512 e062d8d749c1b4197e43e7b89b829a35cb5e3590dcf4162461fb488ed33129c26a98a2bae0134961d4a5e2c7eac1ec8b5930bf9ad5813627d6349eacd3fe0349 WHIRLPOOL 921ceb49a179670352134dd3594c36d9554663e66572371318fc72e80a2a27d582eb54acc1b28bf39081511029860090ada6ccac8fb3e46f5141a85a3707dd67
+EBUILD libsoup-2.46.0-r1.ebuild 2198 SHA256 12714197ff0b493a8aff0b34095db9f6ddfd7d3f8938015804b0b56c718face0 SHA512 e11f4718666cb99dfe0caff95e5a5735a72249fa3a44f2487acc362dc0c419b93612d4340bec0828a8bbb9267343d61b6ce58ad61fb363de34ca8862e2db8ab7 WHIRLPOOL c6281ae2e711793b16b792a1428af1b5927bab025199aaa6fd787ad3a15f2ec5eac862806d6c927170ed686aaecf3f0d1d599992af7b54fe5ad2fca91e096393
+MISC ChangeLog 43731 SHA256 dabfecf3ff59392c1a2992c2db82823ed167e7617dff9a528f0640f2e4b8f6fb SHA512 5c77244a8e67eb1ad9d03561f5860266efc68027d4358bc80ef610f09dce9f2dfcb4abd7d9f3a81b70a696f6dbf10782e0b13c13ab849531edb79edff5126ade WHIRLPOOL f5f76a8c99521c51fc39866566c6be518f97ba2609edc392cae701b0a342f5b888968efa5ce34aebebf1125d0805a5cb214d394c388f851a0e33b65e03cf9f89
MISC metadata.xml 257 SHA256 ee7dfc9e6af8bfc278c145d407d4a9c39458109886dba15303cc1c4c9d1c3ea2 SHA512 68402e9d9c7f3aea455729538fd16d692acad9a52861fa5088f2d170c9da1080c3c284fad0232ea042b5efd765e4988802778802979b927f90853ab26a01eb32 WHIRLPOOL 6d61388c9de173897cb4cff9bd1cf5799eea1e57383ace5f5e2a93193eaac9567e548c1faed6d0703c011e81ef98fff413e8801dbf27fb1f2e351d95ebc6699e
diff --git a/net-libs/libsoup/files/libsoup-2.42.1-ipv6-tests.patch b/net-libs/libsoup/files/libsoup-2.42.1-ipv6-tests.patch
deleted file mode 100644
index cc71213..0000000
--- a/net-libs/libsoup/files/libsoup-2.42.1-ipv6-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ce2043a7a81d2d8c9fba3b87a03df52df99e4115 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Thu, 18 Apr 2013 15:40:55 -0400
-Subject: [PATCH] misc-test: skip the IPv6 server test if there's no IPv6
- support
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698220
----
- tests/misc-test.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tests/misc-test.c b/tests/misc-test.c
-index a9150a1..39ee960 100644
---- a/tests/misc-test.c
-+++ b/tests/misc-test.c
-@@ -1110,6 +1110,11 @@ do_ipv6_test (void)
- ipv6_server = soup_server_new (SOUP_SERVER_INTERFACE, ipv6_addr,
- NULL);
- g_object_unref (ipv6_addr);
-+ if (!ipv6_server) {
-+ debug_printf (1, " skipping due to lack of IPv6 support\n");
-+ return;
-+ }
-+
- soup_server_add_handler (ipv6_server, NULL, ipv6_server_callback, NULL, NULL);
- soup_server_run_async (ipv6_server);
-
---
-1.8.1.4 \ No newline at end of file
diff --git a/net-libs/libsoup/libsoup-2.42.3.1-r1.ebuild b/net-libs/libsoup/libsoup-2.46.0-r1.ebuild
index 299e164..9fcb757 100644
--- a/net-libs/libsoup/libsoup-2.42.3.1-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.46.0-r1.ebuild
@@ -14,11 +14,11 @@ HOMEPAGE="https://wiki.gnome.org/LibSoup"
LICENSE="LGPL-2+"
SLOT="2.4"
-KEYWORDS="~amd64"
IUSE="debug +introspection samba ssl test"
+KEYWORDS="~amd64"
RDEPEND="
- >=dev-libs/glib-2.36.0:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
>=dev-libs/libxml2-2:2[${MULTILIB_USEDEP}]
dev-db/sqlite:3[${MULTILIB_USEDEP}]
>=net-libs/glib-networking-2.30.0[ssl?,${MULTILIB_USEDEP}]
@@ -34,7 +34,8 @@ DEPEND="${RDEPEND}
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r1
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
+ )
+"
# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_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]
@@ -49,6 +50,10 @@ src_prepare() {
|| die "sed failed"
fi
+ # FIXME: does not behave as expected
+ sed -e 's|\(g_test_add.*\)|/*\1*/|' \
+ -i tests/socket-test.c || die
+
gnome2-multilib_src_prepare
}
@@ -59,7 +64,6 @@ src_configure() {
# Disable apache tests until they are usable on Gentoo, bug #326957
gnome2-multilib_src_configure \
- --disable-more-warnings \
--disable-static \
--disable-tls-check \
--without-gnome \