Skip to content
This repository
Browse code

Updated patch set for 6.2.beta8

Package-Manager: portage-2.2.10
  • Loading branch information...
commit 657d527da776769eb71e0dbce2308c45b693f6eb 1 parent ae13023
François Bissey authored April 15, 2014
5  sci-mathematics/sage/ChangeLog
@@ -2,6 +2,11 @@
2 2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
3 3
 # $Header: $
4 4
 
  5
+  15 Apr 2014; François Bissey <francois.bissey@canterbury.ac.nz>
  6
+  +files/sage-6.2-r1-env.patch, +files/sage-6.2-r1-ppl1.patch,
  7
+  -files/sage-6.2-env.patch, -files/sage-6.2-ppl1.patch, sage-9999.ebuild:
  8
+  Updated patch set for 6.2.beta8
  9
+
5 10
   09 Apr 2014; François Bissey <francois.bissey@canterbury.ac.nz>
6 11
   sage-6.0-r2.ebuild, sage-6.1.1-r2.ebuild:
7 12
   properly fix issue #289 for sage 6.0 and 6.1.1
2  sci-mathematics/sage/Manifest
@@ -14,4 +14,4 @@ DIST sage-6.0-neutering.tar.bz2 5182 SHA256 aea96e2ff480e4783a42ce3773e65afffc04
14 14
 DIST sage-6.0.tar.gz 15909971 SHA256 40a735b7e4a2bf0eddb8aafe2062312702c8db6772504c56cfc0f45cce8ed27d SHA512 7b8a10e338d18e78f4c2a68d629253fee8f513a7305520a83affabbbf65cc36f5a73c4abd501765fed09bb804e59da508c0b9cceeb884074bc9e9939dedf307a
15 15
 DIST sage-6.1-neutering.tar.bz2 5456 SHA256 960823314665027e04adbecaba6563239b0969be65c40f1c112c263d3403e73c SHA512 555f06e387e2333c2fb5a91e95ee623b9bc0f6a87570a6e4ff9ad6c9270f77eec7b234190410d58a660d6004a4b2563faf4328d500fcd8f5d17325c8ba76a4ef
16 16
 DIST sage-6.1.1.tar.gz 16160922 SHA256 576cab18e919b53500f87a5f4e4dcc3aab351bd0c251d411b4284407c174267c SHA512 5139646c1afadf234edf8c709cd5e75aa164730b90d579f6505dde577fb9f00b798a7f1b28067f2bff3b64965a31383ac67a6e692ca21ec2327d9bd4b31c8b8f
17  
-DIST sage-6.2-neutering.tar.bz2 5261 SHA256 65be83cc7889d27dad45e2b1fe582771fce6285c26080230b11f83814ae47d29 SHA512 b7319e9f336334aab08f9d7e116646b134a5241a9c8ab2836a2b2c5263456007fb188f06bce222e8437465d4dc32a9140b85b2d9b5b0d3aa1fa8095b711ae959
  17
+DIST sage-6.2-r1-neutering.tar.bz2 14116 SHA256 f130fece1b19139e2ffcf28af0561b373a052232afb006e8146c824d9b0eb8ae SHA512 d802323774c19edbc28a604a51afa422dd7584e7caddf68f8fd90152e80a1866a53a679e255336165ca142f480ccd04b3090f99ca15a36329a4e520e806453ce
3  sci-mathematics/sage/files/sage-6.2-env.patch → sci-mathematics/sage/files/sage-6.2-r1-env.patch
@@ -23,11 +23,10 @@
23 23
 -_add_variable_or_fallback('SAGE_SPKG_INST',  opj('$SAGE_LOCAL', 'var', 'lib', 'sage', 'installed'))
24 24
 -_add_variable_or_fallback('SAGE_DOC',        opj('$SAGE_SRC', 'doc'))
25 25
 -_add_variable_or_fallback('DOT_SAGE',        opj(os.environ.get('HOME','$SAGE_ROOT'), '.sage'))
  26
+-_add_variable_or_fallback('SAGE_DOT_GIT',    opj('$SAGE_ROOT', '.git'))
26 27
 +_add_variable_or_fallback('SAGE_EXTCODE',    opj('$SAGE_SHARE', 'ext'))
27 28
 +_add_variable_or_fallback('SAGE_DOC',        opj('$SAGE_SHARE', 'doc'))
28 29
 +_add_variable_or_fallback('DOT_SAGE',        opj(os.environ.get('HOME'), '.sage'))
29  
- _add_variable_or_fallback('PYTHON_EGG_CACHE',opj('$DOT_SAGE','.python-eggs'))
30  
--_add_variable_or_fallback('SAGE_DOT_GIT',    opj('$SAGE_ROOT', '.git'))
31 30
  
32 31
  # misc
33 32
  _add_variable_or_fallback('SAGE_URL',                'http://sage.math.washington.edu/sage/')
2  sci-mathematics/sage/files/sage-6.2-ppl1.patch → sci-mathematics/sage/files/sage-6.2-r1-ppl1.patch
@@ -19,7 +19,7 @@
19 19
                include_dirs = [SAGE_INC, "sage/c_lib/include/"],
20 20
 +              runtime_library_dirs = [SAGE_LOCAL + "/lib/ppl1"],
21 21
 +              library_dirs = [SAGE_LOCAL + "/lib/ppl1"],
22  
-               libraries=["csage", "stdc++"]),
  22
+               libraries=["stdc++"]),
23 23
  
24 24
      Extension("sage.numerical.backends.glpk_graph_backend",
25 25
 --- sage/libs/ppl.pyx.orig	2014-03-06 21:21:03.000000000 -0600
8  sci-mathematics/sage/sage-9999.ebuild
@@ -26,7 +26,7 @@ fi
26 26
 DESCRIPTION="Math software for algebra, geometry, number theory, cryptography and numerical computation"
27 27
 HOMEPAGE="http://www.sagemath.org"
28 28
 SRC_URI="${SRC_URI}
29  
-	mirror://sagemath/patches/${PN}-6.2-neutering.tar.bz2"
  29
+	mirror://sagemath/patches/${PN}-6.2-r1-neutering.tar.bz2"
30 30
 
31 31
 LICENSE="GPL-2"
32 32
 SLOT="0"
@@ -138,7 +138,7 @@ python_prepare() {
138 138
 	epatch "${FILESDIR}"/${PN}-blas.patch
139 139
 
140 140
 	# Remove sage's package management system
141  
-	epatch "${WORKDIR}"/patches/${PN}-6.1-package.patch
  141
+	epatch "${WORKDIR}"/patches/${PN}-6.2-package.patch
142 142
 	rm sage/misc/package.py
143 143
 
144 144
 	# Remove sage's git capabilities
@@ -185,7 +185,7 @@ python_prepare() {
185 185
 		module_list.py
186 186
 
187 187
 	# use sage-ppl
188  
-	epatch "${FILESDIR}"/${PN}-6.2-ppl1.patch
  188
+	epatch "${FILESDIR}"/${PN}-6.2-r1-ppl1.patch
189 189
 	sed -i "s:lib/ppl1:$(get_libdir)/ppl1:" module_list.py
190 190
 
191 191
 	# fix lcalc path
@@ -202,7 +202,7 @@ python_prepare() {
202 202
 	############################################################################
203 203
 
204 204
 	# sage on gentoo env.py
205  
-	epatch "${FILESDIR}"/sage-6.2-env.patch
  205
+	epatch "${FILESDIR}"/sage-6.2-r1-env.patch
206 206
 	eprefixify sage/env.py
207 207
 
208 208
 	# fix library path of libsingular

0 notes on commit 657d527

Please sign in to comment.
Something went wrong with that request. Please try again.