public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/
Date: Fri, 22 Feb 2013 10:15:43 +0000 (UTC)	[thread overview]
Message-ID: <1361525313.eaf3cb37466102348bffec03089d522286db7721.jlec@gentoo> (raw)

commit:     eaf3cb37466102348bffec03089d522286db7721
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 09:28:33 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 09:28:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=eaf3cb37

sci-mathematics/scilab: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config

Package-Manager: portage-2.2.0_alpha163
RepoMan-Options: --force

---
 sci-mathematics/scilab/ChangeLog              |    6 ++++-
 sci-mathematics/scilab/metadata.xml           |   16 +++++++-------
 sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |   26 +++++++++++++-----------
 sci-mathematics/scilab/scilab-5.4.0.ebuild    |   19 +++++++++--------
 4 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 840b142..6d0b612 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-mathematics/scilab
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2013; Justin Lecher <jlec@gentoo.org> scilab-5.3.3-r1.ebuild,
+  scilab-5.4.0.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
+
   18 Oct 2012; Guillaume Horel <guillaume.horel@gmail.com>
   scilab-5.3.3-r1.ebuild, scilab-5.4.0.ebuild:
   remove virtual/fortran as intended with the updated fortran-2 eclass

diff --git a/sci-mathematics/scilab/metadata.xml b/sci-mathematics/scilab/metadata.xml
index e87dba0..9e49669 100644
--- a/sci-mathematics/scilab/metadata.xml
+++ b/sci-mathematics/scilab/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
   Scilab is a matrix-based scientific software package. Scilab contains
   hundreds of built-in mathematical functions, rich data structures
   (including polynomials, rationals,linear systems, lists, etc...) and
   comes with a number of specific toolboxes for control, signal
   processing, ...
 </longdescription>
-<use>
-  <flag name='gui'>Build the Java base graphical interface</flag>
-  <flag name="umfpack">Adds support for sparse solving
+  <use>
+    <flag name="gui">Build the Java base graphical interface</flag>
+    <flag name="umfpack">Adds support for sparse solving
   with <pkg>sci-libs/umfpack</pkg></flag>
-  <flag name='matio'>Enable support for MATLAB file through <pkg>sci-libs/matio</pkg></flag>
-  <flag name='xcos'>Enable building hybrid dynamic systems modeler and
+    <flag name="matio">Enable support for MATLAB file through <pkg>sci-libs/matio</pkg></flag>
+    <flag name="xcos">Enable building hybrid dynamic systems modeler and
   simulator Xcos</flag>
-</use>
+  </use>
 </pkgmetadata>

diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
index a9883ea..19fe80b 100644
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -20,11 +20,12 @@ inherit eutils autotools check-reqs fdo-mime bash-completion-r1 \
 #   celestlab, jims,...
 
 DESCRIPTION="Scientific software package for numerical computations"
-LICENSE="CeCILL-2"
 HOMEPAGE="http://www.scilab.org/"
 SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
 
 SLOT="0"
+LICENSE="CeCILL-2"
+KEYWORDS="~amd64 ~x86"
 IUSE="bash-completion debug doc fftw +gui hdf5 +matio nls openmp
 	static-libs test tk +umfpack xcos"
 REQUIRED_USE="xcos? ( hdf5 gui ) doc? ( gui )"
@@ -39,9 +40,8 @@ for l in ${LINGUASLONG}; do
 	IUSE="${IUSE} linguas_${l%_*}"
 done
 
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-libs/libpcre
+CDEPEND="
+	dev-libs/libpcre
 	dev-libs/libxml2:2
 	sys-devel/gettext
 	sys-libs/ncurses
@@ -66,8 +66,9 @@ CDEPEND="dev-libs/libpcre
 		dev-java/xmlgraphics-commons
 		virtual/opengl
 		doc? ( dev-java/saxon:6.5 )
-		hdf5? ( dev-java/hdf-java
-				xcos? ( =dev-java/jgraphx-1.4.1.0 ) ) )
+		hdf5? (
+			dev-java/hdf-java
+			xcos? ( =dev-java/jgraphx-1.4.1.0 ) ) )
 	hdf5? ( sci-libs/hdf5 )
 	matio? ( <sci-libs/matio-1.5 )
 	tk? ( dev-lang/tk )
@@ -81,9 +82,10 @@ DEPEND="${CDEPEND}
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.5
-		doc? ( app-text/docbook-xsl-stylesheets
-			   >=dev-java/jlatexmath-fop-0.9.4
-			   dev-java/xml-commons-external )
+		doc? (
+			app-text/docbook-xsl-stylesheets
+			>=dev-java/jlatexmath-fop-0.9.4
+			dev-java/xml-commons-external )
 		xcos? ( dev-lang/ocaml ) )
 	test? ( gui? ( ${VIRTUALX_DEPEND} ) )"
 
@@ -182,8 +184,8 @@ src_configure() {
 		unset JAVAC
 	fi
 
-	export BLAS_LIBS="$(pkg-config --libs blas)"
-	export LAPACK_LIBS="$(pkg-config --libs lapack)"
+	export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+	export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
 	export F77_LDFLAGS="${LDFLAGS}"
 	# gentoo bug #302621
 	use hdf5 && has_version sci-libs/hdf5[mpi] && \

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index f561637..bffe76e 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,14 +12,15 @@ inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \
 
 # Things that don't work:
 # - tests
-# - can't build without docs (-doc) 
+# - can't build without docs (-doc)
 
 DESCRIPTION="Scientific software package for numerical computations"
-LICENSE="CeCILL-2"
 HOMEPAGE="http://www.scilab.org/"
 SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
 
 SLOT="0"
+LICENSE="CeCILL-2"
+KEYWORDS="~amd64 ~x86"
 IUSE="bash-completion debug +doc fftw +gui +matio nls openmp
 	static-libs test tk +umfpack xcos"
 REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
@@ -34,9 +35,8 @@ for l in ${LINGUASLONG}; do
 	IUSE="${IUSE} linguas_${l%_*}"
 done
 
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-libs/libpcre
+CDEPEND="
+	dev-libs/libpcre
 	dev-libs/libxml2:2
 	sci-libs/hdf5
 	>=sci-libs/arpack-3
@@ -77,9 +77,10 @@ DEPEND="${CDEPEND}
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.5
-		doc? ( app-text/docbook-xsl-stylesheets
-			   dev-java/jlatexmath-fop:1
-			   dev-java/xml-commons-external:1.4 )
+		doc? (
+			app-text/docbook-xsl-stylesheets
+			dev-java/jlatexmath-fop:1
+			dev-java/xml-commons-external:1.4 )
 		xcos? ( dev-lang/ocaml ) )
 	test? (
 		dev-java/junit:4


             reply	other threads:[~2013-02-22 10:15 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-22 10:15 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-12-16 10:57 [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/ Andrew Ammerlaan
2021-03-21 12:38 Andrew Ammerlaan
2021-01-25  8:46 Andrew Ammerlaan
2021-01-24 21:05 Andrew Ammerlaan
2021-01-24 21:05 Andrew Ammerlaan
2021-01-24 21:05 Andrew Ammerlaan
2021-01-24 21:05 Andrew Ammerlaan
2021-01-24 21:05 Andrew Ammerlaan
2021-01-24 21:05 Andrew Ammerlaan
2021-01-24 21:05 Andrew Ammerlaan
2021-01-19 16:56 Andrew Ammerlaan
2021-01-11 18:12 Andrew Ammerlaan
2021-01-11 18:11 Andrew Ammerlaan
2015-09-21 19:05 Justin Lecher
2015-09-01  7:57 Justin Lecher
2015-07-31 10:09 Justin Lecher
2015-07-31 10:09 Justin Lecher
2015-07-23 21:06 Jauhien Piatlicki
2015-07-10  3:59 Nicolas Bock
2015-02-01  3:01 Guillaume Horel
2015-02-01  3:01 Guillaume Horel
2014-11-01 16:44 Guillaume Horel
2014-05-05 22:44 Guillaume Horel
2013-11-01  1:59 Guillaume Horel
2013-11-01  1:59 Guillaume Horel
2013-10-21 21:41 Christoph Junghans
2013-06-03 23:33 Christoph Junghans
2013-05-10  0:34 Guillaume Horel
2013-01-19 17:46 Guillaume Horel
2013-01-08  2:27 Guillaume Horel
2012-11-27  3:30 Guillaume Horel
2012-10-18 14:06 Guillaume Horel
2012-10-18  4:34 Guillaume Horel
2012-10-18  4:28 Guillaume Horel
2012-10-02  5:50 Guillaume Horel
2012-09-25  6:08 Guillaume Horel
2012-08-11 22:23 Guillaume Horel
2012-05-30  1:26 Guillaume Horel
2011-12-23  1:02 Guillaume Horel
2011-09-19  3:45 Guillaume Horel
2011-06-30 13:44 Guillaume Horel
2011-06-30 13:44 Guillaume Horel
2011-06-24 17:09 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1361525313.eaf3cb37466102348bffec03089d522286db7721.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox