[dev-python/Forthon] version bump, add modified version of BSD license, port to distutils-r1

3 files changed, 67 insertions, 12 deletions

diff --git a/dev-python/Forthon/Forthon-0.8.10.ebuild b/dev-python/Forthon/Forthon-0.8.11.ebuild
index f1fa4ed20..2383f9bca 100644
--- a/dev-python/Forthon/Forthon-0.8.10.ebuild
+++ b/dev-python/Forthon/Forthon-0.8.11.ebuild
@@ -2,32 +2,30 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Python interface generator for Fortran based codes"
 HOMEPAGE="http://hifweb.lbl.gov/Forthon http://pypi.python.org/pypi/Forthon"
 SRC_URI="http://hifweb.lbl.gov/${PN}/${P}.tgz"
 
-LICENSE="BSD"
+LICENSE="LLNL-BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-src_prepare() {
-	sed -i -e "s/'Notice',//" setup.py || die
-	distutils_src_prepare
+python_prepare_all() {
+	sed -i -e "/data_files/ s/'License.txt',//" setup.py || die
+	distutils-r1_python_prepare_all
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
 	dohtml docs/index.html
 	if use examples ; then
 		insinto /usr/share/doc/${PF}
 		doins -r {example,example2,simpleexample}
 	fi
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/Forthon/Manifest b/dev-python/Forthon/Manifest
index 25603197e..2bf5db228 100644
--- a/dev-python/Forthon/Manifest
+++ b/dev-python/Forthon/Manifest
@@ -1 +1 @@
-DIST Forthon-0.8.10.tgz 89048 SHA256 a92236a1dbdc87f7235247555467216d2db0994db37275fa434775f64b690de4 SHA512 1332e3d5465ca249c357314cf15d2a4e5e83a941841021b8f6a17a107dce268a7a082838ade5e8db944ecde6bfb111211ab218aa414ee90aafbb81f1491b3b93 WHIRLPOOL 9a617dfce840179bcc079b230bfad893c24a915357cf1c3ddca85dfafe6ebe8ccda8106f3ee27db5c9ecc9764ebfe0a7a403a14d731bf90e1173bf777ec771ba
+DIST Forthon-0.8.11.tgz 89277 SHA256 cba78e0f392e75f46a61084b3b16970c9f5828bbd57010bed5e2301002dcbfed SHA512 3f53d0b474bfd79fea2536d0a9197eaef6c0927e95f2f9fd52dbd6c1d46409d0e649c21ac418d8f7767a9f10fe6114b516e06f2be4b06aec3ab5bdebc8768220 WHIRLPOOL 4235e4c3e9a1a2dcc2b3a9250464c9d77b13cacb3f339abc2938979def06272ab6a9145319a4a249ed32419521024841f622af2601395ba981e37dd60a20fe08
diff --git a/licenses/LNLL-BSD b/licenses/LNLL-BSD
new file mode 100644
index 000000000..5d9e89279
--- /dev/null
+++ b/licenses/LNLL-BSD
@@ -0,0 +1,57 @@
+Copyright (c) 2012, Lawrence Livermore National Security, LLC.
+Produced at the Lawrence Livermore National Laboratory
+Written by David Grote, grote1@llnl.gov.
+LLNL-CODE-544231
+All rights reserved.
+
+This file is part of Forthon. For details, see http://hifweb.lbl.gov/Forthon.
+Please also read below, an Additional BSD Notice.
+
+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 disclaimer below.
+
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the disclaimer (as noted below) in
+     the documentation and/or other materials provided with the distribution.
+
+   * Neither the name of the LLNS/LLNL nor the names of its 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 HOLDERS 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 LAWRENCE LIVERMORE NATIONAL SECURITY, LLC,
+THE U.S. DEPARTMENT OF ENERGY 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.
+
+Additional BSD Notice
+
+1. This notice is required to be provided under our contract with the U.S.
+Department of Energy (DOE). This work was produced at Lawrence Livermore
+National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE.
+
+2. Neither the United States Government nor Lawrence Livermore National
+Security, LLC nor any of their employees, makes any warranty, express or
+implied, or assumes any 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.
+
+3. Also, reference herein to any specific commercial products, process, or
+services by trade name, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or favoring
+by the United States Government or Lawrence Livermore National Security, LLC.
+The views and opinions of authors expressed herein do not necessarily state
+or reflect those of the United States Government or Lawrence Livermore
+National Security, LLC, and shall not be used for advertising or product
+endorsement purposes.
+