[gentoo-commits] proj/sci:master commit in: sci-libs/rdkit/files/, sci-libs/rdkit/

[Horea Christian]

commit:     635d1bb2e9b12adaeac34520574f708976eeaf37
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon Sep 28 09:59:00 2020 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Sep 28 09:59:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=635d1bb2

sci-libs/rdkit: version and PYTHON_COMPAT update

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 .../rdkit-2020.03.6-no_dynamic_checking.patch      | 59 ++++++++++++++++++++++
 sci-libs/rdkit/rdkit-2015.03.1.ebuild              | 40 ---------------
 sci-libs/rdkit/rdkit-2020.03.6.ebuild              | 56 ++++++++++++++++++++
 sci-libs/rdkit/rdkit-9999.ebuild                   | 39 --------------
 4 files changed, 115 insertions(+), 79 deletions(-)

diff --git a/sci-libs/rdkit/files/rdkit-2020.03.6-no_dynamic_checking.patch b/sci-libs/rdkit/files/rdkit-2020.03.6-no_dynamic_checking.patch
new file mode 100644
index 000000000..2f7656245
--- /dev/null
+++ b/sci-libs/rdkit/files/rdkit-2020.03.6-no_dynamic_checking.patch
@@ -0,0 +1,59 @@
+--- a/External/catch/CMakeLists.txt	2020-09-28 05:09:11.307595711 -0400
++++ b/External/catch/CMakeLists.txt 	2020-09-28 05:10:35.188570785 -0400
+@@ -13,9 +13,6 @@
+   message("-- Catch not found in ${CATCH_DIR}")
+   include(RDKitUtils)
+   set(RELEASE_NO "2.1.2")
+-  downloadAndCheckMD5("https://github.com/catchorg/Catch2/archive/v${RELEASE_NO}.tar.gz"
+-        "${CMAKE_CURRENT_SOURCE_DIR}/master.tar.gz"
+-        "4c5740d7446d9b4e3735dcff0951aaca")
+   execute_process(COMMAND ${CMAKE_COMMAND} -E tar zxf
+     ${CMAKE_CURRENT_SOURCE_DIR}/master.tar.gz
+     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+--- a/External/CoordGen/CMakeLists.txt	2020-09-28 05:13:38.351584109 -0400
++++ b/External/CoordGen/CMakeLists.txt	2020-09-28 05:15:49.396007762 -0400
+@@ -38,9 +38,6 @@
+
+     if(NOT EXISTS "${MAEPARSER_DIR}/MaeParser.hpp")
+         set(RELEASE_NO "1.2.3")
+-        set(MD5 "4ead02a0bf87110d1caae79ab42a5747")
+-        downloadAndCheckMD5("https://github.com/schrodinger/maeparser/archive/v${RELEASE_NO}.tar.gz"
+-              "${CMAKE_CURRENT_SOURCE_DIR}/maeparser-v${RELEASE_NO}.tar.gz" ${MD5})
+         execute_process(COMMAND ${CMAKE_COMMAND} -E tar zxf
+           ${CMAKE_CURRENT_SOURCE_DIR}/maeparser-v${RELEASE_NO}.tar.gz
+           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+--- a/External/CoordGen/CMakeLists.txt	2020-09-28 05:31:21.353305949 -0400
++++ b/External/CoordGen/CMakeLists.txt 	2020-09-28 05:32:04.187783628 -0400
+@@ -67,9 +67,6 @@
+
+     if(NOT EXISTS "${COORDGEN_DIR}/sketcherMinimizer.h")
+         set(RELEASE_NO "1.4.0")
+-        set(MD5 "5f663c8809b494f0548dd504c011c739")
+-        downloadAndCheckMD5("https://github.com/schrodinger/coordgenlibs/archive/v${RELEASE_NO}.tar.gz"
+-              "${CMAKE_CURRENT_SOURCE_DIR}/coordgenlibs-${RELEASE_NO}.tar.gz" ${MD5})
+         execute_process(COMMAND ${CMAKE_COMMAND} -E tar zxf
+           ${CMAKE_CURRENT_SOURCE_DIR}/coordgenlibs-${RELEASE_NO}.tar.gz
+           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+--- a/External/RingFamilies/CMakeLists.txt	2020-09-18 11:18:37.000000000 -0400
++++ b/External/RingFamilies/CMakeLists.txt 	2020-09-28 05:35:04.427800305 -0400
+@@ -8,9 +8,6 @@
+
+ if(NOT EXISTS "${URFLIB_DIR}/RingDecomposerLib.h")
+     set(RELEASE_NO "1.1.3_rdkit")
+-    set(MD5 "e9a0bcdda8b921a35e812b9888a9a874")
+-    downloadAndCheckMD5("https://github.com/rareylab/RingDecomposerLib/archive/v${RELEASE_NO}.tar.gz"
+-            "${CMAKE_CURRENT_SOURCE_DIR}/RingDecomposerLib-v${RELEASE_NO}.tar.gz" ${MD5})
+     execute_process(COMMAND ${CMAKE_COMMAND} -E tar zxf
+         ${CMAKE_CURRENT_SOURCE_DIR}/RingDecomposerLib-v${RELEASE_NO}.tar.gz
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+--- a/Code/GraphMol/MolInterchange/CMakeLists.txt	2020-09-18 11:18:37.000000000 -0400
++++ b/Code/GraphMol/MolInterchange/CMakeLists.txt 	2020-09-28 05:36:47.759960868 -0400
+@@ -1,8 +1,5 @@
+
+ if(NOT EXISTS "${CMAKE_SOURCE_DIR}/External/rapidjson-1.1.0")
+-    downloadAndCheckMD5("https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz"
+-          "${CMAKE_SOURCE_DIR}/External/rapidjson-1.1.0.tar.gz"
+-          "badd12c511e081fec6c89c43a7027bce")
+     execute_process(COMMAND ${CMAKE_COMMAND} -E tar zxf
+       ${CMAKE_SOURCE_DIR}/External/rapidjson-1.1.0.tar.gz
+       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/External)

diff --git a/sci-libs/rdkit/rdkit-2015.03.1.ebuild b/sci-libs/rdkit/rdkit-2015.03.1.ebuild
deleted file mode 100644
index 818630481..000000000
--- a/sci-libs/rdkit/rdkit-2015.03.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit cmake-utils python-r1
-
-DESCRIPTION="Cheminformatics and machine-learning software written in C++ and Python"
-HOMEPAGE="http://www.rdkit.org/"
-SRC_URI="https://github.com/rdkit/rdkit/archive/Release_${PV//./_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+python -static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/boost
-	python? (
-		dev-libs/boost[python,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	>=dev-db/sqlite-3"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/rdkit-Release_${PV//./_}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX:PATH="${EPREFIX}"/usr
-		-DRDK_INSTALL_INTREE=0
-		-DRDK_BUILD_CPP_TESTS=OFF
-		$(cmake-utils_use static-libs RDK_INSTALL_STATIC_LIBS)
-		$(cmake-utils_use python RDK_BUILD_PYTHON_WRAPPERS)
-	)
-
-	cmake-utils_src_configure
-}

diff --git a/sci-libs/rdkit/rdkit-2020.03.6.ebuild b/sci-libs/rdkit/rdkit-2020.03.6.ebuild
new file mode 100644
index 000000000..2c8ef5817
--- /dev/null
+++ b/sci-libs/rdkit/rdkit-2020.03.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Cheminformatics and machine-learning software written in C++ and Python"
+HOMEPAGE="http://www.rdkit.org/"
+SRC_URI="
+	https://github.com/rdkit/rdkit/archive/Release_${PV//./_}.tar.gz -> ${P}.tar.gz
+	https://github.com/schrodinger/maeparser/archive/v1.2.3.tar.gz -> maeparser-1.2.3.tar.gz
+	https://github.com/schrodinger/coordgenlibs/archive/v1.4.0.tar.gz -> coordgenlibs-1.4.0.tar.gz
+	https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.0.tar.gz
+	"
+# issues with bundled packages; dev-libs/rapidjson, at least, should be unbundled:
+# https://github.com/rdkit/rdkit/issues/3443
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+# build configuration issues https://github.com/rdkit/rdkit/issues/3444
+IUSE="+python -static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/boost
+	python? (
+		dev-libs/boost[python,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	>=dev-db/sqlite-3"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/rdkit-Release_${PV//./_}
+
+PATCHES=( "${FILESDIR}"/${P}-no_dynamic_checking.patch )
+
+src_prepare() {
+	cp ../maeparser-* -rf External/CoordGen/ || die
+	cp ../coordgenlibs-* -rf External/CoordGen/ || die
+	cp ../rapidjson-* -rf External/ || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX:PATH="${EPREFIX}"/usr
+		-DRDK_INSTALL_INTREE=0
+		-DRDK_BUILD_CPP_TESTS=OFF
+		-DRDK_INSTALL_STATIC_LIBS="$(usex static-libs)"
+		-DRDK_BUILD_PYTHON_WRAPPERS="$(usex python)"
+	)
+	cmake_src_configure
+}

diff --git a/sci-libs/rdkit/rdkit-9999.ebuild b/sci-libs/rdkit/rdkit-9999.ebuild
deleted file mode 100644
index 1c4a4e45a..000000000
--- a/sci-libs/rdkit/rdkit-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit cmake-utils python-r1 git-r3
-
-DESCRIPTION="Cheminformatics and machine-learning software written in C++ and Python"
-HOMEPAGE="http://www.rdkit.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/rdkit/rdkit.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+python -static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/boost
-	python? (
-		dev-libs/boost[python,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	>=dev-db/sqlite-3"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX:PATH="${EPREFIX}"/usr
-		-DRDK_INSTALL_INTREE=0
-		-DRDK_BUILD_CPP_TESTS=OFF
-		$(cmake-utils_use static-libs RDK_INSTALL_STATIC_LIBS)
-		$(cmake-utils_use python RDK_BUILD_PYTHON_WRAPPERS)
-	)
-
-	cmake-utils_src_configure
-}