Version bump. Removed icc test since it now compiles and tests are fine

Package-Manager: portage-2.1.4.4

4 files changed, 97 insertions, 44 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 021e5f5d5ae9..05bc073bd7bd 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/gsl
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.42 2008/01/09 16:15:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.43 2008/03/31 09:51:36 bicatali Exp $
+
+*gsl-1.11 (31 Mar 2008)
+
+  31 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> -gsl-1.8.ebuild,
+  +gsl-1.11.ebuild:
+  Version bump. Removed icc test since it now compiles and tests are fine
 
   09 Jan 2008; Jeroen Roovers <jer@gentoo.org> gsl-1.9-r1.ebuild,
   gsl-1.10.ebuild:
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 885e1b9090dc..f46572cc8e58 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,13 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cblas.pc.in 290 RMD160 4fc855a67383ac17b68c29d8f10307178919e217 SHA1 ec23b2092a5498beb602c9b558af8abcf5dd6358 SHA256 f47133de2f49a5ff53c8e295d03fbe8923c79cd0978cedb903cfdf7e57a873a1
 AUX eselect.cblas.gsl 216 RMD160 b2c3d435952eb73fcd02406fbd087176407c1f76 SHA1 814489871b93c2b4f7195fb9bbef1227e04c36cf SHA256 2be1ba93a0bafa73df52913f54d1c7fd299aa1cd0a98c5fbe4eac894073ebac7
 AUX gsl-1.6-deps.diff 418 RMD160 1c6aef845c115fce98c38857948b38a1b5e425b1 SHA1 b03629fad9b09c918ccea6bc328c9b8eb256d351 SHA256 0ca9e6e5431d608c282ce890971b23c2fdba5701f0cac0d70938f14df46e701f
 AUX gsl-cblas.patch 2857 RMD160 2bc2973635d608cdaf73849ba1a85797bbf7dc74 SHA1 b97d867aa5389d258ec04383a1598ae1fad25446 SHA256 e0286230eff05faf9bf2c5c320a0a3a8855286ba2a5fb163cb07a5386e60c5bf
 DIST gsl-1.10.tar.gz 2842422 RMD160 0b6ac2b1aec6a93521941620a824ae78f79adebb SHA1 401d0203d362948e30d0b3c58601a3bc52d0bfd4 SHA256 ea3968b58bfc7619f47bf5ff64a7198a38c72419d24b844e71e48823a4776ff0
-DIST gsl-1.8.tar.gz 2419825 RMD160 f3e7f4622be56635f84c6d889bf8316dbac1edf4 SHA1 0dabdf2d024ae3b29207e485c5413676f3fa136f SHA256 a66a4c5243111f98f11114a9c7e00c316b281e8e383b0d0b8a0b7debdb27d9d6
+DIST gsl-1.11.tar.gz 2700307 RMD160 b69e38e217084fa2aff386b42aadb6f9efc5b1ec SHA1 5a154d1cc66ac479197d25dd93a56da12a034c49 SHA256 7611e507aef1657ccf5e099c9d3873c49cd49a746bc8a00046dcd437fd9211b1
 DIST gsl-1.9.tar.gz 2574939 RMD160 faca66d02876135c31c2f3585baa1931488e1593 SHA1 7541504ed9864b1a278f9392830ecac9e0146258 SHA256 fcd1c6784997c2312d922d107fcb30462f5be4335ebdfa8e1e0e07568c962250
 EBUILD gsl-1.10.ebuild 2347 RMD160 6ec32d6b73c51cec8133c0ee2ef6cda16632bf36 SHA1 15b3ac42ddf83ce68e4a1e40f38bc534552ea81b SHA256 56fba8eced78c7a596c52a71cb550e5bfedd17fdd820cfbf2e7e8a89628b7692
-EBUILD gsl-1.8.ebuild 908 RMD160 f1cca82de4499fed31b1ceb55ce03f37cd960926 SHA1 aeea11f7750262d60de74bcbbbf5e99fe44f4c7b SHA256 5c9cfb936835a1a7f96e16ef1933383ef0df841d865306c17538e0f6d0f65027
+EBUILD gsl-1.11.ebuild 2359 RMD160 c2e4866c52879792e64a5e84525bc03032037742 SHA1 444d010e1233bcd0aedeeef483efff6494181016 SHA256 c0e191f8db32c82fba657d1d530d40f8ea55a5a7c4dfcf280a894989b4586ca9
 EBUILD gsl-1.9-r1.ebuild 2158 RMD160 c8aad89ccf83c72d1d7e649b836ead81c8e88c94 SHA1 73df32e6af7d7d8f144d352918c9b5c47ff10746 SHA256 cf2ae1ff43e463f2fb58cb29cc1815a72650cb66106499ca9f2b6cc64adb9fab
 EBUILD gsl-1.9.ebuild 902 RMD160 6e816c633aad0535855c04a62185081c306ef0e6 SHA1 3a3b63990bd38340d7cceb5f4fcacbded5227261 SHA256 5fb3394f666f79d36cd21232c952d5edb7cda347cc65f7558bd820fd74ce8640
-MISC ChangeLog 7322 RMD160 e04657b69ab15d394d810c2151bedc3fda964826 SHA1 5be4f1fbd0201558b397958893343af69667790a SHA256 17c5db5f873425e409acf24eb427092e64db4cd926e92f6d9adc1c081cafec57
+MISC ChangeLog 7519 RMD160 7feb11ded51ce8452daae735f490b61d42f7a9e4 SHA1 3ec5581c1fff6e167e082e9245583661a914c009 SHA256 bac4a1afb6a1a4d09f741c6633a309924105f08d30ce8cb5f2276fc42a6278c2
 MISC metadata.xml 836 RMD160 b943f54adb51092168df6701a8b609d542294ed2 SHA1 6fa1524e79b23126873585c549946acb69999060 SHA256 5a46124b74c2db07241cec1c43eaf3c7f5882fdf9ce9587383b425443ed9a67c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH8LQy1ycZbhPLE2ARAtXlAKCcZQMZSHeH86iVvyngUQtiTsAg3QCglryY
+ye0k1WLQfWdSEnb/U0v5ig8=
+=LGGc
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/gsl/gsl-1.11.ebuild b/sci-libs/gsl/gsl-1.11.ebuild
new file mode 100644
index 000000000000..dd3e28d814ad
--- /dev/null
+++ b/sci-libs/gsl/gsl-1.11.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.11.ebuild,v 1.1 2008/03/31 09:51:36 bicatali Exp $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+DESCRIPTION="The GNU Scientific Library"
+HOMEPAGE="http://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cblas"
+
+RDEPEND="app-admin/eselect-cblas
+	cblas? ( virtual/cblas )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+#pkg_setup() {
+#	# icc-10.0.026 did not pass rng tests (last check: gsl-1.10)
+#	if [[ $(tc-getCC) == icc ]]; then
+#		eerror "icc known to fail tests. Revert to safer compiler and re-emerge."
+#		die "gsl does not work when compiled with icc"
+#	fi
+#}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/gsl-cblas.patch
+	eautoreconf
+}
+
+src_compile() {
+	# could someone check if they are still needed?
+	replace-cpu-flags k6 k6-2 k6-3 i586
+	filter-flags -ffast-math
+	local myconf=
+	use cblas && myconf="--with-cblas=$(pkg-config --libs cblas)"
+	econf "${myconf}"|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed."
+	dodoc AUTHORS BUGS ChangeLog NEWS README SUPPORT \
+		THANKS TODO || die "dodoc failed"
+
+	# take care of pkgconfig file for cblas implementation.
+	sed -e "s/@LIBDIR@/$(get_libdir)/" \
+		-e "s/@PV@/${PV}/" \
+		"${FILESDIR}"/cblas.pc.in > cblas.pc \
+		|| die "sed cblas.pc failed"
+	insinto /usr/$(get_libdir)/blas/gsl
+	doins cblas.pc || die "installing cblas.pc failed"
+	ESELECT_PROF=gsl
+	eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.gsl ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	local p=cblas
+	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		# work around eselect bug #189942
+		local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect ${p} set ${ESELECT_PROF}
+		elog "${p} has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected ${p} is ${current_lib}"
+		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect ${p} set ${ESELECT_PROF}"
+	fi
+}
diff --git a/sci-libs/gsl/gsl-1.8.ebuild b/sci-libs/gsl/gsl-1.8.ebuild
deleted file mode 100644
index d45ff9985f66..000000000000
--- a/sci-libs/gsl/gsl-1.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.8.ebuild,v 1.13 2007/08/25 14:28:25 vapier Exp $
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/gsl-1.6-deps.diff
-	eautoreconf
-}
-
-src_compile() {
-	replace-cpu-flags k6 k6-2 k6-3 i586
-	filter-flags -ffast-math
-
-	econf --disable-libtool-lock || die
-	emake || die 'emake failed.'
-}
-
-src_test() {
-	make check || die 'make check failed.'
-}
-
-src_install() {
-	einstall || die 'einstall failed.'
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SUPPORT THANKS TODO
-}