commit: 2b66d8af97d2be33da294f4d5ef94bf74712c267 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Mar 27 14:45:33 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Mar 27 14:45:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b66d8af
dev-libs/libnl: drop 3.8.0, 3.9.0 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libnl/Manifest | 2 - .../libnl/files/libnl-3.8.0-printf-non-bash.patch | 22 ---- .../libnl-3.8.0-python-decorator-syntax.patch | 21 ---- dev-libs/libnl/libnl-3.8.0.ebuild | 127 -------------------- dev-libs/libnl/libnl-3.9.0.ebuild | 133 --------------------- 5 files changed, 305 deletions(-) diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest index 607685adfd28..96ee31132b19 100644 --- a/dev-libs/libnl/Manifest +++ b/dev-libs/libnl/Manifest @@ -1,3 +1 @@ DIST libnl-3.10.0.tar.gz 1116186 BLAKE2B 13383c4ef49be3bcf89122b24d1d5dc9834353aa7128f04f50993203add14aa7f97a4500164982ddcb82f481f7324a26efc2375036d5a23bfa62b15c4fe07473 SHA512 c95e79fba69308c63a08d0c576503b4398710ea9cd1d0097851500a7fbc5fbe87fb32ac281cf42bbfe57eab07b110055e6bc9b95d82244bba3df8a31fe562962 -DIST libnl-3.8.0.tar.gz 1071113 BLAKE2B ff90d52e9b617ad8a53e4d42f43bee065b331ed919a3effc4a0f38c8e15b46f86c1eb153816499ed77dd99063500b1dc52951891034475a5bb81da1ad8004594 SHA512 a8da7e8464c5cab2807cd86f83fca53bc77f7c3bdefe43880db7be9caf5ba6bfca1b7e778b906c12fda1cf7e6f413f88cc7ad1dcc42fe8c050a8d28a6e656c02 -DIST libnl-3.9.0.tar.gz 1074117 BLAKE2B 56a39aad9aa15992ff02fe35732abbc5ed5d107b814587e02b914631489877899989d49c7aeee1ecb461ad5f525c7cd7c045c9770864d83b0a58490293441193 SHA512 b6f3633d1920e61645c97f4c4c4419444e7fd66aa3b67b0a73bc29df24cf27065542a62a9c2581f90d0c153247922ce5c649b7da51c0fead6afceaf4d0361dce diff --git a/dev-libs/libnl/files/libnl-3.8.0-printf-non-bash.patch b/dev-libs/libnl/files/libnl-3.8.0-printf-non-bash.patch deleted file mode 100644 index 885f8fd750f3..000000000000 --- a/dev-libs/libnl/files/libnl-3.8.0-printf-non-bash.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/thom311/libnl/pull/360 - -From 32f84a052a4383299b9f30ad09d2a70c3b2cf2b3 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Thu, 31 Aug 2023 06:59:59 +0100 -Subject: [PATCH] Makefile.am: avoid use of non-portable echo arguments - -This fixes tests with a non-bash shell as /bin/sh (in this case, dash) which -does not support `echo -e`. echo itself is portable, but not echo with any arguments. - -Use `printf` instead. ---- a/Makefile.am -+++ b/Makefile.am -@@ -1129,7 +1129,7 @@ EXTRA_DIST += \ - - %.build-headers-test.c: % - mkdir -p "$(dir $@)" -- echo -e "#include <$$(echo "$<" | sed 's|.*\<include/netlink/|netlink/|')>\nint main(int argc, char **argv) { return 0; }" > $@ -+ printf "#include <$$(echo "$<" | sed 's|.*\<include/netlink/|netlink/|')>\nint main(int argc, char **argv) { return 0; }" > $@ - - %.build-headers-test.o: %.build-headers-test.c - $(COMPILE) -Wall -Werror -Wno-error=cpp -I$(srcdir)/include -I$(builddir)/include -c -o $@ $< diff --git a/dev-libs/libnl/files/libnl-3.8.0-python-decorator-syntax.patch b/dev-libs/libnl/files/libnl-3.8.0-python-decorator-syntax.patch deleted file mode 100644 index d7d14962dab4..000000000000 --- a/dev-libs/libnl/files/libnl-3.8.0-python-decorator-syntax.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/thom311/libnl/commit/9aab12dff8e89b7da826c5c0826ef13c71963e28 - -From 9aab12dff8e89b7da826c5c0826ef13c71963e28 Mon Sep 17 00:00:00 2001 -From: David Ward <[email protected]> -Date: Tue, 29 Aug 2023 20:54:19 -0400 -Subject: [PATCH] python: Use correct decorator syntax in HTBQdisc - -Fixes: 87d370912ca8 ("netlink.nlattr re-implemented in more pythonic way") - -https://github.com/thom311/libnl/pull/359 ---- a/python/netlink/route/qdisc/htb.py -+++ b/python/netlink/route/qdisc/htb.py -@@ -28,7 +28,7 @@ def default_class(self, value): - capi.rtnl_htb_set_defcls(self._qdisc._rtnl_qdisc, int(value)) - - @property -- @netlink.nlattr("r2q", type=int) -+ @netlink.nlattr(type=int) - def r2q(self): - return capi.rtnl_htb_get_rate2quantum(self._qdisc._rtnl_qdisc) - diff --git a/dev-libs/libnl/libnl-3.8.0.ebuild b/dev-libs/libnl/libnl-3.8.0.ebuild deleted file mode 100644 index 19141d1ef36b..000000000000 --- a/dev-libs/libnl/libnl-3.8.0.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Make sure to test USE=utils on bumps and update MULTILIB_WRAPPED_HEADERS if needed - -DISTUTILS_EXT=1 -DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) -inherit autotools distutils-r1 multilib-minimal - -LIBNL_P=${P/_/-} -LIBNL_DIR=${PV/_/} -LIBNL_DIR=${LIBNL_DIR//./_} - -DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"; -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/thom311/libnl"; - inherit git-r3 -else - SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - - S="${WORKDIR}/${LIBNL_P}" -fi - -LICENSE="LGPL-2.1 utils? ( GPL-2 )" -SLOT="3" -IUSE="+debug python test utils" -# Tests fail w/ sandboxes -# https://github.com/thom311/libnl/issues/361 -RESTRICT="!test? ( test ) test" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" -BDEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - python? ( - ${DISTUTILS_DEPS} - dev-lang/swig - ) - test? ( dev-libs/check ) -" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -MULTILIB_WRAPPED_HEADERS=( - # We do not install CLI stuff for non-native - /usr/include/libnl3/netlink/cli/addr.h - /usr/include/libnl3/netlink/cli/class.h - /usr/include/libnl3/netlink/cli/cls.h - /usr/include/libnl3/netlink/cli/ct.h - /usr/include/libnl3/netlink/cli/exp.h - /usr/include/libnl3/netlink/cli/link.h - /usr/include/libnl3/netlink/cli/mdb.h - /usr/include/libnl3/netlink/cli/nh.h - /usr/include/libnl3/netlink/cli/neigh.h - /usr/include/libnl3/netlink/cli/qdisc.h - /usr/include/libnl3/netlink/cli/route.h - /usr/include/libnl3/netlink/cli/rule.h - /usr/include/libnl3/netlink/cli/tc.h - /usr/include/libnl3/netlink/cli/utils.h -) - -PATCHES=( - "${FILESDIR}"/${P}-python-decorator-syntax.patch - "${FILESDIR}"/${PN}-3.8.0-printf-non-bash.patch -) - -src_prepare() { - default - - eautoreconf - - if use python; then - pushd "${S}"/python > /dev/null || die - distutils-r1_src_prepare - popd > /dev/null || die - fi -} - -multilib_src_configure() { - # bug #884277 - export YACC=yacc.bison - - ECONF_SOURCE="${S}" econf \ - $(multilib_native_use_enable utils cli) \ - $(use_enable debug) -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - pushd python > /dev/null || die - distutils-r1_src_compile - popd > /dev/null || die - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use python ; then - # Unset DOCS= since distutils-r1.eclass interferes - local DOCS=() - - pushd python > /dev/null || die - - distutils-r1_src_install - - popd > /dev/null || die - fi -} - -multilib_src_install_all() { - DOCS=( ChangeLog ) - - einstalldocs - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/libnl/libnl-3.9.0.ebuild b/dev-libs/libnl/libnl-3.9.0.ebuild deleted file mode 100644 index f3699c74466d..000000000000 --- a/dev-libs/libnl/libnl-3.9.0.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Make sure to test USE=utils on bumps and update MULTILIB_WRAPPED_HEADERS if needed - -DISTUTILS_EXT=1 -DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools distutils-r1 multilib-minimal - -LIBNL_P=${P/_/-} -LIBNL_DIR=${PV/_/} -LIBNL_DIR=${LIBNL_DIR//./_} - -DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"; -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/thom311/libnl"; - inherit git-r3 -else - SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - - S="${WORKDIR}/${LIBNL_P}" -fi - -LICENSE="LGPL-2.1 utils? ( GPL-2 )" -SLOT="3" -IUSE="+debug python test utils" -# Tests fail w/ sandboxes -# https://github.com/thom311/libnl/issues/361 -RESTRICT="!test? ( test ) test" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" -BDEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - python? ( - ${DISTUTILS_DEPS} - dev-lang/swig - ) - test? ( dev-libs/check ) -" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -MULTILIB_WRAPPED_HEADERS=( - # We do not install CLI stuff for non-native - /usr/include/libnl3/netlink/cli/addr.h - /usr/include/libnl3/netlink/cli/class.h - /usr/include/libnl3/netlink/cli/cls.h - /usr/include/libnl3/netlink/cli/ct.h - /usr/include/libnl3/netlink/cli/exp.h - /usr/include/libnl3/netlink/cli/link.h - /usr/include/libnl3/netlink/cli/mdb.h - /usr/include/libnl3/netlink/cli/nh.h - /usr/include/libnl3/netlink/cli/neigh.h - /usr/include/libnl3/netlink/cli/qdisc.h - /usr/include/libnl3/netlink/cli/route.h - /usr/include/libnl3/netlink/cli/rule.h - /usr/include/libnl3/netlink/cli/tc.h - /usr/include/libnl3/netlink/cli/utils.h -) - -src_prepare() { - default - - eautoreconf - - if use python; then - pushd "${S}"/python > /dev/null || die - distutils-r1_src_prepare - popd > /dev/null || die - fi -} - -multilib_src_configure() { - # bug #884277 - export YACC=yacc.bison - - ECONF_SOURCE="${S}" econf \ - $(multilib_native_use_enable utils cli) \ - $(use_enable debug) -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - pushd python > /dev/null || die - distutils-r1_src_compile - popd > /dev/null || die - fi -} - -multilib_src_test() { - CK_VERBOSITY=verbose emake check VERBOSE=1 - - if multilib_is_native_abi && use python ; then - pushd python > /dev/null || die - # TODO: run python/tests/test-create-bridge.py - distutils-r1_src_test - popd > /dev/null || die - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use python ; then - # Unset DOCS= since distutils-r1.eclass interferes - local DOCS=() - - pushd python > /dev/null || die - - distutils-r1_src_install - - popd > /dev/null || die - fi -} - -multilib_src_install_all() { - DOCS=( ChangeLog ) - - einstalldocs - - find "${ED}" -name '*.la' -delete || die -}
