gentoo resync : 22.12.2021

9 files changed, 9 insertions, 243 deletions

diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 7ace9725b1d4..b7a4ea5b81e5 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,11 +1,5 @@
-AUX libnl-1.1-flags.patch 441 BLAKE2B b07df1490a4485468aadbe7dc3aa025fa2514c36116788e517840370952c85e7cc8173b4fec532ddcb405eef9b9df813090c531df1834ad8e7d3644c93247f08 SHA512 1f97dc181118368977ebc7bc6134c7e9fb6acd083721f1c857fca9e3a2cc242e03cbd198a0fb12a05597765a732d9a9384a75f46d1f023f6d5160631a29a9947
-AUX libnl-1.1-vlan-header.patch 2378 BLAKE2B c6d72cb5c7437bc6600e2c34eb6f17fd22df4338c37cee53f0112d3824bf2e940c9166f233fe32df3d451ea37fee2c08db27db7f46d7522f5d04169abdecd28c SHA512 ea45d780b16e6045735aaf2e3febf19ddccab4ca0e03710aebfe51655adc50177aefa3bd4d06e0ccce0160f4c6db73cfa4eb7cebe53b3e15c1807c3b00dc1c9c
-AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86921f2372d200468206ab06cb391a3fce01998d7e4924fd6d235e9292bbbd6134dbc87aa3ebc3dafd16610b4a2a1 SHA512 fe625a9ac6ea8776c8f7ef3d7e3553651c0244e830883587bd7e86490e0ec6e8b29865e172a0e39947e213b910a4279202eabfdd5d7f08e835f5be91d4ff9d6b
 AUX libnl-99999999-2to3.patch 1082 BLAKE2B d3749aa9cf5fd7a2e255ebf6e7ab6c59c81da86fe419ef36b58a9fb14173a9944e7252e64c1a72ccbf9ca9a42f558642548e5247f900344df1bf2f2d54ebac86 SHA512 75796506b16e0953d7fb22d600b747eb48c900badacda665740302002ce112e1cbebd44061158e0557e829c3c16a06917d2acfdb2f450211834de14643112a66
-DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
-EBUILD libnl-1.1.4-r1.ebuild 1163 BLAKE2B 765d47612b1adcfbea4b8d0ac71d5d8cc3d7e198fc225138da70f3f96dc6925b24cd83775c74b6404d98496e1624a4b76cdc33f18e9d8352cd6084505cdc48fb SHA512 2c902a544a77e6ab768589d4125658eeaa6983fac474e1e5703486fa574fcc9d3c5f1ca5225a6433b42b6614757b6a9bd4261e42135ff095a4d0a4ee2e97d763
-EBUILD libnl-1.1.9999.ebuild 1064 BLAKE2B 318f89cd93c4c3d342fded3d5d399c8560e5e1977057248fcd1ae3ae7da3d03bea0a02125e4d5d8c8e1017c3ea1add6cb02babcec3305ffc45b1d7b9da55ecc1 SHA512 2e8e94e598c956e51fbc835b7cff45c0c3783686038cb01bc47acd20f877884c8453fa8b932125e204cab027f546dfe4cca0b24a1482061fbca8e7192f66b056
-EBUILD libnl-3.5.0.ebuild 2445 BLAKE2B f3eb1ad522df08c9e497112ade04ede8f84800a395513b4d5243e3e37b3238cf3ab8fa9e28482d61b9ef956e180895382de4bf16976f2782a4aeaf808d783849 SHA512 6db1a9863c1675147a98e0333b9354c5cde0d81ba66c0c494fa73ce6c398c65bcb87ab870cf59b634367a9eef94fe9215b42309186661b7b98eb7f8bd95e9b32
-EBUILD libnl-99999999.ebuild 2483 BLAKE2B e6a9305001ae8b0780819a27a728d74ccdb9b2e653cc593bdbe058d0db8d8c41e875e80e81d180876f7e0268d73b52efbf953a36f6f5aedbaf037589516d4c4d SHA512 34a68f565764659c11ca862843e8bb38035c3d1baf682842e2535c997414a6f4c92d15277434f2062016acabe719bdc6120fd625b3acef0e39037c339ca7c2c3
-MISC metadata.xml 585 BLAKE2B a9b0dca6b71decc5473ca1345a7ebc0fa977c0165da13c24cbe29cb682daf1be3feb3ee3e85b44afa0314453a9e791a29a29662e1a820d2932b93e7597437fa0 SHA512 ddef3f3a89aa669d1497e75405cb5e9aa4d56fe23d252648c270d04bba3072fe8d03ab820c50c7a582f236eb0c00ca612a3f9b8d89888f8007f6ba5dd76b80cd
+EBUILD libnl-3.5.0.ebuild 2382 BLAKE2B 74f7547affccd9b5d598633dab8f2a9d7392a3a2a47fea889fa151e7fa615d283965b6175bda715034d14f6fdf4cb54e39c02f13d94d38aa082a4f285f654725 SHA512 280eb0e550967896df738c8bb3ab678ce9a8f16b9d6a5f096da63e49b381c81620db8fcce095082f44fc8650f216121275f9b97a7df66fd2aee6be3562118e2c
+EBUILD libnl-99999999.ebuild 2402 BLAKE2B ff14de3e36dd90e8a85134ece01681216c5baf0212a19a4c8ebfa5b9a5e6a06259ae84e4c763c260f602e7c49e80007266cff556c562dd56d0b5b652d2839d48 SHA512 937454d469f5c5ec6d928659e78b2efc68ef0d6207f7bdb9a3ef3c4595b72c96962b07ce72d8f9319c810b64fc0fb1ec806b5d0393346fdf2ef7515b95f38883
+MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
diff --git a/dev-libs/libnl/files/libnl-1.1-flags.patch b/dev-libs/libnl/files/libnl-1.1-flags.patch
deleted file mode 100644
index dc512c587b9e..000000000000
--- a/dev-libs/libnl/files/libnl-1.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -48,7 +48,7 @@
- 
- $(OUT_SLIB): ../Makefile.opts $(OBJ)
- 	@echo "  LD $(OUT_SLIB)"; \
--	$(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
- 	@echo "  LN $(OUT_SLIB) $(LN1_SLIB)"; \
- 	rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
- 	@echo "  LN $(LN1_SLIB) $(LN_SLIB)"; \
diff --git a/dev-libs/libnl/files/libnl-1.1-vlan-header.patch b/dev-libs/libnl/files/libnl-1.1-vlan-header.patch
deleted file mode 100644
index c4c2fc6382de..000000000000
--- a/dev-libs/libnl/files/libnl-1.1-vlan-header.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Patrick McHardy <kaber@trash.net>
-Date: Fri, 18 Jan 2008 16:55:48 +0000 (+0100)
-Subject: [LIBNL]: Add if_vlan.h
-X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=e91bb2ffb090955d443e643a25b250bf3d33534a;hp=7f6b7a8eea0334b34d58dec72c66121a76f08958
-
-[LIBNL]: Add if_vlan.h
-
-vlan support needs VLAN_FLAG_REORDER_HDR, which is not available in
-older if_vlan.h versions. Add the current version from the kernel.
-
-Signed-off-by: Patrick McHardy <kaber@trash.net>
----
-
-diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
-new file mode 100644
-index 0000000..068cd7b
---- /dev/null
-+++ include/linux/if_vlan.h
-@@ -0,0 +1,61 @@
-+/*
-+ * VLAN		An implementation of 802.1Q VLAN tagging.
-+ *
-+ * Authors:	Ben Greear <greearb@candelatech.com>
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ */
-+
-+#ifndef _LINUX_IF_VLAN_H_
-+#define _LINUX_IF_VLAN_H_
-+
-+
-+/* VLAN IOCTLs are found in sockios.h */
-+
-+/* Passed in vlan_ioctl_args structure to determine behaviour. */
-+enum vlan_ioctl_cmds {
-+	ADD_VLAN_CMD,
-+	DEL_VLAN_CMD,
-+	SET_VLAN_INGRESS_PRIORITY_CMD,
-+	SET_VLAN_EGRESS_PRIORITY_CMD,
-+	GET_VLAN_INGRESS_PRIORITY_CMD,
-+	GET_VLAN_EGRESS_PRIORITY_CMD,
-+	SET_VLAN_NAME_TYPE_CMD,
-+	SET_VLAN_FLAG_CMD,
-+	GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
-+	GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
-+};
-+
-+enum vlan_flags {
-+	VLAN_FLAG_REORDER_HDR	= 0x1,
-+};
-+
-+enum vlan_name_types {
-+	VLAN_NAME_TYPE_PLUS_VID, /* Name will look like:  vlan0005 */
-+	VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like:  eth1.0005 */
-+	VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like:  vlan5 */
-+	VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like:  eth0.5 */
-+	VLAN_NAME_TYPE_HIGHEST
-+};
-+
-+struct vlan_ioctl_args {
-+	int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
-+	char device1[24];
-+
-+        union {
-+		char device2[24];
-+		int VID;
-+		unsigned int skb_priority;
-+		unsigned int name_type;
-+		unsigned int bind_type;
-+		unsigned int flag; /* Matches vlan_dev_info flags */
-+        } u;
-+
-+	short vlan_qos;
-+};
-+
-+#endif /* !(_LINUX_IF_VLAN_H_) */
diff --git a/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch b/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch
deleted file mode 100644
index e370a5e62fc6..000000000000
--- a/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/netlink-local.h
-+++ b/include/netlink-local.h
-@@ -343,7 +343,9 @@
- }
- 
- #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
-+#ifndef offsetof
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+#endif
- 
- #define __init __attribute__ ((constructor))
- #define __exit __attribute__ ((destructor))
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
deleted file mode 100644
index 8f3ad2437d6f..000000000000
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
-SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-1.1-flags.patch
-	"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/@echo/d' \
-		Makefile.rules {lib,src,tests}/Makefile || die
-	sed -i \
-		-e 's|-g ||g' \
-		Makefile.opts.in || die
-
-	if ! use static-libs; then
-		sed -i lib/Makefile -e '/OUT_AR/d' || die
-	fi
-
-	rm -f lib/libnl.a || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-
-	if use doc ; then
-		cd "${S}/doc" || die
-		emake gendoc
-	fi
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		cd "${S}/doc" || die
-
-		docinto html
-		dodoc -r html/*
-	fi
-}
diff --git a/dev-libs/libnl/libnl-1.1.9999.ebuild b/dev-libs/libnl/libnl-1.1.9999.ebuild
deleted file mode 100644
index 14a4835802c4..000000000000
--- a/dev-libs/libnl/libnl-1.1.9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 toolchain-funcs
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
-EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-IUSE="doc static-libs"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-1.1-flags.patch
-	"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/@echo/d' \
-		Makefile.rules {lib,src,tests}/Makefile || die
-	sed -i \
-		-e 's|-g ||g' \
-		Makefile.opts.in || die
-
-	if ! use static-libs ; then
-		sed -i lib/Makefile -e '/OUT_AR/d' || die
-	fi
-
-	rm -f lib/libnl.a || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-
-	if use doc ; then
-		cd "${S}/doc" || die
-		emake gendoc
-	fi
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		cd "${S}/doc" || die
-		docinto html
-		dodoc -r html/*
-	fi
-}
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index bb1b8fad31e2..16c5e65ab3f0 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${LIBNL_P}"
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+debug static-libs python test +threads utils"
+IUSE="+debug python test utils"
 RESTRICT="!test? ( test )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
@@ -68,10 +68,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	econf \
+		--disable-static \
 		$(multilib_native_use_enable utils cli) \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
+		$(use_enable debug)
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index b2b6af6a8f1e..5179de7255b9 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/thom311/libnl"
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS=""
-IUSE="+debug static-libs python test +threads utils"
+IUSE="+debug python test utils"
 RESTRICT="!test? ( test )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
@@ -68,11 +68,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	econf \
+		--disable-static \
 		$(multilib_native_use_enable utils cli) \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		--disable-doc
+		$(use_enable debug)
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libnl/metadata.xml b/dev-libs/libnl/metadata.xml
index 9a023d2e9d88..ff40a5ef75a9 100644
--- a/dev-libs/libnl/metadata.xml
+++ b/dev-libs/libnl/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<use>
-		<flag name="doc">Install development documentation</flag>
 		<flag name="python">Install experimental <pkg>dev-lang/python</pkg> bindings</flag>
 		<flag name="utils">Install command line interface utils</flag>
 	</use>