Update GPL-2 to GPL-3 as per upstream homepage linking to GPL-3 license.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 22 insertions, 17 deletions

diff --git a/net-wireless/zd1201-firmware/ChangeLog b/net-wireless/zd1201-firmware/ChangeLog
index da0c71bc9a7f..4057f3208924 100644
--- a/net-wireless/zd1201-firmware/ChangeLog
+++ b/net-wireless/zd1201-firmware/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/zd1201-firmware
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1201-firmware/ChangeLog,v 1.12 2013/02/08 17:56:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1201-firmware/ChangeLog,v 1.13 2013/02/10 15:39:06 ssuominen Exp $
+
+  10 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  zd1201-firmware-0.14.ebuild:
+  Update GPL-2 to GPL-3 as per upstream homepage linking to GPL-3 license.
 
   08 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
   zd1201-firmware-0.14.ebuild:
diff --git a/net-wireless/zd1201-firmware/Manifest b/net-wireless/zd1201-firmware/Manifest
index bef95d859838..4153b926408a 100644
--- a/net-wireless/zd1201-firmware/Manifest
+++ b/net-wireless/zd1201-firmware/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST zd1201-0.14-fw.tar.gz 86538 SHA256 56fd11578b0fc13947786fca0e1b4227f04b0f00cf190fd3d3bc4dd005ba4267
-EBUILD zd1201-firmware-0.14.ebuild 673 SHA256 b9d9e6a30ff36c8cadd7edc0a271a27affbc7202a2a6fc9f86c17b612442d5ed SHA512 8a81b2bfd725bd110c9d0a29f0f019b073a594a2065a76557d42c03d641ed946902f93ad9a9ea432a2aad714ee3e9fe6f80b64ddacb0947fb3245a491d691899 WHIRLPOOL 63230dbc650aa28b35f5159a82098f8d84f813ab475ca1134622873d5f48f1ef663df2efb3c114ceb017d228fa238bf50e33fdd14cdae1c2340c4cdc28f304bc
-MISC ChangeLog 1728 SHA256 76ad5ddc54637b17e648848523879457331cc9fa6269d45bad5bfa7fb92b864e SHA512 c73bea06a11994538fb85bcd348614f959ff5827f8d74a037d90e3e4aa66718dd3b77a1ea2add6a965ddfc681b4c593da482e22029bf095ad4bf888a0cbddd89 WHIRLPOOL d8967b950a0d27a0880905eec2451a377619c77e70e4cf0262ddc52edf0feeb84f8e9ec4780d7120327a0cd819771673696491bdf5dfb82ae57ad5b8c3148977
+DIST zd1201-0.14-fw.tar.gz 86538 SHA256 56fd11578b0fc13947786fca0e1b4227f04b0f00cf190fd3d3bc4dd005ba4267 SHA512 4143966d386029d50b0cf54bb40f0636daac8f4696782f2cd7ec8924b80ed5d889b373817c662000fbbc8010d4bc81864d2381dd7e2242bf9cee0e0fb9d56fe9 WHIRLPOOL 14107b3469e7f84f934032e333351c17122e575a22fb0f131696a9dcbdb356f2cda04d143645e7a5f73f606491147350829d1938680ffdd90bf42af9b6ea31e6
+EBUILD zd1201-firmware-0.14.ebuild 660 SHA256 d69da69bbfda3166c55f5248f0f2fe936639e876d5773dceb35c3d9509dd7239 SHA512 4b7bc20d7233ce382a7e85bf7404e25c0867dcbda2da011be97b83ce10a2be141728deeb744713d95e77368a5b42e4e9d4ebccd10e94bd1a97b5480d4a5f79d0 WHIRLPOOL e465e2f7681ff582b03bd40f03292e3190ea28f02422603c3a200abead7996155ff18af2bf2728c05a554c017c0f3afb7060d1fd6184d7643556f5c489f3a46e
+MISC ChangeLog 1889 SHA256 4e5ffc55016faf530f02c53ef520e563b4c156608d34b27f26ea55baeea563fc SHA512 7f91cac8d6f9b37de675827abbce3e08d54d1925be75dd61798636007bd1bb8057cbb7b31a931fad49f983c682146cdf42961afba457701702dfba9cd653ce4a WHIRLPOOL 1162a4781032149ae1452c71b2ba01f868dfcbfe0f3e35d33c718660af86041b153b3f25fa2dd0f62d62ecf474d6767466345d89996e56fc878b93185b2777ab
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRFTwiAAoJEEdUh39IaPFNfgAIAJ/5wYETOW1NsLT0QwiGqt1d
-wzdCZfqi0E+aQHSOCvWmHMiPHM7Py+GFMaiVAfi7ZBtfDlVAbz8FRWeKidaj3nX4
-dKYYkv0x3iqGgycd11oYjtMB86J7PlLPr7Zl0RhZQJ5BM5rRkhl8KpDZ+hkzTmoa
-62uCVDBLYLjQPDZwbbgopE+PdoG28dWxPPW4+L3CHLCiWC069UF0AFSP2oxfDixS
-VySUgMTJvYtNmTSbZeMQfMBonXRN9bZrj5kWdfP0VUgIHO8C+2OsEunOoILV0Eq+
-vViPjL+Dw7z7zbBWRQc+y+7wz8JA4lLI4BsNRc1wBz996VOME1Ras6Glt3/WB/I=
-=8c1i
+iQEcBAEBCAAGBQJRF77cAAoJEEdUh39IaPFNpFIH+wY6AGKrAAhjbChm8xsTIyiU
+aeQiRxY9dNORfKhbCk2TOv7v+jZYKkU5jbkOXJvK6Jr/Bij0TXyisW1uD0SdZ4I/
+DPP+dbpmr1dkaSHKHL9cccKogmgwkulXMul141UFHdvkgnjZ/hffDPFYQA3FQRxQ
+6vHdjnuj8UX5amaNR4glgXRajlYKZTC9J1YlWaoZZUw0+5E13R+qMBv1RMOSEBMz
+YMvb7pXh/U0Z3LxZOd6MIlzxxxutcOeUuKqCv1/Z8XCAQqmp4KoDZPeCmpMDol+W
++llVax82qPu0ni2IQ8ajqagXwtahrJgl3e//VVvKuVGrjnY2Atf4Wv28RMEMjc8=
+=vjKJ
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/zd1201-firmware/zd1201-firmware-0.14.ebuild b/net-wireless/zd1201-firmware/zd1201-firmware-0.14.ebuild
index 3f17b702a2f6..10fd6f072750 100644
--- a/net-wireless/zd1201-firmware/zd1201-firmware-0.14.ebuild
+++ b/net-wireless/zd1201-firmware/zd1201-firmware-0.14.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1201-firmware/zd1201-firmware-0.14.ebuild,v 1.10 2013/02/08 17:56:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1201-firmware/zd1201-firmware-0.14.ebuild,v 1.11 2013/02/10 15:39:06 ssuominen Exp $
+
+EAPI=5
 
 MY_P=zd1201-${PV}-fw
-S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Firmware for ZyDAS 1201 based USB 802.11b Network WiFi devices"
-
 HOMEPAGE="http://linux-lc100020.sourceforge.net/"
 SRC_URI="mirror://sourceforge/linux-lc100020/${MY_P}.tar.gz"
 
-LICENSE="|| ( MPL-1.1 GPL-2 )" # GPL-2 only
+LICENSE="|| ( GPL-3 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
-
 IUSE=""
 
+S=${WORKDIR}/${MY_P}
+
 src_compile() { :; }
 
 src_install() {
 	insinto /lib/firmware
-	doins zd1201.fw zd1201-ap.fw
+	doins zd1201{,-ap}.fw
 	dodoc README
 }