general cleaning

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@191 32389bae-6d03-0410-99cf-db05cde120eb

12 files changed, 31 insertions, 30 deletions

diff --git a/sci-astronomy/sextractor/Manifest b/sci-astronomy/sextractor/Manifest
index f527bfaf6..1dc667b36 100644
--- a/sci-astronomy/sextractor/Manifest
+++ b/sci-astronomy/sextractor/Manifest
@@ -1,4 +1,4 @@
 MD5 8a0e1872a730ee3aa95e7d7531f3594c ChangeLog 271
 MD5 1837fe343ad054c084ca09560d8414ba files/digest-sextractor-2.4.4 69
 MD5 87811b8b5342ee5676e9185164f15434 metadata.xml 427
-MD5 ddbd34d69e68d78f6b2361b86b6b20b0 sextractor-2.4.4.ebuild 1178
+MD5 c5aefb11f25b728792c914f056abc8a5 sextractor-2.4.4.ebuild 1177
diff --git a/sci-astronomy/sextractor/sextractor-2.4.4.ebuild b/sci-astronomy/sextractor/sextractor-2.4.4.ebuild
index 01dbcd2dc..daec9953e 100644
--- a/sci-astronomy/sextractor/sextractor-2.4.4.ebuild
+++ b/sci-astronomy/sextractor/sextractor-2.4.4.ebuild
@@ -46,4 +46,3 @@ pkg_postinst() {
     einfo "in ${CONFDIR} and loaded by default."
 	einfo
 }
-
diff --git a/sci-astronomy/swarp/Manifest b/sci-astronomy/swarp/Manifest
index 1944d029b..a5b8f4e63 100644
--- a/sci-astronomy/swarp/Manifest
+++ b/sci-astronomy/swarp/Manifest
@@ -1,4 +1,4 @@
 MD5 ea582cfc2d4191f4c495380abd0ca945 ChangeLog 258
 MD5 232f146c5cb3fdf556b7d013b7480db9 files/digest-swarp-2.15.7 65
 MD5 79b02536bd71bf7a4f217cda0ec8edb4 metadata.xml 410
-MD5 d5a1b72ad49b11ccfee47e9cba61c713 swarp-2.15.7.ebuild 1109
+MD5 182d575c55c9ae0f052d77f95ac8634e swarp-2.15.7.ebuild 1058
diff --git a/sci-astronomy/swarp/swarp-2.15.7.ebuild b/sci-astronomy/swarp/swarp-2.15.7.ebuild
index a0b69046f..e4564ed02 100644
--- a/sci-astronomy/swarp/swarp-2.15.7.ebuild
+++ b/sci-astronomy/swarp/swarp-2.15.7.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static doc threads mpi icc"
-DEPEND="mpi? ( virtual/mpi ) )
+DEPEND="mpi? ( virtual/mpi )
 	icc? ( dev-lang/icc >= 9 )"
 
 # mpi stuff untested.
@@ -20,7 +20,6 @@ src_compile() {
 	# trust swarp cflags to be optimized.
 	filter-flags ${CFLAGS}
 	# --disable-threads does not compile
-	# todo: calculate a number of threads (~= ncpu)
 	local myconf=""
 	use threads && myconf="--enable-threads "
 	use mpi || export MPICC="$(tc-getCC)"
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 6298a4ca7..16e02b7fa 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,5 +1,5 @@
 MD5 5d4b169cadf04dcdecbd217d7fcf34b7 ChangeLog 387
-MD5 a6ac11c007404039d9011dd4669d00d5 arpack-96.ebuild 2419
+MD5 82ff082f1a730871f0ed8b06511b92d7 arpack-96.ebuild 2415
 MD5 f5b6414b7b27aca2014468d9755dc1db files/ARmake.inc 3836
 MD5 78fedce5e2dc0ae0dea2d24fcf9c7745 files/digest-arpack-96 236
 MD5 991f9e16c30ad7b3b4bd08968e2235ca metadata.xml 411
diff --git a/sci-libs/arpack/arpack-96.ebuild b/sci-libs/arpack/arpack-96.ebuild
index efcc72728..5841bc446 100644
--- a/sci-libs/arpack/arpack-96.ebuild
+++ b/sci-libs/arpack/arpack-96.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="Library to solve large scale eigenvalue problems."
 HOMEPAGE="http://www.caam.rice.edu/software/ARPACK"
 # not a very good name: patch.tar.gz :(
 SRC_URI="http://www.caam.rice.edu/software/ARPACK/SRC/${PN}${PV}.tar.gz
-		 http://www.caam.rice.edu/software/ARPACK/SRC/patch.tar.gz
-		 mpi? http://www.caam.rice.edu/software/ARPACK/SRC/p${PN}${PV}.tar.gz
-		 mpi? http://www.caam.rice.edu/software/ARPACK/SRC/ppatch.tar.gz"
+	http://www.caam.rice.edu/software/ARPACK/SRC/patch.tar.gz
+	mpi? ( http://www.caam.rice.edu/software/ARPACK/SRC/p${PN}${PV}.tar.gz
+		   http://www.caam.rice.edu/software/ARPACK/SRC/ppatch.tar.gz )"
 
 LICENSE="BSD"
 SLOT="0"
@@ -22,8 +22,9 @@ IUSE="blas mpi examples"
 KEYWORDS="~amd64 ~x86"
 DEPEND="virtual/libc
 	>=sys-devel/libtool-1.5
-	blas? ( virtual/blas )
-	blas? ( sci-libs/blas-config )
+	blas? ( virtual/blas 
+			sci-libs/blas-config 
+		  )
 	mpi? ( virtual/mpi )"
 
 S=${WORKDIR}/ARPACK
@@ -87,3 +88,4 @@ src_postinst() {
 	einfo "\"LDFLAGS=-llarpack\" is enough to link your applications"
 	einfo
 }
+
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 5ea4b7bda..0230fc4da 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,4 +1,4 @@
 MD5 3e61d1f96907e321207198abf4bfcdf9 ChangeLog 354
 MD5 a98a19c7e550d46ae7edc230ab73d7f9 files/digest-pspp-0.4.0 63
 MD5 db6b7bcfdff65546db2b62be1a72fe93 metadata.xml 257
-MD5 1bb33e8e281b3c8cf0908d5859c6177d pspp-0.4.0.ebuild 1228
+MD5 71ff39461819dbce51372c71ea174fc5 pspp-0.4.0.ebuild 1220
diff --git a/sci-mathematics/pspp/pspp-0.4.0.ebuild b/sci-mathematics/pspp/pspp-0.4.0.ebuild
index bc6d97757..a6381e9c2 100644
--- a/sci-mathematics/pspp/pspp-0.4.0.ebuild
+++ b/sci-mathematics/pspp/pspp-0.4.0.ebuild
@@ -16,8 +16,8 @@ DEPEND=">=sci-libs/gsl-1.6
     sys-libs/readline
 	>=sys-devel/gettext-0.14.1
 	>=dev-lang/perl-5.6
-	ncurses? >=sys-libs/ncurses-5.4
-	plotutils? >=media-libs/plotutils-2.4.1"
+	ncurses? ( >=sys-libs/ncurses-5.4 )
+	plotutils? ( >=media-libs/plotutils-2.4.1 )"
 
 src_compile() {
 	econf \
@@ -26,7 +26,9 @@ src_compile() {
 		$(use_enable nls) \
 		|| die "econf failed"
 	emake || die "emake failed"
-	use doc && (emake html || die "make html failed")
+	if use doc; then
+		emake html || die "emake html failed"
+	fi
 }
 
 src_install() {
@@ -36,11 +38,7 @@ src_install() {
 		INSTALL NEWS ONEWS README THANKS TODO
 	docinto examples && dodoc examples/{ChangeLog,descript.stat}
 
-	if use doc; then
-		docinto html
-		dohtml doc/pspp.html/*.html
-	fi
-
+	use doc && dohtml doc/pspp.html/*.html
 	use emacs && elisp-site-file-install pspp-mode.el
 }
 
@@ -51,3 +49,4 @@ pkg_postinst () {
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }
+
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 9946129ef..68cd1b24a 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,7 +1,7 @@
-MD5 327d856dcdf03df067fca15fec2495a4 ChangeLog 406
+MD5 7311c1df9b01c9dbfe63501ad8a35d21 ChangeLog 670
 MD5 d89c1ded9e09d8d9016fdedd932dfffd files/digest-wxmaxima-0.6.4 66
 MD5 d89c1ded9e09d8d9016fdedd932dfffd files/digest-wxmaxima-0.6.4-r1 66
 MD5 b363e4de48445f52bde30676e8e78d8a files/wxmaxima-docfiles.patch 1441
 MD5 db6b7bcfdff65546db2b62be1a72fe93 metadata.xml 257
-MD5 ef0413e82363ed70711ee4fc404ccb04 wxmaxima-0.6.4-r1.ebuild 1133
+MD5 1b3f5d3eb46602fb513e7198197eab6f wxmaxima-0.6.4-r1.ebuild 1149
 MD5 ab3cf7dbf16b93af191666fa1bf33552 wxmaxima-0.6.4.ebuild 850
diff --git a/sci-mathematics/wxmaxima/files/digest-wxmaxima-0.6.4-r1 b/sci-mathematics/wxmaxima/files/digest-wxmaxima-0.6.4-r1
new file mode 100644
index 000000000..e4b8072bb
--- /dev/null
+++ b/sci-mathematics/wxmaxima/files/digest-wxmaxima-0.6.4-r1
@@ -0,0 +1 @@
+MD5 4f4c2999deb7ee45d0e3fabb4b16a50b wxMaxima-0.6.4.tar.gz 874279
diff --git a/sci-mathematics/wxmaxima/wxmaxima-0.6.4-r1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-0.6.4-r1.ebuild
index de57ba55b..ac012ad47 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-0.6.4-r1.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-0.6.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit eutils autotools
 
 MYP=wxMaxima-${PV}
 
@@ -24,13 +24,14 @@ S=${WORKDIR}/${MYP}
 src_unpack () {
 	unpack ${A}
 	
-	sed 's|#PF#|'${PF}'|g' ${FILESDIR}/${PN}-docfiles.patch > ${PN}-docfiles.patch
+	sed 's|#PF#|'${PF}'|g' \
+		${FILESDIR}/${PN}-docfiles.patch > ${PN}-docfiles.patch
 		
 	epatch ${PN}-docfiles.patch
 
 	cd ${S}
 	einfo "Regenerating autotools files..."
-	automake || die "automake failed"
+	eautomake || die "eautomake failed"
 }	
 
 
diff --git a/x11-libs/agg/agg-2.3.ebuild b/x11-libs/agg/agg-2.3.ebuild
index 27fc58014..2a6a94f16 100644
--- a/x11-libs/agg/agg-2.3.ebuild
+++ b/x11-libs/agg/agg-2.3.ebuild
@@ -5,7 +5,6 @@
 inherit eutils versionator autotools
 
 MY_PV="$(delete_all_version_separators ${PV})"
-S="${WORKDIR}/${PN}${MY_PV}"
 
 DESCRIPTION="Anti-Grain Geometry - A High Quality Rendering Engine for C++"
 HOMEPAGE="http://antigrain.com/"
@@ -20,17 +19,18 @@ RDEPEND="virtual/x11"
 DEPEND="${RDEPEND}
 	>=media-libs/freetype-2"
 
+S="${WORKDIR}/${PN}${MY_PV}"
+
 src_compile() {
 	use examples || sed -i -e 's/examples//' Makefile.am
 	eautoreconf || die "eautoreconf failed"
 	econf || die "econf failed"
-	emake || die "make failed!"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed!"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc readme README.txt authors ChangeLog news
-	insinto /usr/share/doc/${P}
+	insinto /usr/share/doc/${PF}
 	doins -r tutorial
 }
-