[sci-libs/gsl] Fix bug #285468. Thanks to Livid

(Portage version: 2.2_rc41/cvs/Linux x86_64)

3 files changed, 96 insertions, 1 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 4bb452f77f74..25d940ebfa88 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/gsl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.58 2009/09/17 22:13:22 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.59 2009/09/20 18:45:49 alexxy Exp $
+
+*gsl-1.13-r1 (20 Sep 2009)
+
+  20 Sep 2009; Alexey Shvetsov <alexxy@gentoo.org> +gsl-1.13-r1.ebuild,
+  +files/gsl-1.13-cblas-vars.patch:
+  Fix bug #285468. Thanks to Livid
 
 *gsl-1.13 (17 Sep 2009)
 
diff --git a/sci-libs/gsl/files/gsl-1.13-cblas-vars.patch b/sci-libs/gsl/files/gsl-1.13-cblas-vars.patch
new file mode 100644
index 000000000000..341b1f53b196
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.13-cblas-vars.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2009-09-20 22:08:42.000000000 +0400
++++ Makefile.in	2009-09-20 22:09:31.000000000 +0400
+@@ -295,6 +295,8 @@
+ 	-e 's|@includedir[@]|$(includedir)|g' \
+ 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
+ 	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
++	-e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
++	-e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
+ 	-e 's|@LIBS[@]|$(LIBS)|g' \
+ 	-e 's|@VERSION[@]|$(VERSION)|g'
+ 
diff --git a/sci-libs/gsl/gsl-1.13-r1.ebuild b/sci-libs/gsl/gsl-1.13-r1.ebuild
new file mode 100644
index 000000000000..96ec58f9d8b3
--- /dev/null
+++ b/sci-libs/gsl/gsl-1.13-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.13-r1.ebuild,v 1.1 2009/09/20 18:45:49 alexxy Exp $
+
+EAPI=2
+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-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cblas"
+
+RDEPEND="cblas? ( virtual/cblas )"
+DEPEND="${RDEPEND}
+	app-admin/eselect-cblas
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	ESELECT_PROF="gsl"
+	# prevent to use external cblas from a previously installed gsl
+	local current_lib=$(eselect cblas show | cut -d' ' -f2)
+	if use cblas && [[ ${current_lib} == gsl ]]; then
+		ewarn "USE flag cblas is set: linking gsl with an external cblas."
+		ewarn "However the current selected external cblas is gsl."
+		ewarn "Please install and/or eselect another cblas"
+		die "Circular gsl dependency"
+	fi
+}
+
+src_prepare() {
+	filter-flags -ffast-math
+	epatch "${FILESDIR}"/${P}-cblas.patch
+	epatch "${FILESDIR}"/${P}-cblas-vars.patch
+	eautoreconf
+}
+
+src_configure() {
+	if use cblas; then
+		export CBLAS_LIBS="$(pkg-config --libs cblas)"
+		export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
+	fi
+	econf $(use_with cblas)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed."
+	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
+
+	# 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 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
+}