gentoo resync : 03.03.2019

4 files changed, 2 insertions, 25 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index a2b83729d503..b6277f5520db 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/zd1211-firmware/Manifest b/sys-firmware/zd1211-firmware/Manifest
index cf29f6670afc..f67dc7eccec4 100644
--- a/sys-firmware/zd1211-firmware/Manifest
+++ b/sys-firmware/zd1211-firmware/Manifest
@@ -1,5 +1,3 @@
-DIST zd1211-firmware-1.4.tar.bz2 39061 BLAKE2B 614463634a81dab96db35a3d5a2290f35f78e4ae3a4222ede46d4f3939d3116cec83b0901202d007d7b1760d900c3eccc9ccc7234282ef2702aea34fdab144a5 SHA512 210cf3438f2e3498cec06068020af7069d5c67469dbfc4c984c995cfc69192067184af2b04ee1f5642af25ab784c6b9a2e49f4fee3e2c144a5f88722e0462890
 DIST zd1211-firmware-1.5.tar.bz2 38291 BLAKE2B 46bba5cc569263d6998b7fa40c4f1ab10138ee4acd871c34fb81a63e38649fd595de9b411c9d29bfd50cef3757cea30fc2faeae9099e43ea9ee485ec0b6c9d3d SHA512 6a8d39318a8c136b2a780ebeb485a94bbb05fa12ad7104b707314e0108e49939b4dcd0035b19f07dac0ec7bdd12668ea281b48724e512b45ac5df9dedf035897
-EBUILD zd1211-firmware-1.4.ebuild 507 BLAKE2B e1fc253f10135d6b9f2db4ddb80fc448a78d2591a637a30169e5126d6c8343d1a239b9874f992cda225023a0492a024fcb5662cd5eb668c6ea68cf19ccb8fcd4 SHA512 28b1df434c48622edea2755a4b5e1b893e2bea8c7b2141a4bb8d99fcff7dec93535839c2177f4890449053550854d18d8349048eed4bbfa7ea2f44f83ad396d7
-EBUILD zd1211-firmware-1.5.ebuild 506 BLAKE2B 376eba158209504b0f9f7e90c0c0662430ff3ddf97e254c4f0ceb0c63169e67ead326213f25ff2d5d1b40f56f78f57c313ff2462a0fb2e71594deed8320dc214 SHA512 b30c25f1c5236dcd51b5ec13a49f3ae0010fbd604b24f270e1554093a0ae5ab610699f93d27aa2da1282094ff94fc5ca7557a257a09dcf7a47c93bb6fbe7c687
+EBUILD zd1211-firmware-1.5.ebuild 505 BLAKE2B 6f658cf6814eb2a2c26781e6b71e581ea9c086a9c257ec4314305e618ac1dbaad72ed904a9d5339b388ea4cbaf99d053772d6191b37d1b1c3c9aa74b19fdbfb1 SHA512 3e6b9ac8ed200f8c00668536ee01858039f6c6cbb7797fa33b06ed931c4eda70d77e8f9fe57a5ac2a5d6983f7acbe7ddc3df4e5668220802685f6f628ff985c8
 MISC metadata.xml 243 BLAKE2B a098e51efdeedab9bc921ba3fb268688c1a82eded5e185e17fad4602b4b1672481112b9475e32e87a65a60374460647beefb311987e72ca20c248b5777a26611 SHA512 52111ad6928aee42b8487e3cc31fef47928589755f6265d333d6fe925cf5d66e9a55f0ae8274d436ee7c965ba041381383d2005c093e39d9934872b46d2d827b
diff --git a/sys-firmware/zd1211-firmware/zd1211-firmware-1.4.ebuild b/sys-firmware/zd1211-firmware/zd1211-firmware-1.4.ebuild
deleted file mode 100644
index 00f0d3bc462c..000000000000
--- a/sys-firmware/zd1211-firmware/zd1211-firmware-1.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
-HOMEPAGE="http://zd1211.ath.cx/wiki/DriverRewrite"
-SRC_URI="mirror://sourceforge/zd1211/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	insinto /lib/firmware/zd1211
-	doins zd1211_u{b,r,phr} zd1211b_u{b,r,phr}
-	dodoc README
-}
diff --git a/sys-firmware/zd1211-firmware/zd1211-firmware-1.5.ebuild b/sys-firmware/zd1211-firmware/zd1211-firmware-1.5.ebuild
index d57ccb3c2fce..1428a149e12e 100644
--- a/sys-firmware/zd1211-firmware/zd1211-firmware-1.5.ebuild
+++ b/sys-firmware/zd1211-firmware/zd1211-firmware-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/zd1211/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}