[gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/, sci-libs/armadillo/files/

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     2b903d04de8bddb33c2c4956f03f9721d65d70de
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 04:22:22 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat May 25 04:22:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2b903d04

sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.01.21938-prefix
RepoMan-Options: --force

---
 sci-libs/armadillo/ChangeLog                       |    9 +++++++++
 ...llo-3.810.2.ebuild => armadillo-3.820.1.ebuild} |    0
 .../armadillo/files/armadillo-3.810.2-hdf5.patch   |   19 -------------------
 ...ch => armadillo-3.820.1-example-makefile.patch} |    0
 .../armadillo/files/armadillo-3.820.1-hdf5.patch   |   19 +++++++++++++++++++
 5 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index ac1aaf0..505c50b 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*armadillo-3.820.1 (25 May 2013)
+
+  25 May 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.820.1.ebuild,
+  +files/armadillo-3.820.1-example-makefile.patch,
+  +files/armadillo-3.820.1-hdf5.patch, -armadillo-3.810.2.ebuild,
+  -files/armadillo-3.810.2-example-makefile.patch,
+  -files/armadillo-3.810.2-hdf5.patch:
+  sci-libs/armadillo: Version bump
+
 *armadillo-3.810.2 (29 Apr 2013)
 
   29 Apr 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.810.2.ebuild,

diff --git a/sci-libs/armadillo/armadillo-3.810.2.ebuild b/sci-libs/armadillo/armadillo-3.820.1.ebuild
similarity index 100%
rename from sci-libs/armadillo/armadillo-3.810.2.ebuild
rename to sci-libs/armadillo/armadillo-3.820.1.ebuild

diff --git a/sci-libs/armadillo/files/armadillo-3.810.2-hdf5.patch b/sci-libs/armadillo/files/armadillo-3.810.2-hdf5.patch
deleted file mode 100644
index 1d2e2ff..0000000
--- a/sci-libs/armadillo/files/armadillo-3.810.2-hdf5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig	2013-02-28 14:51:42.032554805 -0800
-+++ CMakeLists.txt	2013-02-28 14:53:05.730978799 -0800
-@@ -191,11 +191,11 @@
- # find_package(HDF5)
- # message(STATUS "HDF5_FOUND   = ${HDF5_FOUND}")
- # 
--# if(HDF5_FOUND)
--#   set(ARMA_USE_HDF5 true)
--#   set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
--#   set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
--# endif()
-+if(HDF5_FOUND)
-+   set(ARMA_USE_HDF5 true)
-+   set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
-+   set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
-+endif()
- 
- message(STATUS "*** ")
- message(STATUS "*** The Armadillo run-time library component will be an alias for the following libraries:")

diff --git a/sci-libs/armadillo/files/armadillo-3.810.2-example-makefile.patch b/sci-libs/armadillo/files/armadillo-3.820.1-example-makefile.patch
similarity index 100%
rename from sci-libs/armadillo/files/armadillo-3.810.2-example-makefile.patch
rename to sci-libs/armadillo/files/armadillo-3.820.1-example-makefile.patch

diff --git a/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch b/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch
new file mode 100644
index 0000000..f294e7b
--- /dev/null
+++ b/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch
@@ -0,0 +1,19 @@
+--- CMakeLists.txt.orig	2013-05-24 21:14:49.626395820 -0700
++++ CMakeLists.txt	2013-05-24 21:15:10.724511364 -0700
+@@ -222,11 +222,11 @@
+ #   find_package(HDF5)
+ #   message(STATUS "HDF5_FOUND     = ${HDF5_FOUND}")
+ #   
+-#   if(HDF5_FOUND)
+-#     set(ARMA_USE_HDF5 true)
+-#     set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
+-#     set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
+-#   endif()
++if(HDF5_FOUND)
++    set(ARMA_USE_HDF5 true)
++    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
++    set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
++endif()
+ # endif()
+ 
+