--- itpp-3.9.0.ebuild.orig	2006-01-28 22:41:35.000000000 +0100
+++ itpp-3.9.0.ebuild	2006-01-28 22:21:03.000000000 +0100
@@ -2,38 +2,40 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit fortran
+
 DESCRIPTION="IT++ is a C++ library of mathematical, signal processing, speech processing, and communications classes and functions"
+LICENSE="GPL-2"
 HOMEPAGE="http://itpp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86"
 IUSE="blas debug doc fftw lapack"
 
 DEPEND="fftw? ( >=sci-libs/fftw-3.0.0 )
-	blas? ( ~sci-libs/blas-atlas )
-	lapack? ( virtual/lapack )"
+	blas? ( sci-libs/blas-atlas )
+	lapack? ( virtual/lapack )
+	doc? ( app-doc/doxygen
+		app-text/tetex
+		virtual/ghostscript )"
 
 pkg_setup() {
-	if [ -z `which g77` ]; then
-		eerror "No fortran compiler found on the system!"
-		eerror "Please add fortran to your USE flags and reemerge gcc!"
-		die
-	fi
+	need_fortran g77 gfortran
 }
 
 src_compile() {
-	local myconf="$(use_enable doc html-doc) \
-		$(use_enable debug debug) \
-		$(use_with fftw fftw) \
+	econf $(use_enable doc html-doc) \
+		$(use_enable debug) \
+		$(use_with fftw) \
 		$(use_with blas cblas) \
-		$(use_with lapack lapack)"
-	econf ${myconf} || die "econf failed"
+		$(use_with lapack) \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	make install DESTDIR=${D} || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO || \
+		die "failed to install docs"
 }
-