Fix LICENSE, it's actually GPL-2 or later.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x4F064CA3

4 files changed, 22 insertions, 26 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 78e4bb6f5f71..9c53d7709951 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.172 2015/02/28 14:13:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.173 2015/06/26 14:43:16 radhermit Exp $
+
+  26 Jun 2015; Tim Harder <radhermit@gentoo.org> fftw-2.1.5-r8.ebuild,
+  fftw-3.3.4.ebuild:
+  Fix LICENSE, it's actually GPL-2 or later.
 
   28 Feb 2015; Justin Lecher <jlec@gentoo.org> -fftw-3.3.3-r2.ebuild:
   Drop old
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 160ef4500c21..bbc41e626a0f 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX fftw-2.1.5-as-needed.patch 4374 SHA256 b1d65b2dca62257db5c78e81577fb87b7d79f6eb75b8899de48faabfc702e9f0 SHA512 b460d3d3fcc8ea325ef9fc6aa29d0d4f0274697c55b8986d4219531234f89037c814e178144524b5bc6e4a30adf64e1cb30a25ebf042358510485b151c31d049 WHIRLPOOL 6ad4e5676285c8ac17feeaf91980a8bf1116aa70d59e96db319b6beb53579cc6506c684c4c09da482b5307fd634e4d6e449bc1ad59186ead559793d481c23745
 AUX fftw-2.1.5-cc.patch 546 SHA256 52b2ba8a140e46e9a1f1c71d8e85faaac70e6d783ba8e45f4423ba6f70f04dbe SHA512 f21ba12ec727a023d41df95b24d03273d416888b21f56dde8d2a256d15b9543a091a02f7100e86196bb7a38492d470b58ab293fed58a21e2417e2427f786368a WHIRLPOOL a333539e1bf7feee517818f9c9c7375d1c71a7792aa1662d18ba6727ab517c444a68375c0e1210f736f0e9dcd297f3ab64273777f5064afe3b724985dff4a641
@@ -8,26 +8,18 @@ AUX fftw-2.1.5-no-test.patch 1247 SHA256 9a6cad5e81b4a68ef6c8e137a189ffad462cbbe
 AUX fftw-2.1.5-texinfo5.1.patch 596 SHA256 00e61fd86bd0e742efb72212c005615964da4eade40c3024443504e50b9c7186 SHA512 71dd3c13784f9bd1b518827a6784e2619145377cbc88764c69830519096f61863140b90c8138d6a65e3994487cb12cd06baba826d48735c2cbddc1d2320a4214 WHIRLPOOL 9f382908ab6dac7c41c80c7e88a391bb2a71d1c3d8b0e38d153a5fdd8f48b46aee4a216860b599495275ef0f1e2c1501dbe2c12598eae0c637bb16f0878ce2a0
 DIST fftw-2.1.5.tar.gz 1256888 SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15 WHIRLPOOL 2ea64d246c12e14962b93e05411c5f06dd193a887acb3fe5e7f63231a1a2f1f21b3a41f75951e18c332b25105865633c87150f2107169f5487b6b9983b968e10
 DIST fftw-3.3.4.tar.gz 3940427 SHA256 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 SHA512 1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1 WHIRLPOOL 2a5733f5537ff55a1830994431f1750dd790a4df3e8b3d1e9018c1afba2c5172f4e456eaee1c3427a2b170d23b6928da462e067a6f4e94792cfc7ff1cbc38938
-EBUILD fftw-2.1.5-r8.ebuild 3987 SHA256 549c5f70223704a7859648fd67075cee06a6e0028535e2d1a724e9600b70965d SHA512 373c4bad0587e245a26c3da95b52a51f15e3e70d3260d50fd84c528ae196d4062cd0660fb6123dafd6c173836a1384c1f23b2fe7c5bf830474cd35e9d76dd889 WHIRLPOOL bca2d52dc4f7058f84d253b195d8b2a187bd7541fdcefc07719e895731d503596083edb9e25d61c1e9ae2907800f1b67ae97114418260d1b59843f7f7a5253e5
-EBUILD fftw-3.3.4.ebuild 4789 SHA256 afdea2e70f079404b3d4dd1339dfdc8569e5955ee33e583036aa8a5ad2ea40b2 SHA512 029c893b9e32fb5c807256e53aa70a5c653bcdbd7e9bcc622037d3ad051cde09d81c55f033fae819f0c175baec5deddf13ee376c83dcc473c2e6c0dad332ce92 WHIRLPOOL 9629b637f3728f737378b3c3d35031e08f22324f85429e9f3d1cae2e318804d2cf8eeb2d847758ce6e08ec0c9658f6c7be06c01f02efa2b7e07481330b12b3f8
-MISC ChangeLog 29406 SHA256 ab71f993845d0ee52c5551a2bfffd34fa74c43813fc10cbedc987cd4f8c7c625 SHA512 077341c38210a588245e2a20be737a95f9a616585ebf70215578bbd24295f1d28e2881b11f7fbe5b3b5447e2904e82bae282f90db2ae72e6f4e2bdf460a7f220 WHIRLPOOL e862829fe95b0953c25649654e8034f089d92db0869679291b8ed3b9f171ce4c2e1df4315848d105ba640e676e93f972401f43434c3406345e12d5b57e115402
+EBUILD fftw-2.1.5-r8.ebuild 3990 SHA256 2a630d77a554474a61edd58b9b4f9574f6e02b1a20d3ecbabbd429f9bd07445c SHA512 6687d014d5134fe904ed132354cd09d4fc729c31b2676a3184bd817e413439e0c2440f8eabd057fc8cc1972a14b6fc13216ae84fe6b18f60454116c53bf42217 WHIRLPOOL 38afe4c6422dc2dc304ad22140dc7b59cb307ec9270ae1b9ed41080bcdfb628b664b65c22b11c987f87afe30c4817955cf7ca899849d88eb255f3f96da29dbc1
+EBUILD fftw-3.3.4.ebuild 4796 SHA256 3f96b8303b658bdc89fc855e44af9e7808a589490fe09ff7cc0d3f725e730da8 SHA512 6b38d62a0947a9a840855af9727ed5b54dce4c2dbea10dc1482e950444c4d6f56e0b099ead9ec5cfc191b0c77435db177c06c9f82453dba8b05520a6c42f5591 WHIRLPOOL 75f1e99b8766440504c9af1eea159ae7cb5ec64dd19172a77de423e2f842cb592c6d749da7d3e99588d32eeed9243e096f0981b00c8fbb90212a20905e0472b8
+MISC ChangeLog 29549 SHA256 d0310914da994f706201ef395a30b4742fff3381472b591d45b18092007263d3 SHA512 0eef906b94217e969f6e79ba4a1cccf779a862137a8925085118291791f4d122be0aa4fbc8aa344aee8f3b0dcfd7949808676c70d21d3c70acd5d470d6b6ecf1 WHIRLPOOL 2218a1307e055d25628f8713ca7074e61d3a113494e269c046a18771dfc71099857ad32f2ff6c0c282cf0d8e091196daeeec886949b6de04c91693f948bd727a
 MISC metadata.xml 987 SHA256 6c441e0acecaa0c63e03c5f65c22d39c668a48004e31b085b7b4968e9f3750f0 SHA512 58629ec0239e32d90b2818f4e6ec5349f00f4339bd8197f341506d88a71a8504e1e110f23a60a14087dd0325d1a69c6a93f09d46ed47ef7d3859a4b69dabb7d8 WHIRLPOOL 309500ea9d3b47fa92005cff7414aa21b2f7e97887f400fec49ccc56e62399b7a7d343b5469ca1cc3474222cfa25a24ed99edf4491f862a19a0cb6ada7eb16d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJU8c0sXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirC04P/1nfApvmdEd3pjL9pz8/rwr8
-ZfrCTdPm0COzZEAeCiIXOrRJjldVEYEclZbPlRmXilgQ2SWElaTOrgxla/GGwV7j
-GpFza4tCmFwTjjZcDNAc2JspFH83X1M5fUdchtMnT42xzocc1ZLOUpAtVViqkQiC
-wqG2/JL0XcIK+DZxAtf0KuysRkz8wp4tLbk5cuo6h9D/HSJ0RCysOo/9p89ZnAFq
-5MQZ+S/Ggb8UCkvst4Nn3xkouKnZCNaGb7ljmOzXcsNqrCcsyPsDOCIGM+a2zv2i
-JckAPabBMGzEcjL+JA2cjO2ZtbOi7qibJLOPa+rly9KTEEdBwFY1WsVqqOx1jz1y
-Nf/V+9ylIIRoEqfBBJETtUNKAGZMFggqg/JPGv5B3sxiBqYais5YNIUzMqUTRIaU
-mK1JsjkNRqmAJAuDPn2vyVLOl/iqa7oI7g3ng7TdEcac3DGPJruV6N4fnfGAa3tJ
-raq7yBB0idhIQKTLdauT4DM6oyXjruKvtVh+H9+D6wXxkHcFWfYKoZX0e6qo2sym
-zJc2lUVsa3Hzw1K8BAhWejHKZx1p0lLllGyuthztHke2I9O2M5D74EvBMN4Aj7M5
-2SvlbUdvSJf6bbn1wBCPuWFei/tA1JnHi0yz4dOsfbmqao5MtUMyoK7dwTZWBL4s
-uMJ3qXbP+UnaDIEW1i+a
-=6714
+iQEcBAEBCAAGBQJVjWTQAAoJEEqz6FtPBkyj5u8IAKv7xz/gXbHgJ2ytDg7FBkAp
+bNpcYvsryAYYFer+x0mYdu4p4l9LyLHV7i4pBHREgITQZ1ahYibAlBx6J3W1EbOp
+H9mGMGGVU+UUoDLTQxIGituNv81IA3xDEPnDpQ7aGXhBJoRu24IsoxlauqF1La9B
+V1nGek6a6Ozy/o0WEyxVD52nsG6iMGqCy+9cQqpAuRirnguBMwdEnzAXK1Ug+l2O
+F9NvWgz2nNVd93ixh4Y0E5QvJyXUKD8xHf9ApRIsUEEuuIVZoQCMo4ZRTruGnwI2
+fGt5fhW2s4+RDQA5SrtTPZxGzi4/DdMOvHz0Uod77CRR5pKJEjuz4vKyw1F2hmg=
+=jtk8
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-2.1.5-r8.ebuild b/sci-libs/fftw/fftw-2.1.5-r8.ebuild
index 79bf5c85f612..ed542fb8ad55 100644
--- a/sci-libs/fftw/fftw-2.1.5-r8.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r8.ebuild,v 1.18 2014/08/28 15:44:22 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r8.ebuild,v 1.19 2015/06/26 14:43:16 radhermit Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
 SLOT="2.1"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 IUSE="doc float fortran mpi openmp threads static-libs"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild
index f73edd4766c5..2e712ff5c317 100644
--- a/sci-libs/fftw/fftw-3.3.4.ebuild
+++ b/sci-libs/fftw/fftw-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.15 2015/02/28 13:57:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.16 2015/06/26 14:43:16 radhermit Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ else
 	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="3.0/3"
 IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"