From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- sci-chemistry/openbabel-perl/Manifest | 4 - .../files/openbabel-perl-2.3.2-bindings_only.patch | 108 --------------------- .../files/openbabel-perl-2.3.2-trunk_cmake.patch | 41 -------- .../openbabel-perl/openbabel-perl-2.3.2.ebuild | 72 -------------- 4 files changed, 225 deletions(-) delete mode 100644 sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch delete mode 100644 sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch delete mode 100644 sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild (limited to 'sci-chemistry/openbabel-perl') diff --git a/sci-chemistry/openbabel-perl/Manifest b/sci-chemistry/openbabel-perl/Manifest index 3a0ffb6f92bb..079b42b9f50f 100644 --- a/sci-chemistry/openbabel-perl/Manifest +++ b/sci-chemistry/openbabel-perl/Manifest @@ -1,8 +1,4 @@ -AUX openbabel-perl-2.3.2-bindings_only.patch 4557 BLAKE2B 3549bc5f6d0c02ace76d8f26e5669c83ea6dc1912f28433bec54f837c2a8276ee243f4311fd65766b0e5af4bb5d6a6a627ba5ef42c0aa919d842c945aa6db9bc SHA512 475600513f188f2e3dee711ab2073954511b7d71c0af222dc9fe121bcbd4821d0ab32934d5035452ad4820d0dd750899995696c20504769b25cad7ef2d27aa5e AUX openbabel-perl-2.3.2-gcc-6_and_7-backport.patch 635 BLAKE2B 4e98dedd149b14d5bb02fb6d2fa03e07242d100c7b41f36f749ff3d587080eeca44aa26ca095d31e0309e45f3780b67deaa97f1177ed35a9b7407bd7c33f78ff SHA512 e1b4402f34d01ced5b4caaa184b4e5544cf47893cfe7958054052b05a57dc34b4d44239a212c7d909f29b9366b83b6df74993f844a20f23748c01272ec093081 -AUX openbabel-perl-2.3.2-trunk_cmake.patch 2335 BLAKE2B 5e829c555d8a06bf9524b5008c21dfd6830b1c95a40834f248d4b4d875fcd8cd64f664ab93a5f37f614201c106277bc0ae75bbd5f4cd392517e9d8f198e39946 SHA512 9f42cb3c8aff7eb765790fd3a7f259d8076ebce11f3c2e324a9568a94d948583455db90a8714cdcbd6b6a74087167ada9ec19261862233823d0792bc79302f30 -DIST openbabel-2.3.2.tar.gz 20509105 BLAKE2B d475c2da0d7171650eeb4b78a948421b783bdbb9342c81114d3dbc19d5cbb273f7303438920ffaeef5b6332e4b72606a86ded5cbd3d7e541f62b59b46483bb69 SHA512 d0e1f8b758ffdd65ec6c31d988bffe3279355e286ce69fad12c5905b3b832e2b73ee95b1061b1576aba1ee9fe4da5e31ec30350c473be17493c657dc80caf919 DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6 -EBUILD openbabel-perl-2.3.2.ebuild 1638 BLAKE2B 01039ea5f28d080cc2dd47dd2c13260644be996eb9f2f7bfe4db73dabfd6c3e0ed2136a69040e4ed1ce868f21e0fafff647ad16fa995ca2f7a7967c2d0622e0d SHA512 73cb5637922195122ed9cc75092b03b34a595763baa81d8edb4ad323c4381a68593d22b023cb1ad004329b7d54e126b0227bf4211845468811711e374ff0c7ae EBUILD openbabel-perl-2.4.1.ebuild 1583 BLAKE2B 233459caeea67df903f80dff500cce8fc1e4a99cc13124d8cee60fecd59261979c62ee0f5072f955d2c95043722c98450ad27187f7d0443c8ecc4a27f4c9ffee SHA512 6336a34a6d5dca6d573a62276cccf34cee37e95c31704f52a178366910d5267353b49fb981c1dce07ea935cac0e7887aad60df77468f7d4838ca18b901998651 MISC metadata.xml 735 BLAKE2B de3dbec049667c35b29293f9c27e81b0e0ffade4c57ffa519c013c788409f310dac834fd92f0d72c05281bf76317b3c7fc2b429b8644a7d350020caf425185c0 SHA512 62052b0e677a52adba98961185e5b83525c652e260ebad1b820ed19b071a1f6476cca550ec0c570a5faf0cbad7189cadb78ac8d6de077fbf15e346b7c66e4cf7 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 deleted file mode 100644 index 92e126a77d86..000000000000 --- a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch +++ /dev/null @@ -1,108 +0,0 @@ -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 deleted file mode 100644 index b72a622a3afb..000000000000 --- a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch +++ /dev/null @@ -1,41 +0,0 @@ -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) - - ################### diff --git a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild deleted file mode 100644 index 25a87bc1b7ef..000000000000 --- a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils eutils perl-module - -DESCRIPTION="Perl bindings for OpenBabel" -HOMEPAGE="http://openbabel.sourceforge.net/" -SRC_URI="mirror://sourceforge/openbabel/openbabel-${PV}.tar.gz" - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -RDEPEND=" - dev-lang/perl:= - ~sci-chemistry/openbabel-${PV}" -DEPEND="${RDEPEND} - >=dev-util/cmake-2.4.8 - >=dev-lang/swig-2" - -S="${WORKDIR}/openbabel-${PV}" - -PATCHES=( - "${FILESDIR}"/${P}-trunk_cmake.patch - "${FILESDIR}"/${P}-bindings_only.patch - "${FILESDIR}"/${P}-gcc-6_and_7-backport.patch -) - -src_prepare() { - sed \ - -e '/__GNUC__/s:== 4:>= 4:g' \ - -i include/openbabel/shared_ptr.h || die - cmake-utils_src_prepare - perl_set_version -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_RPATH= - -DBINDINGS_ONLY=ON - -DBABEL_SYSTEM_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libopenbabel.so" - -DOB_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/openbabel/${PV}" - -DLIB_INSTALL_DIR="${D}/${VENDOR_ARCH}" - -DPERL_BINDINGS=ON - -DRUN_SWIG=ON - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile bindings_perl -} - -src_test() { - mkdir "${CMAKE_BUILD_DIR}/$(get_libdir)/Chemistry" - cp \ - "${CMAKE_USE_DIR}/scripts/perl/OpenBabel.pm" \ - "${CMAKE_BUILD_DIR}/$(get_libdir)/Chemistry/" - for i in "${CMAKE_USE_DIR}"/scripts/perl/t/*; do - einfo "Running test: ${i}" - perl -I"${CMAKE_BUILD_DIR}/$(get_libdir)" "${i}" || die - done -} - -src_install() { - cd "${CMAKE_BUILD_DIR}" - cmake -DCOMPONENT=bindings_perl -P cmake_install.cmake -} -- cgit v1.2.3