gentoo resync : 22.12.2021

3 files changed, 2 insertions, 58 deletions

diff --git a/sys-firmware/atmel-firmware/Manifest b/sys-firmware/atmel-firmware/Manifest
index b76b842354ea..0e41bc741ed5 100644
--- a/sys-firmware/atmel-firmware/Manifest
+++ b/sys-firmware/atmel-firmware/Manifest
@@ -1,4 +1,3 @@
 DIST atmel-firmware-1.3.tar.gz 470254 BLAKE2B 76b90d6bf34db5540ab8c4034a439e8da6e0590ecbca0962c9e65099143b67337c91f7673a2cc33a2191924f42f69f922176a9b91f8592ce649dbf04a17b36ee SHA512 e87767008d3fe08a7e997b629a11589c00f46ca375639dd0b06c48b2de831a7df666c895888026eff03b7ee81a7594349fd550c4943b088ce26fb57f660ce89b
-EBUILD atmel-firmware-1.3-r1.ebuild 1172 BLAKE2B 5e601ca84288b844b7bb563bcf3a0e06c6523cfbe64356604e9dafa3c70437a8ab5c1c7768b6483116c928523a90c7112b518cddc03af9f03267ec3e3ae59111 SHA512 a1080d92be6c4a1f122222bc705faf74bb5a70a07a4ffcbd3274650cb0c5c3811baae8b3d44ac7c89b947682dc51ae51ddb9d7079d23ba1f49595bb81965bb2a
-EBUILD atmel-firmware-1.3-r2.ebuild 1158 BLAKE2B 08f722272945a23b907422b00124adf8c85f93962c7369ed946d7e24ecc81925f8b20426120f94d23aaf02a78de778dbde581a526ff3f5b606d15cacc9a93249 SHA512 d74d11a5080a8aa68a32de02a35cff91d1664d20bc22d76fa1dce1d32259d214ed1dfc07eb913639ac9ec18a1b64db09dbb7ee410102be6e692e1dd61c3d99a2
+EBUILD atmel-firmware-1.3-r2.ebuild 1156 BLAKE2B e377ff4ba37e71ee23831fba4c3d18c9da436ed1345c6b29823670bee1a4787e21683cf7a562f36fc16bc7c2c93bfd04422097f68688a582d76901aa700a9e29 SHA512 3b4294034d6ae15ccc3cdde87f500557a364fdd947aaa8b16d4d26c8035674aa0754296c7e75db95e3fb40052b2f97a435107a51357a2c2eb27ddc2a6a34c141
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-firmware/atmel-firmware/atmel-firmware-1.3-r1.ebuild b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r1.ebuild
deleted file mode 100644
index bcd244232549..000000000000
--- a/sys-firmware/atmel-firmware/atmel-firmware-1.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Firmware and config for atmel and atmel_cs wlan drivers included in linux 2.6"
-HOMEPAGE="http://www.thekelleys.org.uk/atmel/"
-SRC_URI="http://www.thekelleys.org.uk/atmel/${P}.tar.gz"
-
-LICENSE="Atmel"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="pcmcia usb"
-
-RDEPEND=">=net-wireless/wireless-tools-26-r1
-	pcmcia? ( sys-apps/pcmciautils )"
-
-src_compile() {
-	tc-export CC
-	emake atmel_fwl
-}
-
-src_install() {
-	# atmel_at76c504c-wpa.bin should be renamed to atmel_at76c504-wpa.bin, bug #398803
-	mv images/atmel_at76c504c-wpa.bin images/atmel_at76c504-wpa.bin || die
-
-	insinto /lib/firmware
-	doins images/*.bin
-
-	if use usb; then
-		doins images.usb/*.bin
-	fi
-
-	if use pcmcia; then
-		insinto /etc/pcmcia
-		doins atmel.conf
-	fi
-
-	dosbin atmel_fwl atmel_fwl.pl
-	doman atmel_fwl.8
-	dodoc README VERSION
-}
-
-pkg_postinst() {
-	if use pcmcia && [ -f /var/run/cardmgr.pid ]; then
-		kill -HUP `cat /var/run/cardmgr.pid`
-	fi
-}
-
-pkg_postrm() {
-	if use pcmcia && [ -f /var/run/cardmgr.pid ]; then
-		kill -HUP `cat /var/run/cardmgr.pid`
-	fi
-}
diff --git a/sys-firmware/atmel-firmware/atmel-firmware-1.3-r2.ebuild b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r2.ebuild
index 93b12d7aba22..fecf77bef489 100644
--- a/sys-firmware/atmel-firmware/atmel-firmware-1.3-r2.ebuild
+++ b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.thekelleys.org.uk/atmel/${P}.tar.gz"
 
 LICENSE="Atmel"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="pcmcia usb"
 
 RDEPEND=">=net-wireless/wireless-tools-26-r1