* [gentoo-commits] proj/sci:master commit in: sci-chemistry/ball/files/, sci-chemistry/ball/
@ 2012-04-03 18:07 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2012-04-03 18:07 UTC (permalink / raw
To: gentoo-commits
commit: b17af5ac5341940c9b87e44b33f7af4b9e6adcaf
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 14:12:57 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 14:12:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b17af5ac
Fix patches to be in line with tree
(Portage version: 2.2.0_alpha95/git/Linux x86_64, unsigned Manifest commit)
---
sci-chemistry/ball/ChangeLog | 4 ++
sci-chemistry/ball/ball-9999.ebuild | 12 +++----
sci-chemistry/ball/files/ball-9999-libsvm.patch | 24 +++++++++++++
sci-chemistry/ball/files/ball-9999-multilib.patch | 39 +++++++++++++++++++++
4 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/sci-chemistry/ball/ChangeLog b/sci-chemistry/ball/ChangeLog
index dfe1c65..851aa6f 100644
--- a/sci-chemistry/ball/ChangeLog
+++ b/sci-chemistry/ball/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Mar 2012; Justin Lecher <jlec@gentoo.org> ball-9999.ebuild,
+ +files/ball-9999-libsvm.patch, +files/ball-9999-multilib.patch:
+ Fix patches to be in line with tree
+
25 Mar 2012; Justin Lecher <jlec@gentoo.org> ball-9999.ebuild:
Correct usage of python.eclass
diff --git a/sci-chemistry/ball/ball-9999.ebuild b/sci-chemistry/ball/ball-9999.ebuild
index 1689676..4fac56b 100644
--- a/sci-chemistry/ball/ball-9999.ebuild
+++ b/sci-chemistry/ball/ball-9999.ebuild
@@ -42,19 +42,17 @@ DEPEND="${RDEPEND}
sys-devel/bison
virtual/yacc"
+PATCHES=(
+ "${FILESDIR}"/${P}-multilib.patch
+ "${FILESDIR}"/${P}-libsvm.patch
+ )
+
pkg_setup() {
use python \
&& python_set_active_version 2 \
&& python_pkg_setup
}
-src_prepare() {
- sed \
- -e '/INSTALL_DIRECTORY/s:"lib":${CMAKE_INSTALL_LIBDIR}:g' \
- -i CMakeLists.txt || die
- base_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_use threads FFTW_THREADS)
diff --git a/sci-chemistry/ball/files/ball-9999-libsvm.patch b/sci-chemistry/ball/files/ball-9999-libsvm.patch
new file mode 100644
index 0000000..c85506d
--- /dev/null
+++ b/sci-chemistry/ball/files/ball-9999-libsvm.patch
@@ -0,0 +1,24 @@
+From 60a5f677587046b3e2077872c21b005bad549b85 Mon Sep 17 00:00:00 2001
+Message-Id: <60a5f677587046b3e2077872c21b005bad549b85.1332678065.git.jlec@gentoo.org>
+From: Justin Lecher <jlec@gentoo.org>
+Date: Sun, 25 Mar 2012 14:15:16 +0200
+Subject: [PATCH 1/2] Correct deprecated usage of svm_destroy_model to
+ svm_free_and_destroy_model
+
+---
+ source/QSAR/libsvmModel.C | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/source/QSAR/libsvmModel.C b/source/QSAR/libsvmModel.C
+index 58ce4dc..1f24e15 100644
+--- a/source/QSAR/libsvmModel.C
++++ b/source/QSAR/libsvmModel.C
+@@ -81,7 +81,7 @@ void LibsvmModel::train()
+
+ //free(prob);
+ //free(prob->y); free(prob->x);
+- svm_destroy_model((::svm_model*)svm_train_result_);
++ svm_free_and_destroy_model((::svm_model**)svm_train_result_);
+ }
+ }
+
diff --git a/sci-chemistry/ball/files/ball-9999-multilib.patch b/sci-chemistry/ball/files/ball-9999-multilib.patch
new file mode 100644
index 0000000..317c402
--- /dev/null
+++ b/sci-chemistry/ball/files/ball-9999-multilib.patch
@@ -0,0 +1,39 @@
+From 5b8f4e58b4e54bcdfa6f287e01f91d9dfd4e5a14 Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Sun, 25 Mar 2012 14:12:21 +0200
+Subject: [PATCH] Correct path for multilib installation.
+
+Libraries should go into lib64 not lib on native 64bit. Therefore we can use the LIBDIR detected by cmake.
+---
+ CMakeLists.txt | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 940ebf4..7eb3db4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -426,8 +426,8 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
+ ## These variables are used in all install-targets
+ IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ SET(BALL_RUNTIME_INSTALL_DIRECTORY "bin")
+- SET(BALL_LIBRARY_INSTALL_DIRECTORY "lib")
+- SET(BALL_ARCHIVE_INSTALL_DIRECTORY "lib")
++ SET(BALL_LIBRARY_INSTALL_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
++ SET(BALL_ARCHIVE_INSTALL_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
+ SET(BALL_HEADER_INSTALL_DIRECTORY ".")
+ SET(BALL_DATA_INSTALL_DIRECTORY "share/BALL")
+ SET(BALL_DOCUMENTATION_INSTALL_DIRECTORY "share/BALL/doc")
+@@ -435,8 +435,8 @@ IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ SET(BALL_PYTHON_INSTALL_DIRECTORY "bin")
+ SET(BALL_PLUGIN_INSTALL_DIRECTORY "bin")
+ ELSE()
+- SET(BALL_PYTHON_INSTALL_DIRECTORY "lib")
+- SET(BALL_PLUGIN_INSTALL_DIRECTORY "lib")
++ SET(BALL_PYTHON_INSTALL_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
++ SET(BALL_PLUGIN_INSTALL_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
+ ENDIF()
+ ELSE()
+ SET(BALL_BUNDLE_INSTALL_DIRECTORY "Applications")
+--
+1.7.8.5
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/ball/files/, sci-chemistry/ball/
@ 2013-12-09 8:38 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-12-09 8:38 UTC (permalink / raw
To: gentoo-commits
commit: 0f29e6f3a8275c88a8733bc33ef028b02d518b10
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 9 08:37:51 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Dec 9 08:37:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0f29e6f3
Squashed commit of the following:
commit ef3b3395160b125e80e307af725f858fa2c8845b
Author: zcj <ustcscgy <AT> 163.com>
Date: Thu Oct 10 15:31:02 2013 +0800
sci-chemistry/ball: fix cmake-utils_use_use parameters
commit dbd9518910bea3f813abcc5ec97998e80c33ceab
Author: zcj <ustcscgy <AT> 163.com>
Date: Thu Oct 10 15:19:50 2013 +0800
sci-chemistry/ball: already fixed in upstream, remove patch
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
sci-chemistry/ball/ball-9999.ebuild | 9 ++++-----
sci-chemistry/ball/files/ball-9999-libsvm.patch | 24 ------------------------
2 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/sci-chemistry/ball/ball-9999.ebuild b/sci-chemistry/ball/ball-9999.ebuild
index 0008868..dd1cc56 100644
--- a/sci-chemistry/ball/ball-9999.ebuild
+++ b/sci-chemistry/ball/ball-9999.ebuild
@@ -44,7 +44,6 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-multilib.patch
- "${FILESDIR}"/${P}-libsvm.patch
)
pkg_setup() {
@@ -54,10 +53,10 @@ 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_use cuda CUDA)
+ $(cmake-utils_use_use mpi MPI)
+ $(cmake-utils_use_use sql QTSQL)
+ $(cmake-utils_use_use webkit QTWEBKIT)
$(cmake-utils_use python BALL_PYTHON_SUPPORT)
)
cmake-utils_src_configure
diff --git a/sci-chemistry/ball/files/ball-9999-libsvm.patch b/sci-chemistry/ball/files/ball-9999-libsvm.patch
deleted file mode 100644
index c85506d..0000000
--- a/sci-chemistry/ball/files/ball-9999-libsvm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 60a5f677587046b3e2077872c21b005bad549b85 Mon Sep 17 00:00:00 2001
-Message-Id: <60a5f677587046b3e2077872c21b005bad549b85.1332678065.git.jlec@gentoo.org>
-From: Justin Lecher <jlec@gentoo.org>
-Date: Sun, 25 Mar 2012 14:15:16 +0200
-Subject: [PATCH 1/2] Correct deprecated usage of svm_destroy_model to
- svm_free_and_destroy_model
-
----
- source/QSAR/libsvmModel.C | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/source/QSAR/libsvmModel.C b/source/QSAR/libsvmModel.C
-index 58ce4dc..1f24e15 100644
---- a/source/QSAR/libsvmModel.C
-+++ b/source/QSAR/libsvmModel.C
-@@ -81,7 +81,7 @@ void LibsvmModel::train()
-
- //free(prob);
- //free(prob->y); free(prob->x);
-- svm_destroy_model((::svm_model*)svm_train_result_);
-+ svm_free_and_destroy_model((::svm_model**)svm_train_result_);
- }
- }
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-09 8:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-09 8:38 [gentoo-commits] proj/sci:master commit in: sci-chemistry/ball/files/, sci-chemistry/ball/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2012-04-03 18:07 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox