[gentoo-commits] gentoo-x86 commit in sci-chemistry/openbabel/files: openbabel-2.3.0-swig.patch

[gentoo-commits] gentoo-x86 commit in sci-chemistry/openbabel/files: openbabel-2.3.0-swig.patch

[Justin Lecher (jlec)]

jlec        11/03/28 19:30:52

  Added:                openbabel-2.3.0-swig.patch
  Log:
  Sane check for swig version, https://sourceforge.net/tracker/?func=detail&aid=3253693&group_id=40728&atid=428740
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch

	<<Binary file>>

[gentoo-commits] gentoo-x86 commit in sci-chemistry/openbabel/files: openbabel-2.3.0-swig.patch

[Justin Lecher (jlec)]

jlec        11/06/14 18:06:07

  Modified:             openbabel-2.3.0-swig.patch
  Log:
  Fixed empty swig patch, thanks matts88
  
  (Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch?r1=1.1&r2=1.2

Index: openbabel-2.3.0-swig.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/files/openbabel-2.3.0-swig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openbabel-2.3.0-swig.patch	28 Mar 2011 19:30:52 -0000	1.1
+++ openbabel-2.3.0-swig.patch	14 Jun 2011 18:06:06 -0000	1.2
@@ -0,0 +1,42 @@
+ scripts/CMakeLists.txt |   15 +++++----------
+ 1 files changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index bf2527b..df173f7 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -8,16 +8,11 @@ if (RUN_SWIG)
+   # SWIG_EXECUTABLE - the path to the swig executable
+   # SWIG_VERSION   - the version number of the swig executable
+ 
+-  find_package(SWIG)
++  find_package(SWIG 2.0)
+   if (NOT SWIG_FOUND)
+-    message(STATUS "SWIG NOT found")
++    message(STATUS "SWIG 2.0 NOT found")
+     return()
+   endif (NOT SWIG_FOUND)
+-  message(STATUS "SWIG version is ${SWIG_VERSION}")
+-  if (NOT ${SWIG_VERSION} STREQUAL "2.0.0" AND NOT ${SWIG_VERSION} STREQUAL "2.0.1")
+-    message(STATUS "SWIG version 2.0.0 exactly is required")
+-    return()
+-  endif (NOT ${SWIG_VERSION} STREQUAL "2.0.0" AND NOT ${SWIG_VERSION} STREQUAL "2.0.1")
+ endif (RUN_SWIG)
+ 
+ ###################
+@@ -84,12 +79,12 @@ if (DO_PYTHON_BINDINGS)
+             VERBATIM)
+ 
+         if (PYTHON_PREFIX)
+-            install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${PYTHON_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
++            install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${PYTHON_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)"   LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+         else (PYTHON_PREFIX)
+             if (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
+-                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
++                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)"   LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+             else (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
+-                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
++                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)"   LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+             endif (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
+         endif (PYTHON_PREFIX)
+