gentoo resync : 29.12.2022

4 files changed, 2 insertions, 115 deletions

diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 98dd3cfdaf3c..c2853c03b8fa 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,8 +1,5 @@
 AUX bridge-utils-1.7.1-musl.patch 223 BLAKE2B 16545001ffb6d3a4db3af66adda46f76d2436be78b7ebfba732de5d146b909f9ee7be4ad5bbb1dca6edc517ace3d2994fa6c1eab24bf1db3530076d2411a4970 SHA512 9f80083f6893e2ef1b960ffd602307250ef29fe002f6fa3ee769f7e5a0a7b162b1f9fe8fa028431720b1a7e99a2050864ab624e3a4a11a9012a0174010e9dcd4
 AUX libbridge-substitute-AR-variable-from-configure.patch 942 BLAKE2B e1835eefb982957d2e3a1efa0244b4d9f72decbac8990579b19137df82e758589846e4175f3cc9ddc9e2990663b3ae146cf67b9f5a808255115d1a91d53a3d50 SHA512 b4aecaa7e7fae311effc2f9ccd4ee5ca2a1be007cb94e1eb873693805fcdbc880bfb0df53d592eef46d61d433c7b5a36dbe9e7c16b836b6a3f1452e4034f50d6
-DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
 DIST bridge-utils-1.7.1.tar.xz 29632 BLAKE2B 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515 SHA512 6a3824853bdaa1733c552973e6a5082280facdddc52c3feeb2c8c9375ba9469a5930b559092c9de1a73b464f388f019e147b45ac1e2d10ce8968057779fcd12c
-EBUILD bridge-utils-1.6.ebuild 1436 BLAKE2B 42f9eab53b9e394593c7b9f78f988a5558cbb0aca979e9adbfd96bed3824e2ab1aee9b974df1870a94a639778a90f19b1bd5af3a42dc9f646181bd55dfcb5367 SHA512 002a1d7fbf2f2b756f2c15d73b6d9e7acca1c6d3295a78a19e578de82967d50ace95167a98a060254195719369c5a9e7669b2d262be120f9a1a906619740843a
-EBUILD bridge-utils-1.7.1-r1.ebuild 1434 BLAKE2B 13d9dfd6d950dd5c39db149944d6c133335dabd03d6784500bfa843e2dfff6f3e343d8ef302f98167c82206f908f0a92b50e7ec48beb70c22ba6964783dcdf44 SHA512 d6afdb713dbb99809d5d906683e9939b78434dc1832f42f2f4bc6f0bd1c7240ed29c470fa56680e76fd13aebce53f71d84d152f10fb574a792c78a9b258ece45
-EBUILD bridge-utils-1.7.1.ebuild 1379 BLAKE2B 62267a7aadaaa12fe07c2679c8beb99e6917d6c39ac3697ec696300f897c140fd2cae478cf50e1cd8668f1a3fb96dd5fbcc8c6ba69930e90ba70a679382186c1 SHA512 1283f3f38a9fe0e0065e4101b45d326df424651d708b9c0891fea6a52755cbe313717e37cae25bfd37f385b70c685a4260ea04419d913d1a5fc27279c3dbb5b9
+EBUILD bridge-utils-1.7.1-r1.ebuild 1427 BLAKE2B a6aa67740a404680bb52288113416fa0b5d9ebc8a2e61d68897751e5700bc4313c0583463bf57ceb1cbcaab30d06dd57f7f70733e610ab4b041783a59a2a1a8c SHA512 be36e4d63654676523dc5de0fc6eb2fdd7dd3d952e80203f3a25f42a6825f6825bd321840df7fc23250503b926c051b5a60f9f0d1d0c05a8100bfc6263b0d083
 MISC metadata.xml 492 BLAKE2B a62977b2f90df86ceacd84e556618f3adf5338eef114a17ca9a17e4bff142190fa68df777719b91bc4ec3108d3fd13c21205addaf30e4fc4012ff83fb882590f SHA512 216e32dc64a175f83b942cbc24894e055a77f7b9c251d68395cb4635bda446ea197f8feee7957747e68bdb46c8c84e8625b626c82944e161debba3009f9befa8
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
deleted file mode 100644
index 273624c416b4..000000000000
--- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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"
-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"
-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() {
-	local PATCHES=(
-		"${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch
-	)
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# use santitized headers and not headers from /usr/src
-	local myeconfargs=(
-		--prefix=/
-		--libdir=/usr/$(get_libdir)
-		--includedir=/usr/include
-		--with-linux-headers="$(get_headers)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog README THANKS TODO \
-		doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
-	[ -f "${ED%/}"/sbin/brctl ] || die "upstream makefile failed to install binary"
-}
diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild
index 1ca3e88935d6..d668c78e802c 100644
--- a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild
@@ -11,7 +11,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 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="selinux"
 
 DEPEND="virtual/os-headers"
diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild
deleted file mode 100644
index b3ea6ff1a706..000000000000
--- a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info toolchain-funcs
-
-DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-HOMEPAGE="http://bridge.sourceforge.net/"
-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"
-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() {
-	local PATCHES=(
-		"${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch
-	)
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# use santitized headers and not headers from /usr/src
-	local myeconfargs=(
-		--prefix=/
-		--libdir=/usr/$(get_libdir)
-		--includedir=/usr/include
-		--with-linux-headers="$(get_headers)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog README THANKS \
-		doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
-
-	[ -f "${ED}"/sbin/brctl ] || die "upstream makefile failed to install binary"
-}