gentoo auto-resync : 19:07:2022 - 02:37:54

3 files changed, 135 insertions, 23 deletions

diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 46bc67af4543..cac09f31d873 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -2,7 +2,9 @@ AUX libnl-3.6.0-static-tests.patch 1100 BLAKE2B 1542484bd0e87fa20587f3f8507d9d1b
 AUX libnl-3.6.0-test-fixes-sandbox.patch 5394 BLAKE2B 96f4c5f9f0eab96f164aa04a68a28941962e0e25444c5731e1d040680b2466d440beaeab7831b658f72ff2b1b4d9779f75b9700891bbe79618d3f23cd2d34c17 SHA512 e09340c6a3a8a2e95582d474b56736db379cb72318906a97aa1d15e573c31d005cca6879680f121df5d28faa7c670803099fd29d22fc58a016ee6fb0f20fc664
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
 DIST libnl-3.6.0.tar.gz 981921 BLAKE2B 4fbc1f6284dfbf0aaa855dfc3bb9774327254718257cf162c14574ece6b0da20f03a587830b21a2481d1da6e9c90482d71d8f9308f1eeafa605c90d0847a838c SHA512 7d1190ce94f43f5b18b1f7909221ca034d4ea5c8ed5735dbd27224d03e7f95d3c4e8ccdb611e33b58007729a21bfc0e23adc8758b112c712355664d87a81ce1b
+DIST libnl-3.7.0.tar.gz 1000913 BLAKE2B 22c418ea520416d79ee4552ab6bc5ba99239b29e074c840d31b0ec4171a0403ea9d2c1afcbf1b3428564dd371cadd99bc062ae7540e7496f970c4fb98f967e84 SHA512 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041
 EBUILD libnl-3.5.0.ebuild 2381 BLAKE2B e054756ad522c3cfe593baf45854e6e4a8e669d26ec2027adf30cb537442f14d77b06493fdab911503d4e08045b1c2c9c4302ce9f892e17e221e77d82eabf2b5 SHA512 c99854fbf768e9e5f140fa8f4c88a1549272ba3c9a8200318016b1dbcaa03502527caeb1d26ed917c38958216eb0f3141a722bfc543c9a969e477fc7febd68a1
 EBUILD libnl-3.6.0-r1.ebuild 2637 BLAKE2B 147ee4f4e9e1aa98757c25118761bb2ca9910ee0b07c3452c026d177c0e4a71ac70a55fca49fe77b6d3ff6d1c9074277e1116593ce4a9bc9d349ab58da0111c5 SHA512 e926f00e85bdfa2f115a55ec22f8de09f842dad726c8b0298c445258fb173f2e66c3d54bd7ede5266f248b33037c9b19c0a08ad01fb2a0d61ba3947d78bd1d7c
-EBUILD libnl-99999999.ebuild 2387 BLAKE2B a353e62759550ccf4ef6423c72679aa9a233f202cee3bb0f96579d8fb69347a1c29ededa8facc67989c852c746307bf3fef6adb1d846c10b74ee91a36c8164f6 SHA512 284f5f2425994144ee479f64a99560b398c77771ba4c747bc1648411d8d68b345cce7c0fe578965910c18eedccb9e245660a8983bae8db49c9744cb2a0fcf8ed
+EBUILD libnl-3.7.0.ebuild 2584 BLAKE2B d5a0da4e06a4fc3dd7e4c450b09f9686dcda62ea5931d4d43566122bd80083456f7b356646e54f477774cd6a9b6f52e261b60ba690ec2725c289571ba851db73 SHA512 6bf82bf038c63c2875d4577513221f0046d4768df90b1523a9da9df7940c26163800f95fa39d9b4169c9eacba364a80ddb4d1caffda2a86eb0c38dd1f4d2a079
+EBUILD libnl-9999.ebuild 2584 BLAKE2B d5a0da4e06a4fc3dd7e4c450b09f9686dcda62ea5931d4d43566122bd80083456f7b356646e54f477774cd6a9b6f52e261b60ba690ec2725c289571ba851db73 SHA512 6bf82bf038c63c2875d4577513221f0046d4768df90b1523a9da9df7940c26163800f95fa39d9b4169c9eacba364a80ddb4d1caffda2a86eb0c38dd1f4d2a079
 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-3.7.0.ebuild
index 0cfee098abde..6b420eb95d66 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-3.7.0.ebuild
@@ -1,35 +1,43 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1 git-r3 multilib-minimal
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+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"
-EGIT_REPO_URI="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"
-KEYWORDS=""
 IUSE="+debug python test utils"
 RESTRICT="!test? ( test )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	${RDEPEND}
+BDEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	python? ( dev-lang/swig )
-	test? ( dev-libs/check )
-"
+	test? ( dev-libs/check )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DOCS=( ChangeLog )
-
 MULTILIB_WRAPPED_HEADERS=(
 	# we do not install CLI stuff for non-native
 	/usr/include/libnl3/netlink/cli/addr.h
@@ -57,15 +65,10 @@ src_prepare() {
 		distutils-r1_src_prepare
 		popd > /dev/null || die
 	fi
-
-	# out-of-source build broken
-	# https://github.com/thom311/libnl/pull/58
-	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	econf \
-		--disable-static \
+	ECONF_SOURCE="${S}" econf \
 		$(multilib_native_use_enable utils cli) \
 		$(use_enable debug)
 }
@@ -73,7 +76,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	default
 
-	if multilib_is_native_abi && use python; then
+	if multilib_is_native_abi && use python ; then
 		pushd python > /dev/null || die
 		distutils-r1_src_compile
 		popd > /dev/null || die
@@ -83,7 +86,7 @@ multilib_src_compile() {
 multilib_src_install() {
 	default
 
-	if multilib_is_native_abi && use python; then
+	if multilib_is_native_abi && use python ; then
 		# Unset DOCS= since distutils-r1.eclass interferes
 		local DOCS=()
 
@@ -91,14 +94,14 @@ multilib_src_install() {
 
 		distutils-r1_src_install
 
-		# For no obvious reason this is not done automatically
-		python_foreach_impl python_optimize
-
 		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
new file mode 100644
index 000000000000..6b420eb95d66
--- /dev/null
+++ b/dev-libs/libnl/libnl-9999.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 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_{8..10} )
+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? ( 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
+)
+
+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() {
+	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
+}