projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f68e83d)
Version bump
authorSebastien Fabbro <bicatali@gentoo.org>
Thu, 1 Sep 2011 04:50:01 +0000 (04:50 +0000)
committerSebastien Fabbro <bicatali@gentoo.org>
Thu, 1 Sep 2011 04:50:01 +0000 (04:50 +0000)
Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

sci-libs/armadillo/ChangeLog patch | blob | history
sci-libs/armadillo/Manifest patch | blob | history
sci-libs/armadillo/armadillo-1.2.0.ebuild [deleted file] patch | blob | history
sci-libs/armadillo/armadillo-2.0.2.ebuild [deleted file] patch | blob | history
sci-libs/armadillo/armadillo-2.2.3.ebuild [moved from sci-libs/armadillo/armadillo-1.1.6.ebuild with 95% similarity] patch | blob | history

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index c42035f1faa07945a670d9eaac6ac421fbabf3fd..ca18eaa13e74baf2ae1df80b096fc21472450cc6 100644 (file)
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -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.4 2011/08/06 21:41:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.5 2011/09/01 04:50:01 bicatali Exp $
+
+*armadillo-2.2.3 (01 Sep 2011)
+
+  01 Sep 2011; Sébastien Fabbro <bicatali@gentoo.org> -armadillo-1.1.6.ebuild,
+  -armadillo-1.2.0.ebuild, -armadillo-2.0.2.ebuild, +armadillo-2.2.3.ebuild:
+  Version bump
 
 *armadillo-2.2.1 (06 Aug 2011)
 
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 8c47b7d4dd3e6086f54943e38ce1f9eaf51d2293..b0e5e7db0bf3b5b2f4e7e2c6bf4d5c6a6fda8e70 100644 (file)
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST armadillo-1.1.6.tar.gz 2861337 RMD160 4a8fe4ce8b33676f2a498fae0245dd502328ec94 SHA1 acc2fecb3ce801a53991a37df826c20c8798b037 SHA256 aefe705a22328cddf229c72ee058f4308a09406591e5b03e9487704a42d82b13
-DIST armadillo-1.2.0.tar.gz 2865477 RMD160 e150425d1c03470256f75b635765b849de40fd48 SHA1 ab5d4037ef2ee997b3a78809bc069f37305da1a7 SHA256 859dc5a2d6934a46bd18b42492a0f1c7b97b201c6cc95b4352b8c5b9631e69a3
-DIST armadillo-2.0.2.tar.gz 2885519 RMD160 8f142c12099c273ab2f38dcc3a1c53d37dfc1d5a SHA1 e9df63160650dd8e708cc0bb299f15904e0369ca SHA256 ac6a164402d3e911ff1f486fdbba701fcdd1d488da3580a849d444ba0eaf9146
 DIST armadillo-2.2.1.tar.gz 2888669 RMD160 25a43b91e7b2c084e003b168a4fdd1234c4e613d SHA1 65ab922627c5c411fa9795131caad189cbfb8689 SHA256 c1626acc0063b5d30f2563814584974b8a7ba37761200a9dbb6ae818059355e1
-EBUILD armadillo-1.1.6.ebuild 1393 RMD160 5d928506ec311d9975cfa66a9cda1a8970c7e14a SHA1 9fbc3c632ee51796986c121f795e03a5a8af42bf SHA256 dd3db0aa6b4fb576aad374a79dd05cfd688fc1bccba8ffdde21394461bace637
-EBUILD armadillo-1.2.0.ebuild 1393 RMD160 5ef4ca4410cef73740ac4c950efa3d0dce42708f SHA1 2c107b8d0adff2b638c951eb6e61ad454dc2fbf3 SHA256 82948e337cff69acc97500e83ad1b5a3ce95dc183f66508805b85744bb40481a
-EBUILD armadillo-2.0.2.ebuild 1393 RMD160 ce31e4b54a5555b1386e9d23b727c7040ea62d10 SHA1 bca573ece5a70f9dd8632ea23ecb526d96c75c49 SHA256 fcf2e7ffa27b97b20864f0decb57df04b1142bd84ac2f84f560bc49ddedfd962
+DIST armadillo-2.2.3.tar.gz 2888375 RMD160 86dd5e5217d264852eddf6baeafa471e7d88da49 SHA1 32b25242be6c3c42a801dd64270a06c94ae56648 SHA256 ae9f0727a594fba65eb3cf1a8c724e89ec03f23c49922bb14400148e7da39db7
 EBUILD armadillo-2.2.1.ebuild 1397 RMD160 6330c2f70a330593d283c17c7bb00ea986260e97 SHA1 feff9a09a4f32ed04ed5e81dea976409f338163f SHA256 bb01a3459eabe3715412e1f769411774986650cb05c3f92f97a751e6c5e45ab0
-MISC ChangeLog 999 RMD160 56f7d77a350b7073a769a855359ba9a8c8581381 SHA1 149167ebfd853eb3a3881a35bb6b2df0642b0d87 SHA256 fdb1c9afc86159ebb4dd6016b4e377ee415d70aec7317382a2d9b252eac93ca9
+EBUILD armadillo-2.2.3.ebuild 1397 RMD160 cb96d55058a299c5e6cb5ab7e669d486b0cd44c2 SHA1 6dfd040d716f427fb961ae2847511a601cf439fb SHA256 eca35b69879053a21535c74c8736f43ac1fb348f9111c68b425e43eb50b547b1
+MISC ChangeLog 1204 RMD160 5c9063affe470d8f847b9a7c47fad83d432ed902 SHA1 5f6675c0663e51d814a9cf69e1131d78d6f4c0f0 SHA256 ae2cd7605b2962ee27ebde9418142a19673c3956903cac56b6bb0d152e68c1fa
 MISC metadata.xml 938 RMD160 5bc8667971361af5e848c038f53acb6e8c974f67 SHA1 3dde90b456147fec82470d6a5804489c1b0c91cb SHA256 c26e73cdee3f87e18188e53385b69ef7d90603a040c5eaf13463c648259c4de3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk49tQIACgkQ1ycZbhPLE2BWywCgr9BwwKH0/btGr7Ma0Cx+f5Y7
-uWYAoJxy1rrYJM/z2xUfMVPMkWmLUbO2
-=LLuO
+iEYEARECAAYFAk5fDywACgkQ1ycZbhPLE2D4ngCgpuhaO27/23TgEwz9CLYaYY/a
+pM0AnRNU01SvjQG1cupo6wSxKEw9k+V9
+=q5ng
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/armadillo/armadillo-1.2.0.ebuild b/sci-libs/armadillo/armadillo-1.2.0.ebuild
deleted file mode 100644 (file)
index b2c3d6d..0000000
--- a/sci-libs/armadillo/armadillo-1.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.2 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
-}
diff --git a/sci-libs/armadillo/armadillo-2.0.2.ebuild b/sci-libs/armadillo/armadillo-2.0.2.ebuild
deleted file mode 100644 (file)
index 669793b..0000000
--- a/sci-libs/armadillo/armadillo-2.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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
-}
diff --git a/sci-libs/armadillo/armadillo-1.1.6.ebuild b/sci-libs/armadillo/armadillo-2.2.3.ebuild
similarity index 95%
rename from sci-libs/armadillo/armadillo-1.1.6.ebuild
rename to sci-libs/armadillo/armadillo-2.2.3.ebuild
index e2fff75445ee5dd1be6ac85c6903598069d55c72..e85fb98a96b5e126158f380cd7b219a39b8ec63c 100644 (file)
--- a/sci-libs/armadillo/armadillo-1.1.6.ebuild
+++ b/sci-libs/armadillo/armadillo-2.2.3.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2011/07/18 01:38:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-2.2.3.ebuild,v 1.1 2011/09/01 04:50:01 bicatali Exp $
 
-EAPI=3
+EAPI=4
 
 CMAKE_IN_SOURCE_BUILD=1
 
Unnamed repository; edit this file 'description' to name the repository.