[gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/, net-libs/libsoup/files/

[Mart Raudsepp]

commit:     80c0e75ebdb49dff7fba80eac6db3df4d4c7e967
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 11:45:13 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 11:45:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c0e75e

net-libs/libsoup: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/libsoup/Manifest                          |  1 -
 .../files/libsoup-2.58.2-sparc-unaligned.patch     | 28 ------
 net-libs/libsoup/libsoup-2.58.2.ebuild             | 99 ----------------------
 3 files changed, 128 deletions(-)

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 62f938e2e88..09b9b4d21d9 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,3 +1,2 @@
-DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
 DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad

diff --git a/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch b/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch
deleted file mode 100644
index d09d52c292a..00000000000
--- a/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2aaac0083f58d285b8feb24f13fe347d7f726fe Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eike@×××××××.de>
-Date: Sat, 17 Mar 2018 10:28:00 +0000
-Subject: [PATCH] WebSockets: Avoid unaligned memory access
-
-This is causing test failures in SPARC architectures.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=794421
----
- libsoup/soup-websocket-connection.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c
-index 0258a22c..35eee6a6 100644
---- a/libsoup/soup-websocket-connection.c
-+++ b/libsoup/soup-websocket-connection.c
-@@ -401,9 +401,10 @@ send_message (SoupWebsocketConnection *self,
- 	 * probably a client somewhere that's not expecting it.
- 	 */
- 	if (self->pv->connection_type == SOUP_WEBSOCKET_CONNECTION_CLIENT) {
-+		guint32 rnd = g_random_int ();
- 		outer[1] |= 0x80;
- 		mask = outer + bytes->len;
--		* ((guint32 *)mask) = g_random_int ();
-+		memcpy (mask, &rnd, sizeof (rnd));
- 		bytes->len += 4;
- 	}
- 

diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
deleted file mode 100644
index 9e276e84fa3..00000000000
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multilib-minimal python-any-r1 vala
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-
-IUSE="debug gssapi +introspection samba ssl test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	samba? ( net-fs/samba )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
-	vala? ( $(vala_depend) )
-"
-#	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]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-PATCHES=(
-	# https://bugs.gentoo.org/630516
-	"${FILESDIR}/${PN}-2.58.2-sparc-unaligned.patch"
-)
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# FIXME: workaround upstream not respecting --without-apache-httpd
-	sed -e '/check: start-httpd/d' \
-		-i tests/Makefile.am tests/Makefile.in || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(usex debug --enable-debug=yes ' ') \
-		$(multilib_native_use_with gssapi) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable vala) \
-		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
-
-	if multilib_is_native_abi; then
-		# fix gtk-doc
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}