[gentoo-commits] gentoo-x86 commit in sci-libs/armadillo: armadillo-3.6.0.ebuild armadillo-3.4.4.ebuild ChangeLog armadillo-3.4.3.ebuild

[gentoo-commits] gentoo-x86 commit in sci-libs/armadillo: armadillo-3.6.0.ebuild armadillo-3.4.4.ebuild ChangeLog armadillo-3.4.3.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    12/12/12 18:23:10

  Modified:             armadillo-3.4.4.ebuild ChangeLog
  Added:                armadillo-3.6.0.ebuild
  Removed:              armadillo-3.4.3.ebuild
  Log:
  Version bump. Removed atlas flag temporarily for later integration from the science overlay
  
  (Portage version: 2.2.01.21418-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

Revision  Changes    Path
1.2                  sci-libs/armadillo/armadillo-3.4.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild?r1=1.1&r2=1.2

Index: armadillo-3.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- armadillo-3.4.4.ebuild	20 Nov 2012 00:06:33 -0000	1.1
+++ armadillo-3.4.4.ebuild	12 Dec 2012 18:23:10 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild,v 1.1 2012/11/20 00:06:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild,v 1.2 2012/12/12 18:23:10 bicatali Exp $
 
 EAPI=4
 
@@ -15,11 +15,10 @@
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="atlas blas doc examples lapack"
+IUSE="blas doc examples lapack"
 
 RDEPEND="
 	dev-libs/boost
-	atlas? ( sci-libs/lapack-atlas )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
 
@@ -45,16 +44,6 @@
 			-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
 		)
 	fi
-	if use atlas; then
-		mycmakeargs=(
-			-DARMA_USE_ATLAS=ON
-			-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
 }
 



1.20                 sci-libs/armadillo/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?r1=1.19&r2=1.20

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog	20 Nov 2012 00:06:33 -0000	1.19
+++ ChangeLog	12 Dec 2012 18:23:10 -0000	1.20
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/armadillo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.19 2012/11/20 00:06:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.20 2012/12/12 18:23:10 bicatali Exp $
+
+*armadillo-3.6.0 (12 Dec 2012)
+
+  12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.6.0.ebuild,
+  -armadillo-3.4.3.ebuild, armadillo-3.4.4.ebuild:
+  Version bump. Removed atlas flag temporarily for later integration from the
+  science overlay
 
 *armadillo-3.4.4 (20 Nov 2012)
 



1.1                  sci-libs/armadillo/armadillo-3.6.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-3.6.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-3.6.0.ebuild?rev=1.1&content-type=text/plain

Index: armadillo-3.6.0.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.6.0.ebuild,v 1.1 2012/12/12 18:23:10 bicatali Exp $

EAPI=4

CMAKE_IN_SOURCE_BUILD=1

inherit cmake-utils toolchain-funcs

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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="blas doc examples lapack"

RDEPEND="
	dev-libs/boost
	blas? ( virtual/blas )
	lapack? ( virtual/lapack )"
DEPEND="${DEPEND}
	virtual/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="$($(tc-getPKG_CONFIG) --libs blas)"
		)
	fi
	if use lapack; then
		mycmakeargs+=(
			-DLAPACK_FOUND=ON
			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
		)
	fi
	cmake-utils_src_configure
}

src_install() {
	cmake-utils_src_install
	dodoc README.txt
	use doc && dodoc *pdf && dohtml *html
	if use examples; then
		insinto /usr/share/doc/${PF}
		doins -r examples
	fi
}