gentoo resync : 08.01.2021

3 files changed, 2 insertions, 56 deletions

diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 503131a83559..e2b4c7400cf0 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -4,8 +4,7 @@ AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86
 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 1147 BLAKE2B 29d60f85790c2c8bddaa0836363299f787fa0dd959d307277835923eb54fc7fd65238351054fc49a170e94a71c821b11d6ff34540f906e4baa1282f999ba3c08 SHA512 e0214fad2e204eaca33f53b258640d0cfdb194eef40ccc9b6ee7dad85d711f547ea750c168806b4631f8f1fc56597bd0740961f4f1a804341918b7d388c0c8ff
-EBUILD libnl-1.1.4.ebuild 1131 BLAKE2B 06b433e6fa9c2a3de5c29c51350648c7064555da51e3d4ef043eadc6cab5af3520bff1ab22afc05b65e90cc93ea95d57f4db37ebce7e82507bee6970d01fc0f1 SHA512 f721cc26d35867cb129d374a9e6cbc80e667c4432ea15ce4df67c13d23a57ceada4ec8e6bdad2b1bed78e0d19270db2ad1c703d00d3c33e44da7b48702fb239c
+EBUILD libnl-1.1.4-r1.ebuild 1143 BLAKE2B b6c7360702f8650059cfa0fac3d940f6f1ac5d19a3fe1015b5503413985678dc11d103bb44ff54c6baeda28a988ff0b6b589410585b3f06ecc6918a1a20798f1 SHA512 b0325f64a8aeabb950e1e18c2252be1df3e83903eac265d0e66b96f366ead7604971af680a4c4fef85f5474eb0f1a1e0c123566ee71e99456702bca5bfaae261
 EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
 EBUILD libnl-3.5.0.ebuild 2388 BLAKE2B bd9f4dc4c521c7da0196259f9339c201ec47f5d6e77f22df1905adec346456c1100ca604b5356d565278a36f941a0d8ab8b177bd748528f0939ec54ae5a7396a SHA512 fbffd9ec3a895c710f1d7661d12f3017d54bc25f1b1e38226dbbb94d14859fab776d1c7c21aa9607235f7455409800b9fad018061539be8244c8411f66d116c9
 EBUILD libnl-99999999.ebuild 2429 BLAKE2B 2eca6e27b7712ffd35e72df536ddf2740ef67f4af222d55f8db5fdcb4ac9046ff7545207869b71754d17e9302e0f3c8f59a61bb5f54ecd4d26bfb8319975a647 SHA512 72d03036db53aefcc25ff84ec27dc1f83f5f703f2f80196c45ab0d60a164f088c5a1bfe024404620739ae7b1e2270ee9b27db6ca8b4960f3b3eef73d7eb7f736
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
index 92fd60327864..77e2c37dac6d 100644
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://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"
+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 )"
diff --git a/dev-libs/libnl/libnl-1.1.4.ebuild b/dev-libs/libnl/libnl-1.1.4.ebuild
deleted file mode 100644
index fbf023486940..000000000000
--- a/dev-libs/libnl/libnl-1.1.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://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 )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1-vlan-header.patch \
-		"${FILESDIR}"/${PN}-1.1-flags.patch \
-		"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
-	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
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-
-	if use doc ; then
-		cd "${S}/doc"
-		emake gendoc
-	fi
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		cd "${S}/doc"
-		dohtml -r html/*
-	fi
-}