From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7B0DF138247 for ; Sat, 18 Jan 2014 07:39:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 892A6E0DD3; Sat, 18 Jan 2014 07:39:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34C56E0DCF for ; Sat, 18 Jan 2014 07:38:55 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B4E233FA19 for ; Sat, 18 Jan 2014 07:38:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7C2D81872B for ; Sat, 18 Jan 2014 07:38:51 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1390030714.752a90cd8453cc7576be4b50db06b3a7a5774ca0.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/chemkit/, sci-libs/chemkit/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/chemkit/ChangeLog sci-libs/chemkit/chemkit-0.1.ebuild sci-libs/chemkit/files/chemkit-0.1-multilib.patch X-VCS-Directories: sci-libs/chemkit/ sci-libs/chemkit/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 752a90cd8453cc7576be4b50db06b3a7a5774ca0 X-VCS-Branch: master Date: Sat, 18 Jan 2014 07:38:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6a683dc4-0603-4706-9099-9a2c7ecb5543 X-Archives-Hash: ba998a3c4b911533cb10ef0c137e6e5b commit: 752a90cd8453cc7576be4b50db06b3a7a5774ca0 Author: Justin Lecher gentoo org> AuthorDate: Mon Jan 13 13:50:28 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Jan 18 07:38:34 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=752a90cd sci-libs/chemkit: Fix multilib installation; fix test Package-Manager: portage-2.2.8 --- sci-libs/chemkit/ChangeLog | 4 + sci-libs/chemkit/chemkit-0.1.ebuild | 26 ++++--- sci-libs/chemkit/files/chemkit-0.1-multilib.patch | 90 +++++++++++++++++++++++ 3 files changed, 110 insertions(+), 10 deletions(-) diff --git a/sci-libs/chemkit/ChangeLog b/sci-libs/chemkit/ChangeLog index 47ee244..8c30283 100644 --- a/sci-libs/chemkit/ChangeLog +++ b/sci-libs/chemkit/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Jan 2014; Justin Lecher chemkit-0.1.ebuild, + +files/chemkit-0.1-multilib.patch: + Fix multilib installation; fix test + 11 Jan 2014; Justin Lecher chemkit-0.1.ebuild: Add missing eclass diff --git a/sci-libs/chemkit/chemkit-0.1.ebuild b/sci-libs/chemkit/chemkit-0.1.ebuild index d389a54..e4bbaf0 100644 --- a/sci-libs/chemkit/chemkit-0.1.ebuild +++ b/sci-libs/chemkit/chemkit-0.1.ebuild @@ -6,7 +6,7 @@ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) -inherit cmake-utils multilib python-single-r1 +inherit cmake-utils multilib python-single-r1 virtualx DESCRIPTION="Library for chemistry applications" HOMEPAGE="http://www.chemkit.org/" @@ -17,25 +17,26 @@ LICENSE="BSD" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="applications examples python test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + test? ( applications python )" -RDEPEND="${PYTHON_DEPS} +RDEPEND=" dev-libs/boost dev-cpp/eigen:3 + applications? ( dev-qt/qtcore ) examples? ( x11-libs/libX11 x11-libs/libXext - )" + ) + python? ( ${PYTHON_DEPS} ) +" DEPEND="${RDEPEND}" S="${WORKDIR}"/${PN} -src_prepare() { - sed \ - -e "/install/s:lib:$(get_libdir):g" \ - -i CMakeLists.txt src/CMakeLists.txt src/plugins/CMakeLists.txt || die - cmake-utils_src_prepare -} +PATCHES=( + "${FILESDIR}"/${P}-multilib.patch + ) src_configure() { local mycmakeargs=( @@ -50,6 +51,11 @@ src_configure() { cmake-utils_src_configure } +src_test() { + VIRTUALX_COMMAND="cmake-utils_src_test" + virtualmake +} + src_install() { use examples && dobin demos/*-viewer/*-viewer examples/uff-energy/uff-energy diff --git a/sci-libs/chemkit/files/chemkit-0.1-multilib.patch b/sci-libs/chemkit/files/chemkit-0.1-multilib.patch new file mode 100644 index 0000000..b6a61d5 --- /dev/null +++ b/sci-libs/chemkit/files/chemkit-0.1-multilib.patch @@ -0,0 +1,90 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e531be4..e0d6b2d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,7 +44,7 @@ configure_file( + "${CMAKE_MODULE_PATH}/ChemkitConfig.cmake.in" + "${CMAKE_BINARY_DIR}/ChemkitConfig.cmake" + IMMEDIATE @ONLY) +-install(FILES ${CMAKE_BINARY_DIR}/ChemkitConfig.cmake DESTINATION lib/chemkit) ++install(FILES ${CMAKE_BINARY_DIR}/ChemkitConfig.cmake DESTINATION lib${LIB_SUFFIX}/chemkit) + + # Create a ChemkitBuildTreeSettings.cmake file for the use from the build tree + configure_file( +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 88c6b5f..1100c3b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -8,12 +8,12 @@ macro(add_chemkit_library library_name) + add_library(${library_name} SHARED ${ARGN}) + + # add install target +- install(TARGETS ${library_name} DESTINATION lib) ++ install(TARGETS ${library_name} DESTINATION lib${LIB_SUFFIX}) + + # copy library into build directory + get_target_property(library_location ${library_name} LOCATION) + get_filename_component(library_filename ${library_location} NAME) +- add_custom_command(TARGET ${library_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${library_location} ${CMAKE_BINARY_DIR}/lib/${library_filename}) ++ add_custom_command(TARGET ${library_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${library_location} ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/${library_filename}) + + endmacro(add_chemkit_library) + +diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt +index dc8970f..77029b7 100644 +--- a/src/plugins/CMakeLists.txt ++++ b/src/plugins/CMakeLists.txt +@@ -3,7 +3,7 @@ macro(add_chemkit_plugin plugin_name) + add_library(${plugin_name} SHARED ${ARGN}) + + # add install target +- install(TARGETS ${plugin_name} DESTINATION lib/chemkit/plugins/) ++ install(TARGETS ${plugin_name} DESTINATION lib${LIB_SUFFIX}/chemkit/plugins/) + + # remove 'lib' prefix + set_target_properties(${plugin_name} PROPERTIES PREFIX "") +@@ -11,15 +11,15 @@ macro(add_chemkit_plugin plugin_name) + # copy plugin into build directory + get_target_property(plugin_location ${plugin_name} LOCATION) + get_filename_component(plugin_filename ${plugin_location} NAME) +- add_custom_command(TARGET ${plugin_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${plugin_location} ${CMAKE_BINARY_DIR}/lib/chemkit/plugins/${plugin_filename}) ++ add_custom_command(TARGET ${plugin_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${plugin_location} ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins/${plugin_filename}) + + # plugin data + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/data) + # copy plugin data into build directory +- file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION ${CMAKE_BINARY_DIR}/lib/chemkit/plugins/data/${plugin_name}/) ++ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins/data/${plugin_name}/) + + # install plugin data directory +- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION lib/chemkit/plugins/data/${plugin_name}) ++ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION lib${LIB_SUFFIX}/chemkit/plugins/data/${plugin_name}) + endif() + endmacro(add_chemkit_plugin) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index b191b82..a4ea0b0 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -4,7 +4,7 @@ endif() + + macro(add_chemkit_test test_name test_executable) + add_test(NAME ${test_name} COMMAND ${test_executable}) +- set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib/chemkit/plugins/") ++ set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins/") + endmacro(add_chemkit_test) + + add_subdirectory(auto) +diff --git a/tests/auto/bindings/python/CMakeLists.txt b/tests/auto/bindings/python/CMakeLists.txt +index 9859867..70da693 100644 +--- a/tests/auto/bindings/python/CMakeLists.txt ++++ b/tests/auto/bindings/python/CMakeLists.txt +@@ -5,7 +5,7 @@ endif() + macro(add_chemkit_python_test test_name test_script) + add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_script}) + set_tests_properties(${test_name} PROPERTIES +- ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/bindings/python/;CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib/chemkit/plugins") ++ ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/bindings/python/;CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins") + endmacro(add_chemkit_python_test) + + add_chemkit_python_test(python.Atom ${CMAKE_CURRENT_SOURCE_DIR}/atomtest.py)