diff options
Diffstat (limited to 'sci-chemistry/openbabel')
4 files changed, 49 insertions, 4 deletions
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest index 85e159ec9039..42f0ac860e8d 100644 --- a/sci-chemistry/openbabel/Manifest +++ b/sci-chemistry/openbabel/Manifest @@ -1,7 +1,8 @@ +AUX openbabel-3.1.1-fix-time-check-cmake.patch 1030 BLAKE2B 4d6ecf7103cc96dbd96754b291700b58fc36bf84b67c24ccbb7e819b075992bec40808ae0bf9304b24e8943badf24d190e5ad80837a47ce15b15ab8df68ebb38 SHA512 dac73a275f64120d8697f24b75d08d4339dc62da301b8f53beae390ce254d7d656b6e8fb23b9f3829d677ed03f7a16f2dc2d5051854bfcb0bbebd17f1eaf2b6b AUX openbabel-python.cmake 4402 BLAKE2B 36c325a26f9b23c3957db22110628a0a922ad02b6a7415fc197713d3df8f1703475bf2f2c53b546b7915466ce30b6b3c72c505ea72443dd23a17a7f9131f4f6e SHA512 a7bcdf90588930b05d11312429e735d3cc6a94053e67117bef6c1614932651abee7c4e082916482a9012622c0f29c3ba62dd7788b72aca6c88293660c7f2a3db DIST openbabel-3.1.1_p20210225.tar.gz 36674527 BLAKE2B bb82fc96f704249d211bd86c73de0cf4e7cfe5e2ba5c745aa8b4f6f19583837e2181d85101377810095f6b71fc3b91bf2f6f5636726fc8271c6905f1f8c59e7b SHA512 9ff7cb4acbfad7a9c5c8d0dd8930ac0390d0d0f2758d1a6120009071f47ffe718f92ad620d37f26f196babb14649c52b5eb7bb161c342ef36aec655e0a172de4 DIST openbabel.jpg 12159 BLAKE2B b701df2b8c29df607dc2bd3997a282aa9a726d56c789ff2db900d33234dc691f76b6af12a4c9ccda4f09984504b863c40c39e8bf91058939996714ede2dd37c7 SHA512 998ea526c8c92f87dd203527fdd9f4e001357e951409209f41ab68e0b730fe12d97f9079c12ca289be413854ea2abcf8bb691ae5af823a6f29d6a590e1a3e2b0 DIST openbabel.png 29060 BLAKE2B 8d217d92125cc73462437411dd4e0cc05179cb0934f5ed15a307acc6b549b8ebab250a48a05ef7657f48c6df394f37da9b659de61efb1477b79b573a5b393ad3 SHA512 bbcaaa37663b526c9038ccb9edaf05ccc3ad1a861739a737f05f363098d8402a10b36e341fcc0aca636e809c6c32db99bf987b41719a0c756bf5e31444d3eb70 -EBUILD openbabel-3.1.1_p20210225.ebuild 7234 BLAKE2B 5ea580096819ba3df0b18fe713d04f7811d6c65016ca18492ee4a1deada357261580e87bae9fca8cf9a9eea8214ca0fd7f7ac22f1272cd8f2577dd88c207a44d SHA512 0323ef9d33b9efe318b59c2de88073c3c30c5d90f470f0e8426f9a7563595e1e5e7446130a72c1a747ea080df7ee9189e473e3fc3a5464b07efd2066ed1dac91 -EBUILD openbabel-9999.ebuild 7196 BLAKE2B 07a467606b08dfa7c4b81cb58b25afc37cb06330e8d0c5012896905a672c206c0690898950d1b9bca35ea5ddc5dc415516341fe5f3c2095db7b91f169b9300b9 SHA512 1c1214ad4eb0ec7128feedb5708f814d3910ab0c6adbdaa19b8e34c11968daa8d92efafa2685b69558f5b884f9c09f27f19d75db26a5e522c357081496f4f378 +EBUILD openbabel-3.1.1_p20210225.ebuild 7421 BLAKE2B 4ee4dbdd44516e9acc4ea2ee6c8805873c4077e52d20ffb741986d46883b42b4ea90cb4eca00558e9ef6240969c3188b4d65084f31314416c572e470e145d4d5 SHA512 b552e572cde4822cbca0a85acf39e4636ae91482701235be7976f3bed873868ef30dbfcd9574b3c7f1bc15ee9ee2e1006d08590bce65136601e2b6ebdd61e52f +EBUILD openbabel-9999.ebuild 7312 BLAKE2B c0f5a879d31bf5f85d35cf60a126b40a61abe808cafd2c7dbc1772d90f41a237fba02508914e26fc5076a13d201e1e60aa51c2ae4536f6c61acb344ab5c0d634 SHA512 23a826bcefddbfbed9d79213c78d24781ebf0a18c36a7d76d38adb00d829904ef54018f80822d2385db43fa8dd159a8279d0810a7b082f1b2d29f2a262f3a5a7 MISC metadata.xml 862 BLAKE2B 56a35c050142f5a8939441d6a669986ad58321154f1a46fb78dcf6b861311bbb28d6f49507fff673519396533fbbfb8bf0214aa9dbdf1041ae7497c3287a3eb3 SHA512 7d289c49a91b4ae9a3910c6feb1014fa307ccc01b1e041e1aece7c8f135ac2eb1f5aae562dfd25d17e38d88c5747786a7406d6c09d10f74e80c08691599dec80 diff --git a/sci-chemistry/openbabel/files/openbabel-3.1.1-fix-time-check-cmake.patch b/sci-chemistry/openbabel/files/openbabel-3.1.1-fix-time-check-cmake.patch new file mode 100644 index 000000000000..69e41211023b --- /dev/null +++ b/sci-chemistry/openbabel/files/openbabel-3.1.1-fix-time-check-cmake.patch @@ -0,0 +1,32 @@ +https://github.com/openbabel/openbabel/pull/2493 + +From: Sam James <sam@gentoo.org> +Date: Sun, 12 Jun 2022 11:23:59 +0100 +Subject: [PATCH] CMake: fix time check typo (fixes build failure w/ GCC 12) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without this fixed check, we get a build failure with GCC 12: +``` +/var/tmp/portage/sci-chemistry/openbabel-3.1.1_p20210225/work/openbabel-08e23f39b0cc39b4eebd937a5a2ffc1a7bac3e1b/include/openbabel/obutil.h:65:14: error: ‘clock’ was not declared in this scope; did you mean ‘clock_t’? + 65 | start= clock(); + | ^~~~~ + | clock_t +``` + +Bug: https://bugs.gentoo.org/851510 +--- a/src/config.h.cmake ++++ b/src/config.h.cmake +@@ -182,8 +182,8 @@ + #define OB_MODULE_PATH "@OB_MODULE_PATH@" + + #ifndef TIME_WITH_SYS_TIME +- #ifdef HAVE_SYS_TIME +- #ifdef HAVE_TIME ++ #ifdef HAVE_SYS_TIME_H ++ #ifdef HAVE_TIME_H + #define TIME_WITH_SYS_TIME 1 + #else + #define TIME_WITH_SYS_TIME 0 + diff --git a/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild b/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild index 97dfa6e9a236..0eb8ddaa0cf5 100644 --- a/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild +++ b/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild @@ -80,8 +80,16 @@ RDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/openbabel-3.1.1-fix-time-check-cmake.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + pkg_setup() { - use openmp && tc-check-openmp + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } prepare_python_bindings() { diff --git a/sci-chemistry/openbabel/openbabel-9999.ebuild b/sci-chemistry/openbabel/openbabel-9999.ebuild index 2c73801d2362..956b061aed0f 100644 --- a/sci-chemistry/openbabel/openbabel-9999.ebuild +++ b/sci-chemistry/openbabel/openbabel-9999.ebuild @@ -80,8 +80,12 @@ RDEPEND=" ) " +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + pkg_setup() { - use openmp && tc-check-openmp + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } prepare_python_bindings() { |