commit: d41d13f7700507a497ef9f7691d3ba8adb5b8b5b Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Wed Jul 29 11:21:47 2020 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Wed Jul 29 11:23:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41d13f7
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 | 2 - .../libsoup/files/2.66.2-vala-0.46-compat.patch | 26 ------ net-libs/libsoup/libsoup-2.62.3.ebuild | 94 --------------------- net-libs/libsoup/libsoup-2.66.4.ebuild | 96 ---------------------- 4 files changed, 218 deletions(-) diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest index 23d404c7da8..44c7c0730b2 100644 --- a/net-libs/libsoup/Manifest +++ b/net-libs/libsoup/Manifest @@ -1,3 +1 @@ -DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b -DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b diff --git a/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch b/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch deleted file mode 100644 index ce0e1dc9b62..00000000000 --- a/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1c6f47df99cc5b2efe3d629c71c5d85a7871689c Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz <ric...@ubuntu.com> -Date: Tue, 28 May 2019 09:08:35 +0200 -Subject: [PATCH] gir: soup_auth_new is not a constructor - ---- - libsoup/Soup-2.4.metadata | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libsoup/Soup-2.4.metadata b/libsoup/Soup-2.4.metadata -index c0056ec8..1f107eda 100644 ---- a/libsoup/Soup-2.4.metadata -+++ b/libsoup/Soup-2.4.metadata -@@ -18,6 +18,9 @@ ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver" - - // Report upstream - add_* skip=false type="unowned GLib.TimeoutSource" -+Auth -+ // Factory method -+ .new symbol_type="function" - AuthDomain - .accepts#method name="accepts_authorization" - AuthDomainBasic.new skip=false --- -2.20.1 - diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild deleted file mode 100644 index d55643d5a8f..00000000000 --- a/net-libs/libsoup/libsoup-2.62.3.ebuild +++ /dev/null @@ -1,94 +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 ~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 - 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])" - -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 -} diff --git a/net-libs/libsoup/libsoup-2.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild deleted file mode 100644 index c26cf2bfb52..00000000000 --- a/net-libs/libsoup/libsoup-2.66.4.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome.org meson multilib-minimal vala xdg - -DESCRIPTION="HTTP client/server library for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"; - -LICENSE="LGPL-2.1+" -SLOT="2.4" - -IUSE="gssapi gtk-doc +introspection samba ssl test +vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86" - -DEPEND=" - >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] - >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - >=net-libs/libpsl-0.20[${MULTILIB_USEDEP}] - gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - samba? ( net-fs/samba ) -" -RDEPEND="${DEPEND} - >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}] -" -BDEPEND=" - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.1.2 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - 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=( - # Disable apache tests until they are usable on Gentoo, bug #326957 - "${FILESDIR}"/disable-apache-tests.patch - # Fix libsoup-2.4.vapi to be compatible with vala:0.46 and onwards. Included in 2.67.2 - "${FILESDIR}"/2.66.2-vala-0.46-compat.patch - "${FILESDIR}"/2.66.2-meson-ntlm_auth-fix.patch -) - -src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare -} - -src_configure() { - # FIXME: we need addpredict to workaround bug #324779 until - # root cause (bug #249496) is solved - # But necessary while apache tests are disabled - #addpredict /usr/share/snmp/mibs/.index - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local emesonargs=( - $(meson_use gssapi) - -Dkrb5_config="${CHOST}-krb5-config" - $(meson_use samba ntlm) - -Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth" - -Dtls_check=false # disables check, we still rdep on glib-networking - -Dgnome=false - -Dintrospection=$(multilib_native_usex introspection true false) - -Dvapi=$(multilib_native_usex vala true false) - -Dgtk_doc=$(multilib_native_usex gtk-doc true false) - $(meson_use test tests) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -}
