scamp, sextractor, stiff, swarp: removed flag filtering + cleaning

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

19 files changed, 118 insertions, 176 deletions

diff --git a/sci-astronomy/scamp/ChangeLog b/sci-astronomy/scamp/ChangeLog
index 1c85d3561..71590980d 100644
--- a/sci-astronomy/scamp/ChangeLog
+++ b/sci-astronomy/scamp/ChangeLog
@@ -2,9 +2,11 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-   15 Oct 2006; Sebastien Fabbro <seb@ist.utl.pt> +scamp-1.2.11.ebuild:
-   Forced atlas dep with a warning.
-	
+*scamp-1.2.11-r1 (15 Oct 2006)
+
+   15 Oct 2006; Sebastien Fabbro <seb@ist.utl.pt> +scamp-1.2.11-r1.ebuild:
+   Removed flag filtering, some cleaning.
+
 *scamp-1.2.11 (19 Sep 2006)
 
    19 Sep 2006; Sebastien Fabbro <seb@ist.utl.pt> +scamp-1.2.11.ebuild:
diff --git a/sci-astronomy/scamp/Manifest b/sci-astronomy/scamp/Manifest
index 858737058..05a6f8dc4 100644
--- a/sci-astronomy/scamp/Manifest
+++ b/sci-astronomy/scamp/Manifest
@@ -1,17 +1,17 @@
 DIST scamp-1.2.11.tar.gz 549651 RMD160 5df101edd96950de85b011e2f4056c679f207110 SHA1 d0ebbdb276111c01c7d15b2d1770b960fb89f474 SHA256 4fe9693f66d96e18a7ca40496a290943b03d62431b87aec8ff8286154b5fb224
 DIST scamp.pdf 997131 RMD160 5d6a5e58022d32a571c3a2903cea942a5a641330 SHA1 156d8ae8aeffc4ebbfa1538a7bd6de4ce941f4b3 SHA256 05e197d68199c668a57a5f1d7864e5c4a9428e6363f02c74b899274435c0fd72
-EBUILD scamp-1.2.11.ebuild 1928 RMD160 f89421bde8033243749f4a1888b5f5b7cfbb15b3 SHA1 7faf0e9d8e4cf72ae0749c5b1223209da222bbc9 SHA256 049af02c08430fcf04de945fbadb3498d7eb94393b70a15b11ec4de98ba6afdf
-MD5 8667db35db1209f9c8c44ab771f06089 scamp-1.2.11.ebuild 1928
-RMD160 f89421bde8033243749f4a1888b5f5b7cfbb15b3 scamp-1.2.11.ebuild 1928
-SHA256 049af02c08430fcf04de945fbadb3498d7eb94393b70a15b11ec4de98ba6afdf scamp-1.2.11.ebuild 1928
-MISC ChangeLog 351 RMD160 d7e665d1b17ca387fa36c31724b8fddedbf70aed SHA1 1530c85f8839b8bad4d7fd8112938302c1290ca7 SHA256 6ad763976713eef1c3e484221f412d990a79f6fc404dba7cfc1f54252202c7d7
-MD5 edfd5e8a71f5d5dc8221d2dd79ca6bf9 ChangeLog 351
-RMD160 d7e665d1b17ca387fa36c31724b8fddedbf70aed ChangeLog 351
-SHA256 6ad763976713eef1c3e484221f412d990a79f6fc404dba7cfc1f54252202c7d7 ChangeLog 351
+EBUILD scamp-1.2.11-r1.ebuild 1928 RMD160 87470809d164294f83bbca06c4e23812ded0f2b5 SHA1 9d4668a1efab3743c99004a3b7de9a7e72e4a228 SHA256 a0df00b28010528166a83fabab0475b1376417ba05054ebba4010c1057c5ee94
+MD5 484276be1822d57fc448a023bb3b9748 scamp-1.2.11-r1.ebuild 1928
+RMD160 87470809d164294f83bbca06c4e23812ded0f2b5 scamp-1.2.11-r1.ebuild 1928
+SHA256 a0df00b28010528166a83fabab0475b1376417ba05054ebba4010c1057c5ee94 scamp-1.2.11-r1.ebuild 1928
+MISC ChangeLog 391 RMD160 a42de7c08cddc7331f4ba77ce3f91112c39b140e SHA1 0600d9127cd72d6de7cde6426910f9159c1f5e4a SHA256 9c0e2bf4764d854282f44a7481bd0de82ba80c72440d7c4f5e3407ba32fd4903
+MD5 2197847650684608656e66e0d755b01c ChangeLog 391
+RMD160 a42de7c08cddc7331f4ba77ce3f91112c39b140e ChangeLog 391
+SHA256 9c0e2bf4764d854282f44a7481bd0de82ba80c72440d7c4f5e3407ba32fd4903 ChangeLog 391
 MISC metadata.xml 479 RMD160 ebb26e5dc5c265626a7e8ca83ecb34bd1913a294 SHA1 34663646a7a211c132ec83fdcc50bcd68762fced SHA256 91e22639393349e764c8f2f734fe7fa8cc961fe67d69c5933f3037e12b489013
 MD5 241225d6233e7adcb5fe6b919dab456a metadata.xml 479
 RMD160 ebb26e5dc5c265626a7e8ca83ecb34bd1913a294 metadata.xml 479
 SHA256 91e22639393349e764c8f2f734fe7fa8cc961fe67d69c5933f3037e12b489013 metadata.xml 479
-MD5 7a6fa8683c69eed186ca6df78e802c6a files/digest-scamp-1.2.11 446
-RMD160 4028b94ae685142f34ab8368f8d05133f750a77c files/digest-scamp-1.2.11 446
-SHA256 d67e6f55e035b8ed11c4d33dc51c30ce577065c88f1687bbeea1f30c3cdc5aa0 files/digest-scamp-1.2.11 446
+MD5 7a6fa8683c69eed186ca6df78e802c6a files/digest-scamp-1.2.11-r1 446
+RMD160 4028b94ae685142f34ab8368f8d05133f750a77c files/digest-scamp-1.2.11-r1 446
+SHA256 d67e6f55e035b8ed11c4d33dc51c30ce577065c88f1687bbeea1f30c3cdc5aa0 files/digest-scamp-1.2.11-r1 446
diff --git a/sci-astronomy/scamp/files/digest-scamp-1.2.11 b/sci-astronomy/scamp/files/digest-scamp-1.2.11-r1
index 2a6d47070..2a6d47070 100644
--- a/sci-astronomy/scamp/files/digest-scamp-1.2.11
+++ b/sci-astronomy/scamp/files/digest-scamp-1.2.11-r1
diff --git a/sci-astronomy/scamp/scamp-1.2.11.ebuild b/sci-astronomy/scamp/scamp-1.2.11-r1.ebuild
index 8ef4cc29a..f364848a2 100644
--- a/sci-astronomy/scamp/scamp-1.2.11.ebuild
+++ b/sci-astronomy/scamp/scamp-1.2.11-r1.ebuild
@@ -2,59 +2,58 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit flag-o-matic toolchain-funcs
+inherit eutils
 
 DESCRIPTION="Computes astrometric and photometric solutions for astronomical images."
 HOMEPAGE="http://terapix.iap.fr/soft/scamp"
 SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz
 	doc? http://terapix.iap.fr/IMG/pdf/${PN}.pdf"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static doc threads icc plplot"
+IUSE="static doc icc threads plplot"
+
 # I think this works only with ATLAS lapack implementation.
-DEPEND="sci-astronomy/cdsclient
+RDEPEND="sci-astronomy/cdsclient
 	sci-libs/blas-atlas
 	sci-libs/lapack-atlas
+	>=sci-libs/fftw-3
+	plplot? ( >=sci-libs/plplot-5.1 )"
+DEPEND="${RDEPEND}
 	app-admin/eselect-blas
 	app-admin/eselect-cblas
 	app-admin/eselect-lapack
-	>=sci-libs/fftw-3
-	plplot? ( >=sci-libs/plplot-5.1 )
 	icc? ( dev-lang/icc )"
 
 pkg_setup() {
-	if use threads; then
-		if ! built_with_use sci-libs/fftw threads; then
-			ewarn "when use threads, fftw must be compiled with threads as well"
-			die
-		fi
-	fi
-
 	if ! eselect blas show | grep -q atlas; then
-		ewarn "You must have atlas selected for blas: run"
+		ewarn "You must have atlas selected for blas: try"
 		ewarn "$ eselect blas set atlas"
 		die
 	fi
 	if ! eselect cblas show | grep -q atlas; then
-		ewarn "You must have atlas selected for cblas: run"
+		ewarn "You must have atlas selected for cblas: try"
 		ewarn "$ eselect cblas set atlas"
 		die
 	fi
 	if ! eselect lapack show | grep -q atlas; then
-		ewarn "You must have atlas selected for lapack: run"
+		ewarn "You must have atlas selected for lapack: try"
 		ewarn "$ eselect lapack set atlas"
 		die
 	fi
+	if use threads && ! eselect lapack show | grep -q atlas; then
+		ewarn "scamp threaded only works with blas threaded."
+		ewarn "You must have threaded-atlas selected for blas: try"
+		ewarn "$ eselect blas set threaded-atlas"
+		die
+	fi
 }
 
 src_compile() {
-	# trust swarp cflags to be optimized.
-	filter-flags ${CFLAGS}
-	# --disable-threads does not compile
-	local myconf=""
-	use threads && myconf="--enable-threads "
+	local myconf
+	# --disable-threads is buggy
+	use threads && myconf="--enable-threads"
 	econf \
 		$(use_enable static) \
 		$(use_enable icc) \
@@ -65,7 +64,7 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog HISTORY README THANKS
 	if use doc; then
 		insinto /usr/share/doc/${PF}
diff --git a/sci-astronomy/sextractor/ChangeLog b/sci-astronomy/sextractor/ChangeLog
index edf80c08d..305113237 100644
--- a/sci-astronomy/sextractor/ChangeLog
+++ b/sci-astronomy/sextractor/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sextractor-2.5.0-r1 (15 Oct 2006)
+
+   15 Oct 2006; Sebastien Fabbro <seb@ist.utl.pt> 
+   +sextractor-2.5.0-r1.ebuild -sextractor-2.5.0.ebuild
+   -sextractor-2.4.4.ebuild: removed flag filtering, cleaning,
+   removed old versions.
+
 *sextractor-2.5.0 (06 Sep 2006)
 
    06 Sep 2006; Sebastien Fabbro <seb@ist.utl.pt> +sextractor-2.5.0.ebuild:
diff --git a/sci-astronomy/sextractor/Manifest b/sci-astronomy/sextractor/Manifest
index a4c914973..9341094ad 100644
--- a/sci-astronomy/sextractor/Manifest
+++ b/sci-astronomy/sextractor/Manifest
@@ -1,24 +1,16 @@
-DIST sextractor-2.4.4.tar.gz 1318197
 DIST sextractor-2.5.0.tar.gz 2321708 RMD160 336e3a47f57416ad50bbbdd2afb4ff7e858556d0 SHA1 84e111ea0796428d9336de7add3820575fd7d4cb SHA256 786f987818546d9b72fea7e786f040b63e31fbc46325deb58929251065573303
-EBUILD sextractor-2.4.4.ebuild 1171 RMD160 ace8168f642960acf28530bc725b7ca92358c550 SHA1 7f39a2ade82990e83497caefccf1c8dad025a8fb SHA256 f380ebc9ad40dcbc4a8e4e3d5c1287955c59914c591782ac91a2837eb524f306
-MD5 7e5033d34b9ad68f63db65b2c7748694 sextractor-2.4.4.ebuild 1171
-RMD160 ace8168f642960acf28530bc725b7ca92358c550 sextractor-2.4.4.ebuild 1171
-SHA256 f380ebc9ad40dcbc4a8e4e3d5c1287955c59914c591782ac91a2837eb524f306 sextractor-2.4.4.ebuild 1171
-EBUILD sextractor-2.5.0.ebuild 1171 RMD160 ace8168f642960acf28530bc725b7ca92358c550 SHA1 7f39a2ade82990e83497caefccf1c8dad025a8fb SHA256 f380ebc9ad40dcbc4a8e4e3d5c1287955c59914c591782ac91a2837eb524f306
-MD5 7e5033d34b9ad68f63db65b2c7748694 sextractor-2.5.0.ebuild 1171
-RMD160 ace8168f642960acf28530bc725b7ca92358c550 sextractor-2.5.0.ebuild 1171
-SHA256 f380ebc9ad40dcbc4a8e4e3d5c1287955c59914c591782ac91a2837eb524f306 sextractor-2.5.0.ebuild 1171
-MISC ChangeLog 399 RMD160 9c0054cb703de87831c7cade2d33eff46317afd9 SHA1 2bef8ae8e82821d0c5075ff8405cc4fc4cebcb76 SHA256 fd1db3c38c1ce15155c0c585ee14baf90cb4b6b270e693a6f81f1295d93202d8
-MD5 e72904cc29f5dd4f34736f2bf56441bf ChangeLog 399
-RMD160 9c0054cb703de87831c7cade2d33eff46317afd9 ChangeLog 399
-SHA256 fd1db3c38c1ce15155c0c585ee14baf90cb4b6b270e693a6f81f1295d93202d8 ChangeLog 399
-MISC metadata.xml 411 RMD160 b87b9d499bd9820396321eb0693697671bbf3180 SHA1 4c641da9e4cc413a6d33d1f97c8ac387c317d24d SHA256 0e7a3007d785bcdb096b1b609a2777650745f0461e1922f0c6b5c80d675d34e8
-MD5 5794547932a55c6c5abc6d4409e1659b metadata.xml 411
-RMD160 b87b9d499bd9820396321eb0693697671bbf3180 metadata.xml 411
-SHA256 0e7a3007d785bcdb096b1b609a2777650745f0461e1922f0c6b5c80d675d34e8 metadata.xml 411
-MD5 1837fe343ad054c084ca09560d8414ba files/digest-sextractor-2.4.4 69
-RMD160 403a987c8a97fa132f40ab03f7928ff353f42c66 files/digest-sextractor-2.4.4 69
-SHA256 0efccb2ae3381bf2b229ca24a3ffc3f6f61d5e23c63d56f3be6ba616f5f69731 files/digest-sextractor-2.4.4 69
-MD5 b523c6027f0e84e5301b450f864fa281 files/digest-sextractor-2.5.0 253
-RMD160 dd96d658134de82cd8014bd81a07e648d5960c5d files/digest-sextractor-2.5.0 253
-SHA256 1df35e75f3ed448e81e49c59e66a1c21e3977562281785a65fe7c90b13fa98f3 files/digest-sextractor-2.5.0 253
+EBUILD sextractor-2.5.0-r1.ebuild 1122 RMD160 8f544d8f035f72afc325411d86ead80d2d318973 SHA1 3e08c52b1a701d393ed7f5cb58fa018289e7260e SHA256 0643f6fc0a1f48da3dbdc44e1ac634a26550136b91d11013a8e12d013c8df4f7
+MD5 f3fbeaab1219cc996dfd4357bbefa228 sextractor-2.5.0-r1.ebuild 1122
+RMD160 8f544d8f035f72afc325411d86ead80d2d318973 sextractor-2.5.0-r1.ebuild 1122
+SHA256 0643f6fc0a1f48da3dbdc44e1ac634a26550136b91d11013a8e12d013c8df4f7 sextractor-2.5.0-r1.ebuild 1122
+MISC ChangeLog 631 RMD160 2662ab1aff1c9b1bbcce0791771c783506e91ecf SHA1 1f2ee772e1bd1e5a18dae3aec6b86037a357ecc5 SHA256 5f638464cf74c393d5470cb81aafc1d6399b90b499cc330bafd74c7556cb1d1e
+MD5 9f423032f3bb43122cc8c5905a0cd8b7 ChangeLog 631
+RMD160 2662ab1aff1c9b1bbcce0791771c783506e91ecf ChangeLog 631
+SHA256 5f638464cf74c393d5470cb81aafc1d6399b90b499cc330bafd74c7556cb1d1e ChangeLog 631
+MISC metadata.xml 543 RMD160 8b6f4b17ec88b648a25b6a45cc07aa62b8530e6a SHA1 c85e639d87aae9e2b94fe1f67f5ffa724e080374 SHA256 45445f0c002e393359b2d580ea0f0d991b15cb01c829e6d0c1ead8e53e6bc1dc
+MD5 1a1bfe3a85dfca78716d023150eac7c7 metadata.xml 543
+RMD160 8b6f4b17ec88b648a25b6a45cc07aa62b8530e6a metadata.xml 543
+SHA256 45445f0c002e393359b2d580ea0f0d991b15cb01c829e6d0c1ead8e53e6bc1dc metadata.xml 543
+MD5 b523c6027f0e84e5301b450f864fa281 files/digest-sextractor-2.5.0-r1 253
+RMD160 dd96d658134de82cd8014bd81a07e648d5960c5d files/digest-sextractor-2.5.0-r1 253
+SHA256 1df35e75f3ed448e81e49c59e66a1c21e3977562281785a65fe7c90b13fa98f3 files/digest-sextractor-2.5.0-r1 253
diff --git a/sci-astronomy/sextractor/files/digest-sextractor-2.4.4 b/sci-astronomy/sextractor/files/digest-sextractor-2.4.4
deleted file mode 100644
index 70bafaa6b..000000000
--- a/sci-astronomy/sextractor/files/digest-sextractor-2.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f1389ae9229c65f0a6a0b264deb314f sextractor-2.4.4.tar.gz 1318197
diff --git a/sci-astronomy/sextractor/files/digest-sextractor-2.5.0 b/sci-astronomy/sextractor/files/digest-sextractor-2.5.0-r1
index 8926b3c2d..8926b3c2d 100644
--- a/sci-astronomy/sextractor/files/digest-sextractor-2.5.0
+++ b/sci-astronomy/sextractor/files/digest-sextractor-2.5.0-r1
diff --git a/sci-astronomy/sextractor/metadata.xml b/sci-astronomy/sextractor/metadata.xml
index 4e1386b92..cd5cd149f 100644
--- a/sci-astronomy/sextractor/metadata.xml
+++ b/sci-astronomy/sextractor/metadata.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<maintainer>
-    <email>seb@ist.utl.pt</email>
-    <name>Sebastien Fabbro</name>
-</maintainer>
 <longdescription lang="en">
-SExtractor stands for Source Extractor, a program that build a catalog
-of objects from astronomical FITS images.
+SExtractor (Source Extractor) is a program that builds a catalogue of
+objects from an astronomical image. Although it is particularly
+oriented towards reduction of large scale galaxy-survey data, it
+performs rather well on moderately crowded star fields. It has the
+ability to automatically separate stars and galaxy using neural
+networks.
 </longdescription>
 </pkgmetadata>
diff --git a/sci-astronomy/sextractor/sextractor-2.4.4.ebuild b/sci-astronomy/sextractor/sextractor-2.5.0-r1.ebuild
index c7d031057..3ae79a1b8 100644
--- a/sci-astronomy/sextractor/sextractor-2.4.4.ebuild
+++ b/sci-astronomy/sextractor/sextractor-2.5.0-r1.ebuild
@@ -8,18 +8,17 @@ DESCRIPTION="Extract catalogs of sources from astronomical FITS images."
 HOMEPAGE="http://terapix.iap.fr/soft/sextractor"
 SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=" ~amd64 ~x86"
 IUSE="static doc icc"
-DEPEND="icc? ( dev-lang/icc )"
-RDEPEND=""
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	icc? ( dev-lang/icc )"
 
 CONFDIR=/usr/share/${PN}/config
 
 src_compile() {
-	# trust sextractor cflags to be optimized.
-	filter-flags ${CFLAGS}
 	# change default configuration files location from current dir
 	sed -i -e "s:default\.:${CONFDIR}/default\.:" src/preflist.h
 	econf \
@@ -30,7 +29,7 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS BUGS ChangeLog HISTORY README THANKS
 	insinto ${CONFDIR}
 	doins config/*
@@ -42,7 +41,7 @@ src_install () {
 
 pkg_postinst() {
 	einfo
-    einfo "SExtractor configuration files are located"
-    einfo "in ${CONFDIR} and loaded by default."
+	einfo "SExtractor configuration files are located"
+	einfo "in ${CONFDIR} and loaded by default."
 	einfo
 }
diff --git a/sci-astronomy/sextractor/sextractor-2.5.0.ebuild b/sci-astronomy/sextractor/sextractor-2.5.0.ebuild
deleted file mode 100644
index c7d031057..000000000
--- a/sci-astronomy/sextractor/sextractor-2.5.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit flag-o-matic
-
-DESCRIPTION="Extract catalogs of sources from astronomical FITS images."
-HOMEPAGE="http://terapix.iap.fr/soft/sextractor"
-SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="static doc icc"
-DEPEND="icc? ( dev-lang/icc )"
-RDEPEND=""
-
-CONFDIR=/usr/share/${PN}/config
-
-src_compile() {
-	# trust sextractor cflags to be optimized.
-	filter-flags ${CFLAGS}
-	# change default configuration files location from current dir
-	sed -i -e "s:default\.:${CONFDIR}/default\.:" src/preflist.h
-	econf \
-		$(use_enable static) \
-		$(use_enable icc) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog HISTORY README THANKS
-	insinto ${CONFDIR}
-	doins config/*
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*
-	fi
-}
-
-pkg_postinst() {
-	einfo
-    einfo "SExtractor configuration files are located"
-    einfo "in ${CONFDIR} and loaded by default."
-	einfo
-}
diff --git a/sci-astronomy/stiff/Manifest b/sci-astronomy/stiff/Manifest
index 5376bee0a..c5d651f28 100644
--- a/sci-astronomy/stiff/Manifest
+++ b/sci-astronomy/stiff/Manifest
@@ -1,16 +1,16 @@
 DIST stiff-1.10.tar.gz 5077852 RMD160 73645df6d9b1db5d30f2400336878e5b0ba4d253 SHA1 b55b61e1238f9fb3fc8a50b85ce2b5a8d0350954 SHA256 15433e1e78e25601fc40c106108ee5021aaa9be336f29a771f1747f497561eb1
-EBUILD stiff-1.10.ebuild 768 RMD160 d204349b696aaed4b524341a06bc30e21a36dc3d SHA1 007bce904fca75c3076405352480a0346fa7c49a SHA256 42da9d500eb7898b787db6c99a005b7dd341d06d3523924d4f70bc1f722c3bd7
-MD5 2d8a33baf2dbf96a8df534f4a2c945ff stiff-1.10.ebuild 768
-RMD160 d204349b696aaed4b524341a06bc30e21a36dc3d stiff-1.10.ebuild 768
-SHA256 42da9d500eb7898b787db6c99a005b7dd341d06d3523924d4f70bc1f722c3bd7 stiff-1.10.ebuild 768
+EBUILD stiff-1.10.ebuild 712 RMD160 431b339894d7ff34a32d7d92e12ad4ca2423c0bc SHA1 2309a9b417404da7fd81b8a456043af7787414d3 SHA256 196b0118fbb368322609ed5b123848f9f7c583000c247c1f6b771b62a2272c0d
+MD5 e44d02efb92a144fd907379d3892200e stiff-1.10.ebuild 712
+RMD160 431b339894d7ff34a32d7d92e12ad4ca2423c0bc stiff-1.10.ebuild 712
+SHA256 196b0118fbb368322609ed5b123848f9f7c583000c247c1f6b771b62a2272c0d stiff-1.10.ebuild 712
 MISC ChangeLog 241 RMD160 b41853916f866c54e652b62fb875c31849d60279 SHA1 6fdd9c363dbb4ed915675e00229c125f9578cf32 SHA256 7a85960f00259a4e4fe502133f67b816c6dc21454dd81129c540ec9a1607a79f
 MD5 e33eea8fd27ccd187ff0894a1608aeba ChangeLog 241
 RMD160 b41853916f866c54e652b62fb875c31849d60279 ChangeLog 241
 SHA256 7a85960f00259a4e4fe502133f67b816c6dc21454dd81129c540ec9a1607a79f ChangeLog 241
-MISC metadata.xml 455 RMD160 cbef30847f42d816d72fcd10af47cafd21bd5b10 SHA1 887b07e957595fc9bc7071544ab4de428c8023d3 SHA256 6e16c0f47c3913ef61f58e64ff098a1eb6998754a23cf7c01d6cb512ab9a2a62
-MD5 9a5bbed3ff5030a8d57fe8a2c89ed407 metadata.xml 455
-RMD160 cbef30847f42d816d72fcd10af47cafd21bd5b10 metadata.xml 455
-SHA256 6e16c0f47c3913ef61f58e64ff098a1eb6998754a23cf7c01d6cb512ab9a2a62 metadata.xml 455
+MISC metadata.xml 348 RMD160 808677a0e79eb338980a9cbf5d68a086593a47b0 SHA1 88a4e495e68c143b0a4243d339ae06debf0c02bd SHA256 ca1f352ed481da49dbcaeb817d9579d12b35557c9abb4bc670b2986346200e94
+MD5 0250f276d0a4c03c43d5796076e6dd18 metadata.xml 348
+RMD160 808677a0e79eb338980a9cbf5d68a086593a47b0 metadata.xml 348
+SHA256 ca1f352ed481da49dbcaeb817d9579d12b35557c9abb4bc670b2986346200e94 metadata.xml 348
 MD5 259a6240531669965d93a82bfa2874ce files/digest-stiff-1.10 235
 RMD160 c9e6cdebda42fa042702a99b8d8333aeab50b5ca files/digest-stiff-1.10 235
 SHA256 b98dc3aa6f8217d895b5ff92a3474daa689f516e8ba7f0729e91a39ceca9c80c files/digest-stiff-1.10 235
diff --git a/sci-astronomy/stiff/metadata.xml b/sci-astronomy/stiff/metadata.xml
index cd4aa6a98..39033f584 100644
--- a/sci-astronomy/stiff/metadata.xml
+++ b/sci-astronomy/stiff/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>seb@ist.utl.pt</email>
-    <name>Sebastien Fabbro</name>
-  </maintainer>
-  <longdescription lang="en">
-  STIFF is a program that convert scientific FITS images to the
+<herd>sci</herd>
+<longdescription lang="en">
+STIFF is a program that convert scientific FITS images to the
 more popular TIFF, in 8 (grayscale) or 24 (true colour: 3 times 8) bits per
 pixel.
-  </longdescription>
+</longdescription>
 </pkgmetadata>
diff --git a/sci-astronomy/stiff/stiff-1.10.ebuild b/sci-astronomy/stiff/stiff-1.10.ebuild
index f28cae059..544c422a8 100644
--- a/sci-astronomy/stiff/stiff-1.10.ebuild
+++ b/sci-astronomy/stiff/stiff-1.10.ebuild
@@ -2,22 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit flag-o-matic
-
 DESCRIPTION="Converts astronomical FITS images to the TIFF format for illustration purposes."
 HOMEPAGE="http://terapix.iap.fr/soft/stiff"
 SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=" ~amd64 ~x86"
 IUSE="doc icc"
-DEPEND="icc? ( dev-lang/icc )"
-RDEPEND=""
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	icc? ( dev-lang/icc )"
 
 src_compile() {
-	# trust cflags to be optimized.
-	filter-flags ${CFLAGS}
 	econf \
 		$(use_enable icc) \
 		|| die "econf failed"
diff --git a/sci-astronomy/swarp/ChangeLog b/sci-astronomy/swarp/ChangeLog
index 244f2c282..8f10bf2df 100644
--- a/sci-astronomy/swarp/ChangeLog
+++ b/sci-astronomy/swarp/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*swarp-2.16.0-r1 (15 Oct 2006)
+	
+  15 Oct 2006; Sebastien Fabbro <seb@ist.utl.pt> swarp-2.16.0-r1.ebuild
+  Removed flag filtering. Some cleaning.
 
 *swarp-2.16.0 (10 Sep 2006)	
 	
diff --git a/sci-astronomy/swarp/Manifest b/sci-astronomy/swarp/Manifest
index 4143c7216..6940e51fe 100644
--- a/sci-astronomy/swarp/Manifest
+++ b/sci-astronomy/swarp/Manifest
@@ -1,16 +1,16 @@
 DIST swarp-2.16.0.tar.gz 3420660 RMD160 a1b04885471c37cdf6a6ebe77c545d4cb0fcd4b8 SHA1 208edd2d84243555b92b7a42c02deb69861cf836 SHA256 8cdb168536bde05c78fee4549c584beacc17cebafa307193fbf8f52e2ac6ccac
-EBUILD swarp-2.16.0.ebuild 1044 RMD160 7ebc9a2f68e1b464e50d1510a01d9a5e6422d758 SHA1 b422612cf86059e56aa2a198fa33c73237125e6e SHA256 c815a5f8052fc025a4cfd8a1dfb2b8893d32336b39d3819097c6a8a61277c0dd
-MD5 5ce280aefac732cd0bda0d340b561e28 swarp-2.16.0.ebuild 1044
-RMD160 7ebc9a2f68e1b464e50d1510a01d9a5e6422d758 swarp-2.16.0.ebuild 1044
-SHA256 c815a5f8052fc025a4cfd8a1dfb2b8893d32336b39d3819097c6a8a61277c0dd swarp-2.16.0.ebuild 1044
-MISC ChangeLog 258 RMD160 102db527acebd530b10674a8f97bb7ea434e9aad SHA1 5bbf23be0afe23a4d3f07db77d311b1842e44995 SHA256 20eb0bd4e943e3443325dc5f8e7a7a62bfdc6089716905351710c05fd6dba843
-MD5 1ad5050fa243ac07caed078be67ababf ChangeLog 258
-RMD160 102db527acebd530b10674a8f97bb7ea434e9aad ChangeLog 258
-SHA256 20eb0bd4e943e3443325dc5f8e7a7a62bfdc6089716905351710c05fd6dba843 ChangeLog 258
-MISC metadata.xml 394 RMD160 0519f7d0395e91b74170e2216f1274a2b781720e SHA1 a538a225fc2801b4c709268bbd94d2a7dd267416 SHA256 1f479cedda5ef4763ea8cb6eae75b29159ef195008b909bb336ca8b8222f1c86
-MD5 0c6c800e2d3102695f8e0786dbd3b225 metadata.xml 394
-RMD160 0519f7d0395e91b74170e2216f1274a2b781720e metadata.xml 394
-SHA256 1f479cedda5ef4763ea8cb6eae75b29159ef195008b909bb336ca8b8222f1c86 metadata.xml 394
-MD5 36a72aa572c19c333194c38c2ef2b829 files/digest-swarp-2.16.0 241
-RMD160 c78a9bc573f2c2699b1e7520e0dcfd6f1b5a5109 files/digest-swarp-2.16.0 241
-SHA256 e3b1733eeb205fe09fd9dfa0da237852179beecc20bb7e40ab71fe7d1950572e files/digest-swarp-2.16.0 241
+EBUILD swarp-2.16.0-r1.ebuild 972 RMD160 deca5e24b032fe94ac9865947758881cddc9feef SHA1 de9530727cc15d3b0c7ab13aac546473c089e01c SHA256 4fa0c7f21bc2e958dfe5d82501cc426973452785378ac08ea8258b8069b3b0f5
+MD5 e08e6278f15f0f40bf6e6ceedf7434ab swarp-2.16.0-r1.ebuild 972
+RMD160 deca5e24b032fe94ac9865947758881cddc9feef swarp-2.16.0-r1.ebuild 972
+SHA256 4fa0c7f21bc2e958dfe5d82501cc426973452785378ac08ea8258b8069b3b0f5 swarp-2.16.0-r1.ebuild 972
+MISC ChangeLog 404 RMD160 2ea05706cad6f58cf641247e3be9547a7c84a2b6 SHA1 26c04fa82a448f6b5d64f0d775abc904354a8aed SHA256 651036089e9327a93d0da93a00ead982007d6ee3606ab4ffad3cbf9c70996e09
+MD5 c84145d0b203e0a1f1a4968d767e9585 ChangeLog 404
+RMD160 2ea05706cad6f58cf641247e3be9547a7c84a2b6 ChangeLog 404
+SHA256 651036089e9327a93d0da93a00ead982007d6ee3606ab4ffad3cbf9c70996e09 ChangeLog 404
+MISC metadata.xml 302 RMD160 218ab232f609c110c3cf25aca0788e467cb9b99d SHA1 0900b05ec1dfdc906791c4fca976606078a5dfc9 SHA256 8de11d2c9a0b8f3c81195f010122b0ee86f4c5f9bac16db640bb326e42b5570b
+MD5 b30c308139c4ef0e02d82c2684652b96 metadata.xml 302
+RMD160 218ab232f609c110c3cf25aca0788e467cb9b99d metadata.xml 302
+SHA256 8de11d2c9a0b8f3c81195f010122b0ee86f4c5f9bac16db640bb326e42b5570b metadata.xml 302
+MD5 36a72aa572c19c333194c38c2ef2b829 files/digest-swarp-2.16.0-r1 241
+RMD160 c78a9bc573f2c2699b1e7520e0dcfd6f1b5a5109 files/digest-swarp-2.16.0-r1 241
+SHA256 e3b1733eeb205fe09fd9dfa0da237852179beecc20bb7e40ab71fe7d1950572e files/digest-swarp-2.16.0-r1 241
diff --git a/sci-astronomy/swarp/files/digest-swarp-2.16.0 b/sci-astronomy/swarp/files/digest-swarp-2.16.0-r1
index ec7c71da3..ec7c71da3 100644
--- a/sci-astronomy/swarp/files/digest-swarp-2.16.0
+++ b/sci-astronomy/swarp/files/digest-swarp-2.16.0-r1
diff --git a/sci-astronomy/swarp/metadata.xml b/sci-astronomy/swarp/metadata.xml
index 332586d03..521a0577f 100644
--- a/sci-astronomy/swarp/metadata.xml
+++ b/sci-astronomy/swarp/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<maintainer>
-  <email>seb@ist.utl.pt</email>
-  <name> Sebastien Fabbro</name>
-</maintainer>
 <longdescription lang="en">
 SWarp takes astronomical FITS images with a WCS-like projection,
 resample and coadd them together.
diff --git a/sci-astronomy/swarp/swarp-2.16.0.ebuild b/sci-astronomy/swarp/swarp-2.16.0-r1.ebuild
index a03c3491b..11fa078de 100644
--- a/sci-astronomy/swarp/swarp-2.16.0.ebuild
+++ b/sci-astronomy/swarp/swarp-2.16.0-r1.ebuild
@@ -2,37 +2,36 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Resample and coadd astronomical FITS images"
 HOMEPAGE="http://terapix.iap.fr/soft/swarp"
 SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static doc threads mpi icc"
-DEPEND="mpi? ( virtual/mpi )
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
 	icc? ( dev-lang/icc )"
 
 # mpi stuff untested.
 src_compile() {
-	# trust swarp cflags to be optimized.
-	filter-flags ${CFLAGS}
-	# --disable-threads does not compile
-	local myconf=""
-	use threads && myconf="--enable-threads "
 	use mpi || export MPICC="$(tc-getCC)"
+	local myconf
+	# --disable-threads is buggy
+	use threads && myconf="--enable-threads"
 	econf \
-		$(use_enable static ) \
-		$(use_enable icc ) \
-		$(use_enable mpi ) \
+		$(use_enable static) \
+		$(use_enable icc) \
+		$(use_enable mpi) \
 		${myconf} \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 	dodoc AUTHORS ChangeLog HISTORY README THANKS
 	if use doc; then