Merge branch 'develop' of git.calculate-linux.org:/repo/calculate into develop

mhiretskiy 1867
Alexander Tratsevskiy 4 years ago
commit 37fd50b964

@ -504,14 +504,13 @@
~dev-embedded/ponyprog-3.0.0 amd64 x86
~dev-erlang/meck-0.8.12 amd64 x86
~dev-games/physfs-3.0.2 amd64 x86
~dev-go/go-crypto-0_pre20160126 amd64 x86
~dev-go/go-net-0_pre20160216 amd64 x86
~dev-go/go-oauth2-0_pre20160222 amd64 x86
~dev-go/go-crypto-0_pre20180816 amd64 x86
~dev-go/go-net-0_pre20180816 amd64 x86
~dev-go/go-protobuf-1.2.0 amd64 x86
~dev-go/go-sqlite3-1.1.0_p20160307 amd64 x86
~dev-go/go-sys-0_pre20180816 amd64 x86
~dev-go/go-text-0_pre20160211 amd64 x86
~dev-go/go-tools-0_pre20180817 amd64 x86
~dev-go/go-text-0.3.0 amd64 x86
~dev-go/go-tools-0_pre20190911 amd64 x86
~dev-haskell/c2hs-0.28.3 amd64 x86
~dev-haskell/hashtables-1.2.1.0 amd64 x86
~dev-haskell/language-c-0.7.1 amd64 x86

@ -0,0 +1 @@
DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ee545cf..7f4b944e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -239,7 +239,7 @@ check_type_size(clock_t CLOCK_T)
# Get the GCC version - from KDE4 cmake files
if(CMAKE_COMPILER_IS_GNUCXX)
exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+ string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
# patch level, handle this here:
if (NOT _gcc_version)

@ -0,0 +1,15 @@
https://bugs.gentoo.org/654800
Fixed-by: milan hodoscek
diff --git a/../old/CMakeLists.txt b/CMakeLists.txt
index dc38d1b..801207e 100644
--- a/../old/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -239,7 +239,7 @@ check_type_size(clock_t CLOCK_T)
# Get the GCC version - from KDE4 cmake files
if(CMAKE_COMPILER_IS_GNUCXX)
exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
- string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+ string(REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
# patch level, handle this here:
if (NOT _gcc_version)

@ -0,0 +1,93 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
WX_GTK_VER="3.0"
inherit cmake-utils eutils wxwidgets
DESCRIPTION="Interconverts file formats used in molecular modeling"
HOMEPAGE="http://openbabel.sourceforge.net/"
SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
# See src/CMakeLists.txt for LIBRARY_VERSION
SLOT="0/5.0.0"
LICENSE="GPL-2"
KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc openmp test wxwidgets"
RDEPEND="
dev-cpp/eigen:3
dev-libs/libxml2:2
sci-libs/inchi
sys-libs/zlib
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
DEPEND="${RDEPEND}
>=dev-util/cmake-2.4.8
doc? ( app-doc/doxygen )"
DOCS=( AUTHORS NEWS.md README.md THANKS doc/dioxin.{inc,mol2} doc/README.{dioxin.pov,povray} )
PATCHES=(
"${FILESDIR}"/${PN}-2.3.2-gcc-6_and_7-backport.patch
"${FILESDIR}"/${P}-gcc-8_and_9.patch
)
pkg_setup() {
if use openmp; then
if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
ewarn "OpenMP is not available in your current selected gcc"
die "need openmp capable gcc"
fi
FORTRAN_NEED_OPENMP=1
fi
}
src_prepare() {
sed \
-e '/__GNUC__/s:== 4:>= 4:g' \
-i include/openbabel/shared_ptr.h || die
cmake-utils_src_prepare
}
src_configure() {
use wxwidgets && need-wxwidgets unicode
local mycmakeargs=(
-DOPENBABEL_USE_SYSTEM_INCHI=ON
-DOPENMP=$(usex openmp)
-DBUILD_GUI=$(usex wxwidgets)
)
cmake-utils_src_configure
}
src_install() {
docinto html
dodoc doc/{*.html,*.png}
if use doc ; then
docinto html/API
dodoc -r doc/API/html/*
fi
cmake-utils_src_install
}
src_test() {
local mycmakeargs=(
-DOPENBABEL_USE_SYSTEM_INCHI=ON
-DPYTHON_EXECUTABLE=false
-DOPENMP=$(usex openmp)
-DBUILD_GUI=$(usex wxwidgets)
-DTESTS=$(usex test)
)
cmake-utils_src_configure
cmake-utils_src_compile
cmake-utils_src_test -E py
}
pkg_postinst() {
optfeature "perl support" sci-chemistry/openbabel-perl
optfeature "python support" sci-chemistry/openbabel-python
}

@ -12,7 +12,7 @@ SRC_URI="https://git.kernel.org/pub/scm/fs/xfs/xfsdump-dev.git/snapshot/xfsdump-
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS=""
KEYWORDS="amd64 x86"
IUSE="ncurses nls"
RDEPEND="

@ -5,4 +5,5 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
DIST patch-4.14.156.xz 3120824 BLAKE2B 3a0e2d81b974e468f5825d686f15c079bf1f022c4a88d7f65a2a9da15409d4b3b5aa3e2ff0e287c486f7bd75f075fa55db0a1ac4b1a3fa8019acffcf29e75e7b SHA512 37ef222388cad830c073e0e9cbdc7527efea57ff2f76a18d6089e428820a8d87877c8c4e0b05dc958582e4d8b72625fee740af9d550d3c6da497d5b1b84ce138
DIST patch-4.19.85.xz 2167392 BLAKE2B cc151e761b636205601a035b5018affea49b6fc61f50f975715c782fee706b9487203f44d5d88fc308b46687ccb505f73afc89215e71c5207e653d586bf2ed39 SHA512 745903b6fc93a25f6f6eefa4cc132983202a37d51ca97fefc15ac70ff2667ca8cf40b25ba66fd4dd1967b98883223c774c53d0ad11c87d943a813aabd0f6f769
DIST patch-4.19.86.xz 2215692 BLAKE2B 59d5497b96056db27d4a50cb9d12ca5a6f765d22f3f6456d4e908a7d1e390a093b08adc4d80cf7e0f3fa226e6fd11e47350ce7d7799ee5b3e4fea14e0b81f3b2 SHA512 163c8fb0463f84ed28b51df54553a714d558e8101f4a34d99f9aa02aab45a5482bd49b829775edc809da0dd7a39bf415bc2ae38d2ef1eaf97a8a992ec91397ef
DIST patch-5.3.13.xz 498624 BLAKE2B 8daa5bee5a5df03a6c27e2b58bae41a22884dd1926b13d832c18b66c1863948a4e141b3d79467882dc72cfbfa40abbc757c4b409161e421d2042e48c70eb9a6b SHA512 3df94df06bc296d2edbeb5a409702da3a9d3d8394df9ffa3f01ab745726505b84078cefe352d38955d62d6bbede975450646093858e786eaf7416c46eec33972
DIST patch-5.3.14.xz 524800 BLAKE2B 0607457b59a931e2281a830b596a2f6235354b40c800f86c75ac9f651ef32c96b01713b85f7497b36910be51e676b17090f0463bcd123dfeb194fc7d78a64acc SHA512 96ccee690694a03beffc26edde7e1d9d2e43acdc33098d56c0965cdccb321337d34190ebab0b64663b03d4aa76edb1474dd86b0943385a572aa595fc76b5ec8b
DIST patch-5.4.1.xz 30848 BLAKE2B 49662e41f3f109642e3825da58286146a182c2baa3f82a28bd37875bb43a0c2a0b6906879eb75e0098df48dfcbfa158cbe20d60f148f49fc775ee7568e1189f1 SHA512 93a1eec065cec193c1f741895e181ce915a5be2d985534e339b22778a13801961de0d403fad9c8fb8c35716e6d5a41b646fec79bc9191593ecb90b6ca2b335ce

Loading…
Cancel
Save