[gentoo-commits] proj/sci:master commit in: sci-mathematics/petsc/, sci-mathematics/petsc/files/

[Justin Lecher]

commit:     a5ec25be61777284cc15c42d6574b33388932ee9
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 17:37:16 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 17:37:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a5ec25be

version bump

Package-Manager: portage-2.2.18

 sci-mathematics/petsc/ChangeLog                         |  8 ++++++++
 ...able-rpath.patch => petsc-3.6.0-disable-rpath.patch} |  9 +++++----
 .../petsc/files/petsc-3.6.0-fix_sandbox_violation.patch | 15 +++++++++++++++
 .../petsc/{petsc-3.5.1.ebuild => petsc-3.6.0.ebuild}    | 17 ++++++++++-------
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/sci-mathematics/petsc/ChangeLog b/sci-mathematics/petsc/ChangeLog
index a29efad..858b694 100644
--- a/sci-mathematics/petsc/ChangeLog
+++ b/sci-mathematics/petsc/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*petsc-3.6.0 (23 Jun 2015)
+
+  23 Jun 2015; Matthias Maier <tamiko@g.o>
+  +files/petsc-3.6.0-disable-rpath.patch,
+  +files/petsc-3.6.0-fix_sandbox_violation.patch, +petsc-3.6.0.ebuild,
+  -files/petsc-3.5.1-disable-rpath.patch, -petsc-3.5.1.ebuild:
+  version bump
+
 *petsc-3.5.3 (13 Mar 2015)
 
   13 Mar 2015; Matthias Maier <tamiko@g.o>

diff --git a/sci-mathematics/petsc/files/petsc-3.5.1-disable-rpath.patch b/sci-mathematics/petsc/files/petsc-3.6.0-disable-rpath.patch
similarity index 65%
rename from sci-mathematics/petsc/files/petsc-3.5.1-disable-rpath.patch
rename to sci-mathematics/petsc/files/petsc-3.6.0-disable-rpath.patch
index 0ccf45d..88a7db5 100644
--- a/sci-mathematics/petsc/files/petsc-3.5.1-disable-rpath.patch
+++ b/sci-mathematics/petsc/files/petsc-3.6.0-disable-rpath.patch
@@ -1,6 +1,7 @@
---- config/BuildSystem/config/setCompilers.py	2013-10-08 19:45:00.581513389 +0200
-+++ config/BuildSystem/config/setCompilers.py	2013-05-13 23:35:20.000000000 +0200
-@@ -1303,12 +1303,7 @@
+diff --git a/config/BuildSystem/config/setCompilers.py b/config/BuildSystem/config/setCompilers.py
+--- a/config/BuildSystem/config/setCompilers.py
++++ b/config/BuildSystem/config/setCompilers.py
+@@ -1326,12 +1326,7 @@ class Configure(config.base.Configure):
      for language in languages:
        flag = '-L'
        self.pushLanguage(language)
@@ -8,7 +9,7 @@
 -      if not Configure.isDarwin():
 -        testFlags = ['-Wl,-rpath,', '-R','-rpath ' , '-Wl,-R,']
 -      else:
--        testFlags = []
+-        testFlags = ['-Wl,-rpath,']
 -      # test '-R' before '-Wl,-rpath' for SUN compilers [as cc on linux accepts -Wl,-rpath, but  f90 & CC do not.
 +      testFlags = []
        if self.isSun(self.framework.getCompiler()):

diff --git a/sci-mathematics/petsc/files/petsc-3.6.0-fix_sandbox_violation.patch b/sci-mathematics/petsc/files/petsc-3.6.0-fix_sandbox_violation.patch
new file mode 100644
index 0000000..7510631
--- /dev/null
+++ b/sci-mathematics/petsc/files/petsc-3.6.0-fix_sandbox_violation.patch
@@ -0,0 +1,15 @@
+--- config/PETSc/options/installDir.py.orig	2015-06-23 18:11:25.054911894 +0200
++++ config/PETSc/options/installDir.py	2015-06-23 18:11:44.100289841 +0200
+@@ -38,12 +38,6 @@
+     self.installSudoMessage = ''
+     if self.framework.argDB['prefix']:
+       self.dir = self.framework.argDB['prefix']
+-      try:
+-        os.makedirs(os.path.join(self.dir,'PETScTestDirectory'))
+-        os.rmdir(os.path.join(self.dir,'PETScTestDirectory'))
+-      except:
+-        self.installSudoMessage = 'You do not have write permissions to the --prefix directory '+self.dir+'\nYou will be prompted for the sudo password for any external package installs'
+-        self.installSudo = 'sudo '
+     else:
+       self.dir = os.path.abspath(os.path.join(self.petscdir.dir, self.arch.arch))
+     self.confDir = os.path.abspath(os.path.join(self.petscdir.dir, self.arch.arch))

diff --git a/sci-mathematics/petsc/petsc-3.5.1.ebuild b/sci-mathematics/petsc/petsc-3.6.0.ebuild
similarity index 94%
rename from sci-mathematics/petsc/petsc-3.5.1.ebuild
rename to sci-mathematics/petsc/petsc-3.6.0.ebuild
index 3d01eee..6c96de3 100644
--- a/sci-mathematics/petsc/petsc-3.5.1.ebuild
+++ b/sci-mathematics/petsc/petsc-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -69,7 +69,10 @@ MAKEOPTS="${MAKEOPTS} -j1"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P%_*}-disable-rpath.patch
+	epatch \
+		"${FILESDIR}"/${P%_*}-disable-rpath.patch \
+		"${FILESDIR}"/${P%_*}-fix_sandbox_violation.patch
+
 	sed -i -e 's%/usr/bin/env python%/usr/bin/env python2%' configure || die
 }
 
@@ -192,18 +195,18 @@ src_install() {
 	doins ${PETSC_ARCH}/include/*
 	if use fortran; then
 		insinto /usr/include/${PN}/finclude
-		doins -r include/finclude/*
+		doins -r include/${PN}/finclude/*
 	fi
 	if ! use mpi ; then
 		insinto /usr/include/${PN}/mpiuni
 		doins include/mpiuni/*.h
 	fi
 	insinto /usr/include/${PN}/conf
-	doins conf/{variables,rules,test}
+	doins lib/${PN}/conf/{variables,rules,test}
 	insinto /usr/include/${PN}/${PETSC_ARCH}/conf
-	doins ${PETSC_ARCH}/conf/{petscrules,petscvariables,RDict.db}
-	insinto /usr/include/${PN}/petsc-private
-	doins include/petsc-private/*.h
+	doins ${PETSC_ARCH}/lib/${PN}/conf/{petscrules,petscvariables,RDict.db}
+	insinto /usr/include/${PN}/private
+	doins include/${PN}/private/*.h
 
 	# fix configuration files: replace "${S}" by installed location
 	sed -i \