From: Christoph Junghans Date: Fri, 13 Jan 2012 01:27:50 +0000 (+0000) Subject: fixes for amd64-linux X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0afda814cafa5a7201786ae75c3c9b73e0904bae;p=gentoo.git fixes for amd64-linux Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686 --- diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest index 5823a7abe259..dadf7c06a12d 100644 --- a/sci-chemistry/votca-csg/Manifest +++ b/sci-chemistry/votca-csg/Manifest @@ -8,17 +8,17 @@ DIST votca-csg-tutorials-1.2.2.tar.gz 3576523 RMD160 1479978541abe707094a8405723 DIST votca-manual-1.2.1.pdf 1007275 RMD160 b6193fe851bbc4f529340b0badcd8dae0205eeab SHA1 2c37fa06ab934a0f08054c9d62b82b47384143ce SHA256 9d9a03b9271157aee66f1b8afdad311a4c75f2d7534937ae578c448421f6f863 DIST votca-tutorials-1.2.1.tar.gz 3576658 RMD160 15e9fedb5a95aa4fa3ca40ecb930666797c55488 SHA1 dccb5a6e760083b0ade00bf162830e7266f7b402 SHA256 c313367784d5bbedfd2abf3b8a0920a117f528d76af81aa81d1c8dfc7c414b30 EBUILD votca-csg-1.2.1.ebuild 2305 RMD160 8b4fe0bf8d0f31ee25507e1a03f4b6c002e6862c SHA1 3fd164d6ade5a54fe15663720c970acaa8cd6352 SHA256 b3b57912e6d158626eb7b052c92b916378d94dc1d67fbc3635e35b468b5a7f64 -EBUILD votca-csg-1.2.2.ebuild 2301 RMD160 4e0aa7ef69f6b149520fe52be44682b137de1580 SHA1 90854cdacb73a1f115f15f0df88e2c5a88a49f1b SHA256 f928c5c3708bd2fdb9652a30d3214c244747b37b2e66c70b805b93bbeda59590 -MISC ChangeLog 1838 RMD160 19e6a79d1c2c0f6835b5961d827f7c360897c3bb SHA1 8fa6ed819c2c4d4ad664c1fa697fb32cecbbc3f7 SHA256 7e52b5bfce481a8ced51181613a09319a9702bb0d90176e9088c2bf0b1f8f2a4 +EBUILD votca-csg-1.2.2.ebuild 2314 RMD160 4be7885e294f44527744e4abefc4a97a0da64e35 SHA1 8ccf7ea5a8a3fb00c51f8247427a0df854efae70 SHA256 c0bcbd28e90a2966f84d4c9e53bafa5641666724afa76e6ba42772cf77ce345b +MISC ChangeLog 1940 RMD160 c1b8d49b4d53ebcf202b874d2013b9acdb820cf2 SHA1 64a3cb658303843d25fdb10f33913cadac864840 SHA256 f15e4bd7d783944ac14fc0b9189b83ba36b05a5dd6aa0969ef8a84da29d30497 MISC metadata.xml 592 RMD160 8f322c16be805359bc0f21f5c6abaeb2db201d98 SHA1 293bc38c9ad65c53225d02ec557ba728d652326f SHA256 e947ea2ae0abd72dd56848d07eed807a7bec93762bf8c1e7e0537d1c4674f30e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJPDQvjAAoJEOeBhlrCAAWGO70IAJs8xuvbq4YhXDoPhuHqHC+I -1/umFgvJd+jJDfQCYtfvcY7WPLXFLU25ajL9SAusHMO+kX4v14EAPpgYvE29GWvl -aCwJk3PGyN3SnHp2Rn62N6j7l+5/S+W3JKH+jOZLyvzWNV9orTZtiBQKfXDlISxv -Ry1dsGxjmPHdNXT/hb7XsAchiH515mxgLmGkIlJvAjn3A57i9XBsl33DkJQRqJAL -hZupAt6fxx8yVGTacul6wVKDZNrhSJ8PLalKmQD1VJ96uOJTs6D+GsLaq9Nrnqw7 -fYclY7Z2jwqJtPeLbaqVhrkJFcJPU5/+4d6iVr2ZhFl0/zpPf4MxgDsmm5wKGNM= -=EQmU +iQEcBAEBAgAGBQJPD4knAAoJEOeBhlrCAAWGRigH/2IeVaN5IcriWeINVGEbN4gV +4kEhm3ICSMNZJTJ3RPIMR0XVukqN3BlO8yFXxd3KNjeU9mNJh2xrjiF0KNFi5yhs +UFqTQ2F0nlP0F5B4K8sjtCTKsJPz7dAJiX1eGKkpaLAUdsBzzfqF1Cxgk1GJ0Hxz +YZLaeNj1GcLhC9AS7JlpFbS4IAd915lnrJveChXmXyEZVUPsKDKgaQ74KFE+d6rh +ZHiRLXnhyDx5yBXDYSlVwZvGEnMzYW1bsb9GzXvDgYtArlBBgZWF7+D/EXI+C2TT +uPmZhcW0EJz/9CVblKefLyxDrKczne81jNJgTfDb4ufc5pFIcd32L90GY/mSzWg= +=6Bhf -----END PGP SIGNATURE----- diff --git a/sci-chemistry/votca-csgapps/ChangeLog b/sci-chemistry/votca-csgapps/ChangeLog index 396be59d0340..ef2856775d53 100644 --- a/sci-chemistry/votca-csgapps/ChangeLog +++ b/sci-chemistry/votca-csgapps/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/votca-csgapps # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csgapps/ChangeLog,v 1.3 2012/01/11 04:19:15 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csgapps/ChangeLog,v 1.4 2012/01/13 01:27:50 ottxor Exp $ + + 13 Jan 2012; Christoph Junghans + votca-csgapps-1.2.2.ebuild, +files/votca-csgapps-1.2.2-dso.patch: + fixes for amd64-linux *votca-csgapps-1.2.2 (11 Jan 2012) diff --git a/sci-chemistry/votca-csgapps/Manifest b/sci-chemistry/votca-csgapps/Manifest index acf18e0a3be0..b8a276bf6135 100644 --- a/sci-chemistry/votca-csgapps/Manifest +++ b/sci-chemistry/votca-csgapps/Manifest @@ -1,20 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX votca-csgapps-1.2.2-dso.patch 12030 RMD160 2f6dc53b92c508cffcb8b1e92abb081807febf78 SHA1 55da9888c46c1cedf1dd0830dc7ed78e0fbe8a9d SHA256 c032e61ecef529d8f65e7cd3100d8d4a8c3de62dcde0580f8107947133e3df10 DIST votca-csgapps-1.2.1.tar.gz 8379 RMD160 5e5e8210e45d775e49c1d95199fc255fc70d6bdb SHA1 5a471a44b5149b199893470d393cc44962fde8a2 SHA256 6c4d4254a4fcede691a93d28abab265f15baafd2055cf0cd2c0c81b54037dc5a DIST votca-csgapps-1.2.2.tar.gz 8196 RMD160 43421268d6cb8fb06c2e73df6073b38f0bd9c241 SHA1 4ad90f19d37203bd708e88ace67632c7ec1f2ecd SHA256 09f0669627360dc0a0837899d980d877d8a58231b76919a6273c31fe0f7c341b EBUILD votca-csgapps-1.2.1.ebuild 716 RMD160 eeee24c74360802bef1dbbc2c9f64dbe2d043831 SHA1 1eeb085f6ab48801ef41f863e29275c21471b6b2 SHA256 3c92656d3d1ba9a5f4f433f3c992fad25806aabdf5045bdd2528542c6cbd7ef2 -EBUILD votca-csgapps-1.2.2.ebuild 720 RMD160 b079842a547c7c61126b52f1f224df3e1e51c42b SHA1 5dbac1059b9e983e0b3146e6d9637a659d3e9e52 SHA256 075df16fd582e370bd01414b74dbd144fde34bf7d701974b677f7aee6f6c9ffb -MISC ChangeLog 565 RMD160 0eaac914ab4aa5cd3f5b5e2c2bb86e56cff44a13 SHA1 eb78f094b5f8ad997cf841d61170b8310ce9f681 SHA256 49c52a4a05d4d7a322ed88c9868ec3eca8b699387e7933cbf4941b2e3c1d55e8 +EBUILD votca-csgapps-1.2.2.ebuild 762 RMD160 478a354bf2c72a23fb3070e246df3243020b5f72 SHA1 0bd91dd43c8a3c6dfa7ba133fe7ee951379e5515 SHA256 0666546e28ef565be330fa523a39719ec83ae018478dc8a650d992d18e55c0d6 +MISC ChangeLog 712 RMD160 7b45e266d13e205a714071d6d6f47853641bfd6d SHA1 049341327b4ce10d94f43e34cf08c78f750070cd SHA256 276f1fe49260bd9d1a91539b45ca4b42ea6f1f769b35434b7184709485dfeb40 MISC metadata.xml 265 RMD160 1c8152a0baafa6152d01031d541512ee292cc5c4 SHA1 561b9356b4afc42339456bc340d08d636a5e1007 SHA256 8539979824a3442ef0fec3a29fa81ed617c6b4a1317f44757fe72deb9d40a25c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJPDQ3JAAoJEOeBhlrCAAWGJpwH/RkxERTSP5LeUK4EqSuTzKg9 -6QpoQsu6+scrtSqYXupyg6ZGKuu22ixrX8HO4XBIao/RKalDU7fnGnQ3tLbjY6u2 -WHN2LGW1UJeA/au1KVmh9dJZOAoXRY4Q7rcJrGWmyJJtndFI7or7j561TN4cxHr1 -ffD27PT67qnSw9bceZO+UtZTVgJhwyOdhrlss8lYzCVLPTKoM/NmwlQ6GXcMdsIE -e0WjdVIbG1R841d1kpbX70dI/nPOlHd6gC3l+zPgca9RH2CvEpqbKG8ycAY077HI -eQc59djlDPgHnsmu7qMc3CqnpzM0S6qPTwcYmhsjcukAeUfFOVoXi/b9ZEnLy1Q= -=ENxu +iQEcBAEBAgAGBQJPD4idAAoJEOeBhlrCAAWGb+oH/jo6ct1yy/Mhh31MLO1BFMW/ +Wm2kBMhWl+svun0M6gFn+U7yS4HLhhwWHcuC9g+G21wRKrA/rblee59f4rWSOf3r +P0wch116eeejtWXj8bhsoaIgpOpjYNwKwN3qUGiK7AktrPB6dIy/cFGW3YiHCU6B +d2I9TYXwdT9WHkCK/rfVaBKQS918rRXToBOI1z5LV5Cpz02yYNH9SqimNJznui+2 +wbnkSs9WWmkBJsCd9hZ//67nqd+ly/cEgHZaEv9tmGnyfWQi64X6Dd+rEEd5NSHC +OUEDSK8RUXKaTViDdVCLkcLPOvZUiONqzYTIfnRacLEJXaDJIExWL49iulfhcWg= +=m8zQ -----END PGP SIGNATURE----- diff --git a/sci-chemistry/votca-csgapps/files/votca-csgapps-1.2.2-dso.patch b/sci-chemistry/votca-csgapps/files/votca-csgapps-1.2.2-dso.patch new file mode 100644 index 000000000000..eeec55d4e8e6 --- /dev/null +++ b/sci-chemistry/votca-csgapps/files/votca-csgapps-1.2.2-dso.patch @@ -0,0 +1,266 @@ +# HG changeset patch +# User Christoph Junghans +# Date 1326307444 25200 +# Branch stable +# Node ID 475999c2cd0d19f739e83c88b2df823c32730bc1 +# Parent 7e8f291a6d79da1ebbc512c370b8620714be0cb6 +cmake: make it DSO conform + +diff -r 7e8f291a6d79 -r 475999c2cd0d CMakeLists.txt +--- a/CMakeLists.txt Tue Jan 10 20:16:55 2012 -0700 ++++ b/CMakeLists.txt Wed Jan 11 11:44:04 2012 -0700 +@@ -4,9 +4,42 @@ + + project(csgapps) + +-file(GLOB_RECURSE DIRS */CMakeLists.txt) ++set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules) ++ ++if(NOT CMAKE_BUILD_TYPE) ++ #Release comes with -O3 by default ++ set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) ++endif(NOT CMAKE_BUILD_TYPE) ++ ++enable_language(CXX) ++include(CheckCXXCompilerFlag) ++ ++option(EXTERNAL_BOOST "Use external boost" ON) ++if (EXTERNAL_BOOST) ++ find_package(Boost 1.39.0 COMPONENTS program_options ) ++ if(NOT Boost_FOUND) ++ message(FATAL_ERROR "Boost not found, make sure you have also installed boost and it's dev package or use our internal replacement, if you have built tools with -DEXTERNAL_BOOST=OFF and set it here as well") ++ endif(NOT Boost_FOUND) ++ include_directories(${Boost_INCLUDE_DIRS}) ++ set (BOOST_LIBRARIES ${Boost_PROGRAM_OPTIONS_LIBRARY}) ++else(EXTERNAL_BOOST) ++ find_package(VOTCA_BOOST REQUIRED) ++ include_directories(${VOTCA_BOOST_INCLUDE_DIRS}) ++ set (BOOST_LIBRARIES ${VOTCA_BOOST_LIBRARIES}) ++endif(EXTERNAL_BOOST) ++ ++find_package(VOTCA_TOOLS REQUIRED) ++include_directories(${VOTCA_TOOLS_INCLUDE_DIRS}) ++find_package(VOTCA_CSG REQUIRED) ++include_directories(${VOTCA_CSG_INCLUDE_DIRS}) ++ ++file(GLOB_RECURSE DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */CMakeLists.txt) + foreach(DIR ${DIRS}) +- string(REGEX MATCH ^.*/ DIR ${DIR}) +- add_subdirectory(${DIR}) +- unset(NAME CACHE) ++ string(REGEX MATCH ^[^/]* DIR ${DIR}) ++ file(GLOB SRC ${DIR}/*.cc) ++ add_executable(${DIR} ${SRC}) ++ target_link_libraries(${DIR} ${VOTCA_CSG_LIBRARIES} ${VOTCA_TOOLS_LIBRARIES} ${BOOST_LIBRARIES}) ++ install(TARGETS ${DIR} RUNTIME DESTINATION bin) ++ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${DIR}) ++ set_target_properties(${DIR} PROPERTIES OUTPUT_NAME ${DIR}/csg_${DIR}) + endforeach(DIR) +diff -r 7e8f291a6d79 -r 475999c2cd0d CMakeModules/FindSQLITE3.cmake +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/CMakeModules/FindSQLITE3.cmake Wed Jan 11 11:44:04 2012 -0700 +@@ -0,0 +1,36 @@ ++# - Find libgmx ++# Find the native libgmx headers and libraries. ++# ++# SQLITE3_INCLUDE_DIRS - where to find sqlite3.h, etc ++# SQLITE3_LIBRARIES - List of libraries when using sqlite3. ++# SQLITE3_FOUND - True if sqlite3 found. ++# ++# Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org) ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++# ++ ++find_package(PkgConfig) ++ ++pkg_check_modules(PC_SQLITE3 sqlite3) ++ ++find_path(SQLITE3_INCLUDE_DIR sqlite3.h HINTS ${PC_SQLITE3_INCLUDE_DIRS}) ++find_library(SQLITE3_LIBRARY NAMES sqlite3 HINTS ${PC_SQLITE3_LIBRARY_DIRS} ) ++ ++set(SQLITE3_LIBRARIES "${SQLITE3_LIBRARY}" ) ++set(SQLITE3_INCLUDE_DIRS "${SQLITE3_INCLUDE_DIR}" ) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(SQLITE3 DEFAULT_MSG SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR ) ++ ++mark_as_advanced(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARY ) +diff -r 7e8f291a6d79 -r 475999c2cd0d CMakeModules/FindVOTCA_BOOST.cmake +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/CMakeModules/FindVOTCA_BOOST.cmake Wed Jan 11 11:44:04 2012 -0700 +@@ -0,0 +1,37 @@ ++# - Find libvotca_boost ++# Find the native libvotca_boost headers and libraries. ++# ++# VOTCA_BOOST_INCLUDE_DIRS - where to find headers etc. ++# VOTCA_BOOST_LIBRARIES - List of libraries when using expat. ++# VOTCA_BOOST_FOUND - True if expat found. ++# ++# Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org) ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++# ++ ++find_package(PkgConfig) ++ ++pkg_check_modules(PC_VOTCA_BOOST libvotca_boost) ++find_path(VOTCA_BOOST_INCLUDE_DIR boost/algorithm/string/trim.hpp HINTS ${PC_VOTCA_BOOST_INCLUDE_DIRS} ) ++find_library(VOTCA_BOOST_LIBRARY NAMES votca_boost HINTS ${PC_VOTCA_BOOST_LIBRARY_DIRS} ) ++ ++set(VOTCA_BOOST_LIBRARIES "${VOTCA_BOOST_LIBRARY}" ) ++set(VOTCA_BOOST_INCLUDE_DIRS "${VOTCA_BOOST_INCLUDE_DIR}" ) ++ ++include(FindPackageHandleStandardArgs) ++# handle the QUIETLY and REQUIRED arguments and set VOTCA_BOOST_FOUND to TRUE ++# if all listed variables are TRUE ++find_package_handle_standard_args(VOTCA_BOOST DEFAULT_MSG VOTCA_BOOST_LIBRARY VOTCA_BOOST_INCLUDE_DIR) ++ ++mark_as_advanced(VOTCA_BOOST_INCLUDE_DIR VOTCA_BOOST_LIBRARY ) +diff -r 7e8f291a6d79 -r 475999c2cd0d CMakeModules/FindVOTCA_CSG.cmake +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/CMakeModules/FindVOTCA_CSG.cmake Wed Jan 11 11:44:04 2012 -0700 +@@ -0,0 +1,51 @@ ++# - Find libvotca_csg ++# Find the native libvotca_csg headers and libraries. ++# ++# VOTCA_CSG_INCLUDE_DIRS - where to find votca/csg/version.h, etc. ++# VOTCA_CSG_LIBRARIES - List of libraries when using expat. ++# VOTCA_CSG_FOUND - True if expat found. ++# VOTCA_CSG_HAS_SQLITE3 - True if votca csg was build with sqlite3 support ++# ++# Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org) ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++# ++ ++find_package(PkgConfig) ++ ++pkg_check_modules(PC_VOTCA_CSG libvotca_csg) ++find_path(VOTCA_CSG_INCLUDE_DIR votca/csg/version.h HINTS ${PC_VOTCA_CSG_INCLUDE_DIRS}) ++ ++find_library(VOTCA_CSG_LIBRARY NAMES votca_csg HINTS ${PC_VOTCA_CSG_LIBRARY_DIRS} ) ++ ++if("${VOTCA_CSG_LIBRARY}" MATCHES "libvotca_csg[^;]*\\.a") ++ if(PC_VOTCA_CSG_LIBRARIES) ++ list(REMOVE_ITEM PC_VOTCA_CSG_LIBRARIES votca_csg) ++ foreach (LIB ${PC_VOTCA_CSG_LIBRARIES}) ++ find_library(VOTCA_CSG_${LIB} NAMES ${LIB} HINTS ${PC_VOTCA_CSG_LIBRARY_DIRS} ) ++ list(APPEND VT_DEP_LIBRARIES ${VOTCA_CSG_${LIB}}) ++ unset(VOTCA_CSG_${LIB} CACHE) ++ endforeach(LIB) ++ endif(PC_VOTCA_CSG_LIBRARIES) ++ set(VOTCA_CSG_DEP_LIBRARIES "${VT_DEP_LIBRARIES}" CACHE FILEPATH "votca csg depency libs (only needed for static (.a) libvotca_csg") ++endif("${VOTCA_CSG_LIBRARY}" MATCHES "libvotca_csg[^;]*\\.a") ++ ++set(VOTCA_CSG_LIBRARIES "${VOTCA_CSG_LIBRARY};${VOTCA_CSG_DEP_LIBRARIES}" ) ++set(VOTCA_CSG_INCLUDE_DIRS "${VOTCA_CSG_INCLUDE_DIR}" ) ++ ++include(FindPackageHandleStandardArgs) ++# handle the QUIETLY and REQUIRED arguments and set VOTCA_CSG_FOUND to TRUE ++# if all listed variables are TRUE ++find_package_handle_standard_args(VOTCA_CSG DEFAULT_MSG VOTCA_CSG_LIBRARY VOTCA_CSG_INCLUDE_DIR ) ++ ++mark_as_advanced(VOTCA_CSG_INCLUDE_DIR VOTCA_CSG_LIBRARY ) +diff -r 7e8f291a6d79 -r 475999c2cd0d CMakeModules/FindVOTCA_TOOLS.cmake +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/CMakeModules/FindVOTCA_TOOLS.cmake Wed Jan 11 11:44:04 2012 -0700 +@@ -0,0 +1,68 @@ ++# - Find libvotca_tools ++# Find the native libvotca_tools headers and libraries. ++# ++# VOTCA_TOOLS_INCLUDE_DIRS - where to find votca/tools/version.h, etc. ++# VOTCA_TOOLS_LIBRARIES - List of libraries when using expat. ++# VOTCA_TOOLS_FOUND - True if expat found. ++# VOTCA_TOOLS_HAS_SQLITE3 - True if votca tools was build with sqlite3 support ++# ++# Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org) ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++# ++ ++find_package(PkgConfig) ++ ++pkg_check_modules(PC_VOTCA_TOOLS libvotca_tools) ++find_path(VOTCA_TOOLS_INCLUDE_DIR votca/tools/version.h HINTS ${PC_VOTCA_TOOLS_INCLUDE_DIRS}) ++ ++find_path(VOTCA_TOOLS_HAS_SQLITE3 votca/tools/database.h HINTS ${PC_VOTCA_TOOLS_INCLUDE_DIRS}) ++if (VOTCA_TOOLS_HAS_SQLITE3) ++ #due to include in database.h ++ find_package(SQLITE3 REQUIRED) ++ set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR};${SQLITE3_INCLUDE_DIR}" ) ++else(VOTCA_TOOLS_HAS_SQLITE3) ++ set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR}" ) ++endif (VOTCA_TOOLS_HAS_SQLITE3) ++ ++ ++find_library(VOTCA_TOOLS_LIBRARY NAMES votca_tools HINTS ${PC_VOTCA_TOOLS_LIBRARY_DIRS} ) ++ ++if("${VOTCA_TOOLS_LIBRARY}" MATCHES "libvotca_tools[^;]*\\.a") ++ if(PC_VOTCA_TOOLS_LIBRARIES) ++ list(REMOVE_ITEM PC_VOTCA_TOOLS_LIBRARIES votca_tools) ++ foreach (LIB ${PC_VOTCA_TOOLS_LIBRARIES}) ++ find_library(VOTCA_TOOLS_${LIB} NAMES ${LIB} HINTS ${PC_VOTCA_TOOLS_LIBRARY_DIRS} ) ++ list(APPEND VT_DEP_LIBRARIES ${VOTCA_TOOLS_${LIB}}) ++ unset(VOTCA_TOOLS_${LIB} CACHE) ++ endforeach(LIB) ++ endif(PC_VOTCA_TOOLS_LIBRARIES) ++ set(VOTCA_TOOLS_DEP_LIBRARIES "${VT_DEP_LIBRARIES}" CACHE FILEPATH "votca tools depency libs (only needed for static (.a) libvotca_tools") ++endif("${VOTCA_TOOLS_LIBRARY}" MATCHES "libvotca_tools[^;]*\\.a") ++ ++set(VOTCA_TOOLS_LIBRARIES "${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}" ) ++ ++include(FindPackageHandleStandardArgs) ++# handle the QUIETLY and REQUIRED arguments and set VOTCA_TOOLS_FOUND to TRUE ++# if all listed variables are TRUE ++find_package_handle_standard_args(VOTCA_TOOLS DEFAULT_MSG VOTCA_TOOLS_LIBRARY VOTCA_TOOLS_INCLUDE_DIR ) ++ ++if (VOTCA_TOOLS_FOUND) ++ include(CheckLibraryExists) ++ check_library_exists("${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}" VotcaToolsFromC "" FOUND_VOTCA_TOOLS_VERSION) ++ if(NOT FOUND_VOTCA_TOOLS_VERSION) ++ message(FATAL_ERROR "Could not find VotcaToolsFromC in ${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set VOTCA_TOOLS_LIBRARY and VOTCA_TOOLS_DEP_LIBRARIES by hand, which set votca_tools lib it's depencies (i.e. -DVOTCA_TOOLS_LIBRARY='/path/to/libvotca_tools.so" -VOTCA_TOOLS_DEP_LIBRARIES="/path/to/libgsl.so;/path/to/libm.so') !") ++ endif(NOT FOUND_VOTCA_TOOLS_VERSION) ++endif (VOTCA_TOOLS_FOUND) ++ ++mark_as_advanced(VOTCA_TOOLS_INCLUDE_DIR VOTCA_TOOLS_LIBRARY ) diff --git a/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild b/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild index 48a3ebe4bd1e..179d29224df5 100644 --- a/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild +++ b/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild,v 1.1 2012/01/11 04:19:15 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild,v 1.2 2012/01/13 01:27:50 ottxor Exp $ EAPI=4 @@ -28,3 +28,5 @@ RDEPEND="=sci-chemistry/${PN%apps}-${PV}" DEPEND="${RDEPEND}" DOCS=( README ) + +PATCHES=( "${FILESDIR}/${P}-dso.patch" )