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 AA879138247 for ; Sat, 18 Jan 2014 07:39:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43501E0DCF; 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 34700E0DCE 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 2F09933FA1A 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 99F4618096 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.0ee43073fd0d0e99b3baa081f0812d75afe680f0.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 sci-libs/chemkit/metadata.xml X-VCS-Directories: sci-libs/chemkit/ sci-libs/chemkit/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 0ee43073fd0d0e99b3baa081f0812d75afe680f0 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: 91672af3-2bcb-474e-87b4-112e76fbb302 X-Archives-Hash: 9b443d59871c72b921d416b03fbb8396 commit: 0ee43073fd0d0e99b3baa081f0812d75afe680f0 Author: Justin Lecher gentoo org> AuthorDate: Thu Jan 16 18:01:00 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=0ee43073 inVCS Signed-off-by: Justin Lecher gentoo.org> --- sci-libs/chemkit/ChangeLog | 17 ----- sci-libs/chemkit/chemkit-0.1.ebuild | 63 ---------------- sci-libs/chemkit/files/chemkit-0.1-multilib.patch | 90 ----------------------- sci-libs/chemkit/metadata.xml | 11 --- 4 files changed, 181 deletions(-) diff --git a/sci-libs/chemkit/ChangeLog b/sci-libs/chemkit/ChangeLog deleted file mode 100644 index 8c30283..0000000 --- a/sci-libs/chemkit/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for sci-libs/chemkit -# 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 - -*chemkit-0.1 (22 Jul 2013) - - 22 Jul 2013; Justin Lecher +chemkit-0.1.ebuild, - +metadata.xml: - New addition written by me - diff --git a/sci-libs/chemkit/chemkit-0.1.ebuild b/sci-libs/chemkit/chemkit-0.1.ebuild deleted file mode 100644 index e4bbaf0..0000000 --- a/sci-libs/chemkit/chemkit-0.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit cmake-utils multilib python-single-r1 virtualx - -DESCRIPTION="Library for chemistry applications" -HOMEPAGE="http://www.chemkit.org/" -SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="applications examples python test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( applications python )" - -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} - -PATCHES=( - "${FILESDIR}"/${P}-multilib.patch - ) - -src_configure() { - local mycmakeargs=( - -DCHEMKIT_BUILD_PLUGIN_BABEL=on - $(cmake-utils_use applications CHEMKIT_BUILD_APPS) - $(cmake-utils_use applications CHEMKIT_BUILD_QT_DESIGNER_PLUGINS) - $(cmake-utils_use examples CHEMKIT_BUILD_EXAMPLES) - $(cmake-utils_use examples CHEMKIT_BUILD_DEMOS) - $(cmake-utils_use python CHEMKIT_BUILD_BINDINGS_PYTHON) - $(cmake-utils_use test CHEMKIT_BUILD_TESTS) - ) - 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 - - cmake-utils_src_install -} diff --git a/sci-libs/chemkit/files/chemkit-0.1-multilib.patch b/sci-libs/chemkit/files/chemkit-0.1-multilib.patch deleted file mode 100644 index b6a61d5..0000000 --- a/sci-libs/chemkit/files/chemkit-0.1-multilib.patch +++ /dev/null @@ -1,90 +0,0 @@ -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) diff --git a/sci-libs/chemkit/metadata.xml b/sci-libs/chemkit/metadata.xml deleted file mode 100644 index 200ba79..0000000 --- a/sci-libs/chemkit/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - sci-chemistry - - jlec@gentoo.org - - - Build also applications not only the libraries - -