Merge updates from master

This commit is contained in:
Repository QA checks
2015-10-14 13:45:15 -04:00
16 changed files with 190 additions and 69 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
inherit distutils-r1
+1 -1
View File
@@ -4,7 +4,7 @@
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
+1 -1
View File
@@ -4,7 +4,7 @@
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
inherit distutils-r1
+1 -1
View File
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
inherit distutils-r1
@@ -4,7 +4,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
inherit distutils-r1
@@ -4,7 +4,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
inherit distutils-r1
@@ -4,7 +4,7 @@
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
inherit distutils-r1
+1
View File
@@ -1,3 +1,4 @@
DIST pytest-cov-1.6.tar.gz 8257 SHA256 2e803c89f11e0344111670349f6ef401f831e85cbd287b0c5d61917da5aac454 SHA512 36c18e8e731613f2412e8e377f1911704d4af23a82fe66b822547850c3343204f682d3464c97f2cb4360f5090e7a58e5ac9679e83ae90adc0ccdb5b0e467430f WHIRLPOOL 41543b2e7f61d61d754bfef4c307fc135ab0d69b10d9e057f64bd3f4cacbc6e47316e478dbd797dd7aea0a8360bad5cc183214c742c749991fd5fe73b96503f2
DIST pytest-cov-1.8.1.tar.gz 8649 SHA256 31e5198c06f290e1e813d30ddd063a0401d9e3a698129ca44267781673a71285 SHA512 dff6c6345bdc2d219800782d7acb3d301c8d67314f0f4af983daa0942a8c97768a2ce6c64f11529a3d8d876c218c62dbf08b7a63cc7345072e70bbc85ad4d112 WHIRLPOOL 90f024e0388323a5d1bd8ffd439c3c6cfb242ac2f539d391f4139a6ab2e251c6ff01831e9a261506d2c1552f1beeacc99db43d3b98a3663828083fec1ae722f8
DIST pytest-cov-2.1.0.tar.gz 25992 SHA256 6e86c3ae3be9930fa3f1402651819b00169fb5e963d29ed03d390d152a608506 SHA512 f763e611b19f6769183583d275e28467f7cc5cc8a8fe5a4d3eb798ddf8d4e008732ec8c29b757aaf0fba0f5a660d92729499f3d388693f631ba73cc7a570d738 WHIRLPOOL 1ece60dea2fc1ff2da342313a0e67ee63a63cf35ece930f92b59c2283522698df0be4c10fb6951d3afff9fb1acffd37d207dcc4f0400109cb4f8c830d69a5857
DIST pytest-cov-2.2.0.tar.gz 29965 SHA256 2231d43f07760d6904dadceabca53ab16ef95ba58fff393861b64c0cab96c9d1 SHA512 3e6a2b648b12eff3d8f0aad12dda35a05820f6073e7f87e9c92ed6cca00fe031750da8f6c37eb81cf6ca7b2e4975dafffd7e3e901cb7b91e5c53c83b6e6b8420 WHIRLPOOL 9feff5557af5f4101e9ae508febf3479472781544b54345d5f53f0f19df5f40eb5af4ada2b44037f590445761ee9d3bffe14d729c465f880951d714eeb6ae491
@@ -0,0 +1,37 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="py.test plugin for coverage reporting"
HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/virtualenv[${PYTHON_USEDEP}]
dev-python/process-tests[${PYTHON_USEDEP}]
dev-python/pytest-cache[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
dev-python/pytest-capturelog[${PYTHON_USEDEP}]
)"
python_test() {
PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
py.test -p pytest_cov -vvx || die
}
@@ -4,7 +4,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
inherit distutils-r1
+1 -1
View File
@@ -1 +1 @@
DIST sassena-v1.4.1.tar.gz 777979 SHA256 32f49bad943136bad4cce8b4c427cf1756ae43e20691144b58900653dfc5873f SHA512 568f19810511e86102a6e539a81932e94781362e999964de591a799612cf5d6c1db7e6ef68e5ddda43dfb79aad0a52998ad11272e78174ed48b2a4e5d17a5938 WHIRLPOOL 33dcbf5a4a469710ea0312fdea1f845d3b120fb53193371a3780144a51ebcdacb80d847b980a3604b4c081639faccb3fac641e51f238e176f04022d3ea09eb53
DIST sassena-1.4.2.tar.gz 783708 SHA256 2df437eeaaed8275d73d8168f28242c5a02f2dc4dca302c3e9968cadab586115 SHA512 07dbd44494a50de29b6f3b3542d862328726d132bda097352ac2f6ad24479b93b2d77c5ea2ef812b2956d0ac950ad69b93da0996f14ff1ce9f0e310b27728942 WHIRLPOOL 7c105aa798a3eb962c675f77b195cef68b973c9f34185bbd3f5639b24822da8c9a5fa771777e0f9c652ecdf64d28536bc0ad79bb419d746a72524333f98d6caa
@@ -1,51 +0,0 @@
diff -urN sassena-v1.4.1/cmake/CMakeLists.txt.executables sassena-v1.4.1.patched/cmake/CMakeLists.txt.executables
--- sassena-v1.4.1/cmake/CMakeLists.txt.executables 2012-02-03 04:43:33.000000000 +0400
+++ sassena-v1.4.1.patched/cmake/CMakeLists.txt.executables 2012-03-21 18:07:13.000000000 +0400
@@ -61,6 +61,20 @@
INSTALL(TARGETS s_maketnx RUNTIME DESTINATION bin)
INSTALL(TARGETS s_stage RUNTIME DESTINATION bin)
+IF(NOT STATIC)
+INSTALL(TARGETS sass_controlio LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS sass_decomposition LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS sass_log LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS sass_math LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS sass_mpi LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS sass_report LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS sass_sample LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS sass_scatter_devices LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS sass_services LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS sass_stager LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS sass_vendor_xdrfile LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ENDIF(NOT STATIC)
+
TARGET_LINK_LIBRARIES (unit_broadcast
sass_log
sass_report
@@ -69,4 +83,4 @@
${BOOST_LIBRARIES}
)
-INSTALL(TARGETS unit_broadcast RUNTIME DESTINATION bin)
\ В конце файла нет новой строки
+INSTALL(TARGETS unit_broadcast RUNTIME DESTINATION bin)
diff -urN sassena-v1.4.1/cmake/CMakeLists.txt.shared sassena-v1.4.1.patched/cmake/CMakeLists.txt.shared
--- sassena-v1.4.1/cmake/CMakeLists.txt.shared 2012-02-03 04:43:33.000000000 +0400
+++ sassena-v1.4.1.patched/cmake/CMakeLists.txt.shared 2012-03-21 18:10:30.000000000 +0400
@@ -4,6 +4,8 @@
SET(INTERNAL_LIBRARY_TYPE SHARED)
+SET(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
+
IF(CMAKE_HOST_APPLE)
SET(CMAKE_EXE_LINKER_FLAGS "-fPIC ${CMAKE_EXE_LINKER_FLAGS}")
ELSE(CMAKE_HOST_APPLE)
@@ -15,4 +17,4 @@
INCLUDE(${CMAKE_PROJECT_PATH}/CMakeLists.txt.intern)
INCLUDE(${CMAKE_PROJECT_PATH}/CMakeLists.txt.executables)
-INCLUDE(${CMAKE_PROJECT_PATH}/CMakeLists.txt.packages)
\ В конце файла нет новой строки
+INCLUDE(${CMAKE_PROJECT_PATH}/CMakeLists.txt.packages)
diff -urN sassena-v1.4.1/CMakeLists.txt sassena-v1.4.1.patched/CMakeLists.txt
@@ -0,0 +1,33 @@
diff -ru sassena-1.4.2_org/cmake/CMakeLists.txt.executables sassena-1.4.2/cmake/CMakeLists.txt.executables
--- sassena-1.4.2_org/cmake/CMakeLists.txt.executables 2014-07-29 11:02:12.652053749 +0200
+++ sassena-1.4.2/cmake/CMakeLists.txt.executables 2014-07-29 11:04:57.831042602 +0200
@@ -18,18 +18,12 @@
tests/unit_broadcast.cpp
)
-ADD_EXECUTABLE(unit_parameters
- src/common.cpp
- tests/unit_parameters.cpp
-)
-
IF(STATIC)
SET_TARGET_PROPERTIES(sassena PROPERTIES LINK_SEARCH_END_STATIC 1)
SET_TARGET_PROPERTIES(s_stage PROPERTIES LINK_SEARCH_END_STATIC 1)
SET_TARGET_PROPERTIES(s_maketnx PROPERTIES LINK_SEARCH_END_STATIC 1)
SET_TARGET_PROPERTIES(unit_broadcast PROPERTIES LINK_SEARCH_END_STATIC 1)
-SET_TARGET_PROPERTIES(unit_parameters PROPERTIES LINK_SEARCH_END_STATIC 1)
ENDIF(STATIC)
TARGET_LINK_LIBRARIES (s_stage
@@ -89,10 +83,4 @@
${BOOST_LIBRARIES}
)
-TARGET_LINK_LIBRARIES (unit_parameters
- sass_log
- sass_controlio
- ${BOOST_LIBRARIES}
-)
-
INSTALL(TARGETS unit_broadcast RUNTIME DESTINATION bin)
@@ -0,0 +1,92 @@
diff -ru sassena-1.4.2_org/src/main/sassena.cpp sassena-1.4.2/src/main/sassena.cpp
--- sassena-1.4.2_org/src/main/sassena.cpp 2014-07-29 11:02:12.650053749 +0200
+++ sassena-1.4.2/src/main/sassena.cpp 2014-07-29 12:52:56.978605357 +0200
@@ -62,6 +62,7 @@
#include <boost/serialization/complex.hpp>
#include <boost/serialization/map.hpp>
#include <boost/serialization/vector.hpp>
+#include <boost/thread/thread.hpp>
// other headers
#include "exceptions/exceptions.hpp"
Nur in sassena-1.4.2/src/main: .sassena.cpp.swp.
diff -ru sassena-1.4.2_org/src/main/s_stage.cpp sassena-1.4.2/src/main/s_stage.cpp
--- sassena-1.4.2_org/src/main/s_stage.cpp 2014-07-29 11:02:12.650053749 +0200
+++ sassena-1.4.2/src/main/s_stage.cpp 2014-07-29 12:51:22.257611749 +0200
@@ -33,6 +33,7 @@
#include <boost/serialization/complex.hpp>
#include <boost/serialization/map.hpp>
#include <boost/serialization/vector.hpp>
+#include <boost/thread/thread.hpp>
// other headers
#include "exceptions/exceptions.hpp"
diff -ru sassena-1.4.2_org/src/scatter_devices/abstract_scatter_device.cpp sassena-1.4.2/src/scatter_devices/abstract_scatter_device.cpp
--- sassena-1.4.2_org/src/scatter_devices/abstract_scatter_device.cpp 2014-07-29 11:02:12.650053749 +0200
+++ sassena-1.4.2/src/scatter_devices/abstract_scatter_device.cpp 2014-07-29 13:02:20.824567306 +0200
@@ -18,6 +18,7 @@
#include <boost/accumulators/accumulators.hpp>
#include <boost/accumulators/statistics.hpp>
#include <boost/lexical_cast.hpp>
+#include <boost/thread/thread.hpp>
// other headers
#include "exceptions/exceptions.hpp"
Nur in sassena-1.4.2/src/scatter_devices: .abstract_scatter_device.cpp.swp.
diff -ru sassena-1.4.2_org/src/scatter_devices/all_vectors_scatter_device.cpp sassena-1.4.2/src/scatter_devices/all_vectors_scatter_device.cpp
--- sassena-1.4.2_org/src/scatter_devices/all_vectors_scatter_device.cpp 2014-07-29 11:02:12.649053750 +0200
+++ sassena-1.4.2/src/scatter_devices/all_vectors_scatter_device.cpp 2014-07-29 13:04:04.907560282 +0200
@@ -18,6 +18,7 @@
#include <boost/accumulators/accumulators.hpp>
#include <boost/accumulators/statistics.hpp>
#include <boost/lexical_cast.hpp>
+#include <boost/thread/thread.hpp>
// other headers
#include "math/coor3d.hpp"
Nur in sassena-1.4.2/src/scatter_devices: .all_vectors_scatter_device.cpp.swp.
diff -ru sassena-1.4.2_org/src/scatter_devices/multipole_scatter_device.cpp sassena-1.4.2/src/scatter_devices/multipole_scatter_device.cpp
--- sassena-1.4.2_org/src/scatter_devices/multipole_scatter_device.cpp 2014-07-29 11:02:12.649053750 +0200
+++ sassena-1.4.2/src/scatter_devices/multipole_scatter_device.cpp 2014-07-29 13:01:16.038571678 +0200
@@ -19,6 +19,7 @@
#include <boost/accumulators/statistics.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/math/special_functions.hpp>
+#include <boost/thread/thread.hpp>
// other headers
#include "math/coor3d.hpp"
diff -ru sassena-1.4.2_org/src/scatter_devices/self_vectors_scatter_device.cpp sassena-1.4.2/src/scatter_devices/self_vectors_scatter_device.cpp
--- sassena-1.4.2_org/src/scatter_devices/self_vectors_scatter_device.cpp 2014-07-29 11:02:12.650053749 +0200
+++ sassena-1.4.2/src/scatter_devices/self_vectors_scatter_device.cpp 2014-07-29 13:01:45.753569673 +0200
@@ -18,6 +18,7 @@
#include <boost/accumulators/accumulators.hpp>
#include <boost/accumulators/statistics.hpp>
#include <boost/lexical_cast.hpp>
+#include <boost/thread/thread.hpp>
// other headers
#include "math/coor3d.hpp"
diff -ru sassena-1.4.2_org/src/services/file_writer_service.cpp sassena-1.4.2/src/services/file_writer_service.cpp
--- sassena-1.4.2_org/src/services/file_writer_service.cpp 2014-07-29 11:02:12.650053749 +0200
+++ sassena-1.4.2/src/services/file_writer_service.cpp 2014-07-29 13:08:07.448543914 +0200
@@ -13,6 +13,7 @@
#include <boost/lexical_cast.hpp>
#include <boost/filesystem.hpp>
+#include <boost/thread/thread.hpp>
#include <log.hpp>
#include <control.hpp>
#include <math/smath.hpp>
Nur in sassena-1.4.2/src/services: .file_writer_service.cpp.swp.
diff -ru sassena-1.4.2_org/src/services/monitor_service.cpp sassena-1.4.2/src/services/monitor_service.cpp
--- sassena-1.4.2_org/src/services/monitor_service.cpp 2014-07-29 11:02:12.650053749 +0200
+++ sassena-1.4.2/src/services/monitor_service.cpp 2014-07-29 13:07:06.617548019 +0200
@@ -13,6 +13,7 @@
#include <boost/lexical_cast.hpp>
#include <boost/filesystem.hpp>
#include <boost/random/uniform_int.hpp>
+#include <boost/thread/thread.hpp>
#include <log.hpp>
#include <control.hpp>
#include <report/timer.hpp>
@@ -0,0 +1,11 @@
diff -ru sassena-1.4.2_org/src/sample/frames.cpp sassena-1.4.2/src/sample/frames.cpp
--- sassena-1.4.2_org/src/sample/frames.cpp 2014-07-29 11:02:12.651053749 +0200
+++ sassena-1.4.2/src/sample/frames.cpp 2014-07-29 11:11:39.229015514 +0200
@@ -298,6 +298,7 @@
dcdfile.seekg(marker,ios_base::cur);
dcdfile.read((char*) &marker,sizeof(int32_t));
+ using boost::uint32_t;
uint32_t noa;
dcdfile.read((char*) &marker,sizeof(int32_t));
dcdfile.read((char*) &noa,sizeof(uint32_t));
@@ -1,16 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=4
EAPI=5
inherit cmake-utils
MY_P="${PN}-v${PV}"
DESCRIPTION="Software for Calculating Scattering Diagrams on Massively Parallel Computers"
HOMEPAGE="http://www.sassena.org"
SRC_URI="http://www.sassena.org/software/source-code/releases/v${PV}/${MY_P}.tar.gz/at_download/file -> ${MY_P}.tar.gz"
SRC_URI="https://github.com/benlabs/sassena/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -27,8 +25,8 @@ DEPEND="
virtual/lapack"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/$P-libs.patch"
)
"${FILESDIR}/${P}_cmake-remove-missing.patch"
"${FILESDIR}/${P}_uint32_t.patch"
"${FILESDIR}/${P}_link_boost_thread.patch"
)