1 |
commit: 5b51f0cbdc77f4097824d010fcb62f845d9d1560 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 4 16:20:42 2013 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 4 16:20:42 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b51f0cb |
7 |
|
8 |
sci-mathematics/Macaulay2: Bump EAPI to 5; Bump to python-single-r1 eclass |
9 |
|
10 |
Package-Manager: portage-2.2.7 |
11 |
|
12 |
--- |
13 |
sci-mathematics/Macaulay2/ChangeLog | 3 +++ |
14 |
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 33 +++++++++++++------------ |
15 |
2 files changed, 20 insertions(+), 16 deletions(-) |
16 |
|
17 |
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog |
18 |
index e164ec1..b012ef2 100644 |
19 |
--- a/sci-mathematics/Macaulay2/ChangeLog |
20 |
+++ b/sci-mathematics/Macaulay2/ChangeLog |
21 |
@@ -2,6 +2,9 @@ |
22 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: $ |
24 |
|
25 |
+ 04 Dec 2013; Justin Lecher <jlec@g.o> Macaulay2-9999.ebuild: |
26 |
+ Bump EAPI to 5; Bump to python-single-r1 eclass |
27 |
+ |
28 |
27 Feb 2013; Justin Lecher <jlec@g.o> files/9999-lapack.patch, |
29 |
Macaulay2-9999.ebuild: |
30 |
Use PKG_CONFIG instead of generic pkg-config |
31 |
|
32 |
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild |
33 |
index c88ab6a..d2413c0 100644 |
34 |
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild |
35 |
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild |
36 |
@@ -2,13 +2,11 @@ |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
# $Header: $ |
39 |
|
40 |
-EAPI=4 |
41 |
+EAPI=5 |
42 |
|
43 |
-inherit autotools elisp-common eutils flag-o-matic git-2 python toolchain-funcs |
44 |
+PYTHON_COMPAT=( python{2_6,2_7} ) |
45 |
|
46 |
-IUSE="debug emacs optimization" |
47 |
- |
48 |
-EGIT_REPO_URI="git://github.com/Macaulay2/M2.git" |
49 |
+inherit autotools elisp-common eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs |
50 |
|
51 |
# Those packages will be built internally. |
52 |
FACTORY="factory-3-1-6" |
53 |
@@ -23,19 +21,23 @@ SRC_URI=" |
54 |
http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz |
55 |
http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip" |
56 |
# Need normaliz for an up to date normaliz.m2 |
57 |
+EGIT_REPO_URI="git://github.com/Macaulay2/M2.git" |
58 |
|
59 |
SLOT="0" |
60 |
LICENSE="GPL-2" |
61 |
KEYWORDS="" |
62 |
+IUSE="debug emacs optimization" |
63 |
+ |
64 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
65 |
|
66 |
-DEPEND=" |
67 |
+DEPEND="${PYTHON_DEPS} |
68 |
sys-process/time |
69 |
virtual/pkgconfig |
70 |
app-arch/unzip |
71 |
app-text/dos2unix" |
72 |
# Unzip and dos2unix just for normaliz |
73 |
|
74 |
-RDEPEND=" |
75 |
+RDEPEND="${PYTHON_DEPS} |
76 |
sys-libs/gdbm |
77 |
dev-libs/ntl |
78 |
sci-mathematics/pari[gmp] |
79 |
@@ -67,7 +69,7 @@ RESTRICT="mirror" |
80 |
|
81 |
src_unpack (){ |
82 |
unpack "Normaliz2.8.zip" |
83 |
- git-2_src_unpack |
84 |
+ git-r3_src_unpack |
85 |
# Undo one level of directory until git allows to checkout |
86 |
# subdirectories |
87 |
mv "${S}"/M2/* "${S}" || die |
88 |
@@ -75,14 +77,13 @@ src_unpack (){ |
89 |
} |
90 |
|
91 |
pkg_setup () { |
92 |
- tc-export CC CPP CXX |
93 |
- append-cppflags "-I/usr/include/frobby" |
94 |
- # gtest needs python:2 |
95 |
- python_set_active_version 2 |
96 |
+ tc-export CC CPP CXX PKG_CONFIG |
97 |
+ append-cppflags "-I/usr/include/frobby" |
98 |
+ # gtest needs python:2 |
99 |
+ python-single-r1_pkg_setup |
100 |
} |
101 |
|
102 |
src_prepare() { |
103 |
- tc-export PKG_CONFIG |
104 |
# Put updated Normaliz.m2 in place |
105 |
cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \ |
106 |
"${S}/Macaulay2/packages" || die |
107 |
@@ -139,7 +140,7 @@ src_compile() { |
108 |
emake IgnoreExampleErrors=true -j1 |
109 |
|
110 |
if use emacs; then |
111 |
- cd "${S}/Macaulay2/emacs" |
112 |
+ cd "${S}/Macaulay2/emacs" || die |
113 |
elisp-compile *.el |
114 |
fi |
115 |
} |
116 |
@@ -157,9 +158,9 @@ src_install () { |
117 |
|
118 |
# Remove emacs files and install them in the |
119 |
# correct place if use emacs |
120 |
- rm -rf "${D}"/usr/share/emacs/site-lisp |
121 |
+ rm -rf "${ED}"/usr/share/emacs/site-lisp || die |
122 |
if use emacs; then |
123 |
- cd "${S}/Macaulay2/emacs" |
124 |
+ cd "${S}/Macaulay2/emacs" || die |
125 |
elisp-install ${PN} *.elc *.el |
126 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
127 |
fi |