mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
Merge updates from master
This commit is contained in:
Repository mirror & CI
@@ -1,2 +1 @@
|
||||
DIST beautifulsoup4-4.14.3.tar.gz 627737 BLAKE2B e5b32c33afefcfccfa952b55e800b903e5c65ed54704d39a28603b54a75508079c6cba8db425595fa2b47fa7cf07fa1172dbff4c13c3bc1cc0a705bc786dd1fd SHA512 5c535534045cac033112b7c060539d6b5a748620df9d15fb4c719708cde263ac506f3734a39156681633942543dc555af51c619dae430311a8889204d8ee325e
|
||||
DIST beautifulsoup4-4.15.0.tar.gz 632571 BLAKE2B c9c3745b338ffdf4c8d51246d914f52f7a0caf45933ef413c16f4c7a5a80b9c090463efa9960044065b074b9790db80271cc1cb51af50714bb809c991cca8477 SHA512 ccf07cac23ca52f50802b3d6271b42c1367022e2bc409b1be2924bbbd274cebce3b5afde1c1c4f253802b7a58f907cb60a29d347ae2765c33ce85bec9dcc473c
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=hatchling
|
||||
PYTHON_COMPAT=( python3_{11..14} pypy3_11 )
|
||||
|
||||
inherit distutils-r1 pypi
|
||||
|
||||
DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
|
||||
HOMEPAGE="
|
||||
https://www.crummy.com/software/BeautifulSoup/bs4/
|
||||
https://pypi.org/project/beautifulsoup4/
|
||||
"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/html5lib[${PYTHON_USEDEP}]
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
>=dev-python/soupsieve-2.6[${PYTHON_USEDEP}]
|
||||
>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
|
||||
"
|
||||
# bs4 prefers cchardet > chardet > charset-normalizer
|
||||
# however, charset-normalizer causes test failures, so force the other two
|
||||
# dev-python/chardet[${PYTHON_USEDEP}]
|
||||
BDEPEND="
|
||||
test? (
|
||||
|| (
|
||||
dev-python/faust-cchardet[${PYTHON_USEDEP}]
|
||||
dev-python/chardet[${PYTHON_USEDEP}]
|
||||
)
|
||||
dev-python/packaging[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
EPYTEST_PLUGINS=()
|
||||
distutils_enable_tests pytest
|
||||
distutils_enable_sphinx doc
|
||||
|
||||
EPYTEST_DESELECT=(
|
||||
# broken by security backports, already skipped on py3.13+
|
||||
"bs4/tests/test_fuzz.py::TestFuzz::test_rejected_markup[crash-ffbdfa8a2b26f13537b68d3794b0478a4090ee4a]"
|
||||
)
|
||||
@@ -1,4 +1,2 @@
|
||||
DIST ldns-1.8.4.tar.gz 1301058 BLAKE2B 26003c816c380a58c441f70cb2ea37b7e1402383bc35fbaceae1668af5f591f4cdd04e9ef90655a87ef2ec505a06c1d5c802ed2a80414464ef2e89f4349b995c SHA512 3ee26289bfe587fb19b7441412917d7f7197e385cc1329847c1ae707650709a1ccef7d4a645bd85da89effad95715ec868ef312e5f336d3fe2e408e8109439fc
|
||||
DIST ldns-1.9.0.tar.gz 1305262 BLAKE2B 2079fc2f7b4bf244038bbb94edcced98d5a12272df726c016d94ce9c7f8daabab3c7f4cf1c18355f4572995150a5d5876122086fab5e8704b2c225b211d7a511 SHA512 8b2a40e5e512ef1100240b765d4a6bb183a8f13a27436c42c5e1a9d6a4de71434900216ea339a717f791f5329f9ef64d0f4794b582decbd2a314ef4ca3a1171c
|
||||
DIST ldns-1.9.2.tar.gz 1308193 BLAKE2B ab0b2d60f8af5bb969e59d199326f3ec422e38482db15e96ea9fb2a9e388da5af8b0976e37421f34aba12b2411e3757ade1057918cce3fbee6e831d7faa5dac3 SHA512 a5f9c969a8d0d9359a77ef03614e17876ae237357508ec9525908069f34cf3fd00b1c2a31ca1b67767cf5cd920d1313651d50109769b2a36ad0c21774f03380e
|
||||
DIST ldns-1.9.2.tar.gz.asc 659 BLAKE2B 671e67864b4a1b0bc73ee7927553b871b3202833c644c39217863e9767cb2c5f41627fb444d936df883345dc229a8b8925b83ac7a7a7d0f2aa553b7e3916aeef SHA512 6a922837e4d67d546e5eeb072815a602e8ebb4ad4b29f646699d8e87cb852d58aa7ccf36c641bef24d6f75934ff9239e41e8d535e512dfbec2bc267a93354031
|
||||
|
||||
@@ -1,127 +0,0 @@
|
||||
From 49b2e4a938d263bb8c532e64f33690551e43ca0c Mon Sep 17 00:00:00 2001
|
||||
From: Po-Chuan Hsieh <sunpoet@sunpoet.net>
|
||||
Date: Mon, 28 Oct 2024 21:42:27 +0800
|
||||
Subject: [PATCH] Fix build with SWIG 4.3.0
|
||||
|
||||
Replace SWIG_Python_AppendOutput with SWIG_AppendOutput.
|
||||
|
||||
from CHANGES:
|
||||
New declaration of SWIG_Python_AppendOutput is now:
|
||||
|
||||
SWIG_Python_AppendOutput(PyObject* result, PyObject* obj, int is_void);
|
||||
|
||||
The 3rd parameter is new and the new $isvoid special variable
|
||||
should be passed to it, indicating whether or not the wrapped
|
||||
function returns void. If SWIG_Python_AppendOutput is currently being
|
||||
used and a completely backwards compatible (but technically incorrect)
|
||||
solution is required, then pass 1 for the is_void parameter.
|
||||
|
||||
Also consider replacing with:
|
||||
|
||||
SWIG_AppendOutput(PyObject* result, PyObject* obj);
|
||||
|
||||
which calls SWIG_Python_AppendOutput with same parameters but adding $isvoid
|
||||
for final parameter.
|
||||
|
||||
Reference: https://github.com/swig/swig/blob/master/CHANGES#L382-L397
|
||||
---
|
||||
contrib/python/ldns_buffer.i | 2 +-
|
||||
contrib/python/ldns_key.i | 2 +-
|
||||
contrib/python/ldns_packet.i | 2 +-
|
||||
contrib/python/ldns_rdf.i | 2 +-
|
||||
contrib/python/ldns_resolver.i | 2 +-
|
||||
contrib/python/ldns_rr.i | 2 +-
|
||||
contrib/python/ldns_zone.i | 2 +-
|
||||
7 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/contrib/python/ldns_buffer.i b/contrib/python/ldns_buffer.i
|
||||
index 5c2d583b..0a3e3895 100644
|
||||
--- a/contrib/python/ldns_buffer.i
|
||||
+++ b/contrib/python/ldns_buffer.i
|
||||
@@ -45,7 +45,7 @@
|
||||
/* Result generation, appends (ldns_buffer *) after the result. */
|
||||
%typemap(argout, noblock=1) (ldns_buffer **)
|
||||
{
|
||||
- $result = SWIG_Python_AppendOutput($result,
|
||||
+ $result = SWIG_AppendOutput($result,
|
||||
SWIG_NewPointerObj(SWIG_as_voidptr($1_buf),
|
||||
SWIGTYPE_p_ldns_struct_buffer, SWIG_POINTER_OWN | 0));
|
||||
}
|
||||
diff --git a/contrib/python/ldns_key.i b/contrib/python/ldns_key.i
|
||||
index dc67e67b..6a3c2db4 100644
|
||||
--- a/contrib/python/ldns_key.i
|
||||
+++ b/contrib/python/ldns_key.i
|
||||
@@ -38,7 +38,7 @@
|
||||
/* result generation */
|
||||
%typemap(argout,noblock=1) (ldns_key **)
|
||||
{
|
||||
- $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_key), SWIGTYPE_p_ldns_struct_key, SWIG_POINTER_OWN | 0 ));
|
||||
+ $result = SWIG_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_key), SWIGTYPE_p_ldns_struct_key, SWIG_POINTER_OWN | 0 ));
|
||||
}
|
||||
|
||||
%typemap(argout) ldns_rdf *r "Py_INCREF($input);"
|
||||
diff --git a/contrib/python/ldns_packet.i b/contrib/python/ldns_packet.i
|
||||
index c2d7a3b6..8309808d 100644
|
||||
--- a/contrib/python/ldns_packet.i
|
||||
+++ b/contrib/python/ldns_packet.i
|
||||
@@ -45,7 +45,7 @@
|
||||
/* Result generation, appends (ldns_pkt *) after the result. */
|
||||
%typemap(argout,noblock=1) (ldns_pkt **)
|
||||
{
|
||||
- $result = SWIG_Python_AppendOutput($result,
|
||||
+ $result = SWIG_AppendOutput($result,
|
||||
SWIG_NewPointerObj(SWIG_as_voidptr($1_pkt),
|
||||
SWIGTYPE_p_ldns_struct_pkt, SWIG_POINTER_OWN | 0 ));
|
||||
}
|
||||
diff --git a/contrib/python/ldns_rdf.i b/contrib/python/ldns_rdf.i
|
||||
index 39f9af18..ed1f0d00 100644
|
||||
--- a/contrib/python/ldns_rdf.i
|
||||
+++ b/contrib/python/ldns_rdf.i
|
||||
@@ -45,7 +45,7 @@
|
||||
/* Result generation, appends (ldns_rdf *) after the result. */
|
||||
%typemap(argout, noblock=1) (ldns_rdf **)
|
||||
{
|
||||
- $result = SWIG_Python_AppendOutput($result,
|
||||
+ $result = SWIG_AppendOutput($result,
|
||||
SWIG_NewPointerObj(SWIG_as_voidptr($1_rdf),
|
||||
SWIGTYPE_p_ldns_struct_rdf, SWIG_POINTER_OWN | 0));
|
||||
}
|
||||
diff --git a/contrib/python/ldns_resolver.i b/contrib/python/ldns_resolver.i
|
||||
index 8468cce3..8d0abc6e 100644
|
||||
--- a/contrib/python/ldns_resolver.i
|
||||
+++ b/contrib/python/ldns_resolver.i
|
||||
@@ -45,7 +45,7 @@
|
||||
/* Result generation, appends (ldns_resolver *) after the result. */
|
||||
%typemap(argout,noblock=1) (ldns_resolver **r)
|
||||
{
|
||||
- $result = SWIG_Python_AppendOutput($result,
|
||||
+ $result = SWIG_AppendOutput($result,
|
||||
SWIG_NewPointerObj(SWIG_as_voidptr($1_res),
|
||||
SWIGTYPE_p_ldns_struct_resolver, SWIG_POINTER_OWN | 0 ));
|
||||
}
|
||||
diff --git a/contrib/python/ldns_rr.i b/contrib/python/ldns_rr.i
|
||||
index 2e0a0714..c53955cf 100644
|
||||
--- a/contrib/python/ldns_rr.i
|
||||
+++ b/contrib/python/ldns_rr.i
|
||||
@@ -45,7 +45,7 @@
|
||||
/* Result generation, appends (ldns_rr *) after the result. */
|
||||
%typemap(argout, noblock=1) (ldns_rr **)
|
||||
{
|
||||
- $result = SWIG_Python_AppendOutput($result,
|
||||
+ $result = SWIG_AppendOutput($result,
|
||||
SWIG_NewPointerObj(SWIG_as_voidptr($1_rr),
|
||||
SWIGTYPE_p_ldns_struct_rr, SWIG_POINTER_OWN | 0 ));
|
||||
}
|
||||
diff --git a/contrib/python/ldns_zone.i b/contrib/python/ldns_zone.i
|
||||
index bbb8d8f2..3459478a 100644
|
||||
--- a/contrib/python/ldns_zone.i
|
||||
+++ b/contrib/python/ldns_zone.i
|
||||
@@ -39,7 +39,7 @@
|
||||
/* result generation */
|
||||
%typemap(argout,noblock=1) (ldns_zone **)
|
||||
{
|
||||
- $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_zone), SWIGTYPE_p_ldns_struct_zone, SWIG_POINTER_OWN | 0 ));
|
||||
+ $result = SWIG_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_zone), SWIGTYPE_p_ldns_struct_zone, SWIG_POINTER_OWN | 0 ));
|
||||
}
|
||||
|
||||
%nodefaultctor ldns_struct_zone; //no default constructor & destructor
|
||||
@@ -1,90 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
inherit python-single-r1 multilib-minimal
|
||||
|
||||
DESCRIPTION="A library with the aim to simplify DNS programming in C"
|
||||
HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/about/"
|
||||
SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/3"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc examples python static-libs"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
RESTRICT="test" # missing test directory
|
||||
|
||||
BDEPEND="
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
dev-lang/swig
|
||||
$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
|
||||
)
|
||||
doc? ( app-text/doxygen )
|
||||
"
|
||||
DEPEND="
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
>=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?]
|
||||
examples? ( net-libs/libpcap )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
"
|
||||
|
||||
# False positive, always fails, bug #898658
|
||||
QA_CONFIG_IMPL_DECL_SKIP+=(
|
||||
ioctlsocket
|
||||
)
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/ldns-config
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/ldns-1.8.1-pkgconfig.patch"
|
||||
"${FILESDIR}/ldns-1.8.4-swig-4.3.0.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
$(use_enable static-libs static) \
|
||||
$(multilib_native_use_with python pyldns) \
|
||||
$(multilib_native_use_with python pyldnsx) \
|
||||
--with-ssl="${EPREFIX}"/usr \
|
||||
$(multilib_native_with drill) \
|
||||
$(multilib_native_use_with examples) \
|
||||
--disable-rpath
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi && use doc ; then
|
||||
emake doxygen
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi && use doc ; then
|
||||
dodoc -r doc/html
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
dodoc Changelog README*
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
use python && python_optimize
|
||||
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins libdns.vim
|
||||
}
|
||||
@@ -1,93 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
inherit python-single-r1 multilib-minimal
|
||||
|
||||
DESCRIPTION="Library that aims to simplify DNS programming in C"
|
||||
HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/about/"
|
||||
SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/3"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc examples python static-libs"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
RESTRICT="test" # missing test directory
|
||||
|
||||
BDEPEND="
|
||||
doc? ( app-text/doxygen )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
dev-lang/swig
|
||||
$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
>=dev-libs/openssl-1.1.1l-r1:=[${MULTILIB_USEDEP},static-libs?]
|
||||
examples? ( net-libs/libpcap )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
"
|
||||
|
||||
# False positive, always fails, bug #898658
|
||||
QA_CONFIG_IMPL_DECL_SKIP+=(
|
||||
ioctlsocket
|
||||
)
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/ldns-config
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/ldns-1.8.1-pkgconfig.patch"
|
||||
"${FILESDIR}/ldns-1.9.0-std23-bool.patch" # 970613
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_enable static-libs static)
|
||||
$(multilib_native_use_with python pyldns)
|
||||
$(multilib_native_use_with python pyldnsx)
|
||||
--with-ssl="${EPREFIX}"/usr
|
||||
$(multilib_native_with drill)
|
||||
$(multilib_native_use_with examples)
|
||||
--disable-rpath
|
||||
)
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi && use doc ; then
|
||||
emake doxygen
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi && use doc ; then
|
||||
dodoc -r doc/html
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
dodoc Changelog README*
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
use python && python_optimize
|
||||
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins libdns.vim
|
||||
}
|
||||
@@ -36,6 +36,16 @@
|
||||
|
||||
#--- END OF EXAMPLES ---
|
||||
|
||||
# Michał Górny <mgorny@gentoo.org> (2026-08-04)
|
||||
# Slop package. The old versions bundle a very old fork of
|
||||
# app-i18n/uchardet. The new ones require app-i18n/uchardet from git
|
||||
# that suffers from regressions (and upstream slop-patched them anyway).
|
||||
# The only revdep supports fallback to dev-python/chardet and
|
||||
# dev-python/charset-normalizer (both are also slop nowadays, but we're
|
||||
# stuck with them anyway), and uses a || dep.
|
||||
# Removal on 2026-09-03. Bug #980354.
|
||||
dev-python/faust-cchardet
|
||||
|
||||
# James Le Cuirot <chewi@gentoo.org> (2026-07-29)
|
||||
# These packages have been superseded by recent versions of
|
||||
# games-fps/ut2004-data, which now includes this content regardless of
|
||||
|
||||
Reference in New Issue
Block a user