sci-astronomy/scamp: Version bump

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

5 files changed, 28 insertions, 40 deletions

diff --git a/sci-astronomy/scamp/ChangeLog b/sci-astronomy/scamp/ChangeLog
index ec780a3a7..0407c9d72 100644
--- a/sci-astronomy/scamp/ChangeLog
+++ b/sci-astronomy/scamp/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> -scamp-1.3.8.ebuild,
+  +scamp-1.3.11.ebuild:
+  Version bump
+
   18 May 2007; Sébastien Fabbro <bicatali@gentoo.org> -scamp-1.3.5.ebuild,
   +scamp-1.3.8.ebuild:
   Version bump
diff --git a/sci-astronomy/scamp/Manifest b/sci-astronomy/scamp/Manifest
index 888bbca59..1f55c8e01 100644
--- a/sci-astronomy/scamp/Manifest
+++ b/sci-astronomy/scamp/Manifest
@@ -1,16 +1,16 @@
-DIST scamp-1.3.8.tar.gz 17727433 RMD160 f9afb84946870e1a9da3e0f09f5a63e803637ee5 SHA1 4a47c5aeac475ba43068c2945b2b79ddf467fc1f SHA256 c2b329a2f8d7ef255948fa60f4cdf3cca0828e522c8e0e2091b3be4605e3e771
-EBUILD scamp-1.3.8.ebuild 2008 RMD160 7061561964bba217b5dbf2c02193b8355ad946ae SHA1 cd20ccf3a70ba110d212fe1d82e886cb8dda64f5 SHA256 4196143320ad17da76623b92518c5995914f6c7a72c5b8d5b9c6cdcbb0558f43
-MD5 8c27b883b65d3a1aa969129eac343f43 scamp-1.3.8.ebuild 2008
-RMD160 7061561964bba217b5dbf2c02193b8355ad946ae scamp-1.3.8.ebuild 2008
-SHA256 4196143320ad17da76623b92518c5995914f6c7a72c5b8d5b9c6cdcbb0558f43 scamp-1.3.8.ebuild 2008
-MISC ChangeLog 705 RMD160 c20f787b3cd71d9efd44304a2459fe564615a29f SHA1 591c763c5d9c1ce3f50ffd646a10cc2529ff0b1a SHA256 1dd9c7dcb5e6b81fe2abfccff64d2abd0c217b25ebfb5f5bf1189ef3f361da0d
-MD5 d0941682b1499aede3681f8f6751fc4b ChangeLog 705
-RMD160 c20f787b3cd71d9efd44304a2459fe564615a29f ChangeLog 705
-SHA256 1dd9c7dcb5e6b81fe2abfccff64d2abd0c217b25ebfb5f5bf1189ef3f361da0d ChangeLog 705
+DIST scamp-1.3.11.tar.gz 17721447 RMD160 57afc4e540776dd52b89f4e5d7d1daf255c158f9 SHA1 6d69401c2343f9bba7517956b763db5965156c02 SHA256 c811de1f6a820f9b3b2159086812628e5db67e6651ea11bf378b0534e7cc00da
+EBUILD scamp-1.3.11.ebuild 1594 RMD160 713ba845c43a82265eba8f41d204c889071be929 SHA1 1f093c4fa8118fe41d906a6a2a08d852e8693816 SHA256 c7341263a17a919560a1937e15778d9ba709933380a6061bae0050d780f8cd26
+MD5 a486bc60ec9c3863dfeedae8f946d52d scamp-1.3.11.ebuild 1594
+RMD160 713ba845c43a82265eba8f41d204c889071be929 scamp-1.3.11.ebuild 1594
+SHA256 c7341263a17a919560a1937e15778d9ba709933380a6061bae0050d780f8cd26 scamp-1.3.11.ebuild 1594
+MISC ChangeLog 821 RMD160 3115ff68b9a6bfb68ef41d53950c76b660de5f53 SHA1 686c7af2e65109f1e018a8162a40a4ed6f96832c SHA256 a4ff1f90692573379fe557d8cd266cef0c3f16b661d6f6cf07c12f9fe9e5f208
+MD5 4a225f3d5ce00d1123b790dadc8e3d62 ChangeLog 821
+RMD160 3115ff68b9a6bfb68ef41d53950c76b660de5f53 ChangeLog 821
+SHA256 a4ff1f90692573379fe557d8cd266cef0c3f16b661d6f6cf07c12f9fe9e5f208 ChangeLog 821
 MISC metadata.xml 378 RMD160 51f393d1e79301572f09a1c7bce449e14289f9a1 SHA1 0115b4e450192e8eec4a1236eba31e871eecc055 SHA256 9a28c3abd3899bd79ae8aa958492e89a5fb644f2102a714862a8de7e0bcb1706
 MD5 e9b8ba6d006f70cd7f4ddb67b28880b8 metadata.xml 378
 RMD160 51f393d1e79301572f09a1c7bce449e14289f9a1 metadata.xml 378
 SHA256 9a28c3abd3899bd79ae8aa958492e89a5fb644f2102a714862a8de7e0bcb1706 metadata.xml 378
-MD5 34a827c0731b5b8ba5550adf32e1bdec files/digest-scamp-1.3.8 241
-RMD160 9c29c5909801f53271fd0f1cc2142d638eb19a67 files/digest-scamp-1.3.8 241
-SHA256 27e4e02f527022c26795ac389d97c5e37ceb52a00cef87b11b0867fbd399bfe3 files/digest-scamp-1.3.8 241
+MD5 104f7b5ab9adf97ad32ec556e4c4f5ab files/digest-scamp-1.3.11 244
+RMD160 9d513ddbf0997dc0896b589e310f81b404dbbd1e files/digest-scamp-1.3.11 244
+SHA256 5b1d42ad46bf8d075e4f7573cbacc896b5ea57aa3ea356d69e3702983dc776e4 files/digest-scamp-1.3.11 244
diff --git a/sci-astronomy/scamp/files/digest-scamp-1.3.11 b/sci-astronomy/scamp/files/digest-scamp-1.3.11
new file mode 100644
index 000000000..97f6b5e98
--- /dev/null
+++ b/sci-astronomy/scamp/files/digest-scamp-1.3.11
@@ -0,0 +1,3 @@
+MD5 1c4370faa4092f7b9975e20bc4931581 scamp-1.3.11.tar.gz 17721447
+RMD160 57afc4e540776dd52b89f4e5d7d1daf255c158f9 scamp-1.3.11.tar.gz 17721447
+SHA256 c811de1f6a820f9b3b2159086812628e5db67e6651ea11bf378b0534e7cc00da scamp-1.3.11.tar.gz 17721447
diff --git a/sci-astronomy/scamp/files/digest-scamp-1.3.8 b/sci-astronomy/scamp/files/digest-scamp-1.3.8
deleted file mode 100644
index a8287c32e..000000000
--- a/sci-astronomy/scamp/files/digest-scamp-1.3.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b43d969bf812f21015b8277f34635fae scamp-1.3.8.tar.gz 17727433
-RMD160 f9afb84946870e1a9da3e0f09f5a63e803637ee5 scamp-1.3.8.tar.gz 17727433
-SHA256 c2b329a2f8d7ef255948fa60f4cdf3cca0828e522c8e0e2091b3be4605e3e771 scamp-1.3.8.tar.gz 17727433
diff --git a/sci-astronomy/scamp/scamp-1.3.8.ebuild b/sci-astronomy/scamp/scamp-1.3.11.ebuild
index 22ff51216..a4d5e44c4 100644
--- a/sci-astronomy/scamp/scamp-1.3.8.ebuild
+++ b/sci-astronomy/scamp/scamp-1.3.11.ebuild
@@ -16,37 +16,15 @@ RESTRICT="test"
 
 # right now just work with ATLAS implementations
 # need more work on virtual/cblas eselect for more blas/lapack impl.
+# or need clapack.
 RDEPEND="sci-astronomy/cdsclient
 	>=sci-libs/blas-atlas-3.7.11-r1
 	>=sci-libs/lapack-atlas-3.7.11-r1
 	>=sci-libs/fftw-3
 	plplot? ( >=sci-libs/plplot-5.1 )"
-DEPEND="${RDEPEND}
-	app-admin/eselect-cblas
-	app-admin/eselect-lapack"
 
-pkg_setup() {
+DEPEND="${RDEPEND}"
 
-	if ! eselect cblas show | grep -q atlas; then
-		ewarn "You must have atlas selected for cblas: try"
-		ewarn "$ eselect cblas set atlas  # or threaded-atlas"
-		die
-	fi
-
-	if ! eselect lapack show | grep -q atlas; then
-		ewarn "You must have atlas selected for lapack: try"
-		ewarn "$ eselect lapack set atlas"
-		die
-	fi
-
-	if use threads && ! eselect cblas show | grep -q threaded; then
-		ewarn "scamp with threads only works with threaded-atlas"
-		ewarn "You must have threaded-atlas selected for cblas: try"
-		ewarn "$ eselect cblas set threaded-atlas"
-		die
-	fi
-
-}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -62,11 +40,17 @@ src_compile() {
 	[[ "$(tc-getCC)" == "icc" ]] \
 		&& myconf="${myconf} --enable-icc"
 
+	local myatlas=atlas
+	use threads && \
+		[[ -f /usr/$(get_libdir)/blas/threaded-atlas/libcblas.a ]] && \
+		myatlas="threaded-atlas"	
+	local ldpath="/usr/$(get_libdir)/blas/${myatlas}"
+	ldpath="${ldpath}:/usr/$(get_libdir)/lapack/${myatlas}"
+	
 	econf \
 		$(use_with plplot) \
 		$(use_enable threads) \
 		"${myconf}" \
-		LDPATH=-L/usr/$(get_libdir)/lapack/atlas \
 		|| die "econf failed"
 	emake || die "emake failed"
 }