[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/ball/files/, sci-chemistry/ball/
commit: 90360a7c028f7f1eccfbcf57b10428481a003ac8
Author: Mikle Kolyada gentoo org>
AuthorDate: Thu May 2 18:47:53 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Thu May 2 18:47:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90360a7c
sci-chemistry/ball: remove last rited package
Signed-off-by: Mikle Kolyada gentoo.org>
sci-chemistry/ball/Manifest| 1 -
sci-chemistry/ball/ball-1.5.0_pre20180419.ebuild | 100 --
.../ball/files/ball-1.5.0-gnuinstalldirs.patch | 355 -
sci-chemistry/ball/metadata.xml| 36 ---
4 files changed, 492 deletions(-)
diff --git a/sci-chemistry/ball/Manifest b/sci-chemistry/ball/Manifest
deleted file mode 100644
index 71590f52041..000
--- a/sci-chemistry/ball/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ball-1.5.0_pre20180419.tar.gz 37577697 BLAKE2B
44db256dad4703115ca381c4bc7f8393657d9d205b78c9ed55328769129dc38a2898d838bea2beb2e1e5e25184944a5724dd808917928f79c41b8216d98a6677
SHA512
a5cf9680468636c6b3de950f058d1bedb9c2d9ef7b5ba1af60e4b79fab3e6bae9cd814ec3238703075ae66c5a637d1ba8281ce7f11ac842133af91c000c983c3
diff --git a/sci-chemistry/ball/ball-1.5.0_pre20180419.ebuild
b/sci-chemistry/ball/ball-1.5.0_pre20180419.ebuild
deleted file mode 100644
index b4d49d1fb14..000
--- a/sci-chemistry/ball/ball-1.5.0_pre20180419.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-COMMIT=e80b5e2021a72faa36bf9e35207998d4590f2cf4
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Biochemical Algorithms Library"
-HOMEPAGE="https://github.com/BALL-Project/ball;
-SRC_URI="https://github.com/BALL-Project/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2 fftw? ( GPL-3 ) openbabel? ( GPL-3 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc +fftw +gui lpsolve mpi openbabel +python svm test threads
webengine"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- threads? ( fftw )
- webengine? ( gui )
-"
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-libs/boost:=
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- dev-qt/qtxml:5
- media-libs/glew:0=
- virtual/opengl
- x11-libs/libX11
- cuda? ( dev-util/nvidia-cuda-toolkit )
- fftw? ( sci-libs/fftw:3.0=[threads?] )
- gui? (
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
- )
- lpsolve? ( sci-mathematics/lpsolve )
- mpi? ( virtual/mpi )
- openbabel? ( sci-chemistry/openbabel:= )
- python? ( ${PYTHON_DEPS} )
- svm? ( sci-libs/libsvm:= )
- webengine? (
- dev-qt/qtwebchannel:5
- dev-qt/qtwebengine:5[widgets]
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- virtual/yacc
- doc? ( app-doc/doxygen[dot] )
- gui? ( dev-qt/linguist-tools:5 )
- python? ( dev-python/sip )
-"
-
-S="${WORKDIR}"/${PN}-${COMMIT}
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.0-gnuinstalldirs.patch )
-
-RESTRICT="test"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUPDATE_TRANSLATIONS=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DUSE_CUDA=$(usex cuda)
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex !doc)
- -DCMAKE_DISABLE_FIND_PACKAGE_FFTW=$(usex !fftw)
- -DUSE_LPSOLVE=$(usex lpsolve)
- -DUSE_MPI=$(usex mpi)
- -DREQUIRE_MPI=$(usex mpi)
- -DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel2=$(usex !openbabel)
- -DBALL_PYTHON_SUPPORT=$(usex python)
- -DBALL_HAS_VIEW=$(usex gui)
- -DUSE_LIBSVM=$(usex svm)
- -DUSE_FFTW_THREADS=$(usex threads)
- -DUSE_QTWEBENGINE=$(usex webengine)
- )
-
- if use fftw || use openbabel; then
- mycmakeargs+=( -DBALL_LICENSE=GPL )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use test && cmake-utils_src_make build_tests
-}
diff --git a/sci-chemistry/ball/files/ball-1.5.0-gnuinstalldirs.patch
b/sci-chemistry/ball/files/ball-1.5.0-gnuinstalldirs.patch
deleted file mode 100644
index f9fedc58bb6..000
--- a/sci-chemistry/ball/files/ball-1.5.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,355 +0,0 @@
-From a8cade5ed7090c704aed53871fb664a0fe07af54 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Sat, 21 Apr 2018 20:07:09 +0200
-Subject: [PATCH 1/3] Use GNUInstallDirs
-
- CMakeLists.txt | 30 --
- 1 file changed, 16
[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/ball/files/, sci-chemistry/ball/
commit: 09716046e454d0a416a5d424938189d3c8dca296
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 21 16:46:33 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 21 21:33:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09716046
sci-chemistry/ball: Add 1.5.0_pre20180419 Qt5-based snapshot
Bug: https://bugs.gentoo.org/639000
Package-Manager: Portage-2.3.31, Repoman-2.3.9
sci-chemistry/ball/Manifest| 1 +
sci-chemistry/ball/ball-1.5.0_pre20180419.ebuild | 100 ++
.../ball/files/ball-1.5.0-gnuinstalldirs.patch | 355 +
sci-chemistry/ball/metadata.xml| 26 +-
4 files changed, 472 insertions(+), 10 deletions(-)
diff --git a/sci-chemistry/ball/Manifest b/sci-chemistry/ball/Manifest
index f5a46e40473..f8232c238a6 100644
--- a/sci-chemistry/ball/Manifest
+++ b/sci-chemistry/ball/Manifest
@@ -1 +1,2 @@
DIST BALL-1.4.2.tar.xz 16080664 BLAKE2B
15faa5f1aed0701ab318ac965ece216be0ff653ab1e57b0a1f2c253cf97b1ac89800ab528c9d044da903b154e16d1dfde936bd1475d6b1903acfa867904a55a7
SHA512
c719af4ef2dc1076818d59b72350b704fbffea06bd44737519fb50d88da113ea509333d407f2330aa59bf1c4e6b81adfd3d28e05459f66d7c9707f8d85db7a87
+DIST ball-1.5.0_pre20180419.tar.gz 37577697 BLAKE2B
44db256dad4703115ca381c4bc7f8393657d9d205b78c9ed55328769129dc38a2898d838bea2beb2e1e5e25184944a5724dd808917928f79c41b8216d98a6677
SHA512
a5cf9680468636c6b3de950f058d1bedb9c2d9ef7b5ba1af60e4b79fab3e6bae9cd814ec3238703075ae66c5a637d1ba8281ce7f11ac842133af91c000c983c3
diff --git a/sci-chemistry/ball/ball-1.5.0_pre20180419.ebuild
b/sci-chemistry/ball/ball-1.5.0_pre20180419.ebuild
new file mode 100644
index 000..b4d49d1fb14
--- /dev/null
+++ b/sci-chemistry/ball/ball-1.5.0_pre20180419.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+COMMIT=e80b5e2021a72faa36bf9e35207998d4590f2cf4
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Biochemical Algorithms Library"
+HOMEPAGE="https://github.com/BALL-Project/ball;
+SRC_URI="https://github.com/BALL-Project/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2 fftw? ( GPL-3 ) openbabel? ( GPL-3 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda doc +fftw +gui lpsolve mpi openbabel +python svm test threads
webengine"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ threads? ( fftw )
+ webengine? ( gui )
+"
+
+RDEPEND="
+ dev-cpp/eigen:3
+ dev-libs/boost:=
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtxml:5
+ media-libs/glew:0=
+ virtual/opengl
+ x11-libs/libX11
+ cuda? ( dev-util/nvidia-cuda-toolkit )
+ fftw? ( sci-libs/fftw:3.0=[threads?] )
+ gui? (
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ )
+ lpsolve? ( sci-mathematics/lpsolve )
+ mpi? ( virtual/mpi )
+ openbabel? ( sci-chemistry/openbabel:= )
+ python? ( ${PYTHON_DEPS} )
+ svm? ( sci-libs/libsvm:= )
+ webengine? (
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5[widgets]
+ )
+"
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ virtual/yacc
+ doc? ( app-doc/doxygen[dot] )
+ gui? ( dev-qt/linguist-tools:5 )
+ python? ( dev-python/sip )
+"
+
+S="${WORKDIR}"/${PN}-${COMMIT}
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5.0-gnuinstalldirs.patch )
+
+RESTRICT="test"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUPDATE_TRANSLATIONS=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ -DUSE_CUDA=$(usex cuda)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex !doc)
+ -DCMAKE_DISABLE_FIND_PACKAGE_FFTW=$(usex !fftw)
+ -DUSE_LPSOLVE=$(usex lpsolve)
+ -DUSE_MPI=$(usex mpi)
+ -DREQUIRE_MPI=$(usex mpi)
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel2=$(usex !openbabel)
+ -DBALL_PYTHON_SUPPORT=$(usex python)
+ -DBALL_HAS_VIEW=$(usex gui)
+ -DUSE_LIBSVM=$(usex svm)
+ -DUSE_FFTW_THREADS=$(usex threads)
+ -DUSE_QTWEBENGINE=$(usex webengine)
+ )
+
+ if use fftw || use openbabel; then
+ mycmakeargs+=( -DBALL_LICENSE=GPL )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use test && cmake-utils_src_make build_tests
+}
diff --git a/sci-chemistry/ball/files/ball-1.5.0-gnuinstalldirs.patch
b/sci-chemistry/ball/files/ball-1.5.0-gnuinstalldirs.patch
new file mode
[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/ball/files/, sci-chemistry/ball/
commit: 0947afa365abf88670172058186a1ff22de84a07
Author: David Seifert gentoo org>
AuthorDate: Sun Jun 5 15:18:04 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jun 5 15:22:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0947afa3
sci-chemistry/ball: Fix Swig bug, qualify std::isnan
Gentoo-Bug: 583932
* EAPI=6
* Also fix GCC warning pollution due to
misplaced attributes
* Add subslot operator for dev-libs/boost
* Remove USE=webkit, as webkit is no longer supported
Package-Manager: portage-2.3.0_rc1
.../{ball-1.4.2.ebuild => ball-1.4.2-r1.ebuild}| 28
.../files/ball-1.4.2-fix-python-bindings.patch | 22 ++
.../files/ball-1.4.2-std-namespace-isnan.patch | 16 +
.../files/ball-1.4.2-struct-swap-attribute.patch | 80 ++
sci-chemistry/ball/metadata.xml| 1 -
5 files changed, 133 insertions(+), 14 deletions(-)
diff --git a/sci-chemistry/ball/ball-1.4.2.ebuild
b/sci-chemistry/ball/ball-1.4.2-r1.ebuild
similarity index 78%
rename from sci-chemistry/ball/ball-1.4.2.ebuild
rename to sci-chemistry/ball/ball-1.4.2-r1.ebuild
index bc10052..635e8b4 100644
--- a/sci-chemistry/ball/ball-1.4.2.ebuild
+++ b/sci-chemistry/ball/ball-1.4.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
@@ -15,13 +15,13 @@
SRC_URI="http://www.ball-project.org/Downloads/v${PV}/BALL-${PV}.tar.xz;
SLOT="0"
LICENSE="LGPL-2 GPL-3"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda mpi +python sql test +threads +webkit"
+IUSE="cuda mpi +python sql test +threads"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
dev-cpp/eigen:3
- dev-libs/boost
+ dev-libs/boost:=
dev-qt/qtcore:4
dev-qt/qtgui:4
dev-qt/qtopengl:4
@@ -37,8 +37,7 @@ RDEPEND="
cuda? ( dev-util/nvidia-cuda-toolkit )
mpi? ( virtual/mpi )
python? ( ${PYTHON_DEPS} )
- sql? ( dev-qt/qtsql:4 )
- webkit? ( dev-qt/qtwebkit:4 )"
+ sql? ( dev-qt/qtsql:4 )"
DEPEND="${RDEPEND}
dev-python/sip
sys-devel/bison
@@ -54,7 +53,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.4.1-BondOrder.xml.patch
"${FILESDIR}"/${P}-Fix-compilation-of-sipModularWidget.patch
"${FILESDIR}"/${P}-underlinking.patch
- )
+ "${FILESDIR}"/${P}-fix-python-bindings.patch
+ "${FILESDIR}"/${P}-std-namespace-isnan.patch
+ "${FILESDIR}"/${P}-struct-swap-attribute.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
@@ -62,14 +64,14 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_use threads FFTW_THREADS)
- $(cmake-utils_use cuda MT_ENABLE_CUDA)
- $(cmake-utils_use mpi MT_ENABLE_MPI)
- $(cmake-utils_use sql BALL_HAS_QTSQL)
- $(cmake-utils_use_use webkit USE_QTWEBKIT)
- $(cmake-utils_use python BALL_PYTHON_SUPPORT)
+ -DUSE_FFTW_THREADS=$(usex threads)
+ -DMT_ENABLE_CUDA=$(usex cuda)
+ -DMT_ENABLE_MPI=$(usex mpi)
+ -DBALL_HAS_QTSQL=$(usex sql)
+ -DBALL_PYTHON_SUPPORT=$(usex python)
)
cmake-utils_src_configure
+
local i
for i in "${S}"/data/*; do
ln -sf "${i}" "${BUILD_DIR}"/source/TEST/ || die
diff --git a/sci-chemistry/ball/files/ball-1.4.2-fix-python-bindings.patch
b/sci-chemistry/ball/files/ball-1.4.2-fix-python-bindings.patch
new file mode 100644
index 000..a13ea2f
--- /dev/null
+++ b/sci-chemistry/ball/files/ball-1.4.2-fix-python-bindings.patch
@@ -0,0 +1,22 @@
+From 38a955ad9588817073a330c79d4b4476afcf69d5 Mon Sep 17 00:00:00 2001
+From: Daniel Stoeckel
+Date: Thu, 14 Apr 2016 19:30:04 +0200
+Subject: [PATCH] Fix Python bindings for Box
+
+---
+ source/PYTHON/EXTENSIONS/VIEW/box.sip | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/PYTHON/EXTENSIONS/VIEW/box.sip
b/source/PYTHON/EXTENSIONS/VIEW/box.sip
+index 341b1a4..592765e 100644
+--- a/source/PYTHON/EXTENSIONS/VIEW/box.sip
b/source/PYTHON/EXTENSIONS/VIEW/box.sip
+@@ -6,7 +6,7 @@
+
+ class Box
+ : GeometricObject,
+- Vertex2
++Box3
+ {
+ %TypeHeaderCode
+ #include
diff --git a/sci-chemistry/ball/files/ball-1.4.2-std-namespace-isnan.patch
b/sci-chemistry/ball/files/ball-1.4.2-std-namespace-isnan.patch
new file mode 100644
index 000..cea6377
--- /dev/null
+++ b/sci-chemistry/ball/files/ball-1.4.2-std-namespace-isnan.patch
@@ -0,0 +1,16 @@
+Fix C++11 changes to isnan():
+*
/var/tmp/portage/sci-chemistry/ball-1.4.2/work/BALL-1.4.2/source/MOLMEC/MINIMIZATION/shiftedLVMM.C:769:46:
required from here
+*
