gentoo auto-resync : 31:08:2023 - 10:10:44

5 files changed, 181 insertions, 5 deletions

diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 12f2d0017d89..bd7fa93583d6 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,4 +1,8 @@
+AUX libnl-3.8.0-printf-non-bash.patch 974 BLAKE2B 6f7b4d3d25cc7ffaf6566aeeaa943d4e8ce3ff14af28f2d1ee98c3dc89e87bee24d1d8a211084b4dde0668ff37830f4039ccde93708edda75434dfc0831632a2 SHA512 9eaeddb3ed12be03ba824ad2924879c67f1f3e12f1a938e866404780e6390297bed0b926981820b93459849380ddaac7bb6824e07e096be97ee8cebf18927027
+AUX libnl-3.8.0-python-decorator-syntax.patch 798 BLAKE2B 364c3eff7873ae791c5ff24f3ffa699c149817e1fc871ff257877723c67c8f187270d57a6204df40cb8b534dca3a41903f5d911c21e9ae1e82d1dbf8796cfc58 SHA512 332e2c53e766bb84fdcd7bf2c2d944c3cb78722d733441f3d8f8403a949b9fdbe202bfa6874154733735f193279ab3c7fed960eeff462c0468b355412abbb5d6
 DIST libnl-3.7.0.tar.gz 1000913 BLAKE2B 22c418ea520416d79ee4552ab6bc5ba99239b29e074c840d31b0ec4171a0403ea9d2c1afcbf1b3428564dd371cadd99bc062ae7540e7496f970c4fb98f967e84 SHA512 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041
+DIST libnl-3.8.0.tar.gz 1071113 BLAKE2B ff90d52e9b617ad8a53e4d42f43bee065b331ed919a3effc4a0f38c8e15b46f86c1eb153816499ed77dd99063500b1dc52951891034475a5bb81da1ad8004594 SHA512 a8da7e8464c5cab2807cd86f83fca53bc77f7c3bdefe43880db7be9caf5ba6bfca1b7e778b906c12fda1cf7e6f413f88cc7ad1dcc42fe8c050a8d28a6e656c02
 EBUILD libnl-3.7.0.ebuild 2639 BLAKE2B 9f93d4b6028347d62b49758d015b1dafd1627f87ae84259fd8d5a68f20ed1355db80d0defc0f3fb4a1d55180c20927fb024d9e1bbb30a78e528543e1004d4fac SHA512 c3eda33ee4c7a322c36f658c3cda16b97ff560aee28362db5c288d2f60d6562e739aa523f4db164984bf8c29777e49e124989715a09f189f8f978d188928fa95
-EBUILD libnl-9999.ebuild 2607 BLAKE2B db3ab25cbaecc60eef9c44e8a40b45765fe34659b223e735bee07a951b0b5bad0c102193dc6be532d1cbb5c12c4a5854d7f069199c770a1bad5a317e8cc6f2f7 SHA512 de20c14bb633d55ab4c4df02cf71126c0aff8eca1bb135f4d321d111b78003749ba3dd0dd8f4ef2533525b690d780936cebd1dab3deb66510ff8ffb4541ec846
+EBUILD libnl-3.8.0.ebuild 2763 BLAKE2B d6421cfd9df3cc01f83633bebdc447d2e68ee752de6e80dc553e090b740aeb51b9aa0c4d01bf4a2462f8228dba495f3b831edcb891b22da24783f3e096f793c2 SHA512 421684ab9a05b8d9acd86c57451fa679f89f145274931a0b29d44e735cf9a6e57e1936d0ba44f7173fb3bf951ce1a0568720d113504e4f34a090d58c95c6a491
+EBUILD libnl-9999.ebuild 2713 BLAKE2B 4dd197363e5b9904e8cc6dd2750659c007bd5b2388f8ca09d2617ece4630d2d1ecf94d1400f28b0006a9a80cb79689793d1a8fb3ee297913d3232e30a5aacd8b SHA512 b8771eb81cf727d516e5add7467ca70322f6a06ba8602d1894f89e4f013eba6e68d29d9f05a5b4324d9ab24b06af56a1bbedc3c373aafc932d9e0b997056cced
 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
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
new file mode 100644
index 000000000000..885f8fd750f3
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-3.8.0-printf-non-bash.patch
@@ -0,0 +1,22 @@
+https://github.com/thom311/libnl/pull/360
+
+From 32f84a052a4383299b9f30ad09d2a70c3b2cf2b3 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+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
new file mode 100644
index 000000000000..d7d14962dab4
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-3.8.0-python-decorator-syntax.patch
@@ -0,0 +1,21 @@
+https://github.com/thom311/libnl/commit/9aab12dff8e89b7da826c5c0826ef13c71963e28
+
+From 9aab12dff8e89b7da826c5c0826ef13c71963e28 Mon Sep 17 00:00:00 2001
+From: David Ward <david.ward@ll.mit.edu>
+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
new file mode 100644
index 000000000000..19cb734e478a
--- /dev/null
+++ b/dev-libs/libnl/libnl-3.8.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~ia64 ~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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	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/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-9999.ebuild b/dev-libs/libnl/libnl-9999.ebuild
index 67eba8f4740d..b7e772377e97 100644
--- a/dev-libs/libnl/libnl-9999.ebuild
+++ b/dev-libs/libnl/libnl-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools distutils-r1 multilib-minimal
 
 LIBNL_P=${P/_/-}
@@ -31,18 +31,20 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
+BDEPEND="
+	${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	python? (
 		${DISTUTILS_DEPS}
 		dev-lang/swig
 	)
-	test? ( dev-libs/check )"
+	test? ( dev-libs/check )
+"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 MULTILIB_WRAPPED_HEADERS=(
-	# we do not install CLI stuff for non-native
+	# 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
@@ -58,6 +60,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libnl3/netlink/cli/utils.h
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.0-printf-non-bash.patch
+)
+
 src_prepare() {
 	default
 
@@ -71,6 +77,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# bug #884277
+	export YACC=yacc.bison
+
 	ECONF_SOURCE="${S}" econf \
 		$(multilib_native_use_enable utils cli) \
 		$(use_enable debug)