jlec 15/05/04 13:57:43
Modified: armadillo-4.600.4.ebuild armadillo-4.650.2.ebuild
armadillo-4.650.4.ebuild metadata.xml ChangeLog
Log:
Remove atlas support, fixes bug #541524, fixes
https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/108; thanks Marius
Brehler
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.2 sci-libs/armadillo/armadillo-4.600.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild?r1=1.1&r2=1.2
Index: armadillo-4.600.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- armadillo-4.600.4.ebuild 27 Feb 2015 13:13:27 -0000 1.1
+++ armadillo-4.600.4.ebuild 4 May 2015 13:57:42 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild,v 1.1
2015/02/27 13:13:27 dilfridge Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild,v 1.2
2015/05/04 13:57:42 jlec Exp $
EAPI=5
@@ -15,18 +15,16 @@
LICENSE="MPL-2.0"
SLOT="0/4"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
+IUSE="arpack blas debug doc examples hdf5 lapack mkl tbb test"
REQUIRED_USE="test? ( lapack )"
RDEPEND="
dev-libs/boost
arpack? ( sci-libs/arpack )
- atlas? ( sci-libs/atlas[lapack] )
blas? ( virtual/blas )
lapack? ( virtual/lapack )"
DEPEND="${RDEPEND}
arpack? ( virtual/pkgconfig )
- atlas? ( virtual/pkgconfig )
blas? ( virtual/pkgconfig )
hdf5? ( sci-libs/hdf5 )
lapack? ( virtual/pkgconfig )
@@ -56,19 +54,6 @@
-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
)
fi
- if use atlas; then
- local c=atlas-cblas l=atlas-clapack
- $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
- $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
- mycmakeargs+=(
- -DCBLAS_FOUND=ON
- -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG)
--cflags-only-I ${c} | sed 's/-I//')"
- -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
- -DCLAPACK_FOUND=ON
- -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG)
--cflags-only-I ${l} | sed 's/-I//')"
- -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
- )
- fi
if use blas; then
mycmakeargs+=(
-DBLAS_FOUND=ON
1.2 sci-libs/armadillo/armadillo-4.650.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.650.2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.650.2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.650.2.ebuild?r1=1.1&r2=1.2
Index: armadillo-4.650.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- armadillo-4.650.2.ebuild 27 Feb 2015 14:41:26 -0000 1.1
+++ armadillo-4.650.2.ebuild 4 May 2015 13:57:42 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.2.ebuild,v 1.1
2015/02/27 14:41:26 dilfridge Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.2.ebuild,v 1.2
2015/05/04 13:57:42 jlec Exp $
EAPI=5
@@ -15,18 +15,16 @@
LICENSE="MPL-2.0"
SLOT="0/4"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
+IUSE="arpack blas debug doc examples hdf5 lapack mkl tbb test"
REQUIRED_USE="test? ( lapack )"
RDEPEND="
dev-libs/boost
arpack? ( sci-libs/arpack )
- atlas? ( sci-libs/atlas[lapack] )
blas? ( virtual/blas )
lapack? ( virtual/lapack )"
DEPEND="${RDEPEND}
arpack? ( virtual/pkgconfig )
- atlas? ( virtual/pkgconfig )
blas? ( virtual/pkgconfig )
hdf5? ( sci-libs/hdf5 )
lapack? ( virtual/pkgconfig )
@@ -56,19 +54,6 @@
-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
)
fi
- if use atlas; then
- local c=atlas-cblas l=atlas-clapack
- $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
- $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
- mycmakeargs+=(
- -DCBLAS_FOUND=ON
- -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG)
--cflags-only-I ${c} | sed 's/-I//')"
- -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
- -DCLAPACK_FOUND=ON
- -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG)
--cflags-only-I ${l} | sed 's/-I//')"
- -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
- )
- fi
if use blas; then
mycmakeargs+=(
-DBLAS_FOUND=ON
1.2 sci-libs/armadillo/armadillo-4.650.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild?r1=1.1&r2=1.2
Index: armadillo-4.650.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- armadillo-4.650.4.ebuild 3 Apr 2015 12:32:07 -0000 1.1
+++ armadillo-4.650.4.ebuild 4 May 2015 13:57:42 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1
2015/04/03 12:32:07 jlec Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.2
2015/05/04 13:57:42 jlec Exp $
EAPI=5
@@ -15,18 +15,16 @@
LICENSE="MPL-2.0"
SLOT="0/4"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
+IUSE="arpack blas debug doc examples hdf5 lapack mkl tbb test"
REQUIRED_USE="test? ( lapack )"
RDEPEND="
dev-libs/boost
arpack? ( sci-libs/arpack )
- atlas? ( sci-libs/atlas[lapack] )
blas? ( virtual/blas )
lapack? ( virtual/lapack )"
DEPEND="${RDEPEND}
arpack? ( virtual/pkgconfig )
- atlas? ( virtual/pkgconfig )
blas? ( virtual/pkgconfig )
hdf5? ( sci-libs/hdf5 )
lapack? ( virtual/pkgconfig )
@@ -56,19 +54,19 @@
-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
)
fi
- if use atlas; then
- local c=atlas-cblas l=atlas-clapack
- $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
- $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
- mycmakeargs+=(
- -DCBLAS_FOUND=ON
- -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG)
--cflags-only-I ${c} | sed 's/-I//')"
- -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
- -DCLAPACK_FOUND=ON
- -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG)
--cflags-only-I ${l} | sed 's/-I//')"
- -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
- )
- fi
+# if use atlas; then
+# local c=atlas-cblas l=atlas-clapack
+# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+# mycmakeargs+=(
+# -DCBLAS_FOUND=ON
+# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG)
--cflags-only-I ${c} | sed 's/-I//')"
+# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+# -DCLAPACK_FOUND=ON
+# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG)
--cflags-only-I ${l} | sed 's/-I//')"
+# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+# )
+# fi
if use blas; then
mycmakeargs+=(
-DBLAS_FOUND=ON
1.8 sci-libs/armadillo/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?r1=1.7&r2=1.8
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml 3 Apr 2015 12:32:07 -0000 1.7
+++ metadata.xml 4 May 2015 13:57:42 -0000 1.8
@@ -18,10 +18,6 @@
templates and template meta-programming.
</longdescription>
<use>
- <flag name="atlas">
- Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and
- clapack
- </flag>
<flag name="arpack">
Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition
</flag>
1.33 sci-libs/armadillo/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.33&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.33&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?r1=1.32&r2=1.33
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog 3 Apr 2015 12:32:07 -0000 1.32
+++ ChangeLog 4 May 2015 13:57:42 -0000 1.33
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/armadillo
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.32
2015/04/03 12:32:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.33
2015/05/04 13:57:42 jlec Exp $
+
+ 04 May 2015; Justin Lecher <[email protected]> armadillo-4.600.4.ebuild,
+ armadillo-4.650.2.ebuild, armadillo-4.650.4.ebuild, metadata.xml:
+ Remove atlas support, fixes bug #541524, fixes https://github.com/gentoo
+ /gentoo-portage-rsync-mirror/pull/108; thanks Marius Brehler
*armadillo-4.650.4 (03 Apr 2015)
