gentoo resync : 04.07.2020

4 files changed, 2 insertions, 76 deletions

diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 86a0af6c102d..e94b222b0d3e 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,7 +1,4 @@
-AUX bridge-utils-1.5-linux-3.8.patch 435 BLAKE2B 0e9adb67c1cf21f58d85933ee2d00a21c6192500ab2dfc71f61a3da4a6367afec2d217efcca52dc515ee75b099432ff5ec2b04ae91f4cef3d0c36fba193bc0c9 SHA512 dea1668cc0b76b1f88e7040262e3056db278000df2680e8d3a1596b6821e7f8213a0e67ae26ffc23950b848c2ccc5dabf61baf6c40159eecfb7c22118dec2635
 AUX libbridge-substitute-AR-variable-from-configure.patch 942 BLAKE2B e1835eefb982957d2e3a1efa0244b4d9f72decbac8990579b19137df82e758589846e4175f3cc9ddc9e2990663b3ae146cf67b9f5a808255115d1a91d53a3d50 SHA512 b4aecaa7e7fae311effc2f9ccd4ee5ca2a1be007cb94e1eb873693805fcdbc880bfb0df53d592eef46d61d433c7b5a36dbe9e7c16b836b6a3f1452e4034f50d6
-DIST bridge-utils-1.5.tar.gz 33243 BLAKE2B 211ecb831f802c119f32c30621daa781056bd9ff2fb5880d328704bd76b5b5b964d0671f77489fb9c71f25a3e073e5e4070cfa759deeba014aa1136ff60b1fdd SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3
 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
-EBUILD bridge-utils-1.5.ebuild 1319 BLAKE2B fb76d4f17be11bfa531e2f43c2cefa72f5077befdbf2d4ed75f5f7722379fc082810c25d3f360be56ce4e4a69e79a4761343798137d8a34514b466d652ee7f9e SHA512 5d360cfd301b69732fa8a2f713673c776e24a3bf5963044b53ae87e86ca768aebd6c56462083bd33488d5593097bab7a655f5eea70d22a526df0b74e707395f2
-EBUILD bridge-utils-1.6.ebuild 1437 BLAKE2B db6310f76e4b10f54a24bc472aa44c70fa6a9d0b45f2f87850da532b024729bbda3fea181316312d3584fd03104bbff94169f588ea67fadd5faf34f27fceae36 SHA512 324720b237f4b0ebded7892de8f348dbf0080c172aa4d8e4785480bf76a742c397ab0cf8dab12d8f3b03021429b6dde712a1950810b9fc276d119e1b1d357e3e
+EBUILD bridge-utils-1.6.ebuild 1436 BLAKE2B 2fd4187c9a7df60c6893b8cf157fa08b3facbf5d378786a6465c0257bf3207e08b1854f03f0e1d81c3ddb6d76fcc8d18203c7cbf6b79c891a6d51a42bc30f55d SHA512 4454eb9609fe857190fc486debaca029a528cf91ebe7decb2c7f9648fa286a97dde9ed3966ec869059489066d0039ac2c64ea6970dc113a3e8fb6263fc313540
 MISC metadata.xml 491 BLAKE2B bf2e6636e5cd672907c0fa7a57894aadd2a56c6a86243d6894567e5819684dba5ef73419b9796d3e8e30e5d9048e13f4a11f714400f4b71dc2a61b8fee81467f SHA512 ec5ffecc293290fa0931f16fc447b5f9537d86db112462f6f865b1e4714e95c10d22fef326692d4506958956c3148061beba187e19b8549608f02ef974302bee
diff --git a/net-misc/bridge-utils/bridge-utils-1.5.ebuild b/net-misc/bridge-utils/bridge-utils-1.5.ebuild
deleted file mode 100644
index d48b3a0242bc..000000000000
--- a/net-misc/bridge-utils/bridge-utils-1.5.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 autotools eutils linux-info toolchain-funcs
-
-DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-HOMEPAGE="http://bridge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="selinux"
-
-DEPEND="virtual/os-headers"
-RDEPEND="selinux? ( sec-policy/selinux-brctl )"
-
-CONFIG_CHECK="~BRIDGE"
-WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel"
-
-get_headers() {
-	CTARGET=${CTARGET:-${CHOST}}
-	dir=/usr/include
-	tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include
-	echo "${dir}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-linux-3.8.patch
-	eautoreconf
-}
-
-src_configure() {
-	# use santitized headers and not headers from /usr/src
-	econf \
-		--prefix=/ \
-		--libdir=/usr/$(get_libdir) \
-		--includedir=/usr/include \
-		--with-linux-headers="$(get_headers)"
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog README THANKS TODO \
-		doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
-	[ -f "${D}"/sbin/brctl ] || die "upstream makefile failed to install binary"
-}
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
index 47491b009b6a..4963b29d27fe 100644
--- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="selinux"
 
 DEPEND="virtual/os-headers"
diff --git a/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch b/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch
deleted file mode 100644
index 49ebb4e9da28..000000000000
--- a/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-unfortunately if_bridge.h from Linux 3.8+ is not self-contained and the struct
-for ip6 is missing
-
-http://bugs.gentoo.org/460262
-
-this is not unheard of with Linux headers, for example, <linux/cdrom.h> needs
-<limits.h> to get INT_MAX
-
---- libbridge/libbridge.h
-+++ libbridge/libbridge.h
-@@ -20,6 +20,7 @@
- #define _LIBBRIDGE_H
- 
- #include <sys/socket.h>
-+#include <netinet/ip6.h>
- #include <linux/if.h>
- #include <linux/if_bridge.h>
-