Fix sed on *FLAGS from : to |, EAPI bump

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

5 files changed, 64 insertions, 52 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 61de2b4c608e..9c705d30b306 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/scilab
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.57 2011/06/21 14:43:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.58 2011/06/28 13:56:38 jlec Exp $
+
+  28 Jun 2011; Justin Lecher <jlec@gentoo.org> scilab-4.1.2-r1.ebuild,
+  scilab-4.1.2-r2.ebuild, metadata.xml:
+  Fix sed on *FLAGS from : to |, EAPI bump
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> scilab-4.1.2-r1.ebuild,
   scilab-4.1.2-r2.ebuild:
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index 1fe42565de5b..9510df5044d0 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX scilab-4.0-configure-gfortran.patch 14731 RMD160 be5367c2dc91d582fed58ad17733770474690cf3 SHA1 3208c8f48ade5a4934f72cb613400a177abebeb8 SHA256 2e2ef24db30ad6c69fd9fd0c6690841ae9286256e2de71784d48f09d84e0222a
 AUX scilab-4.0-gtk-fix.patch 929 RMD160 d0b3c0c754431bdd33d41b632eee1af1ab3c18e3 SHA1 7a11bbaf84c784ad7ae86b5d56f7ccba6c512a36 SHA256 25ef3f5dacfb91adb3d239855d7f32655a554b21608a4b485bf2bf3937ae6b85
@@ -14,14 +14,14 @@ AUX scilab-4.1.2-java-config.patch 446 RMD160 300d2ac4d0bf34e5842696644735af78c6
 AUX scilab-4.1.2-tmp-fix.patch 6067 RMD160 63f217f41edb721d1717724931410c228ad92dd9 SHA1 9a4856ce02c47d4bbcbffeb449d0861bb13dedf2 SHA256 b25b46e0738b2f37d8333128dc32d2f40358e0a217615f65b5e5811c423e336f
 AUX scilab-ppc-gcc4.patch 1045 RMD160 db4219fc04b5555e702d823425735125f3000c00 SHA1 ba001966a62202f66188ba4be1abe483f56f8fbe SHA256 0844c4edad45ba23219b8d3405104a8bbb2b45e2b7b742f7aaeb10ce5e92388a
 DIST scilab-4.1.2-src.tar.gz 15892277 RMD160 f708b966143ccbf989f7a0dbed95e4dab324e66f SHA1 d3f3190bd11fe23eebec03fe9feaced0406ddfe3 SHA256 4c0318a316c62a1206e53b936bbb1262d940e390c1d14da77c231e49b134b3a9
-EBUILD scilab-4.1.2-r1.ebuild 4366 RMD160 11c072f3b6fdfb9f4c5e0886b6ba3d49615a4c1b SHA1 ee21a3e1f92693b4c2dbc8ddfc7f2a2e5c537051 SHA256 0d99ef91bbf3c84c4994bd9a6e0057dcdb4f24910308969dcbab420ccc91733f
-EBUILD scilab-4.1.2-r2.ebuild 4636 RMD160 681be2c2922341dce61e950b4df5b9e468cba5a4 SHA1 da054b9f842488421a41ed29179f3de8266527d8 SHA256 9887417f7b4b67d04c998c968fba41d6c1ecc1cb4c303b063204c8d819702591
-MISC ChangeLog 12785 RMD160 b396006fe7161d41904a0468866a1d1df5c3e487 SHA1 39e5c460b97dcc0bf73cff43360b6c01ac7f6381 SHA256 15dc964383269b5b131d533c460f8369815b1284a90cd5e2bd4bc86727d639f8
-MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
+EBUILD scilab-4.1.2-r1.ebuild 4327 RMD160 53b2e872869ef90b771b9772921c1d2f90d1d83a SHA1 121010878bfb609bc06182b6aae56574dc598011 SHA256 f4e4ebe5d62e151df7099307934a9a3e1d0f1a139b238ee87eb2a706ebe29b5c
+EBUILD scilab-4.1.2-r2.ebuild 4241 RMD160 db405af889923cee5b1fe6284b365e02eec117b1 SHA1 4880c157377b171a8dc335b2655d88e44fb48ab6 SHA256 7b20207a3147e3961268aac3dcb10c752b974ef1bb90a7f230447dc8b9dba0ea
+MISC ChangeLog 12940 RMD160 69e50c84e0159bd8e5f848b19d4d8d3427b8c312 SHA1 cb7f6885e63c7e17d06ac58a1002ddfe59045787 SHA256 e7a03bc2f41174a4002e27eb6b53a68ffa5513904a5de75b18aaf50020729934
+MISC metadata.xml 169 RMD160 a8b2671842bbec7d36e587fbf53c4eb111498347 SHA1 604114857745acb6253b121cda619e3c35771cc7 SHA256 7a9f25879c1299572cfaf2a3efb47313412564a1ef12c828224194f4e96edcd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4ArggACgkQgAnW8HDreRbTeQCeLHDCfpZRlFBXPS+F4PJ11pOR
-DxQAoNGcuyQVdhAnN20c8ab2MjlE2zAu
-=6H8H
+iEYEAREKAAYFAk4J3aEACgkQgAnW8HDreRY+xACfRlFJIEmyDMlSbX7en+oKDzVg
+R1cAoKefqTWFaeNdmNzBjCAI6vsxhBnY
+=AyqK
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/scilab/metadata.xml b/sci-mathematics/scilab/metadata.xml
index 5a2f1c7b832e..2b0bd5314823 100644
--- a/sci-mathematics/scilab/metadata.xml
+++ b/sci-mathematics/scilab/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
+	<herd>sci-mathematics</herd>
 </pkgmetadata>
diff --git a/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild b/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild
index 3b88d4d2b509..0fc614b63a4b 100644
--- a/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 EAPI="1"
 
-inherit eutils fortran-2 toolchain-funcs multilib autotools java-pkg-opt-2
+inherit autotools eutils fortran-2 java-pkg-opt-2 multilib toolchain-funcs
 
 DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)"
 LICENSE="scilab"
@@ -12,7 +12,7 @@ SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
 HOMEPAGE="http://www.scilab.org/"
 
 SLOT="0"
-IUSE="ocaml gtk Xaw3d java"
+IUSE="gtk java ocaml Xaw3d"
 KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
@@ -55,17 +55,20 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-tmp-fix.patch
 	eautoconf
 
-	sed -e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/liblapack.so $(ATLASDIR)/libblas.so $(ATLASDIR)/libcblas.so,' \
+	sed \
+		-e "/^ATLAS_LAPACKBLAS\>/s,=.*,= $(pkg-config --libs blas cblas lapack)," \
 		-e 's,$(SCIDIR)/libs/lapack.a,,' \
 		-i Makefile.OBJ.in || die "Failed to fix Makefile.OBJ.in"
 
-	sed -e "s:\$(PREFIX):\${D}\$(PREFIX):g" \
+	sed \
+		-e "s:\$(PREFIX):\${D}\$(PREFIX):g" \
 		-e "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):g" \
 		-i Makefile.in || die "Failed to fix Makefile.in"
 
-	sed -e "s:@CC_OPTIONS@:${CFLAGS}:" \
-		-e "s:@FC_OPTIONS@:${FFLAGS}:" \
-		-e "s:@LD_LDFLAGS@:${LDFLAGS} -lpthread:" \
+	sed \
+		-e "s|@CC_OPTIONS@|${CFLAGS}|" \
+		-e "s|@FC_OPTIONS@|${FFLAGS}|" \
+		-e "s|@LD_LDFLAGS@|${LDFLAGS} -lpthread|" \
 		-i Makefile.incl.in || die "Failed to fix Makefile.incl.in"
 
 	# fix bad C practices by failure of scilab build system to
@@ -94,11 +97,12 @@ src_compile() {
 		myopts="${myopts} --with-gfortran"
 	fi
 
-	econf $(use_with Xaw3d xaw3d) \
+	econf \
+		$(use_with Xaw3d xaw3d) \
 		$(use_with gtk gtk2 ) \
 		$(use_with ocaml) \
 		$(use_with java ) \
-		${myopts} || die "econf failed"
+		${myopts}
 	env HOME="${S}" emake -j1 all || die "emake failed"
 }
 
diff --git a/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild b/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
index e46aa2aa2fd2..fc7f83a0e8fa 100644
--- a/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
+++ b/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
-EAPI="1"
+EAPI=4
 
-inherit eutils fortran-2 toolchain-funcs multilib autotools java-pkg-opt-2
+inherit autotools eutils fortran-2 java-pkg-opt-2 multilib toolchain-funcs
 
 DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)"
 LICENSE="scilab"
@@ -12,7 +12,7 @@ SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
 HOMEPAGE="http://www.scilab.org/"
 
 SLOT="0"
-IUSE="ocaml gtk Xaw3d java examples"
+IUSE="examples gtk java ocaml Xaw3d"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
@@ -43,30 +43,31 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-4.0-makefile.patch
-	epatch "${FILESDIR}"/${PN}-4.1-java-pic.patch
-	epatch "${FILESDIR}"/${P}-header-fix.patch
-	epatch "${FILESDIR}"/${PN}-4.1-examples.patch
-	epatch "${FILESDIR}"/${P}-java-config.patch
-	epatch "${FILESDIR}"/${P}-tmp-fix.patch
-	epatch "${FILESDIR}"/${P}-gcc45.patch
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.0-makefile.patch \
+		"${FILESDIR}"/${PN}-4.1-java-pic.patch \
+		"${FILESDIR}"/${P}-header-fix.patch \
+		"${FILESDIR}"/${PN}-4.1-examples.patch \
+		"${FILESDIR}"/${P}-java-config.patch \
+		"${FILESDIR}"/${P}-tmp-fix.patch \
+		"${FILESDIR}"/${P}-gcc45.patch
 	eautoconf
 
-	sed -e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/liblapack.so $(ATLASDIR)/libblas.so $(ATLASDIR)/libcblas.so,' \
+	sed \
+		-e "/^ATLAS_LAPACKBLAS\>/s,=.*,= $(pkg-config --libs blas cblas lapack)," \
 		-e 's,$(SCIDIR)/libs/lapack.a,,' \
 		-i Makefile.OBJ.in || die "Failed to fix Makefile.OBJ.in"
 
-	sed -e "s:\$(PREFIX):\${D}\$(PREFIX):g" \
+	sed \
+		-e "s:\$(PREFIX):\${D}\$(PREFIX):g" \
 		-e "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):g" \
 		-i Makefile.in || die "Failed to fix Makefile.in"
 
-	sed -e "s:@CC_OPTIONS@:${CFLAGS}:" \
-		-e "s:@FC_OPTIONS@:${FFLAGS}:" \
-		-e "s:@LD_LDFLAGS@:${LDFLAGS} -lpthread:" \
+	sed \
+		-e "s|@CC_OPTIONS@|${CFLAGS}|" \
+		-e "s|@FC_OPTIONS@|${FFLAGS}|" \
+		-e "s|@LD_LDFLAGS@|${LDFLAGS} -lpthread|" \
 		-i Makefile.incl.in || die "Failed to fix Makefile.incl.in"
 
 	# fix bad C practices by failure of scilab build system to
@@ -84,7 +85,7 @@ src_unpack() {
 	done
 }
 
-src_compile() {
+src_configure() {
 	local myopts
 	myopts="${myopts} --with-atlas-library=/usr/$(get_libdir)"
 
@@ -95,44 +96,47 @@ src_compile() {
 		myopts="${myopts} --with-gfortran"
 	fi
 
-	econf $(use_with Xaw3d xaw3d) \
+	econf \
+		$(use_with Xaw3d xaw3d) \
 		$(use_with gtk gtk2 ) \
 		$(use_with ocaml) \
 		$(use_with java ) \
-		${myopts} || die "econf failed"
-	env HOME="${S}" emake -j1 all || die "emake failed"
+		${myopts}
+}
+
+src_compile() {
+	env HOME="${S}" emake -j1 all
 }
 
 src_install() {
-	DESTDIR="${D}" make install || die "installation failed"
+	default
 
 	# some postinstall fixes
 	echo "SCIDIR=/usr/$(get_libdir)/${P}" > \
 		"${D}/usr/$(get_libdir)/${P}/Path.incl"
 
 	# install docs
-	dodoc ACKNOWLEDGEMENTS CHANGES README_Unix RELEASE_NOTES \
-		Readme_Visual.txt || die "failed to install docs"
+	dodoc ACKNOWLEDGEMENTS Readme_Visual.txt
 
 	# install examples
 	if use examples; then
 		insinto /usr/share/${PN}/
-		doins -r examples/ || die "failed to install examples"
+		doins -r examples/
 	fi
 
 	# install static libs since they are needed to link some third
 	# party apps (see bug #257252)
 	insinto /usr/$(get_libdir)/${P}/libs
-	doins libs/*.a || die "failed to install static libs"
+	doins libs/*.a
 
 	insinto /usr/$(get_libdir)/${P}
-	doins Makefile.incl || die "failed to install Makefile.incl"
+	doins Makefile.incl
 
 	exeinto /usr/$(get_libdir)/${P}
-	doexe libtool || die "failed to install libtool"
+	doexe libtool
 
 	insinto /usr/$(get_libdir)/${P}/config
-	doins config/Makeso.incl || die "failed to install Makeso.incl"
+	doins config/Makeso.incl
 
 	# The compile and install process causes the work folder
 	# to be registered as the runtime folder in many files.