* [gentoo-commits] gentoo-x86 commit in sci-libs/armadillo: metadata.xml ChangeLog armadillo-1.2.0.ebuild armadillo-1.1.6.ebuild armadillo-2.0.2.ebuild
@ 2011-07-18 1:38 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2011-07-18 1:38 UTC (permalink / raw
To: gentoo-commits
jlec 11/07/18 01:38:07
Modified: metadata.xml ChangeLog armadillo-1.2.0.ebuild
armadillo-1.1.6.ebuild
Added: armadillo-2.0.2.ebuild
Log:
Version Bump, #373715
(Portage version: 2.2.0_alpha45/cvs/Linux x86_64)
Revision Changes Path
1.2 sci-libs/armadillo/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?r1=1.1&r2=1.2
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml 6 Mar 2011 19:23:25 -0000 1.1
+++ metadata.xml 18 Jul 2011 01:38:06 -0000 1.2
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
Armadillo is a C++ linear algebra library (matrix maths) aiming
towards a good balance between speed and ease of use. Integer,
floating point and complex numbers are supported, as well as a
@@ -14,8 +14,7 @@
need for temporaries. This is accomplished through recursive
templates and template meta-programming.
</longdescription>
-<use>
- <flag name='atlas'>Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag>
-</use>
+ <use>
+ <flag name="atlas">Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag>
+ </use>
</pkgmetadata>
-
1.3 sci-libs/armadillo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?r1=1.2&r2=1.3
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 4 May 2011 00:29:37 -0000 1.2
+++ ChangeLog 18 Jul 2011 01:38:06 -0000 1.3
@@ -1,6 +1,12 @@
# ChangeLog for sci-libs/armadillo
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.2 2011/05/04 00:29:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.3 2011/07/18 01:38:06 jlec Exp $
+
+*armadillo-2.0.2 (18 Jul 2011)
+
+ 18 Jul 2011; Justin Lecher <jlec@gentoo.org> armadillo-1.1.6.ebuild,
+ armadillo-1.2.0.ebuild, +armadillo-2.0.2.ebuild, metadata.xml:
+ Version Bump, #373715
*armadillo-1.2.0 (04 May 2011)
1.2 sci-libs/armadillo/armadillo-1.2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-1.2.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-1.2.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-1.2.0.ebuild?r1=1.1&r2=1.2
Index: armadillo-1.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-1.2.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- armadillo-1.2.0.ebuild 4 May 2011 00:29:37 -0000 1.1
+++ armadillo-1.2.0.ebuild 18 Jul 2011 01:38:06 -0000 1.2
@@ -1,9 +1,11 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-1.2.0.ebuild,v 1.1 2011/05/04 00:29:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-1.2.0.ebuild,v 1.2 2011/07/18 01:38:06 jlec Exp $
+
+EAPI=3
-EAPI="3"
CMAKE_IN_SOURCE_BUILD=1
+
inherit cmake-utils
DESCRIPTION="Streamlined C++ linear algebra library"
@@ -15,7 +17,8 @@
KEYWORDS="~amd64 ~x86"
IUSE="atlas blas doc lapack"
-RDEPEND=">=dev-libs/boost-1.34
+RDEPEND="
+ >=dev-libs/boost-1.34
atlas? ( sci-libs/lapack-atlas )
blas? ( virtual/blas )
lapack? ( virtual/lapack )"
1.2 sci-libs/armadillo/armadillo-1.1.6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-1.1.6.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-1.1.6.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-1.1.6.ebuild?r1=1.1&r2=1.2
Index: armadillo-1.1.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-1.1.6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- armadillo-1.1.6.ebuild 6 Mar 2011 19:23:25 -0000 1.1
+++ armadillo-1.1.6.ebuild 18 Jul 2011 01:38:06 -0000 1.2
@@ -1,9 +1,11 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-1.1.6.ebuild,v 1.1 2011/03/06 19:23:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-1.1.6.ebuild,v 1.2 2011/07/18 01:38:06 jlec Exp $
+
+EAPI=3
-EAPI="3"
CMAKE_IN_SOURCE_BUILD=1
+
inherit cmake-utils
DESCRIPTION="Streamlined C++ linear algebra library"
@@ -15,7 +17,8 @@
KEYWORDS="~amd64 ~x86"
IUSE="atlas blas doc lapack"
-RDEPEND=">=dev-libs/boost-1.34
+RDEPEND="
+ >=dev-libs/boost-1.34
atlas? ( sci-libs/lapack-atlas )
blas? ( virtual/blas )
lapack? ( virtual/lapack )"
@@ -25,7 +28,7 @@
src_prepare() {
# avoid the automagic cmake macros
- sed -i -e '/ARMA_Find/d' CMakeLists.txt
+ sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
}
src_configure() {
1.1 sci-libs/armadillo/armadillo-2.0.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-2.0.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-2.0.2.ebuild?rev=1.1&content-type=text/plain
Index: armadillo-2.0.2.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-2.0.2.ebuild,v 1.1 2011/07/18 01:38:06 jlec Exp $
EAPI=3
CMAKE_IN_SOURCE_BUILD=1
inherit cmake-utils
DESCRIPTION="Streamlined C++ linear algebra library"
HOMEPAGE="http://arma.sourceforge.net/"
SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="atlas blas doc lapack"
RDEPEND="
>=dev-libs/boost-1.34
atlas? ( sci-libs/lapack-atlas )
blas? ( virtual/blas )
lapack? ( virtual/lapack )"
DEPEND="${DEPEND}
dev-util/pkgconfig"
src_prepare() {
# avoid the automagic cmake macros
sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
}
src_configure() {
local mycmakeargs=()
if use blas; then
mycmakeargs+=(
-DBLAS_FOUND=ON
-DBLAS_LIBRARIES="$(pkg-config --libs blas)"
)
fi
if use lapack; then
mycmakeargs+=(
-DLAPACK_FOUND=ON
-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
)
fi
if use atlas; then
mycmakeargs=(
-DCBLAS_FOUND=ON
-DCLAPACK_FOUND=ON
-DATLAS_INCLUDE_DIR="${EPREFIX}/usr/include/atlas/"
-DCBLAS_LIBRARIES="$(pkg-config --libs cblas)"
-DCLAPACK_LIBRARIES="-L${EPREFIX}/usr/lib64/lapack/atlas -llapack"
)
fi
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
use doc && dodoc docs/*pdf
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-18 1:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-18 1:38 [gentoo-commits] gentoo-x86 commit in sci-libs/armadillo: metadata.xml ChangeLog armadillo-1.2.0.ebuild armadillo-1.1.6.ebuild armadillo-2.0.2.ebuild Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox