[gentoo-commits] gentoo-x86 commit in sci-libs/gsl: metadata.xml ChangeLog gsl-1.12.ebuild gsl-1.10.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    09/01/19 19:22:30

  Modified:             metadata.xml ChangeLog
  Added:                gsl-1.12.ebuild
  Removed:              gsl-1.10.ebuild
  Log:
  Version bump. cblas patch adapted and added a check on the external cblas lib not to be gsl itself
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  sci-libs/gsl/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gsl/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gsl/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gsl/metadata.xml?r1=1.3&r2=1.4

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gsl/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml	7 Aug 2008 07:04:30 -0000	1.3
+++ metadata.xml	19 Jan 2009 19:22:30 -0000	1.4
@@ -3,20 +3,20 @@
 <pkgmetadata>
 <herd>sci</herd>
 <longdescription lang="en">
-The GNU Scientific Library (GSL) is a collection of routines for
-numerical analysis. The routines are written from scratch by the GSL
-team in C, and present a modern API for C programmers, while allowing
-wrappers to be written for very high level languages.
-
-GSL includes data types and routines for complex numbers, vectors,
-matrices, basic linear algebra subroutines (BLAS), eigensystems,
-simulated annealing, minimization, root finding, pseudo-random
-numbers, least-squares fitting, fast Fourier transforms (FFT),
-differential equations, quadrature, Monte Carlo integration, special
-functions, physical constants, and much more. 
+  The GNU Scientific Library (GSL) is a collection of routines for
+  numerical analysis. The routines are written from scratch by the GSL
+  team in C, and present a modern API for C programmers, while allowing
+  wrappers to be written for very high level languages.
+  
+  GSL includes data types and routines for complex numbers, vectors,
+  matrices, basic linear algebra subroutines (BLAS), eigensystems,
+  simulated annealing, minimization, root finding, pseudo-random
+  numbers, least-squares fitting, fast Fourier transforms (FFT),
+  differential equations, quadrature, Monte Carlo integration, special
+  functions, physical constants, and much more. 
 </longdescription>
 <use>
-  <flag name='cblas'>Build gsl with external cblas by default
+  <flag name='cblas'>Link gsl with external cblas provided by
     (<pkg>virtual/cblas</pkg>)</flag>
 </use>
 </pkgmetadata>



1.50                 sci-libs/gsl/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gsl/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gsl/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gsl/ChangeLog?r1=1.49&r2=1.50

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog	9 Nov 2008 16:46:11 -0000	1.49
+++ ChangeLog	19 Jan 2009 19:22:30 -0000	1.50
@@ -1,6 +1,13 @@
 # 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.49 2008/11/09 16:46:11 armin76 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.50 2009/01/19 19:22:30 bicatali Exp $
+
+*gsl-1.12 (19 Jan 2009)
+
+  19 Jan 2009; Sébastien Fabbro <bicatali@g.o>
+  +files/gsl-1.12-cblas.patch, -gsl-1.10.ebuild, +gsl-1.12.ebuild:
+  Version bump. cblas patch adapted and added a check on the external
+  cblas lib not to be gsl itself.
 
   09 Nov 2008; Raúl Porcel <armin76@g.o> gsl-1.11.ebuild:
   alpha/ia64 stable wrt #245838



1.1                  sci-libs/gsl/gsl-1.12.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gsl/gsl-1.12.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gsl/gsl-1.12.ebuild?rev=1.1&content-type=text/plain

Index: gsl-1.12.ebuild
===================================================================
# 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.12.ebuild,v 1.1 2009/01/19 19:22:30 bicatali 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 ~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
	replace-cpu-flags k6 k6-2 k6-3 i586
	epatch "${FILESDIR}"/${P}-cblas.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 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 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
}