Tweak the ebuild

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 39 insertions, 50 deletions

diff --git a/sci-mathematics/algae/ChangeLog b/sci-mathematics/algae/ChangeLog
index 6d397a1be..079bc8992 100644
--- a/sci-mathematics/algae/ChangeLog
+++ b/sci-mathematics/algae/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> algae-4.3.6.ebuild,
+  metadata.xml:
+  Tweak the ebuild
+
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> algae-4.3.6.ebuild:
   Added fortran-2.eclass support
 
diff --git a/sci-mathematics/algae/Manifest b/sci-mathematics/algae/Manifest
index 4212d931a..6e38c0079 100644
--- a/sci-mathematics/algae/Manifest
+++ b/sci-mathematics/algae/Manifest
@@ -5,13 +5,13 @@ AUX Makefile.in-doc.patch 235 RMD160 5074f322864ebf809aba80ed5020a18ff24b0864 SH
 AUX Makefile.in-src.patch 193 RMD160 23f3389914dab1b15c2c9821c6b37800afde408e SHA1 d7bc9639c4053911076440e7cf5470aa15d66455 SHA256 dd5204e6eaff31c655cc543443d4c204b929bb3d27646b37e0422dc7f54f7024
 AUX configure.in.patch 466 RMD160 fc73794fed429776e6e90e3949f38e038a29cc63 SHA1 89a06bf3a3220c810e50a4bd28c38ffee62c4dce SHA256 b2f13f41937c36bf2332e96b8e19cc5e37e1af077dc83aed55201b31934563ab
 DIST algae-4.3.6.tar.gz 1790061 RMD160 0dfee737c3eccb59563fd85da8d7772937d5795c SHA1 f935540e8479b543d51cf04fc38e6c573679e19c SHA256 b456e8ab32eda24a1c0dde44f75455e6b5a8a7604ce8cd7ff9419651d93c0ec1
-EBUILD algae-4.3.6.ebuild 1771 RMD160 befa3f8dbaa4a1d8d40b6b1504fd1b550a324529 SHA1 318600b1f747222de1030026b5e06145ca939978 SHA256 93bb6881745a76ced30c1e3d08d6b705a6454f3007de58d3141401be97f85271
-MISC ChangeLog 522 RMD160 365f5e48608a0fed893ff581e7bc62665dc461b7 SHA1 e92e970505de95458d3c2d021a2f05a79f09226c SHA256 9d1f164a6f3fc8ad5b2468bea1bc0b9a1b2dab66b56ef9c86349c74d035d94be
-MISC metadata.xml 622 RMD160 3c7038660ff369d060982ecbb5d3e41b3fe795c8 SHA1 ae99381539d123b82485e9276191fb706a92fc0d SHA256 c9dcd4273b31dc409b0b6b65d1dffdebbc343fa3d4555d738ba206e2f3cdf865
+EBUILD algae-4.3.6.ebuild 1270 RMD160 30eae418e7036157626c2a2d9c1cbec7afeaec1d SHA1 c7e247f79ce5882b76d839c131a52eab712c2b3e SHA256 98b624db2f108979d6415532a5d463e7804548243c0411af2b8b43a158eb8e41
+MISC ChangeLog 625 RMD160 f11a45bca44cda7b3e62869d70632a41264e9e81 SHA1 6afd7f41d759fcb418fdefc3dd6252d280c3f625 SHA256 96ab71667a17455a5b1724e61251dbb976caf3b65d616d32ddf526a5c16633d6
+MISC metadata.xml 624 RMD160 9398614645d38f7fc4479329d0c9644ec671e263 SHA1 17098234c2520361f4a5ea33c19460edaafb3ac6 SHA256 336b4da1efeb1c0f9df43348e8c8d429032ed58151c10c3b8c33be4d2e3dd446
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4AhH4ACgkQgAnW8HDreRZq+ACgoo7Ocl/mr5Lc1ch/zhMCi+iC
-m/gAoLoqgI6GZefj0NHPrrl4rbhN+F4H
-=hOe/
+iEYEARECAAYFAk4AhdMACgkQgAnW8HDreRYskgCeLu/bpeAH7yxgqLsRW/fOCOjW
+f+8AoMXh2+V76YV9plfTQioAE7DcMpz0
+=J4WF
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/algae/algae-4.3.6.ebuild b/sci-mathematics/algae/algae-4.3.6.ebuild
index a18a165d6..575c87b31 100644
--- a/sci-mathematics/algae/algae-4.3.6.ebuild
+++ b/sci-mathematics/algae/algae-4.3.6.ebuild
@@ -2,69 +2,54 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils fortran-2
+EAPI=4
 
-DESCRIPTION="high-level interpreted language for numerical analysis"
+inherit autotools eutils fortran-2
 
+DESCRIPTION="High-level interpreted language for numerical analysis"
 HOMEPAGE="http://algae.sourceforge.net/"
-
 SRC_URI="mirror://sourceforge/algae/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~x86"
+IUSE="intel blas lapack"
 
-IUSE="icc blas lapack"
-
-DEPEND="sci-libs/fftw \
-	icc? ( dev-lang/icc dev-lang/ifc ) \
+DEPEND="
+	sci-libs/fftw \
+	intel? ( dev-lang/icc dev-lang/ifc )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/configure.in.patch" || die "epatch configure.in failed"
-	epatch "${FILESDIR}/Makefile.in-src.patch" || die "epatch src/Makefile.in failed"
-	epatch "${FILESDIR}/Makefile.in-doc.patch" || die "epatch doc/Makefile.in failed"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/configure.in.patch
+		"${FILESDIR}"/Makefile.in-src.patch
+		"${FILESDIR}"/Makefile.in-doc.patch
+	eautoreconf
 }
 
-src_compile() {
-	autoconf
-	if use icc; then
-		F77="ifort" FFLAGS="-O3 -axKWNBP -ip" \
-		CC="icc" CFLAGS="-O3 -axKWNBP -ip" \
+src_configure() {
+	if use intel; then
+		F77="ifort" \
+		CC="icc" \
 		LDFLAGS="-L/opt/intel/compiler80/lib" LIBS="-latlas" \
 		econf \
 			--with-readline --with-fftw \
 			$(use-enable blas ) $(use-enable lapack ) \
-			--with-fortran-libs="-limf -lifcore -lifport" \
-				|| die "econf failed"
+			--with-fortran-libs="-limf -lifcore -lifport"
 	else
-		FLAGS="${CFLAGS}" econf --with-readline --with-fftw \
-			$(use-enable blas ) $(use-enable lapack ) \
-				|| die "econf failed"
+		FLAGS="${FCFLAGS}" econf --with-readline --with-fftw \
+			$(use-enable blas ) $(use-enable lapack )
 	fi
-
-	emake htmldir="/usr/share/doc/${P}/html" || die "emake failed"
 }
 
-src_install() {
-	dodoc INSTALL NEWS PROBLEMS README VERSION doc/FAQ
-	dodir /usr/share/doc/${P}/html
-	make install prefix="${D}usr" htmldir="${D}usr/share/doc/${P}/html" \
-		|| die "make install failed"
-	insinto /usr/share/doc/${P}
-	doins doc/*ps
-}
-
-pkg_postinst() {
-	ln -s "/usr/bin/${P}" "/usr/bin/${PN}"
-	ln -s "/usr/share/doc/${P}/html" "/usr/share/${PN}/html"
+src_compile() {
+	emake htmldir="/usr/share/doc/${P}/html"
 }
 
-pkg_prerm() {
-	rm -f "/usr/bin/${PN}"
-	rm -f "/usr/share/${PN}/html"
+src_install() {
+	emake install prefix="${D}usr" htmldir="${D}usr/share/doc/${P}/html"
+	dodoc INSTALL NEWS PROBLEMS README VERSION doc/FAQ doc/*ps
 }
diff --git a/sci-mathematics/algae/metadata.xml b/sci-mathematics/algae/metadata.xml
index 8bf543149..5b73e554a 100644
--- a/sci-mathematics/algae/metadata.xml
+++ b/sci-mathematics/algae/metadata.xml
@@ -12,5 +12,5 @@ Boeing because they needed a fast and versatile tool, capable of handling large
 systems. Algae has been applied to interesting problems in aerospace and
 related fields for more than a decade.
 </longdescription>
-<use><flag name='icc'>Use icc as c compiler</flag></use>
+<use><flag name='intel'>Use icc as c compiler</flag></use>
 </pkgmetadata>