[gentoo-commits] proj/sci:master commit in: licenses/, profiles/, sci-mathematics/gappa/, sci-biology/genepop/

[Aisha Tammy]

commit:     3f26d1a15d016c08e2993e4edd1b1892777aa757
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Dec 29 16:29:16 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Dec 29 17:10:14 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=3f26d1a1

*/* clean up licenses

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Closes: https://github.com/gentoo/sci/pull/1000
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 licenses/AMD-APPSDK                      | 267 ----------------
 licenses/CeCILL-2.0                      | 505 ------------------------------
 licenses/CeCILL-B                        | 515 -------------------------------
 licenses/ECL-2.0                         |  97 ------
 licenses/Intel-SDP                       | 369 ----------------------
 licenses/NOSA                            | 258 ----------------
 licenses/modeller                        |  19 --
 licenses/mpich2                          |  39 ---
 licenses/phrap                           | 210 -------------
 profiles/license_groups                  |   3 +-
 sci-biology/genepop/genepop-4.2.1.ebuild |   4 +-
 sci-mathematics/gappa/gappa-1.1.1.ebuild |   4 +-
 12 files changed, 5 insertions(+), 2285 deletions(-)

diff --git a/licenses/AMD-APPSDK b/licenses/AMD-APPSDK
deleted file mode 100644
index fece351dd..000000000
--- a/licenses/AMD-APPSDK
+++ /dev/null
@@ -1,267 +0,0 @@
-
-		SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT
-			(Linux APP SDK Installer)
-
-IMPORTANT-READ CAREFULLY:  This is a legal agreement 
-("Agreement") between you and Advanced Micro Devices, Inc. 
-("AMD"). Your use of this AMD Software Development Kit, (the 
-"SDK") including software, tools, utilities,
-Documentation, and to the extent provided hereunder, Libraries, 
-Sample Code, header files, any related AMD materials, and 
-updates thereto (collectively, "Licensed Materials"), are 
-subject to the following terms and conditions.
-Do not use these Licensed Materials until you have carefully 
-read the following terms and conditions. By downloading or 
-using the Licensed Materials obtained herewith, you are 
-expressly agreeing to all of the following
-terms:
-WARRANTIES, SUPPORT, RIGHTS, AND DAMAGES ARE DISCLAIMED AND/OR 
-LIMITED BELOW, PLEASE READ ENTIRELY AND CAREFULLY.  IF YOU DO 
-NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT DOWNLOAD OR 
-USE THE LICENSED MATERIALS OR ANY PORTION THEREOF.  DOWNLOADING 
-OR USING THE LICENSED MATERIALS OR ANY PORTION THEREOF 
-CONSTITUTES YOUR ACCEPTANCE OF THIS AGREEMENT.
-
-1. Definitions.
-
-   1.1. "Documentation" means install scripts and online or 
-electronic 		documentation included with the Licensed 
-Materials, or portions thereof.
-
-   1.2. "Free Software License" means an open source or other 
-license that requires, as a condition of use, modification or 
-distribution, that any resulting software must be (a) disclosed 
-or distributed in source code form; (b) licensed for the 
-purpose of making derivative works; or (c) re-distributable at 
-no charge.
-
-   1.3. "Licensee Software" means any software developed or 
-modified by you using the Licensed Materials, and which may 
-include any Libraries, Sample Code and/or derivative works of 
-Sample Code.
-
-   1.4. "Intellectual Property Rights" means all copyrights, 
-trademarks, trade secrets, patents, mask works, and all 
-related, similar, or other intellectual property rights 
-recognized in any jurisdiction worldwide, including all 
-applications and registrations with respect thereto.
-
-   1.5. "Libraries" means any run-times or other functionality 
-provided in Object Code including but not limited to codecs and 
-video processing libraries.
-
-   1.6. "Object Code" means machine readable computer 
-programming code files, which is not in a human readable form.
-
-   1.7. "Sample Code" means the Source Code identified within 
-the SDK as sample code.
-
-   1.8. "Source Code" means computer programming code in human 
-readable form and related system level documentation, including 
-all comments, symbols and any procedural code such as job 
-control language.
-
-2 License Grants.
-
-   2.1 Internal Use.  Subject to the terms and conditions of 
-this Agreement, AMD hereby grants to you a non-exclusive, non-
-transferable, royalty-free copyright license solely for your 
-internal use in developing Licensee Software for use with 
-products based on or incorporating AMD products (a) to use the 
-Licensed Materials, (b) to download, use, copy, and create 
-derivative works of Sample Code in Source Code and to create 
-compilations of same in Object Code form, and (c) to download, 
-use and copy the Libraries.
-
-	2.2 Restrictions.  This Agreement does not grant you any 
-rights, by license, implication or otherwise, in or to any 
-associated materials or technology, except as is expressly 
-provided herein.  Furthermore, you acknowledge that except as 
-expressly provided herein, the Licensed Materials provided by 
-AMD hereunder are for your internal use only and you may not 
-sell, transfer, assign, sublicense or distribute the Licensed 
-Materials, in whole or in part, in any manner.  Except as 
-expressly specified in Section 2.1, you will have no right to 
-make or have made derivatives of the Licensed Materials, to 
-reverse engineer, modify, disassemble or to decompile the 
-Licensed Materials, or otherwise reduce any part of the 
-Licensed Materials to any human readable form.  You will not 
-use the Licensed Materials in applications intended to support 
-or sustain life, or in which the failure of your product could 
-create a situation where personal injury, death, or severe 
-property or environmental damage may occur. You will not use or 
-distribute with any Licensee Software any code that is licensed 
-under a Free Software License.  No portion of the Licensed 
-Materials may in any event be distributed on a stand-alone 
-basis or other than in the form of Licensee Software.  You must 
-not alter or remove any copyright, trademark or patent notice 
-in the Licensed Materials.  You must reproduce all AMD 
-trademark and/or copyright notices on any derivative work that 
-incorporates Sample Code or Libraries.  You may not use AMD's 
-trademarks in the Licensee Software name or advertising in a 
-way that suggests the Licensee Software comes from or is 
-endorsed by AMD.
-
-	2.3 Third Party Materials.  Together with the Licensed 
-Materials, AMD may include third party technologies (e.g. third 
-party libraries) for which you must obtain licenses from 
-parties other than AMD.  You agree that AMD has not obtained or 
-conveyed to you, and that you shall be responsible for 
-obtaining, Intellectual Property Rights to use and/or 
-distribute the applicable, underlying Intellectual Property 
-Rights related to the third party technologies.  These third 
-party technologies are not licensed as part of the Licensed 
-Materials and are not licensed under this Agreement.
-
-	2.4 Other AMD Software Components.  The Licensed 
-Materials may be accompanied by AMD software components (e.g. 
-libraries, sample code) which are licensed to you under the 
-terms and conditions of their respective licenses located in 
-the directory with the software component.
-
-	2.5 Feedback.  You have no obligation to give AMD any 
-suggestions, comments or other feedback ("Feedback") relating 
-to the Licensed Materials.  However, AMD may use and include 
-any Feedback that you voluntarily provide to improve the 
-Licensed Materials or other AMD products and technologies.  
-Accordingly, if you provide Feedback, you grant AMD and its 
-affiliates and subsidiaries a worldwide, non-exclusive, 
-irrevocable, royalty-free, perpetual license to use, reproduce, 
-license, sublicense, distribute, make, have made, sell and 
-otherwise commercialize the Feedback in the Licensed Materials 
-or other AMD technologies.  You further agree not to provide 
-any Feedback that (a) you know is subject to any patent, 
-copyright or other intellectual property claim or right of any 
-third party; or (b) is subject to a Free Software License.
-
-3 Ownership and Copyright Notices.  The Licensed Materials are 
-owned or licensed by AMD and are protected by United States and 
-foreign intellectual property laws and international treaty 
-provisions.  All title and copyrights in and to the Licensed 
-Materials, all copies thereof (in whole or in part, and in any 
-form), and all rights therein will remain vested in AMD.  
-Except as expressly provided herein, AMD does not grant any 
-express or implied right to you under AMD patents, copyrights, 
-trademarks, or trade secrets. You agree the Licensed Materials 
-are licensed, not sold by AMD.
-
-4 Support.  You will not be entitled to any support of any kind 
-from AMD or AMD's licensors.  Furthermore, you will be solely 
-responsible for providing support to your end users for the 
-Licensee Software distributed by you or your
-products.  AMD may, in its sole discretion, provide to you 
-updates to the Licensed Materials. 
-
-5 Warranty, Limitations of Liability and Indemnification.
-
-	5.1 THE LICENSED MATERIALS ARE PROVIDED "AS IS," WITH ALL 
-FAULTS, AND WITHOUT WARRANTY OF ANY KIND.  AMD DISCLAIMS ALL 
-WARRANTIES, EXPRESS, IMPLIED, OR STATUTORY, INCLUDING BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT.  AMD 
-DOES NOT WARRANT THAT THE LICENSED MATERIALS ARE ERROR FREE OR 
-THAT THE LICENSED MATERIALS WILL RUN CONTINUOUSLY.
-
-	5.2 AMD WILL NOT, UNDER ANY CIRCUMSTANCES, BE LIABLE TO 
-YOU FOR CONSEQUENTIAL, INCIDENTAL, PUNITIVE OR SPECIAL DAMAGES, 
-INCLUDING BUT NOT LIMITED TO, LOSS OF USE, DATA OR PROFITS, 
-ARISING FROM THIS AGREEMENT, EVEN IF AMD HAS BEEN APPRISED OF 
-THE LIKELIHOOD OF SUCH DAMAGES.  In no event will AMD's total 
-liability to you for all damages, losses, and causes of action 
-(whether in contract, tort (including negligence) or otherwise) 
-exceed the amount of $100 USD.
-
-	5.3 You agree to defend, indemnify and hold harmless AMD 
-and its licensors, and any of their directors, officers, 
-employees, affiliates or agents, from and against any and all 
-loss, damage, liability and other expenses (including 
-reasonable attorneys' fees), resulting from (a) your improper 
-use of the Licensed Materials or (b) use of Licensee Software.
-
-6 Termination.  Either party may terminate this Agreement upon 
-thirty (30) days prior written notice to the other party.  This 
-Agreement will terminate immediately without notice from AMD or 
-judicial resolution if you fail to comply
-with any provisions of this Agreement or upon AMD's written 
-request for return of the Licensed Materials.  Upon termination 
-of this Agreement, you will cease using the Licensed Materials. 
-Termination of this Agreement will have no effect on any sub-
-licenses properly granted by you to end users under Section 2, 
-which sub-licenses will survive in accordance with their terms.
-
-7 Survival.  Notwithstanding the foregoing, Sections 2.2, 2.3, 
-2.4, 2.5, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 and 13 will survive 
-any expiration or termination of this Agreement, until by their 
-own terms they are fulfilled.
-
-8 Export Restrictions.  You shall adhere to all applicable 
-U.S., European, and other export laws, including but not 
-limited to the U.S. Export Administration Regulations ("EAR"), 
-(15 C.F.R. Sections 730 through 774), and E.U. Council 
-Regulation (EC) No 428/2009 of 5 May 2009.  Further, pursuant 
-to Section 740.6 of the EAR, you hereby certify that, except 
-pursuant to a license granted by the United States Department 
-of Commerce Bureau of Industry and Security or as otherwise 
-permitted pursuant to a License Exception under the EAR, you 
-will not (1) export, re-export or release to a national of a 
-country in Country Groups D:1, E:1 or E:2 any restricted 
-technology, software, or source code you receive from AMD, or 
-(2) export to Country Groups D:1, E:1 or E:2 the direct product 
-of such technology or software, if such foreign produced direct 
-product is subject to national security controls as identified 
-on the Commerce Control List (currently found in Supplement 1 
-to Part 774 of EAR).  For the most current Country Group 
-listings, or for additional information about the EAR or your 
-obligations under those regulations, please refer to the U.S. 
-Bureau of Industry and Security's website at 
-http://www.bis.doc.gov/.
-
-9. U.S. Government Restricted Rights.  The Licensed Materials 
-are provided with "RESTRICTED RIGHTS."  Use, duplication or 
-disclosure by the Government is subject to restrictions as set 
-forth in FAR 52.227-14 and DFAR 252.227-7013, et seq., or its 
-successor.  Use of the Licensed Materials by the Government 
-constitutes acknowledgement of AMD's proprietary rights in 
-them.
-
-10. Governing Law.  This Agreement will be governed under the 
-laws of Texas, excluding the conflicts of law rules, and is 
-deemed to have been executed and performed in Austin, Texas.
-
-11.	Equitable Remedies.  You acknowledge that your breach of 
-this Agreement may cause irreparable damage to AMD and agree 
-that AMD shall be entitled to seek injunctive relief under this 
-Agreement, as well as such further relief as may be granted by 
-a court of competent jurisdiction.
-
-12. General.  You may not assign this Agreement.  Any attempted 
-assignment by you will be null and void. The parties do not 
-intend that any agency or partnership relationship be created 
-between them by this Agreement.  Each
-provision of this Agreement shall be interpreted in such a 
-manner as to be effective and valid under applicable law. 
-However, in the event that any provision of this Agreement 
-becomes or is declared unenforceable by any court of
-competent jurisdiction, such provision shall be deemed deleted 
-and the remainder of this Agreement shall remain in full force 
-and effect
-
-13. Entire Agreement.  This Agreement sets forth the entire 
-agreement and understanding between the parties and supersedes 
-and merges all prior and contemporaneous oral and/or written 
-agreements, discussions and
-understandings concerning the subject matter hereof.  This 
-Agreement may not be modified except by a written instrument 
-executed by the parties.  No waiver or modification of any 
-provision of this Agreement shall be binding unless made in 
-writing and signed by an authorized representative of each 
-party.
-
-If you agree to abide by the terms and conditions of this 
-Agreement, please press "Accept."  If you do not agree to abide 
-by the terms and conditions of this Agreement, press "Decline" 
-and you may not use or access the Licensed
-Materials.
-
-By clicking accept, you confirm that you are neither a resident 
-nor a national of Cuba, Iran, North Korea, the Sudan or Syria.

diff --git a/licenses/CeCILL-2.0 b/licenses/CeCILL-2.0
deleted file mode 100644
index 9061494b8..000000000
--- a/licenses/CeCILL-2.0
+++ /dev/null
@@ -1,505 +0,0 @@
-CeCILL FREE SOFTWARE LICENSE AGREEMENT
-
-
-    Notice
-
-This Agreement is a Free Software license agreement that is the result
-of discussions between its authors in order to ensure compliance with
-the two main principles guiding its drafting:
-
-    * firstly, compliance with the principles governing the distribution
-      of Free Software: access to source code, broad rights granted to
-      users,
-    * secondly, the election of a governing law, French law, with which
-      it is conformant, both as regards the law of torts and
-      intellectual property law, and the protection that it offers to
-      both authors and holders of the economic rights over software.
-
-The authors of the CeCILL (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
-license are:
-
-Commissariat  l'Energie Atomique - CEA, a public scientific, technical
-and industrial research establishment, having its principal place of
-business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
-
-Centre National de la Recherche Scientifique - CNRS, a public scientific
-and technological establishment, having its principal place of business
-at 3 rue Michel-Ange, 75794 Paris cedex 16, France.
-
-Institut National de Recherche en Informatique et en Automatique -
-INRIA, a public scientific and technological establishment, having its
-principal place of business at Domaine de Voluceau, Rocquencourt, BP
-105, 78153 Le Chesnay cedex, France.
-
-
-    Preamble
-
-The purpose of this Free Software license agreement is to grant users
-the right to modify and redistribute the software governed by this
-license within the framework of an open source distribution model.
-
-The exercising of these rights is conditional upon certain obligations
-for users so as to preserve this status for all subsequent redistributions.
-
-In consideration of access to the source code and the rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty and the software's author, the holder of the
-economic rights, and the successive licensors only have limited liability.
-
-In this respect, the risks associated with loading, using, modifying
-and/or developing or reproducing the software by the user are brought to
-the user's attention, given its Free Software status, which may make it
-complicated to use, with the result that its use is reserved for
-developers and experienced professionals having in-depth computer
-knowledge. Users are therefore encouraged to load and test the
-suitability of the software as regards their requirements in conditions
-enabling the security of their systems and/or data to be ensured and,
-more generally, to use and operate it in the same conditions of
-security. This Agreement may be freely reproduced and published,
-provided it is not altered, and that no provisions are either added or
-removed herefrom.
-
-This Agreement may apply to any or all software for which the holder of
-the economic rights decides to submit the use thereof to its provisions.
-
-
-    Article 1 - DEFINITIONS
-
-For the purpose of this Agreement, when the following expressions
-commence with a capital letter, they shall have the following meaning:
-
-Agreement: means this license agreement, and its possible subsequent
-versions and annexes.
-
-Software: means the software in its Object Code and/or Source Code form
-and, where applicable, its documentation, "as is" when the Licensee
-accepts the Agreement.
-
-Initial Software: means the Software in its Source Code and possibly its
-Object Code form and, where applicable, its documentation, "as is" when
-it is first distributed under the terms and conditions of the Agreement.
-
-Modified Software: means the Software modified by at least one
-Contribution.
-
-Source Code: means all the Software's instructions and program lines to
-which access is required so as to modify the Software.
-
-Object Code: means the binary files originating from the compilation of
-the Source Code.
-
-Holder: means the holder(s) of the economic rights over the Initial
-Software.
-
-Licensee: means the Software user(s) having accepted the Agreement.
-
-Contributor: means a Licensee having made at least one Contribution.
-
-Licensor: means the Holder, or any other individual or legal entity, who
-distributes the Software under the Agreement.
-
-Contribution: means any or all modifications, corrections, translations,
-adaptations and/or new functions integrated into the Software by any or
-all Contributors, as well as any or all Internal Modules.
-
-Module: means a set of sources files including their documentation that
-enables supplementary functions or services in addition to those offered
-by the Software.
-
-External Module: means any or all Modules, not derived from the
-Software, so that this Module and the Software run in separate address
-spaces, with one calling the other when they are run.
-
-Internal Module: means any or all Module, connected to the Software so
-that they both execute in the same address space.
-
-GNU GPL: means the GNU General Public License version 2 or any
-subsequent version, as published by the Free Software Foundation Inc.
-
-Parties: mean both the Licensee and the Licensor.
-
-These expressions may be used both in singular and plural form.
-
-
-    Article 2 - PURPOSE
-
-The purpose of the Agreement is the grant by the Licensor to the
-Licensee of a non-exclusive, transferable and worldwide license for the
-Software as set forth in Article 5 hereinafter for the whole term of the
-protection granted by the rights over said Software. 
-
-
-    Article 3 - ACCEPTANCE
-
-3.1 The Licensee shall be deemed as having accepted the terms and
-conditions of this Agreement upon the occurrence of the first of the
-following events:
-
-    * (i) loading the Software by any or all means, notably, by
-      downloading from a remote server, or by loading from a physical
-      medium;
-    * (ii) the first time the Licensee exercises any of the rights
-      granted hereunder.
-
-3.2 One copy of the Agreement, containing a notice relating to the
-characteristics of the Software, to the limited warranty, and to the
-fact that its use is restricted to experienced users has been provided
-to the Licensee prior to its acceptance as set forth in Article 3.1
-hereinabove, and the Licensee hereby acknowledges that it has read and
-understood it.
-
-
-    Article 4 - EFFECTIVE DATE AND TERM
-
-
-      4.1 EFFECTIVE DATE
-
-The Agreement shall become effective on the date when it is accepted by
-the Licensee as set forth in Article 3.1.
-
-
-      4.2 TERM
-
-The Agreement shall remain in force for the entire legal term of
-protection of the economic rights over the Software.
-
-
-    Article 5 - SCOPE OF RIGHTS GRANTED
-
-The Licensor hereby grants to the Licensee, who accepts, the following
-rights over the Software for any or all use, and for the term of the
-Agreement, on the basis of the terms and conditions set forth hereinafter.
-
-Besides, if the Licensor owns or comes to own one or more patents
-protecting all or part of the functions of the Software or of its
-components, the Licensor undertakes not to enforce the rights granted by
-these patents against successive Licensees using, exploiting or
-modifying the Software. If these patents are transferred, the Licensor
-undertakes to have the transferees subscribe to the obligations set
-forth in this paragraph.
-
-
-      5.1 RIGHT OF USE
-
-The Licensee is authorized to use the Software, without any limitation
-as to its fields of application, with it being hereinafter specified
-that this comprises:
-
-   1. permanent or temporary reproduction of all or part of the Software
-      by any or all means and in any or all form.
-
-   2. loading, displaying, running, or storing the Software on any or
-      all medium.
-
-   3. entitlement to observe, study or test its operation so as to
-      determine the ideas and principles behind any or all constituent
-      elements of said Software. This shall apply when the Licensee
-      carries out any or all loading, displaying, running, transmission
-      or storage operation as regards the Software, that it is entitled
-      to carry out hereunder.
-
-
-      5.2 ENTITLEMENT TO MAKE CONTRIBUTIONS
-
-The right to make Contributions includes the right to translate, adapt,
-arrange, or make any or all modifications to the Software, and the right
-to reproduce the resulting software.
-
-The Licensee is authorized to make any or all Contributions to the
-Software provided that it includes an explicit notice that it is the
-author of said Contribution and indicates the date of the creation thereof.
-
-
-      5.3 RIGHT OF DISTRIBUTION
-
-In particular, the right of distribution includes the right to publish,
-transmit and communicate the Software to the general public on any or
-all medium, and by any or all means, and the right to market, either in
-consideration of a fee, or free of charge, one or more copies of the
-Software by any means.
-
-The Licensee is further authorized to distribute copies of the modified
-or unmodified Software to third parties according to the terms and
-conditions set forth hereinafter.
-
-
-        5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
-
-The Licensee is authorized to distribute true copies of the Software in
-Source Code or Object Code form, provided that said distribution
-complies with all the provisions of the Agreement and is accompanied by:
-
-   1. a copy of the Agreement,
-
-   2. a notice relating to the limitation of both the Licensor's
-      warranty and liability as set forth in Articles 8 and 9,
-
-and that, in the event that only the Object Code of the Software is
-redistributed, the Licensee allows future Licensees unhindered access to
-the full Source Code of the Software by indicating how to access it, it
-being understood that the additional cost of acquiring the Source Code
-shall not exceed the cost of transferring the data.
-
-
-        5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE
-
-When the Licensee makes a Contribution to the Software, the terms and
-conditions for the distribution of the resulting Modified Software
-become subject to all the provisions of this Agreement.
-
-The Licensee is authorized to distribute the Modified Software, in
-source code or object code form, provided that said distribution
-complies with all the provisions of the Agreement and is accompanied by:
-
-   1. a copy of the Agreement,
-
-   2. a notice relating to the limitation of both the Licensor's
-      warranty and liability as set forth in Articles 8 and 9,
-
-and that, in the event that only the object code of the Modified
-Software is redistributed, the Licensee allows future Licensees
-unhindered access to the full source code of the Modified Software by
-indicating how to access it, it being understood that the additional
-cost of acquiring the source code shall not exceed the cost of
-transferring the data.
-
-
-        5.3.3 DISTRIBUTION OF EXTERNAL MODULES
-
-When the Licensee has developed an External Module, the terms and
-conditions of this Agreement do not apply to said External Module, that
-may be distributed under a separate license agreement.
-
-
-        5.3.4 COMPATIBILITY WITH THE GNU GPL
-
-The Licensee can include a code that is subject to the provisions of one
-of the versions of the GNU GPL in the Modified or unmodified Software,
-and distribute that entire code under the terms of the same version of
-the GNU GPL.
-
-The Licensee can include the Modified or unmodified Software in a code
-that is subject to the provisions of one of the versions of the GNU GPL,
-and distribute that entire code under the terms of the same version of
-the GNU GPL.
-
-
-    Article 6 - INTELLECTUAL PROPERTY
-
-
-      6.1 OVER THE INITIAL SOFTWARE
-
-The Holder owns the economic rights over the Initial Software. Any or
-all use of the Initial Software is subject to compliance with the terms
-and conditions under which the Holder has elected to distribute its work
-and no one shall be entitled to modify the terms and conditions for the
-distribution of said Initial Software.
-
-The Holder undertakes that the Initial Software will remain ruled at
-least by this Agreement, for the duration set forth in Article 4.2.
-
-
-      6.2 OVER THE CONTRIBUTIONS
-
-The Licensee who develops a Contribution is the owner of the
-intellectual property rights over this Contribution as defined by
-applicable law.
-
-
-      6.3 OVER THE EXTERNAL MODULES
-
-The Licensee who develops an External Module is the owner of the
-intellectual property rights over this External Module as defined by
-applicable law and is free to choose the type of agreement that shall
-govern its distribution.
-
-
-      6.4 JOINT PROVISIONS
-
-The Licensee expressly undertakes:
-
-   1. not to remove, or modify, in any manner, the intellectual property
-      notices attached to the Software;
-
-   2. to reproduce said notices, in an identical manner, in the copies
-      of the Software modified or not.
-
-The Licensee undertakes not to directly or indirectly infringe the
-intellectual property rights of the Holder and/or Contributors on the
-Software and to take, where applicable, vis--vis its staff, any and all
-measures required to ensure respect of said intellectual property rights
-of the Holder and/or Contributors.
-
-
-    Article 7 - RELATED SERVICES
-
-7.1 Under no circumstances shall the Agreement oblige the Licensor to
-provide technical assistance or maintenance services for the Software.
-
-However, the Licensor is entitled to offer this type of services. The
-terms and conditions of such technical assistance, and/or such
-maintenance, shall be set forth in a separate instrument. Only the
-Licensor offering said maintenance and/or technical assistance services
-shall incur liability therefor.
-
-7.2 Similarly, any Licensor is entitled to offer to its licensees, under
-its sole responsibility, a warranty, that shall only be binding upon
-itself, for the redistribution of the Software and/or the Modified
-Software, under terms and conditions that it is free to decide. Said
-warranty, and the financial terms and conditions of its application,
-shall be subject of a separate instrument executed between the Licensor
-and the Licensee.
-
-
-    Article 8 - LIABILITY
-
-8.1 Subject to the provisions of Article 8.2, the Licensee shall be
-entitled to claim compensation for any direct loss it may have suffered
-from the Software as a result of a fault on the part of the relevant
-Licensor, subject to providing evidence thereof.
-
-8.2 The Licensor's liability is limited to the commitments made under
-this Agreement and shall not be incurred as a result of in particular:
-(i) loss due the Licensee's total or partial failure to fulfill its
-obligations, (ii) direct or consequential loss that is suffered by the
-Licensee due to the use or performance of the Software, and (iii) more
-generally, any consequential loss. In particular the Parties expressly
-agree that any or all pecuniary or business loss (i.e. loss of data,
-loss of profits, operating loss, loss of customers or orders,
-opportunity cost, any disturbance to business activities) or any or all
-legal proceedings instituted against the Licensee by a third party,
-shall constitute consequential loss and shall not provide entitlement to
-any or all compensation from the Licensor.
-
-
-    Article 9 - WARRANTY
-
-9.1 The Licensee acknowledges that the scientific and technical
-state-of-the-art when the Software was distributed did not enable all
-possible uses to be tested and verified, nor for the presence of
-possible defects to be detected. In this respect, the Licensee's
-attention has been drawn to the risks associated with loading, using,
-modifying and/or developing and reproducing the Software which are
-reserved for experienced users.
-
-The Licensee shall be responsible for verifying, by any or all means,
-the suitability of the product for its requirements, its good working
-order, and for ensuring that it shall not cause damage to either persons
-or properties.
-
-9.2 The Licensor hereby represents, in good faith, that it is entitled
-to grant all the rights over the Software (including in particular the
-rights set forth in Article 5).
-
-9.3 The Licensee acknowledges that the Software is supplied "as is" by
-the Licensor without any other express or tacit warranty, other than
-that provided for in Article 9.2 and, in particular, without any warranty 
-as to its commercial value, its secured, safe, innovative or relevant
-nature.
-
-Specifically, the Licensor does not warrant that the Software is free
-from any error, that it will operate without interruption, that it will
-be compatible with the Licensee's own equipment and software
-configuration, nor that it will meet the Licensee's requirements.
-
-9.4 The Licensor does not either expressly or tacitly warrant that the
-Software does not infringe any third party intellectual property right
-relating to a patent, software or any other property right. Therefore,
-the Licensor disclaims any and all liability towards the Licensee
-arising out of any or all proceedings for infringement that may be
-instituted in respect of the use, modification and redistribution of the
-Software. Nevertheless, should such proceedings be instituted against
-the Licensee, the Licensor shall provide it with technical and legal
-assistance for its defense. Such technical and legal assistance shall be
-decided on a case-by-case basis between the relevant Licensor and the
-Licensee pursuant to a memorandum of understanding. The Licensor
-disclaims any and all liability as regards the Licensee's use of the
-name of the Software. No warranty is given as regards the existence of
-prior rights over the name of the Software or as regards the existence
-of a trademark.
-
-
-    Article 10 - TERMINATION
-
-10.1 In the event of a breach by the Licensee of its obligations
-hereunder, the Licensor may automatically terminate this Agreement
-thirty (30) days after notice has been sent to the Licensee and has
-remained ineffective.
-
-10.2 A Licensee whose Agreement is terminated shall no longer be
-authorized to use, modify or distribute the Software. However, any
-licenses that it may have granted prior to termination of the Agreement
-shall remain valid subject to their having been granted in compliance
-with the terms and conditions hereof.
-
-
-    Article 11 - MISCELLANEOUS
-
-
-      11.1 EXCUSABLE EVENTS
-
-Neither Party shall be liable for any or all delay, or failure to
-perform the Agreement, that may be attributable to an event of force
-majeure, an act of God or an outside cause, such as defective
-functioning or interruptions of the electricity or telecommunications
-networks, network paralysis following a virus attack, intervention by
-government authorities, natural disasters, water damage, earthquakes,
-fire, explosions, strikes and labor unrest, war, etc.
-
-11.2 Any failure by either Party, on one or more occasions, to invoke
-one or more of the provisions hereof, shall under no circumstances be
-interpreted as being a waiver by the interested Party of its right to
-invoke said provision(s) subsequently.
-
-11.3 The Agreement cancels and replaces any or all previous agreements,
-whether written or oral, between the Parties and having the same
-purpose, and constitutes the entirety of the agreement between said
-Parties concerning said purpose. No supplement or modification to the
-terms and conditions hereof shall be effective as between the Parties
-unless it is made in writing and signed by their duly authorized
-representatives.
-
-11.4 In the event that one or more of the provisions hereof were to
-conflict with a current or future applicable act or legislative text,
-said act or legislative text shall prevail, and the Parties shall make
-the necessary amendments so as to comply with said act or legislative
-text. All other provisions shall remain effective. Similarly, invalidity
-of a provision of the Agreement, for any reason whatsoever, shall not
-cause the Agreement as a whole to be invalid.
-
-
-      11.5 LANGUAGE
-
-The Agreement is drafted in both French and English and both versions
-are deemed authentic.
-
-
-    Article 12 - NEW VERSIONS OF THE AGREEMENT
-
-12.1 Any person is authorized to duplicate and distribute copies of this
-Agreement.
-
-12.2 So as to ensure coherence, the wording of this Agreement is
-protected and may only be modified by the authors of the License, who
-reserve the right to periodically publish updates or new versions of the
-Agreement, each with a separate number. These subsequent versions may
-address new issues encountered by Free Software.
-
-12.3 Any Software distributed under a given version of the Agreement may
-only be subsequently distributed under the same version of the Agreement
-or a subsequent version, subject to the provisions of Article 5.3.4.
-
-
-    Article 13 - GOVERNING LAW AND JURISDICTION
-
-13.1 The Agreement is governed by French law. The Parties agree to
-endeavor to seek an amicable solution to any disagreements or disputes
-that may arise during the performance of the Agreement.
-
-13.2 Failing an amicable solution within two (2) months as from their
-occurrence, and unless emergency proceedings are necessary, the
-disagreements or disputes shall be referred to the Paris Courts having
-jurisdiction, by the more diligent Party.
-
-
-Version 2.0 dated 2006-09-05.

diff --git a/licenses/CeCILL-B b/licenses/CeCILL-B
deleted file mode 100644
index 3ad4deaa3..000000000
--- a/licenses/CeCILL-B
+++ /dev/null
@@ -1,515 +0,0 @@
-
-CeCILL-B FREE SOFTWARE LICENSE AGREEMENT
-
-
-    Notice
-
-This Agreement is a Free Software license agreement that is the result
-of discussions between its authors in order to ensure compliance with
-the two main principles guiding its drafting:
-
-    * firstly, compliance with the principles governing the distribution
-      of Free Software: access to source code, broad rights granted to
-      users,
-    * secondly, the election of a governing law, French law, with which
-      it is conformant, both as regards the law of torts and
-      intellectual property law, and the protection that it offers to
-      both authors and holders of the economic rights over software.
-
-The authors of the CeCILL-B (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
-license are: 
-
-Commissariat à l'Energie Atomique - CEA, a public scientific, technical
-and industrial research establishment, having its principal place of
-business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
-
-Centre National de la Recherche Scientifique - CNRS, a public scientific
-and technological establishment, having its principal place of business
-at 3 rue Michel-Ange, 75794 Paris cedex 16, France.
-
-Institut National de Recherche en Informatique et en Automatique -
-INRIA, a public scientific and technological establishment, having its
-principal place of business at Domaine de Voluceau, Rocquencourt, BP
-105, 78153 Le Chesnay cedex, France.
-
-
-    Preamble
-
-This Agreement is an open source software license intended to give users
-significant freedom to modify and redistribute the software licensed
-hereunder.
-
-The exercising of this freedom is conditional upon a strong obligation
-of giving credits for everybody that distributes a software
-incorporating a software ruled by the current license so as all
-contributions to be properly identified and acknowledged.
-
-In consideration of access to the source code and the rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty and the software's author, the holder of the
-economic rights, and the successive licensors only have limited liability.
-
-In this respect, the risks associated with loading, using, modifying
-and/or developing or reproducing the software by the user are brought to
-the user's attention, given its Free Software status, which may make it
-complicated to use, with the result that its use is reserved for
-developers and experienced professionals having in-depth computer
-knowledge. Users are therefore encouraged to load and test the
-suitability of the software as regards their requirements in conditions
-enabling the security of their systems and/or data to be ensured and,
-more generally, to use and operate it in the same conditions of
-security. This Agreement may be freely reproduced and published,
-provided it is not altered, and that no provisions are either added or
-removed herefrom.
-
-This Agreement may apply to any or all software for which the holder of
-the economic rights decides to submit the use thereof to its provisions.
-
-
-    Article 1 - DEFINITIONS
-
-For the purpose of this Agreement, when the following expressions
-commence with a capital letter, they shall have the following meaning:
-
-Agreement: means this license agreement, and its possible subsequent
-versions and annexes.
-
-Software: means the software in its Object Code and/or Source Code form
-and, where applicable, its documentation, "as is" when the Licensee
-accepts the Agreement.
-
-Initial Software: means the Software in its Source Code and possibly its
-Object Code form and, where applicable, its documentation, "as is" when
-it is first distributed under the terms and conditions of the Agreement.
-
-Modified Software: means the Software modified by at least one
-Contribution.
-
-Source Code: means all the Software's instructions and program lines to
-which access is required so as to modify the Software.
-
-Object Code: means the binary files originating from the compilation of
-the Source Code.
-
-Holder: means the holder(s) of the economic rights over the Initial
-Software.
-
-Licensee: means the Software user(s) having accepted the Agreement.
-
-Contributor: means a Licensee having made at least one Contribution.
-
-Licensor: means the Holder, or any other individual or legal entity, who
-distributes the Software under the Agreement.
-
-Contribution: means any or all modifications, corrections, translations,
-adaptations and/or new functions integrated into the Software by any or
-all Contributors, as well as any or all Internal Modules.
-
-Module: means a set of sources files including their documentation that
-enables supplementary functions or services in addition to those offered
-by the Software.
-
-External Module: means any or all Modules, not derived from the
-Software, so that this Module and the Software run in separate address
-spaces, with one calling the other when they are run.
-
-Internal Module: means any or all Module, connected to the Software so
-that they both execute in the same address space.
-
-Parties: mean both the Licensee and the Licensor.
-
-These expressions may be used both in singular and plural form.
-
-
-    Article 2 - PURPOSE
-
-The purpose of the Agreement is the grant by the Licensor to the
-Licensee of a non-exclusive, transferable and worldwide license for the
-Software as set forth in Article 5 hereinafter for the whole term of the
-protection granted by the rights over said Software.
-
-
-    Article 3 - ACCEPTANCE
-
-3.1 The Licensee shall be deemed as having accepted the terms and
-conditions of this Agreement upon the occurrence of the first of the
-following events:
-
-    * (i) loading the Software by any or all means, notably, by
-      downloading from a remote server, or by loading from a physical
-      medium;
-    * (ii) the first time the Licensee exercises any of the rights
-      granted hereunder.
-
-3.2 One copy of the Agreement, containing a notice relating to the
-characteristics of the Software, to the limited warranty, and to the
-fact that its use is restricted to experienced users has been provided
-to the Licensee prior to its acceptance as set forth in Article 3.1
-hereinabove, and the Licensee hereby acknowledges that it has read and
-understood it.
-
-
-    Article 4 - EFFECTIVE DATE AND TERM
-
-
-      4.1 EFFECTIVE DATE
-
-The Agreement shall become effective on the date when it is accepted by
-the Licensee as set forth in Article 3.1.
-
-
-      4.2 TERM
-
-The Agreement shall remain in force for the entire legal term of
-protection of the economic rights over the Software.
-
-
-    Article 5 - SCOPE OF RIGHTS GRANTED
-
-The Licensor hereby grants to the Licensee, who accepts, the following
-rights over the Software for any or all use, and for the term of the
-Agreement, on the basis of the terms and conditions set forth hereinafter.
-
-Besides, if the Licensor owns or comes to own one or more patents
-protecting all or part of the functions of the Software or of its
-components, the Licensor undertakes not to enforce the rights granted by
-these patents against successive Licensees using, exploiting or
-modifying the Software. If these patents are transferred, the Licensor
-undertakes to have the transferees subscribe to the obligations set
-forth in this paragraph.
-
-
-      5.1 RIGHT OF USE
-
-The Licensee is authorized to use the Software, without any limitation
-as to its fields of application, with it being hereinafter specified
-that this comprises:
-
-   1. permanent or temporary reproduction of all or part of the Software
-      by any or all means and in any or all form.
-
-   2. loading, displaying, running, or storing the Software on any or
-      all medium.
-
-   3. entitlement to observe, study or test its operation so as to
-      determine the ideas and principles behind any or all constituent
-      elements of said Software. This shall apply when the Licensee
-      carries out any or all loading, displaying, running, transmission
-      or storage operation as regards the Software, that it is entitled
-      to carry out hereunder.
-
-
-      5.2 ENTITLEMENT TO MAKE CONTRIBUTIONS
-
-The right to make Contributions includes the right to translate, adapt,
-arrange, or make any or all modifications to the Software, and the right
-to reproduce the resulting software.
-
-The Licensee is authorized to make any or all Contributions to the
-Software provided that it includes an explicit notice that it is the
-author of said Contribution and indicates the date of the creation thereof.
-
-
-      5.3 RIGHT OF DISTRIBUTION
-
-In particular, the right of distribution includes the right to publish,
-transmit and communicate the Software to the general public on any or
-all medium, and by any or all means, and the right to market, either in
-consideration of a fee, or free of charge, one or more copies of the
-Software by any means.
-
-The Licensee is further authorized to distribute copies of the modified
-or unmodified Software to third parties according to the terms and
-conditions set forth hereinafter.
-
-
-        5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
-
-The Licensee is authorized to distribute true copies of the Software in
-Source Code or Object Code form, provided that said distribution
-complies with all the provisions of the Agreement and is accompanied by:
-
-   1. a copy of the Agreement,
-
-   2. a notice relating to the limitation of both the Licensor's
-      warranty and liability as set forth in Articles 8 and 9,
-
-and that, in the event that only the Object Code of the Software is
-redistributed, the Licensee allows effective access to the full Source
-Code of the Software at a minimum during the entire period of its
-distribution of the Software, it being understood that the additional
-cost of acquiring the Source Code shall not exceed the cost of
-transferring the data.
-
-
-        5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE
-
-If the Licensee makes any Contribution to the Software, the resulting
-Modified Software may be distributed under a license agreement other
-than this Agreement subject to compliance with the provisions of Article
-5.3.4.
-
-
-        5.3.3 DISTRIBUTION OF EXTERNAL MODULES
-
-When the Licensee has developed an External Module, the terms and
-conditions of this Agreement do not apply to said External Module, that
-may be distributed under a separate license agreement.
-
-
-        5.3.4 CREDITS
-
-Any Licensee who may distribute a Modified Software hereby expressly
-agrees to:
-
-   1. indicate in the related documentation that it is based on the
-      Software licensed hereunder, and reproduce the intellectual
-      property notice for the Software,
-
-   2. ensure that written indications of the Software intended use,
-      intellectual property notice and license hereunder are included in
-      easily accessible format from the Modified Software interface,
-
-   3. mention, on a freely accessible website describing the Modified
-      Software, at least throughout the distribution term thereof, that
-      it is based on the Software licensed hereunder, and reproduce the
-      Software intellectual property notice,
-
-   4. where it is distributed to a third party that may distribute a
-      Modified Software without having to make its source code
-      available, make its best efforts to ensure that said third party
-      agrees to comply with the obligations set forth in this Article .
-
-If the Software, whether or not modified, is distributed with an
-External Module designed for use in connection with the Software, the
-Licensee shall submit said External Module to the foregoing obligations.
-
-
-        5.3.5 COMPATIBILITY WITH THE CeCILL AND CeCILL-C LICENSES
-
-Where a Modified Software contains a Contribution subject to the CeCILL
-license, the provisions set forth in Article 5.3.4 shall be optional.
-
-A Modified Software may be distributed under the CeCILL-C license. In
-such a case the provisions set forth in Article 5.3.4 shall be optional.
-
-
-    Article 6 - INTELLECTUAL PROPERTY
-
-
-      6.1 OVER THE INITIAL SOFTWARE
-
-The Holder owns the economic rights over the Initial Software. Any or
-all use of the Initial Software is subject to compliance with the terms
-and conditions under which the Holder has elected to distribute its work
-and no one shall be entitled to modify the terms and conditions for the
-distribution of said Initial Software.
-
-The Holder undertakes that the Initial Software will remain ruled at
-least by this Agreement, for the duration set forth in Article 4.2.
-
-
-      6.2 OVER THE CONTRIBUTIONS
-
-The Licensee who develops a Contribution is the owner of the
-intellectual property rights over this Contribution as defined by
-applicable law.
-
-
-      6.3 OVER THE EXTERNAL MODULES
-
-The Licensee who develops an External Module is the owner of the
-intellectual property rights over this External Module as defined by
-applicable law and is free to choose the type of agreement that shall
-govern its distribution.
-
-
-      6.4 JOINT PROVISIONS
-
-The Licensee expressly undertakes:
-
-   1. not to remove, or modify, in any manner, the intellectual property
-      notices attached to the Software;
-
-   2. to reproduce said notices, in an identical manner, in the copies
-      of the Software modified or not.
-
-The Licensee undertakes not to directly or indirectly infringe the
-intellectual property rights of the Holder and/or Contributors on the
-Software and to take, where applicable, vis-à-vis its staff, any and all
-measures required to ensure respect of said intellectual property rights
-of the Holder and/or Contributors.
-
-
-    Article 7 - RELATED SERVICES
-
-7.1 Under no circumstances shall the Agreement oblige the Licensor to
-provide technical assistance or maintenance services for the Software.
-
-However, the Licensor is entitled to offer this type of services. The
-terms and conditions of such technical assistance, and/or such
-maintenance, shall be set forth in a separate instrument. Only the
-Licensor offering said maintenance and/or technical assistance services
-shall incur liability therefor.
-
-7.2 Similarly, any Licensor is entitled to offer to its licensees, under
-its sole responsibility, a warranty, that shall only be binding upon
-itself, for the redistribution of the Software and/or the Modified
-Software, under terms and conditions that it is free to decide. Said
-warranty, and the financial terms and conditions of its application,
-shall be subject of a separate instrument executed between the Licensor
-and the Licensee.
-
-
-    Article 8 - LIABILITY
-
-8.1 Subject to the provisions of Article 8.2, the Licensee shall be
-entitled to claim compensation for any direct loss it may have suffered
-from the Software as a result of a fault on the part of the relevant
-Licensor, subject to providing evidence thereof.
-
-8.2 The Licensor's liability is limited to the commitments made under
-this Agreement and shall not be incurred as a result of in particular:
-(i) loss due the Licensee's total or partial failure to fulfill its
-obligations, (ii) direct or consequential loss that is suffered by the
-Licensee due to the use or performance of the Software, and (iii) more
-generally, any consequential loss. In particular the Parties expressly
-agree that any or all pecuniary or business loss (i.e. loss of data,
-loss of profits, operating loss, loss of customers or orders,
-opportunity cost, any disturbance to business activities) or any or all
-legal proceedings instituted against the Licensee by a third party,
-shall constitute consequential loss and shall not provide entitlement to
-any or all compensation from the Licensor.
-
-
-    Article 9 - WARRANTY
-
-9.1 The Licensee acknowledges that the scientific and technical
-state-of-the-art when the Software was distributed did not enable all
-possible uses to be tested and verified, nor for the presence of
-possible defects to be detected. In this respect, the Licensee's
-attention has been drawn to the risks associated with loading, using,
-modifying and/or developing and reproducing the Software which are
-reserved for experienced users.
-
-The Licensee shall be responsible for verifying, by any or all means,
-the suitability of the product for its requirements, its good working
-order, and for ensuring that it shall not cause damage to either persons
-or properties.
-
-9.2 The Licensor hereby represents, in good faith, that it is entitled
-to grant all the rights over the Software (including in particular the
-rights set forth in Article 5).
-
-9.3 The Licensee acknowledges that the Software is supplied "as is" by
-the Licensor without any other express or tacit warranty, other than
-that provided for in Article 9.2 and, in particular, without any warranty 
-as to its commercial value, its secured, safe, innovative or relevant 
-nature.
-
-Specifically, the Licensor does not warrant that the Software is free
-from any error, that it will operate without interruption, that it will
-be compatible with the Licensee's own equipment and software
-configuration, nor that it will meet the Licensee's requirements.
-
-9.4 The Licensor does not either expressly or tacitly warrant that the
-Software does not infringe any third party intellectual property right
-relating to a patent, software or any other property right. Therefore,
-the Licensor disclaims any and all liability towards the Licensee
-arising out of any or all proceedings for infringement that may be
-instituted in respect of the use, modification and redistribution of the
-Software. Nevertheless, should such proceedings be instituted against
-the Licensee, the Licensor shall provide it with technical and legal
-assistance for its defense. Such technical and legal assistance shall be
-decided on a case-by-case basis between the relevant Licensor and the
-Licensee pursuant to a memorandum of understanding. The Licensor
-disclaims any and all liability as regards the Licensee's use of the
-name of the Software. No warranty is given as regards the existence of
-prior rights over the name of the Software or as regards the existence
-of a trademark.
-
-
-    Article 10 - TERMINATION
-
-10.1 In the event of a breach by the Licensee of its obligations
-hereunder, the Licensor may automatically terminate this Agreement
-thirty (30) days after notice has been sent to the Licensee and has
-remained ineffective.
-
-10.2 A Licensee whose Agreement is terminated shall no longer be
-authorized to use, modify or distribute the Software. However, any
-licenses that it may have granted prior to termination of the Agreement
-shall remain valid subject to their having been granted in compliance
-with the terms and conditions hereof.
-
-
-    Article 11 - MISCELLANEOUS
-
-
-      11.1 EXCUSABLE EVENTS
-
-Neither Party shall be liable for any or all delay, or failure to
-perform the Agreement, that may be attributable to an event of force
-majeure, an act of God or an outside cause, such as defective
-functioning or interruptions of the electricity or telecommunications
-networks, network paralysis following a virus attack, intervention by
-government authorities, natural disasters, water damage, earthquakes,
-fire, explosions, strikes and labor unrest, war, etc.
-
-11.2 Any failure by either Party, on one or more occasions, to invoke
-one or more of the provisions hereof, shall under no circumstances be
-interpreted as being a waiver by the interested Party of its right to
-invoke said provision(s) subsequently.
-
-11.3 The Agreement cancels and replaces any or all previous agreements,
-whether written or oral, between the Parties and having the same
-purpose, and constitutes the entirety of the agreement between said
-Parties concerning said purpose. No supplement or modification to the
-terms and conditions hereof shall be effective as between the Parties
-unless it is made in writing and signed by their duly authorized
-representatives.
-
-11.4 In the event that one or more of the provisions hereof were to
-conflict with a current or future applicable act or legislative text,
-said act or legislative text shall prevail, and the Parties shall make
-the necessary amendments so as to comply with said act or legislative
-text. All other provisions shall remain effective. Similarly, invalidity
-of a provision of the Agreement, for any reason whatsoever, shall not
-cause the Agreement as a whole to be invalid.
-
-
-      11.5 LANGUAGE
-
-The Agreement is drafted in both French and English and both versions
-are deemed authentic.
-
-
-    Article 12 - NEW VERSIONS OF THE AGREEMENT
-
-12.1 Any person is authorized to duplicate and distribute copies of this
-Agreement.
-
-12.2 So as to ensure coherence, the wording of this Agreement is
-protected and may only be modified by the authors of the License, who
-reserve the right to periodically publish updates or new versions of the
-Agreement, each with a separate number. These subsequent versions may
-address new issues encountered by Free Software.
-
-12.3 Any Software distributed under a given version of the Agreement may
-only be subsequently distributed under the same version of the Agreement
-or a subsequent version.
-
-
-    Article 13 - GOVERNING LAW AND JURISDICTION
-
-13.1 The Agreement is governed by French law. The Parties agree to
-endeavor to seek an amicable solution to any disagreements or disputes
-that may arise during the performance of the Agreement.
-
-13.2 Failing an amicable solution within two (2) months as from their
-occurrence, and unless emergency proceedings are necessary, the
-disagreements or disputes shall be referred to the Paris Courts having
-jurisdiction, by the more diligent Party.
-
-
-Version 1.0 dated 2006-09-05.

diff --git a/licenses/ECL-2.0 b/licenses/ECL-2.0
deleted file mode 100644
index 012da6c80..000000000
--- a/licenses/ECL-2.0
+++ /dev/null
@@ -1,97 +0,0 @@
-Educational Community License, Version 2.0 (ECL-2.0)
-(plain text)
-Educational Community License
-
-Version 2.0, April 2007
-
-http://www.osedu.org/licenses/
-
-The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. The original Apache 2.0 license can be found at: http://www.apache.org/licenses/LICENSE-2.0
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. Any patent license granted hereby with respect to contributions by an individu
 al employed by an institution or organization is limited to patent claims where the individual that is the author of the Work is also the inventor of the patent claims licensed, and where the organization or institution has the right to grant such license under applicable grant and research funding agreements. No other express or implied licenses are granted.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Educational Community License to your work
-
-To apply the Educational Community License to your work, attach
-the following boilerplate notice, with the fields enclosed by
-brackets "[]" replaced with your own identifying information.
-(Don't include the brackets!) The text should be enclosed in the
-appropriate comment syntax for the file format. We also recommend
-that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier
-identification within third-party archives.
-
-	Copyright [yyyy] [name of copyright owner] Licensed under the
-	Educational Community License, Version 2.0 (the "License"); you may
-	not use this file except in compliance with the License. You may
-	obtain a copy of the License at
-
-http://www.osedu.org/licenses/ECL-2.0
-
-	Unless required by applicable law or agreed to in writing,
-	software distributed under the License is distributed on an "AS IS"
-	BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-	or implied. See the License for the specific language governing
-	permissions and limitations under the License.
\ No newline at end of file

diff --git a/licenses/Intel-SDP b/licenses/Intel-SDP
deleted file mode 100644
index be409eb57..000000000
--- a/licenses/Intel-SDP
+++ /dev/null
@@ -1,369 +0,0 @@
-IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING.
-Do not copy, install, or use the Materials provided under this license agreement
-("Agreement"), until you have carefully read the following terms and conditions.
-
-By copying, installing, or otherwise using the Materials, you agree to be bound 
-by the terms of this Agreement. If you do not agree to the terms of this 
-Agreement, do not copy, install, or use the Materials.
-
-End User License Agreement for the Intel(R) Software Development Products
-
-1.	LICENSE DEFINITIONS: 
-
-A.	"Materials" are defined as the software, documentation, license key codes 
-and other materials, including any updates and upgrade thereto, that are 
-provided to you under this Agreement. Materials also include the 
-Redistributables, Cluster OpenMP Library, and Sample Source as defined below.
-
-B.	"Redistributables" are the files listed in the following text files that 
-may be included in the Materials for the applicable Intel Software Development 
-Product: clredist.txt, credist.txt, fredist.txt, redist.txt.
-
-C.	"Cluster OpenMP Library", is comprised of the files listed in the 
-"clredist.txt" file specified above, is the Intel(R) Cluster OpenMP* Library 
-add-on option to the Intel(R) C++ Compiler for Linux* and Intel(R) Fortran 
-Compiler for Linux* products ("Intel Compiler for Linux"). The use of the 
-Cluster OpenMP Library is conditioned on having a valid license from Intel for
-the Cluster OpenMP Library and for either Intel Compiler for Linux, and further
-is governed by the terms and conditions of the license agreement for applicable
-the Intel Compiler for Linux.
-
-D.	"Source Code" is defined as the Materials provided in human readable 
-format, whether unmodified or modified by you.
-
-E.	"Sample Source" is the Source Code file(s) that: (i) demonstrate certain 
-limited functions included in the binary libraries of the Intel(R) Integrated 
-Performance Primitives ("Intel(R) IPPs"); (ii) are identified as Intel IPP 
-sample source code; (iii) are obtained separately from Intel after you register 
-your copy of the Intel Integrated Performance Primitives product with Intel; 
-and (iv) are subject to all of the terms and conditions of this Agreement.
-
-F.	"Microsoft Platforms" means any current and future Microsoft operating 
-system products, Microsoft run-time technologies (such as the .NET Framework), 
-and Microsoft application platforms (such as Microsoft Office or Microsoft 
-Dynamics) that Microsoft offers.
-
-2.	LICENSE GRANT:
-
-A.	Subject to all of the terms and conditions of this Agreement, Intel 
-Corporation ("Intel") grants to you a non-exclusive, non-assignable, copyright 
-license to use the Materials. 
-
-B.	Subject to all of the terms and conditions of this Agreement, Intel 
-grants to you a non-exclusive, non-assignable copyright license to modify the 
-Materials, or any portions thereof, that are (i) provided in Source Code form or
-,(ii) are defined as Redistributables and are provided in text form.
-
-C.	Subject to all of the terms and conditions of this Agreement and any 
-specific restrictions which may appear in the Redistributables text files, Intel
-grants to you a non-exclusive, non-assignable, fully-paid copyright license to 
-distribute (except if you received the Materials under an Evaluation License as
-specified below) the Redistributables, including any modifications pursuant to 
-Section 2.B, or any portions thereof, as part of the product or application you 
-developed using the Materials. If such application is a software development 
-library, then attribution, as specified in the product release notes of the 
-corresponding Materials, shall be displayed prominently in that application's 
-product documentation and on the application's product web site. 
-
-3.	LICENSE RESTRICTIONS:
-
-A.	If you receive your first copy of the Materials electronically, and a 
-second copy on media, then you may use the second copy only in accordance with
-your applicable license stated in this Agreement, or for backup or archival 
-purposes. You may not provide the second copy to another user.
-
-B.	You may NOT: (i) use or copy the Materials except as provided in this 
-Agreement; (ii) rent or lease the Materials to any third party; (iii) assign 
-this Agreement or transfer the Materials without the express written consent of
-Intel; (iv) modify, adapt, or translate the Materials in whole or in part except
-as provided in this Agreement; (v) reverse engineer, decompile, or disassemble 
-the Materials; (vi) attempt to modify or tamper with the normal function of a 
-license manager that regulates usage of the Materials; (vii) distribute, 
-sublicense or transfer the Source Code form of any components of the Materials,
-Redistributables and Sample Source and derivatives thereof to any third party 
-except as provided in this Agreement; (viii) distribute Redistributables except
-as part of a larger program that adds significant primary functionality 
-different from that of the Redistributables; (ix) distribute the 
-Redistributables to run on a platform other than a Microsoft Platform if per the
-accompanying user documentation the Materials are meant to execute only on the 
-Microsoft Platforms; (x) include the Redistributables in malicious, deceptive, 
-or unlawful programs; or (xi) modify or distribute the Source Code of any 
-Redistributable so that any part of it becomes subject to an Excluded License. 
-An "Excluded License" is one that requires, as a condition of use, modification,
-or distribution, that (a) the code be disclosed or distributed in source code 
-form; or (b) others have the right to modify it.
-
-C.	The scope and duration (time period) of your license depends on the type 
-of license you obtained from Intel. The variety of license types are set forth 
-below, which may not be available for all "Intel(R) Software Development 
-Products" and therefore may not apply to the Materials. For more information on
-the types of licenses, please contact Intel or your sales representative.
-
-i.	PRE-RELEASE LICENSE: If you are using the Materials under the control of 
-a pre-release license, (a) the Materials are pre-release code (e.g., beta 
-release, etc), which may not be fully functional and which Intel may 
-substantially modify in producing any commercial version, and which Intel can 
-provide no assurance that it will ever produce or make generally available a 
-commercial version, and (b) you as an individual may use the Materials only for
-the term of the pre-release time period, which is specified elsewhere in the 
-Materials, or upon the commercial release of the Materials. You may install 
-copies of the Materials on an unlimited number of computers provided that you 
-are the only individual using the Materials and only one copy of the 
-Materials is in use at any one time. A separate license is required for each 
-additional use and/or individual user in all other cases. If you are an entity,
-Intel grants you the right to designate one individual within your organization 
-to have the sole right to use the Materials in the manner provided above.
-
-ii.	EVALUATION LICENSE: If you are using the Materials under the control of an
-Evaluation license, you as an individual may use the Materials only for internal
-evaluation purposes and only for the term of the evaluation time period, which 
-may be controlled by the license key code for the Materials. NOTWITHSTANDING 
-ANYTHING TO THE CONTRARY ELSEWHERE IN THIS AGREEMENT, YOU MAY NOT DISTRIBUTE ANY
-PORTION OF THE MATERIALS, AND THE APPLICATION AND/OR PRODUCT DEVELOPED BY YOU 
-MAY ONLY BE USED FOR EVALUATION PURPOSES AND ONLY FOR THE TERM OF THE EVALUATION
-PERIOD. You may install copies of the Materials on a reasonable number of 
-computers to conduct your evaluation provided that you are the only individual 
-using the Materials and only one copy of the Materials is in use at any one 
-time. A separate license is required for each additional use and/or individual 
-user in all other cases. Intel may provide you with a license code key that 
-enables the Materials for an Evaluation license. If you are an entity, Intel 
-grants you the right to designate one individual within your organization to 
-have the sole right to use the Materials in the manner provided above.
-
-iii.	NONCOMMERCIAL-USE LICENSE: If you are using the Materials under the 
-control of a Noncommercial-Use license, you as an individual may use the 
-Materials only for non-business use where you receive no fee, salary or any 
-other form of compensation. The Materials may not be used for any other 
-purpose, whether "for profit" or "not for profit." Any work performed or 
-produced as a result of use of the Materials cannot be performed or produced for
-the benefit of other parties for a fee, compensation or any other reimbursement
-or remuneration. You may install copies of the Materials on an unlimited number 
-of computers provided that you are the only individual using the Materials and 
-only one copy of the Materials is in use at any one time. A separate license is
-required for each additional use and/or individual user in all other cases.
-Intel will provide you with a license code key that enables the Materials for a
-Noncommercial-Use license. If you obtained a time-limited Noncommercial-Use 
-license, the duration (time period) of your license and your ability to use the
-Materials is limited to the time period of the obtained license, which is 
-controlled by the license key code for the Materials. If you are an entity, 
-Intel grants you the right to designate one individual within your organization
-to have the sole right to use the Materials in the manner provided above.
-
-iv.	SINGLE-USER LICENSE: If you are using the Materials under the control of 
-a Single-User license, you as an individual may install and use the Materials 
-on an unlimited number of computers provided that you are the only individual 
-using the Materials and only one copy of the Materials is in use at any one 
-time. A separate license is required for each additional use and/or individual
-user in all other cases. Intel will provide you with a license code key that 
-enables the Materials for a Single-User license. If you obtained a time-limited
-Single-User license, the duration (time period) of your license and your ability
- to use the Materials is limited to the time 
-period of the obtained license, which is controlled by the license key code for
-the Materials. If you are an entity, Intel grants you the right to designate 
-one individual within your organization to have the sole right to use the 
-Materials in the manner provided above.
-
-v.	NODE-LOCKED LICENSE: If you are using the Materials under the control of 
-a Node-Locked license, you may use the Materials only on a single designated 
-computer by no more than the authorized number of concurrent users. A separate
-license is required for each additional concurrent user and/or computer in all
-other cases. Intel will provide you with a license code key that enables the 
-Materials for a Node-Locked license up to the authorized number of concurrent 
-users. If you obtained a time-limited Node-Locked license, the duration (time
-period) of your license and your ability to use the Materials is limited to the
-time period of the obtained license, which is controlled by the license key code
-for the Materials.
-
-vi.	FLOATING LICENSE: If you are using the Materials under the control of a 
-Floating license, you may (a) install the Materials on an unlimited number of
-computers that are connected to the designated network and (b) use the Material
-by no more than the authorized number of concurrent users. A separate license 
-is required for each additional concurrent user and/or network on which the 
-Materials are used. Intel will provide you with a license code key that 
-enables the Materials for a Floating license up to the authorized number of 
-concurrent users. If you obtained a time-limited Floating license, the duration
-(time period) of your license and your ability to use the Materials is limited 
-to the time period of the obtained license, which is controlled by the license 
-key code for the Materials. Intel Library Floating License: If the Materials 
-are the Intel(R) Math Kernel Library or the Intel(R) Integrated Performance 
-Primitives Library or the Intel(R) Threading Building Blocks (either "Intel 
-Library"), then the Intel Library is provided to you as an add-on option to 
-either the Intel(R) C++ Compiler product or the Intel(R) Fortran Compiler 
-product (either "Intel Compiler") for which you have a Floating license, and as
-such, in addition to the terms and conditions above, the Intel Library may only
-be used by the authorized concurrent users of that Intel Compiler Floating 
-license.
-
-D.	DISTRIBUTION: Distribution of the Redistributables is also subject to the
-following limitations: You (i) shall be solely responsible to your customers 
-for any update or support obligation or other liability which may arise from the
-distribution, (ii) shall not make any statement that your product is 
-"certified", or that its performance is guaranteed, by Intel, (iii) shall not 
-use Intel's name or trademarks to market your product without written 
-permission, (iv) shall use a license agreement that prohibits disassembly and 
-reverse engineering of the Redistributables, (v) shall indemnify, hold harmless,
-and defend Intel and its suppliers from and against any claims or lawsuits, 
-including attorney's fees, that arise or result from your distribution of any 
-product.
-
-E.	Intel(R) Integrated Performance Primitives (Intel IPP). The following 
-terms and conditions apply only to the Intel IPP.
-
-i.	 Notwithstanding anything in this Agreement to the contrary, if you 
-implement the Sample Sources in your application or if you use Intel IPP to 
-implement algorithms that are protected by others' licenses then you may need 
-additional licenses from various entities. Should any such additional licenses
-be required, you are solely responsible for obtaining any such licenses and 
-agree to obtain any such licenses at your own expense.
-
-ii.	Notwithstanding anything herein to the contrary, a valid license to Intel
-IPP is a prerequisite to any license for Sample Source, and possession of Sample
-Source does not grant any license to Intel IPP (or any portion thereof). To 
-access Sample Source, you must first register your licensed copy of the Intel 
-IPP with Intel. By downloading, installing or copying any Sample Source file, 
-you agree to be bound by terms of this Agreement.
-
-F.	SOFTWARE TRANSFER: You may permanently transfer the Materials and all of
-your rights under this Agreement to another party ("Recipient") only if you 
-notify Intel of the transfer by sending a letter to Intel certifying that you 
-retain no copies of the Materials and that the Recipient has agreed in writing
-to be bound by all of the terms and conditions of this Agreement. Please send
-such letter to:
-
-Intel Corporation
-2111 NE 25th Avenue
-Hillsboro, OR 97124
-Attn: DPD Contracts Management, JF1-15
-
-4.	COPYRIGHT: Title to the Materials and all copies thereof remain with Intel
-or its suppliers. The Materials are copyrighted and are protected by United 
-States copyright laws and international treaty provisions. You will not remove
-any copyright notice from the Materials. You agree to prevent any unauthorized
-copying of the Materials. Except as expressly provided herein, no license or 
-right is granted to you directly or by implication, inducement, estoppel or 
-otherwise, specifically Intel does not grant any express or implied right to you
-under Intel patents, copyrights, trademarks, or trade secret information.
-
-5.	NO WARRANTY AND LIMITED REPLACEMENT: THE MATERIALS AND INFORMATION ARE 
-PROVIDED "AS IS" WITH NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
-LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS, OR ANY WARRANTY 
-OTHERWISE ARISING OUT OF ANY PROPOSAL, SPECIFICATION, OR SAMPLE. If the media
-on which the Materials are furnished are found to be defective in material or 
-workmanship under normal use for a period of ninety (90) days from the date of 
-receipt, Intel's entire liability and your exclusive remedy shall be the 
-replacement of the media. This offer is void if the media defect results from 
-accident, abuse, or misapplication.
-
-6.	LIMITATION OF LIABILITY: THE ABOVE REPLACEMENT PROVISION IS THE ONLY 
-WARRANTY OF ANY KIND. INTEL OFFERS NO OTHER WARRANTY EITHER EXPRESS OR IMPLIED 
-INCLUDING THOSE OF MERCHANTABILITY, NONINFRINGEMENT OF THIRD- PARTY 
-INTELLECTUAL PROPERTY OR FITNESS FOR A PARTICULAR PURPOSE. NEITHER INTEL NOR 
-ITS SUPPLIERS SHALL BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT 
-LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS 
-OF BUSINESS INFORMATION, OR OTHER LOSS) ARISING OUT OF THE USE OF OR INABILITY 
-TO USE THE SOFTWARE, EVEN IF INTEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGES. BECAUSE SOME JURISDICTIONS PROHIBIT THE EXCLUSION OR LIMITATION OF 
-LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT 
-APPLY TO YOU.
-
-7.	UNAUTHORIZED USE: THE MATERIALS ARE NOT DESIGNED, INTENDED, OR AUTHORIZED 
-FOR USE IN ANY TYPE OF SYSTEM OR APPLICATION IN WHICH THE FAILURE OF THE 
-MATERIALS COULD CREATE A SITUATION WHERE PERSONAL INJURY OR DEATH MAY OCCUR 
-(E.G MEDICAL SYSTEMS, LIFE SUSTAINING OR LIFE SAVING SYSTEMS). Should the buyer 
-purchase or use the Materials for any such unintended or unauthorized use, the 
-buyer shall indemnify and hold Intel and its officers, subsidiaries and 
-affiliates harmless against all claims, costs, damages, and expenses, and 
-reasonable attorney fees arising out of, directly or indirectly, any claim of 
-product liability, personal injury or death associated with such unintended or
-unauthorized use, even if such claim alleges that Intel was negligent regarding
-the design or manufacture of the part.
-
-8.	USER SUBMISSIONS: You agree that any material, information or other 
-communication you transmit or post to an Intel website or provide to Intel under
-this Agreement related to the features, functions, performance or use of the 
-Materials will be considered non-confidential and non-proprietary 
-("Communications"). Intel will have no obligations with respect to the 
-Communications. You hereby grant to Intel a non-exclusive, perpetual, 
-irrevocable, royalty-free, copyright license to copy, modify, create derivative
-works, publicly display, disclose, distribute, license and sublicense through 
-multiple tiers of distribution and licensees, incorporate and otherwise use the
-Communications and all data, images, sounds, text, and other things embodied 
-therein, including derivative works thereto, for any and all commercial or 
-non-commercial purposes. You are prohibited from posting or transmitting to or
-from an Intel website or provide to Intel any unlawful, threatening, libelous,
-defamatory, obscene, pornographic, or other material that would violate any law.
-If you wish to provide Intel with your confidential information, Intel requires
-a non-disclosure agreement ("NDA") to receive such confidential information, so
-please contact your Intel representative to ensure the proper NDA is in place.
-
-9.	CONSENT. You agree that Intel, its subsidiaries or suppliers may collect
-and use technical and related information, including but not limited to 
-technical information about your computer, system and application software, and
-peripherals, that is gathered periodically to facilitate the provision of 
-software updates, product support and other services to you (if any) related to
-the Materials, and to verify compliance with the terms of this Agreement.
-Intel may use this information, as long as it is in a form that does not 
-personally identify you, to improve our products or to provide services or 
-technologies to you.
-
-10.	TERMINATION OF THIS LICENSE: This Agreement becomes effective on the date
-you accept this Agreement and will continue until terminated as provided for in
-this Agreement. If you are using the Materials under the control of a 
-time-limited license, for example an Evaluation License, this Agreement 
-terminates without notice on the last day of the time period, which is specified
-elsewhere in the Materials, and/or controlled by the license key code for the 
-Materials. Intel may terminate this license immediately if you are in breach of
-any of its terms and conditions and such breach is not cured within thirty (30)
-days of written notice from Intel. Upon termination, you will immediately 
-return to Intel or destroy the Materials and all copies thereof. Any 
-distribution of the Redistributables conducted in accordance with the terms and
-conditions of this Agreement shall survive termination of this Agreement.
-
-11.	U.S. GOVERNMENT RESTRICTED RIGHTS: The technical data and computer 
-software covered by this license is a "Commercial Item," as such term is defined
-by the FAR 2.101 (48 C.F.R. 2.101) and is "commercial computer software" and 
-"commercial computer software documentation" as specified under FAR 12.212 
-(48 C.F.R. 12.212) or DFARS 227.7202 (48 C.F.R. 227.7202), as applicable. This
-commercial computer software and related documentation is provided to end users
-for use by and on behalf of the U.S. Government, with only those rights as are
-granted to all other end users pursuant to the terms and conditions herein. Use
-for or on behalf of the U.S. Government is permitted only if the party acquiring
- or using this software is properly authorized by an appropriate U.S. Government
-official. This use by or for the U.S. Government clause is in lieu of, and 
-supersedes, any other FAR, DFARS, or other provision that addresses Government
-rights in the computer software or documentation covered by this license. All 
-copyright licenses granted to the U.S. Government are coextensive with the 
-technical data and computer software licenses granted herein. The U.S. 
-Government shall only have the right to reproduce, distribute, perform, display,
-and prepare derivative works as needed to implement those rights.
-
-12.	GENERAL PROVISIONS
-
-A.	ENTIRE AGREEMENT: This Agreement is intended to be the entire agreement
-between you and Intel with respect to matters contained herein, and supersedes
-all prior or contemporaneous agreements and negotiations with respect to those
-matters. No waiver of any breach or default shall constitute a waiver of any
-subsequent breach or default. If any provision of this Agreement is determined
-by a court to be unenforceable, you and Intel will deem the provision to be 
-modified to the extent necessary to allow it to be enforced to the extent
-permitted by law, or if it cannot be modified, the provision will be severed and
-deleted from this Agreement, and the remainder of the Agreement will continue in
-effect. Any change, modification or waiver to this Agreement must be in writing
-and signed by an authorized representative of you and Intel.
-
-B.	APPLICABLE LAWS: Any claim arising under or relating to this Agreement 
-shall be governed by the internal substantive laws of the State of Delaware,
-without regard to principles of conflict of laws. You agree that the terms of
-the United Nations Convention on Contracts for the Sale of Goods do not apply
-to this Agreement. You agree that your distribution and export/re-export of the
-Software and permitted modifications shall be in compliance with the laws,
-regulations, orders or other restrictions of applicable export laws.
-
-13.	THIRD PARTY PROGRAMS. The Materials may include third party programs or
-materials. The license terms with those programs or materials apply to your use
-of them, and Intel is not liable for them.
-
-* Other names and brands may be claimed as the property of others
-	November 2010
-

diff --git a/licenses/NOSA b/licenses/NOSA
deleted file mode 100644
index 298f1e588..000000000
--- a/licenses/NOSA
+++ /dev/null
@@ -1,258 +0,0 @@
-NASA OPEN SOURCE AGREEMENT VERSION 1.3
-
-THIS OPEN SOURCE AGREEMENT ("AGREEMENT") DEFINES THE RIGHTS OF USE,
-REPRODUCTION, DISTRIBUTION, MODIFICATION AND REDISTRIBUTION OF CERTAIN
-COMPUTER SOFTWARE ORIGINALLY RELEASED BY THE UNITED STATES GOVERNMENT
-AS REPRESENTED BY THE GOVERNMENT AGENCY LISTED BELOW ("GOVERNMENT
-AGENCY").  THE UNITED STATES GOVERNMENT, AS REPRESENTED BY GOVERNMENT
-AGENCY, IS AN INTENDED THIRD-PARTY BENEFICIARY OF ALL SUBSEQUENT
-DISTRIBUTIONS OR REDISTRIBUTIONS OF THE SUBJECT SOFTWARE.  ANYONE WHO
-USES, REPRODUCES, DISTRIBUTES, MODIFIES OR REDISTRIBUTES THE SUBJECT
-SOFTWARE, AS DEFINED HEREIN, OR ANY PART THEREOF, IS, BY THAT ACTION,
-ACCEPTING IN FULL THE RESPONSIBILITIES AND OBLIGATIONS CONTAINED IN
-THIS AGREEMENT.
-
-Government Agency: National Aeronautics and Space Administration (NASA) 
-Government Agency Original Software Designation: ARC-15277
-Government Agency Original Software Title: growler 0.1
-User Registration Requested.  Please Visit http://opensource.arc.nasa.gov/
-Government Agency Point of Contact for Original Software: bgreen@××××××××.gov
-
-1. DEFINITIONS
-
-A. "Contributor" means Government Agency, as the developer of the
-Original Software, and any entity that makes a Modification.
-
-B. "Covered Patents" mean patent claims licensable by a Contributor
-that are necessarily infringed by the use or sale of its Modification
-alone or when combined with the Subject Software.
-
-C. "Display" means the showing of a copy of the Subject Software,
-either directly or by means of an image, or any other device.
-
-D. "Distribution" means conveyance or transfer of the Subject
-Software, regardless of means, to another.
-
-E. "Larger Work" means computer software that combines Subject
-Software, or portions thereof, with software separate from the Subject
-Software that is not governed by the terms of this Agreement.
-
-F.  "Modification" means any alteration of, including addition to or
-deletion from, the substance or structure of either the Original
-Software or Subject Software, and includes derivative works, as that
-term is defined in the Copyright Statute, 17 USC 101.  However, the
-act of including Subject Software as part of a Larger Work does not in
-and of itself constitute a Modification.
-
-G. "Original Software" means the computer software first released
-under this Agreement by Government Agency with Government Agency
-designation ARC-15277 and entitled growler, including source code,
-object code and accompanying documentation, if any.
-
-H. "Recipient" means anyone who acquires the Subject Software under
-this Agreement, including all Contributors.
-
-I. "Redistribution" means Distribution of the Subject Software after a
-Modification has been made.
-
-J. "Reproduction" means the making of a counterpart, image or copy of
-the Subject Software.
-
-K. "Sale" means the exchange of the Subject Software for money or
-equivalent value.
-
-L. "Subject Software" means the Original Software, Modifications, or
-any respective parts thereof.
-
-M. "Use" means the application or employment of the Subject Software
-for any purpose.
-
-2. GRANT OF RIGHTS
-
-A. Under Non-Patent Rights: Subject to the terms and conditions of
-this Agreement, each Contributor, with respect to its own contribution
-to the Subject Software, hereby grants to each Recipient a
-non-exclusive, world-wide, royalty-free license to engage in the
-following activities pertaining to the Subject Software:
-
-1. Use
-2. Distribution
-3. Reproduction
-4. Modification
-5. Redistribution
-6. Display
-
-B. Under Patent Rights: Subject to the terms and conditions of this
-Agreement, each Contributor, with respect to its own contribution to
-the Subject Software, hereby grants to each Recipient under Covered
-Patents a non-exclusive, world-wide, royalty-free license to engage in
-the following activities pertaining to the Subject Software:
-
-1. Use
-2. Distribution
-3. Reproduction
-4. Sale
-5. Offer for Sale
-
-C. The rights granted under Paragraph B. also apply to the combination
-of a Contributor's Modification and the Subject Software if, at the
-time the Modification is added by the Contributor, the addition of
-such Modification causes the combination to be covered by the Covered
-Patents.  It does not apply to any other combinations that include a
-Modification.
-
-D. The rights granted in Paragraphs A. and B. allow the Recipient to
-sublicense those same rights.  Such sublicense must be under the same
-terms and conditions of this Agreement.
-
-3. OBLIGATIONS OF RECIPIENT
-
-A. Distribution or Redistribution of the Subject Software must be made
-under this Agreement except for additions covered under paragraph 3H.
-
-1. Whenever a Recipient distributes or redistributes the Subject
-   Software, a copy of this Agreement must be included with each copy
-   of the Subject Software; and
-2. If Recipient distributes or redistributes the Subject Software in
-   any form other than source code, Recipient must also make the
-   source code freely available, and must provide with each copy of
-   the Subject Software information on how to obtain the source code
-   in a reasonable manner on or through a medium customarily used for
-   software exchange.
-
-B. Each Recipient must ensure that the following copyright notice
-appears prominently in the Subject Software:
-
-Copyright ã 2004 United States Government as represented by the
-Administrator of the National Aeronautics and Space Administration.
-All Rights Reserved.
-
-C. Each Contributor must characterize its alteration of the Subject
-Software as a Modification and must identify itself as the originator
-of its Modification in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Modification.  In
-fulfillment of these requirements, Contributor must include a file
-(e.g., a change log file) that describes the alterations made and the
-date of the alterations, identifies Contributor as originator of the
-alterations, and consents to characterization of the alterations as a
-Modification, for example, by including a statement that the
-Modification is derived, directly or indirectly, from Original
-Software provided by Government Agency. Once consent is granted, it
-may not thereafter be revoked.
-
-D. A Contributor may add its own copyright notice to the Subject
-Software.  Once a copyright notice has been added to the Subject
-Software, a Recipient may not remove it without the express permission
-of the Contributor who added the notice.
-
-E. A Recipient may not make any representation in the Subject Software
-or in any promotional, advertising or other material that may be
-construed as an endorsement by Government Agency or by any prior
-Recipient of any product or service provided by Recipient, or that may
-seek to obtain commercial advantage by the fact of Government Agency's
-or a prior Recipient's participation in this Agreement.
-
-F. In an effort to track usage and maintain accurate records of the
-Subject Software, each Recipient, upon receipt of the Subject
-Software, is requested to register with Government Agency by visiting
-the following website: http://opensource.arc.nasa.gov.  Recipient's
-name and personal information shall be used for statistical purposes
-only. Once a Recipient makes a Modification available, it is requested
-that the Recipient inform Government Agency at the web site provided
-above how to access the Modification.
-
-G. Each Contributor represents that that its Modification is believed
-to be Contributor's original creation and does not violate any
-existing agreements, regulations, statutes or rules, and further that
-Contributor has sufficient rights to grant the rights conveyed by this
-Agreement.
-
-H. A Recipient may choose to offer, and to charge a fee for, warranty,
-support, indemnity and/or liability obligations to one or more other
-Recipients of the Subject Software.  A Recipient may do so, however,
-only on its own behalf and not on behalf of Government Agency or any
-other Recipient.  Such a Recipient must make it absolutely clear that
-any such warranty, support, indemnity and/or liability obligation is
-offered by that Recipient alone.  Further, such Recipient agrees to
-indemnify Government Agency and every other Recipient for any
-liability incurred by them as a result of warranty, support, indemnity
-and/or liability offered by such Recipient.
-
-I. A Recipient may create a Larger Work by combining Subject Software
-with separate software not governed by the terms of this agreement and
-distribute the Larger Work as a single product. In such case, the
-Recipient must make sure Subject Software, or portions thereof,
-included in the Larger Work is subject to this Agreement.
-
-J. Notwithstanding any provisions contained herein, Recipient is
-hereby put on notice that export of any goods or technical data from
-the United States may require some form of export license from the
-U.S. Government.  Failure to obtain necessary export licenses may
-result in criminal liability under U.S. laws.  Government Agency
-neither represents that a license shall not be required nor that, if
-required, it shall be issued.  Nothing granted herein provides any
-such export license.
-
-4. DISCLAIMER OF WARRANTIES AND LIABILITIES; WAIVER AND INDEMNIFICATION
-
-A. No Warranty: THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY
-WARRANTY OF ANY KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY,
-INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE
-WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR FREEDOM FROM
-INFRINGEMENT, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL BE ERROR
-FREE, OR ANY WARRANTY THAT DOCUMENTATION, IF PROVIDED, WILL CONFORM TO
-THE SUBJECT SOFTWARE. THIS AGREEMENT DOES NOT, IN ANY MANNER,
-CONSTITUTE AN ENDORSEMENT BY GOVERNMENT AGENCY OR ANY PRIOR RECIPIENT
-OF ANY RESULTS, RESULTING DESIGNS, HARDWARE, SOFTWARE PRODUCTS OR ANY
-OTHER APPLICATIONS RESULTING FROM USE OF THE SUBJECT SOFTWARE.
-FURTHER, GOVERNMENT AGENCY DISCLAIMS ALL WARRANTIES AND LIABILITIES
-REGARDING THIRD-PARTY SOFTWARE, IF PRESENT IN THE ORIGINAL SOFTWARE,
-AND DISTRIBUTES IT "AS IS."
-
-B. Waiver and Indemnity: RECIPIENT AGREES TO WAIVE ANY AND ALL CLAIMS
-AGAINST THE UNITED STATES GOVERNMENT, ITS CONTRACTORS AND
-SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT.  IF RECIPIENT'S USE OF
-THE SUBJECT SOFTWARE RESULTS IN ANY LIABILITIES, DEMANDS, DAMAGES,
-EXPENSES OR LOSSES ARISING FROM SUCH USE, INCLUDING ANY DAMAGES FROM
-PRODUCTS BASED ON, OR RESULTING FROM, RECIPIENT'S USE OF THE SUBJECT
-SOFTWARE, RECIPIENT SHALL INDEMNIFY AND HOLD HARMLESS THE UNITED
-STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY
-PRIOR RECIPIENT, TO THE EXTENT PERMITTED BY LAW.  RECIPIENT'S SOLE
-REMEDY FOR ANY SUCH MATTER SHALL BE THE IMMEDIATE, UNILATERAL
-TERMINATION OF THIS AGREEMENT.
-
-
-5. GENERAL TERMS
-
-A. Termination: This Agreement and the rights granted hereunder will
-terminate automatically if a Recipient fails to comply with these
-terms and conditions, and fails to cure such noncompliance within
-thirty (30) days of becoming aware of such noncompliance.  Upon
-termination, a Recipient agrees to immediately cease use and
-distribution of the Subject Software.  All sublicenses to the Subject
-Software properly granted by the breaching Recipient shall survive any
-such termination of this Agreement.
-
-B. Severability: If any provision of this Agreement is invalid or
-unenforceable under applicable law, it shall not affect the validity
-or enforceability of the remainder of the terms of this Agreement.
-
-C. Applicable Law: This Agreement shall be subject to United States
-federal law only for all purposes, including, but not limited to,
-determining the validity of this Agreement, the meaning of its
-provisions and the rights, obligations and remedies of the parties.
-
-D. Entire Understanding: This Agreement constitutes the entire
-understanding and agreement of the parties relating to release of the
-Subject Software and may not be superseded, modified or amended except
-by further written agreement duly executed by the parties.
-
-E. Binding Authority: By accepting and using the Subject Software
-under this Agreement, a Recipient affirms its authority to bind the
-Recipient to all terms and conditions of this Agreement and that that
-Recipient hereby agrees to all terms and conditions herein.
-
-F. Point of Contact: Any Recipient contact with Government Agency is
-to be directed to the designated representative as follows:
-bgreen@××××××××.gov.

diff --git a/licenses/modeller b/licenses/modeller
deleted file mode 100644
index 4921a6462..000000000
--- a/licenses/modeller
+++ /dev/null
@@ -1,19 +0,0 @@
-End-User Software License Agreement for MODELLER
-
-   1. Andrej Sali (``LICENSOR'') grants to (``LICENSEE'') a fully-paid, non-exclusive, and non-transferable license to use the ``MODELLER'' computer software program and associated documentation furnished hereunder (hereinafter called the ``PROGRAM''), upon the terms and conditions hereinafter set out and until termination of this license as set forth below.
-
-   2. LICENSEE understands that this Agreement is license for use of, not sale of, the PROGRAM. Consequently, no Purchase Orders can be accepted by LICENSOR.
-
-   3. LICENSEE acknowledges that the PROGRAM is a research tool still in the development stage, that is being supplied ``as is'', without any accompanying services or improvements from LICENSOR and that this license is entered into in order to enable others to utilize the PROGRAM in their scholarly activities.
-
-   4. LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. By way of example, but not limitation, LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE PROGRAM WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. LICENSOR shall have no liability nor be liable for an direct, indirect or consequential damages with respect to any claim by LICENSEE or any third party on account of or arising from this Agreement or use of the PROGRAM.
-
-   5. LICENSEE agrees that it will use the PROGRAM, and any modifications, improvements, or derivatives to PROGRAM that LICENSEE may create (collectively, ``IMPROVEMENTS'') solely for internal, non-commercial purposes and shall not distribute or transfer the PROGRAM OR IMPROVEMENTS to any person without prior written permission from LICENSOR. The term ``non-commercial'', as used in this Agreement, means academic or other scholarly research which (a) is not undertaken for profit, or (b) is not intended to produce works, services, or data for commercial use, or (c) is neither conducted, nor funded, by a person or an entity engaged in the commercial use, application or exploitation of works similar to the PROGRAM.
-
-   6. LICENSEE agrees to notify LICENSOR of any IMPROVEMENTS made to the PROGRAM, as described in Section 5, above, and hereby (a) agrees to supply LICENSOR with a copy of same, and (b) grants LICENSOR a worldwide, perpetual license, with the right to sublicense (at any tier), such IMPROVEMENTS without any royalty or other obligation to LICENSEE.
-
-   7. Ownership of all rights, including copyright in the PROGRAM and in any material associated therewith, shall at all times remain with LICENSOR and LICENSEE agrees to preserve same. LICENSEE agrees not to use any portion of the PROGRAM in any machine-readable form outside the PROGRAM, nor to make any copies except for its internal use, without prior written consent of LICENSOR. LICENSEE agrees to place the appropriate copyright notice on any such copies.
-
-   8. This Agreement shall be construed, interpreted and applied in accordance with the Commonwealth of Massachusetts and any legal action arising out of this Agreement or use of the PROGRAM shall be filed in a court in the Commonwealth of Massachusetts.
-
-   9. This license shall be for a term of 5 years except that upon any breach of this Agreement by LICENSEE, LICENSOR shall have the right to terminate this license immediately upon notice to LICENSEE.

diff --git a/licenses/mpich2 b/licenses/mpich2
deleted file mode 100644
index a9216d495..000000000
--- a/licenses/mpich2
+++ /dev/null
@@ -1,39 +0,0 @@
-
-				  COPYRIGHT
-
-The following is a notice of limited availability of the code, and disclaimer
-which must be included in the prologue of the code and in all source listings
-of the code.
-
-Copyright Notice
- + 2002 University of Chicago
-
-Permission is hereby granted to use, reproduce, prepare derivative works, and
-to redistribute to others.  This software was authored by:
-
-Mathematics and Computer Science Division
-Argonne National Laboratory, Argonne IL 60439
-
-(and)
-
-Department of Computer Science
-University of Illinois at Urbana-Champaign
-
-
-			      GOVERNMENT LICENSE
-
-Portions of this material resulted from work developed under a U.S.
-Government Contract and are subject to the following license: the Government
-is granted for itself and others acting on its behalf a paid-up, nonexclusive,
-irrevocable worldwide license in this computer software to reproduce, prepare
-derivative works, and perform publicly and display publicly.
-
-				  DISCLAIMER
-
-This computer code material was prepared, in part, as an account of work
-sponsored by an agency of the United States Government.  Neither the United
-States, nor the University of Chicago, nor any of their employees, makes any
-warranty express or implied, or assumes any legal liability or responsibility
-for the accuracy, completeness, or usefulness of any information, apparatus,
-product, or process disclosed, or represents that its use would not infringe
-privately owned rights.

diff --git a/licenses/phrap b/licenses/phrap
deleted file mode 100644
index 0e1df110a..000000000
--- a/licenses/phrap
+++ /dev/null
@@ -1,210 +0,0 @@
-ACADEMIC USER AGREEMENT
-
-Please read the entire agreement, fill in the information in the
-indicated positions (such as "NAME:"), and return the entire document
-to the indicated people.  Please send the document as the message--not
-as an attachment.
-
-Phrap:  A program for assembling DNA sequence data.
-
-Swat:  A program for searching one or more DNA or protein query sequences
-against a sequence database, using (an efficient implementation of) the
-Smith-Waterman-Gotoh algorithm.
-
-Cross_Match:  A general-purpose utility based on Swat for comparing any
-two sets of (long or short) DNA sequences.
-
-Phred:  A program that reads DNA sequencer trace data, calls bases,
-assigns quality values to the bases, and writes the base calls and quality
-values to output files.
-
-Consed:  A program for viewing and editing Phrap assemblies.
-
-To receive any of these programs you will need to agree to the following
-conditions. They should be taken seriously!
-
-1) You agree to read the documentation.  We welcome feedback on any
-inaccuracies.
-
-2) You agree to report any bugs to us.  (To fix bugs, we will need
-from you a dataset and a procedure that reproduces the problem; but do
-not send datasets without first emailing us to describe the nature of
-the bug.)
-
-3) You agree not to make the programs (including source code,
-executables, or any part thereof, in modified or unmodified form)
-available to anyone outside your group, and not to put them where they
-may be accessible to outside individuals without your direct knowledge
-(e.g. on a computer to which people outside your group have login
-privileges).  The documentation however may be freely distributed.
-Refer any requests for the programs to the authors.  If you are
-operating a computer facility which provides access to several
-independent investigators, you agree to set the permissions on the
-executables and source code to allow execute but not read access, so
-that the programs may not be copied. Investigators who want copies of
-the software for their own use must return a separate copy of this
-agreement.
-
-4) You agree not to use the programs for any commercial purpose,
-including but not limited to commercially restricted sequencing
-(defined as sequencing for which a company retains patenting or
-licensing rights regarding the sequence, or the right to restrict or
-delay dissemination of the sequence; with the sole exception that
-sequencing is not considered to be commercially restricted if it is
-federally funded and the investigators adopt the data release policies
-endorsed at the Wellcome Trust-sponsored Bermuda meeting,
-i.e. immediate release of data as it is generated).
- [If you wish to obtain the software for commercially restricted
-sequencing or any other commercial purposes, you will need to execute
-a separate licensing agreement with the University of Washington and
-pay a fee. In that case please contact:
-
-Lisa Heinz
-University of Washington TechTransfer, Digital Ventures
-Box 354990
-4311-11th Avenue NE, Suite 500
-Seattle, WA  98105-4608
-
-http://depts.washington.edu/techtran
-
-206-616-3451  FAX: [phone]
-swxfr@××××××××××××.edu
-
-Do not contact her if the academic license applies.]
-
-5) You acknowledge that the software is experimental in nature and is
-supplied "AS IS", without obligation by the authors or the University
-of Washington to provide accompanying services or support.  The entire
-risk as to the quality and performance of the Software is with you.
-UW AND THE AUTHORS EXPRESSLY DISCLAIM ANY AND ALL WARRANTIES
-REGARDING THE SOFTWARE, WHETHER EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO WARRANTIES PERTAINING TO MERCHANTABILITY OR FITNESS FOR A
-PARTICULAR PURPOSE.
-
-6) All members of your group with access to the software agree to the
-same conditions.
-
-
-
-Having read the above, if you are still interested in obtaining the
-programs, please return a copy of this entire message (which MUST be
-included so that it is clear what you are agreeing to) by email
-together with the following information:
-
-NAME: Your name in first name/last name order.
-
-NAME:  
-
-
-Example:
-NAME: John Dracula
-(Please do not use all capitals such as John DRACULA)
-
-ACKNOWLEDGEMENT: An acknowledgement that you and the members of your
-group agree to these conditions.
-
-ACKNOWLEDGEMENT:
-
-Example:
-ACKNOWLEDGEMENT: I agree to the license.
-
-PROGRAMS: Which programs you want (phrap,cross_match, and swat are
-distributed together). You must cc the message to each appropriate
-individual (Brent Ewing, David Gordon, and/or Phil Green) at the email
-addresses below so that they will know to send you the appropriate
-program.
-
-PROGRAMS:
-
-Example:
-PROGRAMS: phred, phrap, consed
-
-INSTITUTION: Your academic or government institution (give full name,
-not abbreviation)
-
-INSTITUTION: 
-
-Example:
-INSTITUTION:  University of Lower Transylvania
-
-DEPARTMENT: Your department
-
-DEPARTMENT:
-
-Example:
-DEPARTMENT:  Department of Hematology
-
-EMAIL: Your email address for all future correspondence. Ideally this
-should be a Unix computer running a generic mail program, since
-several of the programs are sent as uuencoded files which may be
-corrupted by some mail programs.
-  If this address is not at the institution & department listed above,
-please explain the discrepancy.
-
-EMAIL: 
-
-Example:
-EMAIL: john.dracula@××××××.edu
-
-OS: (Consed requestors only) Which platform(s) you want Consed for:
-solaris 2.5.1, solaris 2.6, solaris 2.7 (solaris 7), solaris 8,
-solaris 9, digital unix 4.0 (or better), hp-ux 11.x, sgi irix 6.2,
-6.3, 6.4, or 6.5, linux (normal 32 bit) (Redhat 7.1-1 or better),
-linux (Itanium), linux (AMD64), ibm aix 5.2 (or better), macosx 10.2
-(Darwin kernel 6.0) (or better), or solaris-intel (2.8 or better).
-
-OS:
-
-Example:
-OS: hpux
-
-Note: Consed is not available for PC's running Windows, XP, NT, or
-2000.
-
-IP: (Consed requestors only) The ip address of the computer on which
-you will be running a web browser to download consed.  This does not
-have to be the same computer as the one on which you will run consed.
-Please view page
-http://bozeman.mbt.washington.edu/consed/find_ip_address.html
-which will tell you what my computer thinks is your ip address.
-
-(Even if you think you know your ip address, firewalls and proxies can
-cause your browser to transmit a different ip address, and thus my
-webserver would deny you access to consed.  So it would be a good idea
-to view the page above and send me the ip address it shows, even if
-this isn't your real ip address.)
-
-IP:
-
-Example:
-IP: 123.49.74.80
-
-
-If you want Consed/Autofinish, you must include OS and IP (above).
-Consed cannot be obtained without them.
-
-Please return this entire agreement so it is clear what you are
-agreeing to.
-
-Please send all of this, including the agreement, as part of the
-email message--not as an attachment.  
-
-Send it to each of the relevant individuals below:
-
-Contacts for obtaining the programs and for questions, bug reports,
-suggestions:
-
-      Phrap/cross_match/swat:  Phil Green, phg (at) u.washington.edu
-      Phred: Brent Ewing, bge (at) u.washington.edu
-      Consed: David Gordon, gordon (at) genome.washington.edu
-
-where the " (at) " is replaced by "@".
-
-It can take up to 2 weeks for a license application to be processed,
-so please be patient.
-
-
-
-
-
-

diff --git a/profiles/license_groups b/profiles/license_groups
index c23a2a105..1d2f8f87a 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,2 +1 @@
-EULA AMD-APPSDK NVIDIA-gdk NVIDIA-CUDA OpenSIFT
-MISC-FREE CeCILL-B
+EULA NVIDIA-gdk OpenSIFT

diff --git a/sci-biology/genepop/genepop-4.2.1.ebuild b/sci-biology/genepop/genepop-4.2.1.ebuild
index 7119b9936..2e1d48a45 100644
--- a/sci-biology/genepop/genepop-4.2.1.ebuild
+++ b/sci-biology/genepop/genepop-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="Population genetics analysis"
-HOMEPAGE="http://genepop.curtin.edu.au/ http://kimura.univ-montp2.fr/~rousset/Genepop.htm"
+HOMEPAGE="https://genepop.curtin.edu.au/ https://kimura.univ-montp2.fr/~rousset/Genepop.htm"
 SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz"
 
 LICENSE="CeCILL-2"

diff --git a/sci-mathematics/gappa/gappa-1.1.1.ebuild b/sci-mathematics/gappa/gappa-1.1.1.ebuild
index 29de6ffa5..97c64ef6e 100644
--- a/sci-mathematics/gappa/gappa-1.1.1.ebuild
+++ b/sci-mathematics/gappa/gappa-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ DESCRIPTION="Verifying and proving properties on floating-point or fixed-point a
 HOMEPAGE="http://gappa.gforge.inria.fr/"
 SRC_URI="http://gforge.inria.fr/frs/download.php/33486/${P}.tar.gz"
 
-LICENSE="|| ( CeCILL-2.0 GPL-2 )"
+LICENSE="|| ( CeCILL-2 GPL-2 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"