version bump

Package-Manager: portage-2.2.18

5 files changed, 39 insertions, 12 deletions

diff --git a/sci-mathematics/petsc/ChangeLog b/sci-mathematics/petsc/ChangeLog
index a29efad6d..858b69454 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@gentoo.org>
+  +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@gentoo.org>
diff --git a/sci-mathematics/petsc/Manifest b/sci-mathematics/petsc/Manifest
index ee294a873..433581b44 100644
--- a/sci-mathematics/petsc/Manifest
+++ b/sci-mathematics/petsc/Manifest
@@ -1,3 +1,3 @@
 DIST petsc-3.4.2.tar.gz 18658689 SHA256 f13b0dc978fe0dcc1df032f8142a2fd345217f02b9967936d9aac26ce4b2b52e SHA512 f839e4cfadbee720e53993eb8de74a2d82bfe2a46a418f528b4cdb2e9245b8ecafbc02d6d1718034cfe80d291095187b0946ebe237c8f985e4213c4c35bc345b WHIRLPOOL a00f4340e5dc151c57d9f5e2b764a609a508490756d8337d52bec4712fb26b8c06edf46293ed838f08ff34e1c068549ea9680657b7282cb884df4c1314c58cdb
-DIST petsc-3.5.1.tar.gz 20099475 SHA256 199af205f62dcc572728600670c7d4c8cb0d4efc4172c26f02b895d9dd1df245 SHA512 6c7285ad4d89de39b8ff0e73c65e6caeaed7dc7797c21f56caaca75f53550459cb76962c98d345748e1aae96c3daf57c8c20340a2b3233352022910ec5f08010 WHIRLPOOL 04f18580559b64f294237c6f4b2987f11b9b53ab86f20a0114a39c903f676e73753d6c782e9360b68225b72e42558d64e401f5d661708242f29fca959fa396e0
 DIST petsc-3.5.3.tar.gz 20729341 SHA256 68e6a42f5ec75bad87f74d4df8f55ad63f0c4d996f162da6713cb3d6f566830d SHA512 7455e9a67e5bbefce8f51eeb85418cdca2b14c50c85c8f9e91c0c53744a30954915a5a3aa141969d123daf54513610502cc52051a36a2a2da82410110f7421f8 WHIRLPOOL f473eb4a4136fb74114a51e3fa4a7ff60600c77b029a600360eca0418f6412ea653a6a8d6c72f750711d9d961982aad4b4e55332661dc2c203bb8c9344e0cca4
+DIST petsc-3.6.0.tar.gz 21447278 SHA256 c27cce12d212190726d3f17b4dcc48e8afca942271f1ad32aa48b0effeaffdbe SHA512 dc0f44debc2362a47b6658a01b77f6d0f3950d0b3eb22f73bcd3f2608b1d51e169447c9e994dd4f8ebef113b8ce7f2869533645cded6098a6c66f7244f2f62da WHIRLPOOL 3004e38988eb89371212a6bd2c8fdab00246256d3ca44cee2dba952565b4e023cb73b56d38c2a897191762b4b73053ab32d8be4905b93ff70fc97356ff8cdbcf
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
index 0ccf45ded..88a7db565 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 000000000..7510631a1
--- /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
index 3d01eee2e..6c96de3d9 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 \