From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../files/openbabel-perl-2.3.0-makefile.patch | 28 ++++++ .../files/openbabel-perl-2.3.0-swig.patch | 25 +++++ .../files/openbabel-perl-2.3.1-makefile.patch | 9 ++ .../files/openbabel-perl-2.3.2-bindings_only.patch | 108 +++++++++++++++++++++ .../files/openbabel-perl-2.3.2-trunk_cmake.patch | 41 ++++++++ 5 files changed, 211 insertions(+) create mode 100644 sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-makefile.patch create mode 100644 sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-swig.patch create mode 100644 sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch create mode 100644 sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch create mode 100644 sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch (limited to 'sci-chemistry/openbabel-perl/files') diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-makefile.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-makefile.patch new file mode 100644 index 000000000000..597c9a79c103 --- /dev/null +++ b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-makefile.patch @@ -0,0 +1,28 @@ + scripts/CMakeLists.txt | 2 +- + scripts/perl/Makefile.PL | 1 + + 2 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index bf2527b..3c45111 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -223,7 +223,7 @@ if (DO_PERL_BINDINGS) + COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/Makefile.PL ${openbabel_BINARY_DIR}/scripts/perl + COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm ${openbabel_BINARY_DIR}/scripts/perl + COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp ${openbabel_BINARY_DIR}/scripts/perl +- COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL ${PERL_PREFIX_TEXT} ++ COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL INSTALLDIRS=vendor ${PERL_PREFIX_TEXT} + COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc make + DEPENDS ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp + WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts/perl +diff --git a/scripts/perl/Makefile.PL b/scripts/perl/Makefile.PL +index a3a2116..44ad27d 100644 +--- a/scripts/perl/Makefile.PL ++++ b/scripts/perl/Makefile.PL +@@ -32,5 +32,6 @@ WriteMakefile( + 'CC' => $CC, + 'LD' => '$(CC)', + 'INC' => '-I../../include -I'.$cmakesrcdir.'/include', ++ 'DESTDIR' => @ENV{"D"}, + 'OBJECT' => 'openbabel-perl.o' + ); diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-swig.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-swig.patch new file mode 100644 index 000000000000..6beacf74880c --- /dev/null +++ b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-swig.patch @@ -0,0 +1,25 @@ + scripts/CMakeLists.txt | 6 +----- + 1 files changed, 1 insertions(+), 5 deletions(-) + +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index bf2527b..16feeb4 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -8,16 +8,12 @@ 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.0) + if (NOT SWIG_FOUND) + message(STATUS "SWIG 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) + + ################### diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch new file mode 100644 index 000000000000..88248b4432f1 --- /dev/null +++ b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch @@ -0,0 +1,9 @@ +--- scripts/perl/Makefile.PL ++++ scripts/perl/Makefile.PL +@@ -37,5 +37,6 @@ 'LDFROM' => $ldfrom, + 'CC' => $CC, + 'LD' => '$(CC)', + 'INC' => '-I../../include -I'.$cmakesrcdir.'/include', ++ 'DESTDIR' => @ENV{"D"}, + 'OBJECT' => 'openbabel-perl.o' + ); diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch new file mode 100644 index 000000000000..92e126a77d86 --- /dev/null +++ b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch @@ -0,0 +1,108 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 449f4b4..1c9ad00 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -252,7 +252,8 @@ if(NOT MSVC) + } + " SCANDIR_NEEDS_CONST) + +- set(OB_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${OB_PLUGIN_INSTALL_DIR}") ++ set(OB_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${OB_PLUGIN_INSTALL_DIR}" ++ CACHE PATH "Set to system install for bindings only build") + add_definitions(-DOB_MODULE_PATH="\\"${OB_MODULE_PATH}\\"") + + # Add some visibility support when using GCC +@@ -380,7 +381,8 @@ if(UNIX AND BUILD_SHARED) + if(APPLE) + set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) + else() +- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") ++ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" ++ CACHE PATH "Set sane rpath") + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +@@ -477,6 +479,13 @@ endif() + # Should the language bindings be regenereted? + option(RUN_SWIG "Generate language bindings with SWIG" OFF) + ++# Build bindings only ++option(BINDINGS_ONLY "Build bindings only" OFF) ++ ++# Point to library if building bindings only ++set(BABEL_SYSTEM_LIBRARY ${BABEL_LIBRARY} ++ CACHE PATH "Point to openbabel library if building bindings only") ++ + # Should all bindings be built? + option(ALL_BINDINGS "Build all languages bindings" OFF) + +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 16e9000..8f92e91 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -92,16 +92,30 @@ if (DO_PYTHON_BINDINGS) + endif(RUN_SWIG) + + add_library(bindings_python MODULE ${openbabel_SOURCE_DIR}/scripts/python/openbabel-python.cpp) +- target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_LIBRARY}) ++ if(BINDINGS_ONLY) ++ target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_SYSTEM_LIBRARY}) ++ else() ++ target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_LIBRARY}) ++ endif() ++ + if(NOT WIN32) + set_target_properties(bindings_python PROPERTIES + OUTPUT_NAME _openbabel + PREFIX "" + SUFFIX .so ) +- add_dependencies(bindings_python openbabel) +- install(TARGETS bindings_python LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +- install(FILES ${openbabel_SOURCE_DIR}/scripts/python/openbabel.py DESTINATION ${LIB_INSTALL_DIR}) +- install(FILES ${openbabel_SOURCE_DIR}/scripts/python/pybel.py DESTINATION ${LIB_INSTALL_DIR}) ++ if(NOT BINDINGS_ONLY) ++ add_dependencies(bindings_python openbabel) ++ endif() ++ ++ install(TARGETS bindings_python ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++ COMPONENT bindings_python) ++ install(FILES ${openbabel_SOURCE_DIR}/scripts/python/openbabel.py ++ DESTINATION ${LIB_INSTALL_DIR} ++ COMPONENT bindings_python) ++ install(FILES ${openbabel_SOURCE_DIR}/scripts/python/pybel.py ++ DESTINATION ${LIB_INSTALL_DIR} ++ COMPONENT bindings_python) + else(NOT WIN32) + set_target_properties(bindings_python PROPERTIES + OUTPUT_NAME _openbabel +@@ -231,13 +245,25 @@ if (DO_PERL_BINDINGS) + endif (RUN_SWIG) + + add_library(bindings_perl MODULE ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp) +- target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_LIBRARY} ${PERL_EXTRA_LINK_FLAGS}) ++ if(BINDINGS_ONLY) ++ target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_SYSTEM_LIBRARY} ${PERL_EXTRA_LINK_FLAGS}) ++ else() ++ target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_LIBRARY} ${PERL_EXTRA_LINK_FLAGS}) ++ endif() ++ + set_target_properties(bindings_perl PROPERTIES + PREFIX "" + OUTPUT_NAME OpenBabel) +- add_dependencies(bindings_perl openbabel) +- install(TARGETS bindings_perl LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +- install(FILES ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm DESTINATION ${LIB_INSTALL_DIR}) ++ if(NOT BINDINGS_ONLY) ++ add_dependencies(bindings_perl openbabel) ++ endif() ++ ++ install(TARGETS bindings_perl ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/auto/Chemistry/OpenBabel/ ++ COMPONENT bindings_perl) ++ install(FILES ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm ++ DESTINATION ${LIB_INSTALL_DIR}/Chemistry/ ++ COMPONENT bindings_perl) + + endif (DO_PERL_BINDINGS) + diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch new file mode 100644 index 000000000000..b72a622a3afb --- /dev/null +++ b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch @@ -0,0 +1,41 @@ +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index e7298ce..16e9000 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -231,36 +239,6 @@ if (DO_PERL_BINDINGS) + install(TARGETS bindings_perl LIBRARY DESTINATION ${LIB_INSTALL_DIR}) + install(FILES ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm DESTINATION ${LIB_INSTALL_DIR}) + +- set(PERL_INSTALLDIRS_TEXT "") +- if (OBPERL_INSTALLDIRS) +- set(PERL_INSTALLDIRS_TEXT "INSTALLDIRS=${OBPERL_INSTALLDIRS}") +- endif (OBPERL_INSTALLDIRS) +- +- if (NOT MSVC) +- add_custom_target(pre_bindings_perl ALL +- # Create the scripts/perl directory; we cannot do this inside +- # bindings_perl as the WORKING_DIRECTORY needs to already exist! +- COMMAND ${CMAKE_COMMAND} -E make_directory ${openbabel_BINARY_DIR}/scripts/perl +- ) +- add_custom_target(bindings_perl ALL +- COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/Makefile.PL ${openbabel_BINARY_DIR}/scripts/perl +- COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm ${openbabel_BINARY_DIR}/scripts/perl +- COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp ${openbabel_BINARY_DIR}/scripts/perl +- COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL ${PERL_PREFIX_TEXT} ${PERL_INSTALLDIRS_TEXT} +- COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc make +- DEPENDS openbabel ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp +- WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts/perl +- ) +- add_dependencies(bindings_perl pre_bindings_perl openbabel) +- install(CODE "execute_process(COMMAND make install DESTDIR=\$ENV{DESTDIR} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts/perl)") +- +- else (NOT MSVC) +- add_library(bindings_perl MODULE ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp) +- target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_LIBRARY}) +- set_target_properties(bindings_perl PROPERTIES +- OUTPUT_NAME openbabel_perl ) +- endif(NOT MSVC) +- + endif (DO_PERL_BINDINGS) + + ################### -- cgit v1.2.3-65-gdbad