Fix bug #418455 sci-mathematics/cvs3 license issues

2 files changed, 32 insertions, 73 deletions

diff --git a/licenses/CVC3 b/licenses/CVC3
deleted file mode 100644
index d3cf05ca7344..000000000000
--- a/licenses/CVC3
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!\page LICENSE LICENSE
-
-Copyright (C) 2003-2009 by the Board of Trustees of Leland Stanford Junior
-University, New York University, and the University of Iowa, hereafter
-designated as the Copyright Owners.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-* Neither the names of the Copyright Owners nor the names of any contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT OWNERS AND CONTRIBUTORS ''AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNERS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Note:
-
-The following files contain code whose copyright does not belong to the
-Copyright Owners.  However, separate copyright notices in these files give
-express permission to copy, use, modify, sell, or distribute the code.  Please
-see the copyright notices in the individual files for details.
-
-<pre>
-src/include/fdstream.h
-src/include/hash_map.h
-src/include/hash_fun.h
-src/include/hash_set.h
-src/include/hash_table.h
-src/sat/minisat_varorder.h
-src/sat/minisat_solver.cpp
-src/sat/minisat_heap.h
-src/sat/minisat_types.h
-src/sat/minisat_solver.h
-src/sat/minisat_global.h
-</pre>
-This copy of CVC3 is also configured to use the SAT solver zchaff whose
-copyright is owned by Princeton University and is more restrictive.
-
-Specifically, it may be used for internal, noncommercial, research purposes
-only.  See the copyright notice in the following files for more information.
-To build CVC3 without these files, please delete them and then run:
-<pre>
-   ./configure --disable-zchaff
-   make
-</pre>
-
-<pre>
-src/sat/xchaff_base.h
-src/sat/xchaff_dbase.h
-src/sat/xchaff_solver.h
-src/sat/xchaff_utils.h
-src/sat/xchaff_dbase.cpp
-src/sat/xchaff_solver.cpp
-src/sat/xchaff_utils.cpp
-</pre>
-
-*/
diff --git a/licenses/zchaff b/licenses/zchaff
new file mode 100644
index 000000000000..4fa67e2880c5
--- /dev/null
+++ b/licenses/zchaff
@@ -0,0 +1,32 @@
+ Copyright 2000-2001, Princeton University.  All rights reserved. 
+ By using this software the USER indicates that he or she has read, 
+ understood and will comply with the following:
+
+ --- Princeton University hereby grants USER nonexclusive permission 
+ to use, copy and/or modify this software for internal, noncommercial,
+ research purposes only. Any distribution, including commercial sale 
+ or license, of this software, copies of the software, its associated 
+ documentation and/or modifications of either is strictly prohibited 
+ without the prior consent of Princeton University.  Title to copyright
+ to this software and its associated documentation shall at all times 
+ remain with Princeton University.  Appropriate copyright notice shall 
+ be placed on all software copies, and a complete copy of this notice 
+ shall be included in all copies of the associated documentation.  
+ No right is  granted to use in advertising, publicity or otherwise 
+ any trademark, service mark, or the name of Princeton University. 
+
+
+ --- This software and any associated documentation is provided "as is" 
+
+ PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS 
+ OR IMPLIED, INCLUDING THOSE OF MERCHANTABILITY OR FITNESS FOR A 
+ PARTICULAR PURPOSE, OR THAT  USE OF THE SOFTWARE, MODIFICATIONS, OR 
+ ASSOCIATED DOCUMENTATION WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, 
+ TRADEMARKS OR OTHER INTELLECTUAL PROPERTY RIGHTS OF A THIRD PARTY.  
+
+ Princeton University shall not be liable under any circumstances for 
+ any direct, indirect, special, incidental, or consequential damages 
+ with respect to any claim by USER or any third party on account of 
+ or arising from the use, or inability to use, this software or its 
+ associated documentation, even if Princeton University has been advised
+ of the possibility of those damages.