| 1 |
jlec 11/06/28 13:56:39 |
| 2 |
|
| 3 |
Modified: metadata.xml scilab-4.1.2-r1.ebuild ChangeLog |
| 4 |
scilab-4.1.2-r2.ebuild |
| 5 |
Log: |
| 6 |
Fix sed on *FLAGS from : to |, EAPI bump |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 sci-mathematics/scilab/metadata.xml |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/metadata.xml?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/metadata.xml?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/metadata.xml?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: metadata.xml |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/metadata.xml,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- metadata.xml 31 Jul 2006 17:59:45 -0000 1.2 |
| 24 |
+++ metadata.xml 28 Jun 2011 13:56:38 -0000 1.3 |
| 25 |
@@ -1,5 +1,5 @@ |
| 26 |
<?xml version="1.0" encoding="UTF-8"?> |
| 27 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 28 |
<pkgmetadata> |
| 29 |
-<herd>sci-mathematics</herd> |
| 30 |
+ <herd>sci-mathematics</herd> |
| 31 |
</pkgmetadata> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.13 sci-mathematics/scilab/scilab-4.1.2-r1.ebuild |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild?rev=1.13&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild?rev=1.13&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild?r1=1.12&r2=1.13 |
| 40 |
|
| 41 |
Index: scilab-4.1.2-r1.ebuild |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild,v |
| 44 |
retrieving revision 1.12 |
| 45 |
retrieving revision 1.13 |
| 46 |
diff -u -r1.12 -r1.13 |
| 47 |
--- scilab-4.1.2-r1.ebuild 21 Jun 2011 14:43:15 -0000 1.12 |
| 48 |
+++ scilab-4.1.2-r1.ebuild 28 Jun 2011 13:56:38 -0000 1.13 |
| 49 |
@@ -1,10 +1,10 @@ |
| 50 |
# Copyright 1999-2011 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild,v 1.12 2011/06/21 14:43:15 jlec Exp $ |
| 53 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild,v 1.13 2011/06/28 13:56:38 jlec Exp $ |
| 54 |
|
| 55 |
EAPI="1" |
| 56 |
|
| 57 |
-inherit eutils fortran-2 toolchain-funcs multilib autotools java-pkg-opt-2 |
| 58 |
+inherit autotools eutils fortran-2 java-pkg-opt-2 multilib toolchain-funcs |
| 59 |
|
| 60 |
DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)" |
| 61 |
LICENSE="scilab" |
| 62 |
@@ -12,7 +12,7 @@ |
| 63 |
HOMEPAGE="http://www.scilab.org/" |
| 64 |
|
| 65 |
SLOT="0" |
| 66 |
-IUSE="ocaml gtk Xaw3d java" |
| 67 |
+IUSE="gtk java ocaml Xaw3d" |
| 68 |
KEYWORDS="amd64 ppc x86" |
| 69 |
|
| 70 |
RDEPEND=" |
| 71 |
@@ -55,17 +55,20 @@ |
| 72 |
epatch "${FILESDIR}"/${P}-tmp-fix.patch |
| 73 |
eautoconf |
| 74 |
|
| 75 |
- sed -e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/liblapack.so $(ATLASDIR)/libblas.so $(ATLASDIR)/libcblas.so,' \ |
| 76 |
+ sed \ |
| 77 |
+ -e "/^ATLAS_LAPACKBLAS\>/s,=.*,= $(pkg-config --libs blas cblas lapack)," \ |
| 78 |
-e 's,$(SCIDIR)/libs/lapack.a,,' \ |
| 79 |
-i Makefile.OBJ.in || die "Failed to fix Makefile.OBJ.in" |
| 80 |
|
| 81 |
- sed -e "s:\$(PREFIX):\${D}\$(PREFIX):g" \ |
| 82 |
+ sed \ |
| 83 |
+ -e "s:\$(PREFIX):\${D}\$(PREFIX):g" \ |
| 84 |
-e "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):g" \ |
| 85 |
-i Makefile.in || die "Failed to fix Makefile.in" |
| 86 |
|
| 87 |
- sed -e "s:@CC_OPTIONS@:${CFLAGS}:" \ |
| 88 |
- -e "s:@FC_OPTIONS@:${FFLAGS}:" \ |
| 89 |
- -e "s:@LD_LDFLAGS@:${LDFLAGS} -lpthread:" \ |
| 90 |
+ sed \ |
| 91 |
+ -e "s|@CC_OPTIONS@|${CFLAGS}|" \ |
| 92 |
+ -e "s|@FC_OPTIONS@|${FFLAGS}|" \ |
| 93 |
+ -e "s|@LD_LDFLAGS@|${LDFLAGS} -lpthread|" \ |
| 94 |
-i Makefile.incl.in || die "Failed to fix Makefile.incl.in" |
| 95 |
|
| 96 |
# fix bad C practices by failure of scilab build system to |
| 97 |
@@ -94,11 +97,12 @@ |
| 98 |
myopts="${myopts} --with-gfortran" |
| 99 |
fi |
| 100 |
|
| 101 |
- econf $(use_with Xaw3d xaw3d) \ |
| 102 |
+ econf \ |
| 103 |
+ $(use_with Xaw3d xaw3d) \ |
| 104 |
$(use_with gtk gtk2 ) \ |
| 105 |
$(use_with ocaml) \ |
| 106 |
$(use_with java ) \ |
| 107 |
- ${myopts} || die "econf failed" |
| 108 |
+ ${myopts} |
| 109 |
env HOME="${S}" emake -j1 all || die "emake failed" |
| 110 |
} |
| 111 |
|
| 112 |
|
| 113 |
|
| 114 |
|
| 115 |
1.58 sci-mathematics/scilab/ChangeLog |
| 116 |
|
| 117 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/ChangeLog?rev=1.58&view=markup |
| 118 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/ChangeLog?rev=1.58&content-type=text/plain |
| 119 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/ChangeLog?r1=1.57&r2=1.58 |
| 120 |
|
| 121 |
Index: ChangeLog |
| 122 |
=================================================================== |
| 123 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v |
| 124 |
retrieving revision 1.57 |
| 125 |
retrieving revision 1.58 |
| 126 |
diff -u -r1.57 -r1.58 |
| 127 |
--- ChangeLog 21 Jun 2011 14:43:15 -0000 1.57 |
| 128 |
+++ ChangeLog 28 Jun 2011 13:56:38 -0000 1.58 |
| 129 |
@@ -1,6 +1,10 @@ |
| 130 |
# ChangeLog for sci-mathematics/scilab |
| 131 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 132 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.57 2011/06/21 14:43:15 jlec Exp $ |
| 133 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.58 2011/06/28 13:56:38 jlec Exp $ |
| 134 |
+ |
| 135 |
+ 28 Jun 2011; Justin Lecher <jlec@g.o> scilab-4.1.2-r1.ebuild, |
| 136 |
+ scilab-4.1.2-r2.ebuild, metadata.xml: |
| 137 |
+ Fix sed on *FLAGS from : to |, EAPI bump |
| 138 |
|
| 139 |
21 Jun 2011; Justin Lecher <jlec@g.o> scilab-4.1.2-r1.ebuild, |
| 140 |
scilab-4.1.2-r2.ebuild: |
| 141 |
|
| 142 |
|
| 143 |
|
| 144 |
1.11 sci-mathematics/scilab/scilab-4.1.2-r2.ebuild |
| 145 |
|
| 146 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild?rev=1.11&view=markup |
| 147 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild?rev=1.11&content-type=text/plain |
| 148 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild?r1=1.10&r2=1.11 |
| 149 |
|
| 150 |
Index: scilab-4.1.2-r2.ebuild |
| 151 |
=================================================================== |
| 152 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild,v |
| 153 |
retrieving revision 1.10 |
| 154 |
retrieving revision 1.11 |
| 155 |
diff -u -r1.10 -r1.11 |
| 156 |
--- scilab-4.1.2-r2.ebuild 21 Jun 2011 14:43:15 -0000 1.10 |
| 157 |
+++ scilab-4.1.2-r2.ebuild 28 Jun 2011 13:56:38 -0000 1.11 |
| 158 |
@@ -1,10 +1,10 @@ |
| 159 |
# Copyright 1999-2011 Gentoo Foundation |
| 160 |
# Distributed under the terms of the GNU General Public License v2 |
| 161 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild,v 1.10 2011/06/21 14:43:15 jlec Exp $ |
| 162 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild,v 1.11 2011/06/28 13:56:38 jlec Exp $ |
| 163 |
|
| 164 |
-EAPI="1" |
| 165 |
+EAPI=4 |
| 166 |
|
| 167 |
-inherit eutils fortran-2 toolchain-funcs multilib autotools java-pkg-opt-2 |
| 168 |
+inherit autotools eutils fortran-2 java-pkg-opt-2 multilib toolchain-funcs |
| 169 |
|
| 170 |
DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)" |
| 171 |
LICENSE="scilab" |
| 172 |
@@ -12,7 +12,7 @@ |
| 173 |
HOMEPAGE="http://www.scilab.org/" |
| 174 |
|
| 175 |
SLOT="0" |
| 176 |
-IUSE="ocaml gtk Xaw3d java examples" |
| 177 |
+IUSE="examples gtk java ocaml Xaw3d" |
| 178 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 179 |
|
| 180 |
RDEPEND=" |
| 181 |
@@ -43,30 +43,31 @@ |
| 182 |
java-pkg-opt-2_pkg_setup |
| 183 |
} |
| 184 |
|
| 185 |
-src_unpack() { |
| 186 |
- unpack ${A} |
| 187 |
- cd "${S}" |
| 188 |
- |
| 189 |
- epatch "${FILESDIR}"/${PN}-4.0-makefile.patch |
| 190 |
- epatch "${FILESDIR}"/${PN}-4.1-java-pic.patch |
| 191 |
- epatch "${FILESDIR}"/${P}-header-fix.patch |
| 192 |
- epatch "${FILESDIR}"/${PN}-4.1-examples.patch |
| 193 |
- epatch "${FILESDIR}"/${P}-java-config.patch |
| 194 |
- epatch "${FILESDIR}"/${P}-tmp-fix.patch |
| 195 |
- epatch "${FILESDIR}"/${P}-gcc45.patch |
| 196 |
+src_prepare() { |
| 197 |
+ epatch \ |
| 198 |
+ "${FILESDIR}"/${PN}-4.0-makefile.patch \ |
| 199 |
+ "${FILESDIR}"/${PN}-4.1-java-pic.patch \ |
| 200 |
+ "${FILESDIR}"/${P}-header-fix.patch \ |
| 201 |
+ "${FILESDIR}"/${PN}-4.1-examples.patch \ |
| 202 |
+ "${FILESDIR}"/${P}-java-config.patch \ |
| 203 |
+ "${FILESDIR}"/${P}-tmp-fix.patch \ |
| 204 |
+ "${FILESDIR}"/${P}-gcc45.patch |
| 205 |
eautoconf |
| 206 |
|
| 207 |
- sed -e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/liblapack.so $(ATLASDIR)/libblas.so $(ATLASDIR)/libcblas.so,' \ |
| 208 |
+ sed \ |
| 209 |
+ -e "/^ATLAS_LAPACKBLAS\>/s,=.*,= $(pkg-config --libs blas cblas lapack)," \ |
| 210 |
-e 's,$(SCIDIR)/libs/lapack.a,,' \ |
| 211 |
-i Makefile.OBJ.in || die "Failed to fix Makefile.OBJ.in" |
| 212 |
|
| 213 |
- sed -e "s:\$(PREFIX):\${D}\$(PREFIX):g" \ |
| 214 |
+ sed \ |
| 215 |
+ -e "s:\$(PREFIX):\${D}\$(PREFIX):g" \ |
| 216 |
-e "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):g" \ |
| 217 |
-i Makefile.in || die "Failed to fix Makefile.in" |
| 218 |
|
| 219 |
- sed -e "s:@CC_OPTIONS@:${CFLAGS}:" \ |
| 220 |
- -e "s:@FC_OPTIONS@:${FFLAGS}:" \ |
| 221 |
- -e "s:@LD_LDFLAGS@:${LDFLAGS} -lpthread:" \ |
| 222 |
+ sed \ |
| 223 |
+ -e "s|@CC_OPTIONS@|${CFLAGS}|" \ |
| 224 |
+ -e "s|@FC_OPTIONS@|${FFLAGS}|" \ |
| 225 |
+ -e "s|@LD_LDFLAGS@|${LDFLAGS} -lpthread|" \ |
| 226 |
-i Makefile.incl.in || die "Failed to fix Makefile.incl.in" |
| 227 |
|
| 228 |
# fix bad C practices by failure of scilab build system to |
| 229 |
@@ -84,7 +85,7 @@ |
| 230 |
done |
| 231 |
} |
| 232 |
|
| 233 |
-src_compile() { |
| 234 |
+src_configure() { |
| 235 |
local myopts |
| 236 |
myopts="${myopts} --with-atlas-library=/usr/$(get_libdir)" |
| 237 |
|
| 238 |
@@ -95,44 +96,47 @@ |
| 239 |
myopts="${myopts} --with-gfortran" |
| 240 |
fi |
| 241 |
|
| 242 |
- econf $(use_with Xaw3d xaw3d) \ |
| 243 |
+ econf \ |
| 244 |
+ $(use_with Xaw3d xaw3d) \ |
| 245 |
$(use_with gtk gtk2 ) \ |
| 246 |
$(use_with ocaml) \ |
| 247 |
$(use_with java ) \ |
| 248 |
- ${myopts} || die "econf failed" |
| 249 |
- env HOME="${S}" emake -j1 all || die "emake failed" |
| 250 |
+ ${myopts} |
| 251 |
+} |
| 252 |
+ |
| 253 |
+src_compile() { |
| 254 |
+ env HOME="${S}" emake -j1 all |
| 255 |
} |
| 256 |
|
| 257 |
src_install() { |
| 258 |
- DESTDIR="${D}" make install || die "installation failed" |
| 259 |
+ default |
| 260 |
|
| 261 |
# some postinstall fixes |
| 262 |
echo "SCIDIR=/usr/$(get_libdir)/${P}" > \ |
| 263 |
"${D}/usr/$(get_libdir)/${P}/Path.incl" |
| 264 |
|
| 265 |
# install docs |
| 266 |
- dodoc ACKNOWLEDGEMENTS CHANGES README_Unix RELEASE_NOTES \ |
| 267 |
- Readme_Visual.txt || die "failed to install docs" |
| 268 |
+ dodoc ACKNOWLEDGEMENTS Readme_Visual.txt |
| 269 |
|
| 270 |
# install examples |
| 271 |
if use examples; then |
| 272 |
insinto /usr/share/${PN}/ |
| 273 |
- doins -r examples/ || die "failed to install examples" |
| 274 |
+ doins -r examples/ |
| 275 |
fi |
| 276 |
|
| 277 |
# install static libs since they are needed to link some third |
| 278 |
# party apps (see bug #257252) |
| 279 |
insinto /usr/$(get_libdir)/${P}/libs |
| 280 |
- doins libs/*.a || die "failed to install static libs" |
| 281 |
+ doins libs/*.a |
| 282 |
|
| 283 |
insinto /usr/$(get_libdir)/${P} |
| 284 |
- doins Makefile.incl || die "failed to install Makefile.incl" |
| 285 |
+ doins Makefile.incl |
| 286 |
|
| 287 |
exeinto /usr/$(get_libdir)/${P} |
| 288 |
- doexe libtool || die "failed to install libtool" |
| 289 |
+ doexe libtool |
| 290 |
|
| 291 |
insinto /usr/$(get_libdir)/${P}/config |
| 292 |
- doins config/Makeso.incl || die "failed to install Makeso.incl" |
| 293 |
+ doins config/Makeso.incl |
| 294 |
|
| 295 |
# The compile and install process causes the work folder |
| 296 |
# to be registered as the runtime folder in many files. |
Archives