Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-mathematics/octave: octave-3.6.0.ebuild ChangeLog octave-3.4.3-r1.ebuild
Date: Tue, 31 Jan 2012 18:01:18
Message-Id: 20120131180109.12C722004C@flycatcher.gentoo.org
1 bicatali 12/01/31 18:01:08
2
3 Modified: octave-3.6.0.ebuild ChangeLog
4 octave-3.4.3-r1.ebuild
5 Log:
6 Remove openmp (too experimental, do it with EXTRA_ECONF if interested), fixed a parallel build issue (bug #401189), remove obsolete configure option
7
8 (Portage version: 2.1.10.41/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.3 sci-mathematics/octave/octave-3.6.0.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild?r1=1.2&r2=1.3
16
17 Index: octave-3.6.0.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- octave-3.6.0.ebuild 20 Jan 2012 23:53:28 -0000 1.2
24 +++ octave-3.6.0.ebuild 31 Jan 2012 18:01:08 -0000 1.3
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2012 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild,v 1.2 2012/01/20 23:53:28 bicatali Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild,v 1.3 2012/01/31 18:01:08 bicatali Exp $
30
31 EAPI=4
32
33 @@ -13,7 +13,7 @@
34 SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
35
36 SLOT="0"
37 -IUSE="curl doc fftw +glpk +imagemagick opengl openmp +qhull +qrupdate
38 +IUSE="curl doc fftw +glpk +imagemagick opengl +qhull +qrupdate
39 readline +sparse static-libs X zlib"
40 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
41
42 @@ -52,12 +52,7 @@
43 dev-util/gperf
44 dev-util/pkgconfig"
45
46 -PATCHES=( "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help}.patch )
47 -
48 -pkg_setup() {
49 - use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp && \
50 - die "You have openmp enabled but your current gcc does not support it"
51 -}
52 +PATCHES=( "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help,texi}.patch )
53
54 src_configure() {
55 # hdf5 disabled because not really useful (bug #299876)
56 @@ -72,12 +67,10 @@
57
58 myeconfargs+=(
59 --localstatedir="${EPREFIX}/var/state/octave"
60 - --disable-rpath
61 --without-hdf5
62 --with-blas="$(pkg-config --libs blas)"
63 --with-lapack="$(pkg-config --libs lapack)"
64 $(use_enable doc docs)
65 - $(use_enable openmp)
66 $(use_enable readline)
67 $(use_with curl)
68 $(use_with fftw fftw3)
69
70
71
72 1.115 sci-mathematics/octave/ChangeLog
73
74 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.115&view=markup
75 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.115&content-type=text/plain
76 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?r1=1.114&r2=1.115
77
78 Index: ChangeLog
79 ===================================================================
80 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v
81 retrieving revision 1.114
82 retrieving revision 1.115
83 diff -u -r1.114 -r1.115
84 --- ChangeLog 21 Jan 2012 18:28:10 -0000 1.114
85 +++ ChangeLog 31 Jan 2012 18:01:08 -0000 1.115
86 @@ -1,6 +1,11 @@
87 # ChangeLog for sci-mathematics/octave
88 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
89 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.114 2012/01/21 18:28:10 bicatali Exp $
90 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.115 2012/01/31 18:01:08 bicatali Exp $
91 +
92 + 31 Jan 2012; S├ębastien Fabbro <bicatali@g.o> octave-3.4.3-r1.ebuild,
93 + +files/octave-3.4.3-texi.patch, octave-3.6.0.ebuild:
94 + Remove openmp (too experimental, do it with EXTRA_ECONF if interested), fixed
95 + a parallel build issue (bug #401189), remove obsolete configure option
96
97 21 Jan 2012; S├ębastien Fabbro <bicatali@g.o> octave-3.4.3-r1.ebuild:
98 Applying pkg_setup to earlier version
99
100
101
102 1.5 sci-mathematics/octave/octave-3.4.3-r1.ebuild
103
104 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild?rev=1.5&view=markup
105 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild?rev=1.5&content-type=text/plain
106 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild?r1=1.4&r2=1.5
107
108 Index: octave-3.4.3-r1.ebuild
109 ===================================================================
110 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild,v
111 retrieving revision 1.4
112 retrieving revision 1.5
113 diff -u -r1.4 -r1.5
114 --- octave-3.4.3-r1.ebuild 21 Jan 2012 18:28:10 -0000 1.4
115 +++ octave-3.4.3-r1.ebuild 31 Jan 2012 18:01:08 -0000 1.5
116 @@ -1,6 +1,6 @@
117 # Copyright 1999-2012 Gentoo Foundation
118 # Distributed under the terms of the GNU General Public License v2
119 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild,v 1.4 2012/01/21 18:28:10 bicatali Exp $
120 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild,v 1.5 2012/01/31 18:01:08 bicatali Exp $
121
122 EAPI=4
123 inherit eutils base autotools toolchain-funcs
124 @@ -55,7 +55,7 @@
125 }
126
127 src_prepare() {
128 - epatch "${FILESDIR}"/${P}-{pkgbuilddir,help}.patch
129 + epatch "${FILESDIR}"/${P}-{pkgbuilddir,help,texi}.patch
130 eautoreconf
131 }