commit: 05707cedf9d5af5d5fd19bf78bf9ded93477e2a3
parent 1018ba13597fd1a97e5a7651f25433094627a887
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sat, 19 Mar 2022 23:11:01 +0100
net-libs/libsoup: add 3.0.5, drop 3.0.0
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Diffstat:
3 files changed, 92 insertions(+), 95 deletions(-)
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
@@ -1,2 +1 @@
-DIST libsoup-2.99.7.tar.xz 1478036 BLAKE2B 00912896a797c1ce44aaf234bb09b1d39dbbb45687d4d4f308ee50bb73622c0d174f15a86fd6a0201bb40931f3d612d5bacdc7c07f43652143444a8311e5f360 SHA512 9ddeb1dc89675bdb2fb5b2a645994034433c7df1034a89802e48e9ae20fead20c26f6e72ec2e6aa13d25b46b2019b7a91feb72555cd15bcf991556ccbc12761f
-DIST libsoup-3.0.0.tar.xz 1522816 BLAKE2B 682ac28c10da127e4c8b978984ebb9ee3f992e535ac1529474162be762ca6845476977f2ae024074b14c361c1d7e20d45d2f5b75eca8c8f94cd5352fa68261f9 SHA512 4c7388b18fdaf11d6685548935b87dd3f8770dcb05f1a4c55b8d3af277751c041e7ed569ff9bced9bfbb091dd93c59a17c9ff479678fb74bdba5dc8cefb254c4
+DIST libsoup-3.0.5.tar.xz 1528824 BLAKE2B 952b72e81d61d4aca2a5c035bafa37deb3ddd26a35a285aa2c09731b60b675a9f90bc185abd4787c16e8e9fb1007ae633a6f91c6e58df9eddb04249b503adc13 SHA512 38d1ba57bcd390385950cf79cfe6781d9ad59e5f75f2c080adac976f2fcfa020cbada1e63fedd780b1efe33a53fb7563b73fd38f011c462d92a90988e4fed9b8
diff --git a/net-libs/libsoup/libsoup-3.0.0.ebuild b/net-libs/libsoup/libsoup-3.0.0.ebuild
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="HTTP client/server library for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-
-IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-DEPEND="
- >=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
- net-libs/nghttp2:=[${MULTILIB_USEDEP}]
- >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
- >=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
- sys-libs/zlib
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- samba? ( net-fs/samba )
-"
-RDEPEND="${DEPEND}
- >=net-libs/glib-networking-2.70_alpha[ssl?,${MULTILIB_USEDEP}]
-"
-BDEPEND="
- dev-libs/glib
- 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? ( net-libs/gnutls[pkcs11] )
-"
-# 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
-)
-
-src_prepare() {
- use vala && vala_src_prepare
- xdg_src_prepare
- # https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
- sed -e '/hsts/d' -i tests/meson.build || die
-}
-
-src_configure() {
- # FIXME: we need addpredict to workaround bug #324779 until
- # root cause (bug #249496) is solved
- # But unnecessary while apache tests are disabled
- #addpredict /usr/share/snmp/mibs/.index
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_feature gssapi)
- -Dkrb5_config="${CHOST}-krb5-config"
- $(meson_feature samba ntlm)
- $(meson_feature brotli)
- -Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
- -Dtls_check=false # disables check, we still rdep on glib-networking
- -Dgnome=false
- $(meson_native_use_feature introspection)
- $(meson_native_use_feature vala vapi)
- $(meson_native_use_bool gtk-doc gtk_doc)
- $(meson_use test tests)
- -Dinstalled_tests=false
- $(meson_feature sysprof)
- $(meson_feature test pkcs11_tests)
- )
- meson_src_configure
-}
diff --git a/net-libs/libsoup/libsoup-3.0.5.ebuild b/net-libs/libsoup/libsoup-3.0.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
+
+inherit gnome.org meson-multilib vala xdg
+
+DESCRIPTION="HTTP client/server library for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+
+IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+ >=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
+ net-libs/nghttp2:=[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+ brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
+ >=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
+ sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+ sys-libs/zlib
+ gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ samba? ( net-fs/samba )
+"
+RDEPEND="${DEPEND}
+ >=net-libs/glib-networking-2.70_alpha[ssl?,${MULTILIB_USEDEP}]
+"
+BDEPEND="
+ dev-libs/glib
+ 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? ( >=net-libs/gnutls-3.6.0[pkcs11] )
+"
+# 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
+)
+
+src_prepare() {
+ use vala && vala_src_prepare
+ xdg_src_prepare
+ # https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
+ sed -e '/hsts/d' -i tests/meson.build || die
+}
+
+src_configure() {
+ # FIXME: we need addpredict to workaround bug #324779 until
+ # root cause (bug #249496) is solved
+ # But unnecessary while apache tests are disabled
+ #addpredict /usr/share/snmp/mibs/.index
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature gssapi)
+ -Dkrb5_config="${CHOST}-krb5-config"
+ $(meson_feature samba ntlm)
+ $(meson_feature brotli)
+ -Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
+ -Dtls_check=false # disables check, we still rdep on glib-networking
+ $(meson_native_use_feature introspection)
+ $(meson_native_use_feature vala vapi)
+ $(meson_native_use_bool gtk-doc gtk_doc)
+ $(meson_use test tests)
+ -Dinstalled_tests=false
+ $(meson_feature sysprof)
+ $(meson_feature test pkcs11_tests)
+ )
+ meson_src_configure
+}
