public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/algae/
@ 2011-06-21 11:54 Justin Lecher
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2011-06-21 11:54 UTC (permalink / raw
  To: gentoo-commits

commit:     d937642d4c43e995794aafb646c22325df4e0b9f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 11:51:47 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 11:51:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d937642d

Tweak the ebuild

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

---
 sci-mathematics/algae/ChangeLog          |    4 ++
 sci-mathematics/algae/algae-4.3.6.ebuild |   71 ++++++++++++------------------
 sci-mathematics/algae/metadata.xml       |    2 +-
 3 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/sci-mathematics/algae/ChangeLog b/sci-mathematics/algae/ChangeLog
index 6d397a1..079bc89 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/algae-4.3.6.ebuild b/sci-mathematics/algae/algae-4.3.6.ebuild
index a18a165..575c87b 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 8bf5431..5b73e55 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>



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-mathematics/algae/
@ 2011-06-21 11:54 Justin Lecher
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2011-06-21 11:54 UTC (permalink / raw
  To: gentoo-commits

commit:     54c5e0e16d8f2570a676efbf5692dba6845e93e6
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 11:46:06 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 11:46:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=54c5e0e1

commit

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

---
 sci-mathematics/algae/ChangeLog          |    5 ++++-
 sci-mathematics/algae/algae-4.3.6.ebuild |    4 ++--
 sci-mathematics/algae/metadata.xml       |    1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/algae/ChangeLog b/sci-mathematics/algae/ChangeLog
index 9bb5869..6d397a1 100644
--- a/sci-mathematics/algae/ChangeLog
+++ b/sci-mathematics/algae/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-mathematics/algae
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> algae-4.3.6.ebuild:
+  Added fortran-2.eclass support
+
 *algae-4.3.6 (7 June 2006)
 
   7 June 2006; Andrey Grozin <A.G.Grozin@inp.nsk.su>

diff --git a/sci-mathematics/algae/algae-4.3.6.ebuild b/sci-mathematics/algae/algae-4.3.6.ebuild
index 06cfc37..a18a165 100644
--- a/sci-mathematics/algae/algae-4.3.6.ebuild
+++ b/sci-mathematics/algae/algae-4.3.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit eutils fortran-2
 
 DESCRIPTION="high-level interpreted language for numerical analysis"
 

diff --git a/sci-mathematics/algae/metadata.xml b/sci-mathematics/algae/metadata.xml
index 0cbe82f..8bf5431 100644
--- a/sci-mathematics/algae/metadata.xml
+++ b/sci-mathematics/algae/metadata.xml
@@ -12,4 +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>
 </pkgmetadata>



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-mathematics/algae/
@ 2011-06-24 17:09 Justin Lecher
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     c4c637354c58b1a815ec35da9013b74f2e3d4b19
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 15:06:50 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 15:06:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c4c63735

Sort inherit and/or USE

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

---
 sci-mathematics/algae/algae-4.3.6.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-mathematics/algae/algae-4.3.6.ebuild b/sci-mathematics/algae/algae-4.3.6.ebuild
index 575c87b..eeeaaae 100644
--- a/sci-mathematics/algae/algae-4.3.6.ebuild
+++ b/sci-mathematics/algae/algae-4.3.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/algae/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="intel blas lapack"
+IUSE="blas intel lapack"
 
 DEPEND="
 	sci-libs/fftw \



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-06-24 17:16 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-24 17:09 [gentoo-commits] proj/sci:master commit in: sci-mathematics/algae/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2011-06-21 11:54 Justin Lecher
2011-06-21 11:54 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox