Remove old version and update description as noted by Tim Harder in bug #329161.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 14 insertions, 39 deletions

diff --git a/net-wireless/iwl6000-ucode/ChangeLog b/net-wireless/iwl6000-ucode/ChangeLog
index 30b0e55d47b5..e71820f1a5fa 100644
--- a/net-wireless/iwl6000-ucode/ChangeLog
+++ b/net-wireless/iwl6000-ucode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/iwl6000-ucode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/ChangeLog,v 1.2 2010/06/25 14:55:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/ChangeLog,v 1.3 2010/07/20 22:05:39 flameeyes Exp $
+
+  20 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -iwl6000-ucode-9.193.4.1.ebuild, iwl6000-ucode-9.221.4.1.ebuild:
+  Remove old version and update description as noted by Tim Harder in bug
+  #329161.
 
 *iwl6000-ucode-9.221.4.1 (25 Jun 2010)
 
diff --git a/net-wireless/iwl6000-ucode/Manifest b/net-wireless/iwl6000-ucode/Manifest
index 9eb700b821f2..c86730ef74d4 100644
--- a/net-wireless/iwl6000-ucode/Manifest
+++ b/net-wireless/iwl6000-ucode/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST iwlwifi-6000-ucode-9.193.4.1.tgz 220966 RMD160 f9d396374008dce206c4ffdfe8926b8f747c5ac2 SHA1 6878dc15a767dbbbf2c288847ce0040a46a30b1f SHA256 0d8b466ca26a586757184b685be919b2ac6de6a8d7ffaced19a7c86c20cd67c5
 DIST iwlwifi-6000-ucode-9.221.4.1.tgz 216806 RMD160 7d5dd5d7366bd46141d80e63d8e7f1a468e8afbf SHA1 a888cf54974702594e82bcbfca20c26d8f906e9f SHA256 7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b
-EBUILD iwl6000-ucode-9.193.4.1.ebuild 766 RMD160 19a936f10d8e0e28b4ce966588f31de9c38de557 SHA1 776e405ac64c4102b9d79f7dbadcb1f30616f7f2 SHA256 7a3583e6949892eb8eed7da42e97d60e1e9ecb479d493a194e31d5ad925f110d
-EBUILD iwl6000-ucode-9.221.4.1.ebuild 766 RMD160 cb7624b30c5d98e57ee3baadb718ae20b95f5054 SHA1 af7cb84f4226272190c36b9b84e3a6bfe4995eb8 SHA256 63417e6ed7bc2bd28fbc11dcf2e5dc66b9e3929c45dd4437a4355cf936019fdc
-MISC ChangeLog 576 RMD160 602fd17c798846f97ec86b66aecb3e98c9b663ba SHA1 77022a606ea44b2605ff8d166e68762dfe980de9 SHA256 c43906b455baa346a1f05d4670543c257a1f69353076da671dd33eee292ee23d
+EBUILD iwl6000-ucode-9.221.4.1.ebuild 768 RMD160 bb5297cb92eb04d30addb9dcb9d0c3d7d5a78370 SHA1 9c667e9f5d61a22835cb2a18637bb08ba8d092dc SHA256 b4070a80bb45043519ee13732322e045bb1650bf2c7a5a9068825036798537cf
+MISC ChangeLog 785 RMD160 17b0f1a88eb957e98d93c8a72e74d61de4cb5e15 SHA1 2b94c2cb9eeef1673e1c94c4caff9dfd983f9675 SHA256 50a343e4581d2b225fc17ede688346466cce8c2e05353dc15fcb52eb343b293b
 MISC metadata.xml 233 RMD160 da5a1d3b7836dcebb5fec29696b5bfb583fe346c SHA1 1c7142c677598358888a6cfc6f6f65df2e8b6901 SHA256 4d1294dc1b2a6f96aa637a0b8d340bc67191103af0f15197d07fc62446b4a709
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwkw3oACgkQAiZjviIA2XjmigCfWLIRIBdPihTQy3I0Al7zXz/S
-U8gAnA6a0i/tkTGHwQJvsfFKX/XqmTgv
-=wCGE
+iEYEARECAAYFAkxGHcgACgkQAiZjviIA2Xjq9gCgunwdMmIVhvMaf4REmtxg6RSq
+af8An1Q+ddTsPMjyKqd9G4ZD2ZV54gCv
+=Io1M
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/iwl6000-ucode/iwl6000-ucode-9.193.4.1.ebuild b/net-wireless/iwl6000-ucode/iwl6000-ucode-9.193.4.1.ebuild
deleted file mode 100644
index eb53c1c27f0c..000000000000
--- a/net-wireless/iwl6000-ucode/iwl6000-ucode-9.193.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.193.4.1.ebuild,v 1.1 2010/06/10 13:46:22 flameeyes Exp $
-
-MY_PN="iwlwifi-6000-ucode"
-
-DESCRIPTION="Intel (R) Wireless WiFi Link 5150-AGN ucode"
-HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
-
-LICENSE="ipw3945"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=""
-
-DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-6000-4.ucode" || die
-
-	dodoc README* || die "dodoc failed"
-}
diff --git a/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild b/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild
index d33d9b65f6bc..7db797b8cd04 100644
--- a/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild
+++ b/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.1 2010/06/25 14:55:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl6000-ucode/iwl6000-ucode-9.221.4.1.ebuild,v 1.2 2010/07/20 22:05:39 flameeyes Exp $
 
 MY_PN="iwlwifi-6000-ucode"
 
-DESCRIPTION="Intel (R) Wireless WiFi Link 5150-AGN ucode"
+DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6000 ucode"
 HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
 SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"