From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SF89v-000140-H7 for garchives@archives.gentoo.org; Tue, 03 Apr 2012 18:08:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5122E0D2E; Tue, 3 Apr 2012 18:07:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 73862E091C for ; Tue, 3 Apr 2012 18:07:50 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B43EA1B4008 for ; Tue, 3 Apr 2012 18:07:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 51F4EE542E for ; Tue, 3 Apr 2012 18:07:46 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1332684777.b17af5ac5341940c9b87e44b33f7af4b9e6adcaf.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/ball/files/, sci-chemistry/ball/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/ball/ChangeLog sci-chemistry/ball/ball-9999.ebuild sci-chemistry/ball/files/ball-9999-libsvm.patch sci-chemistry/ball/files/ball-9999-multilib.patch X-VCS-Directories: sci-chemistry/ball/files/ sci-chemistry/ball/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: b17af5ac5341940c9b87e44b33f7af4b9e6adcaf X-VCS-Branch: master Date: Tue, 3 Apr 2012 18:07:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 25d634cb-8d5a-4813-9418-cb5d4e405b97 X-Archives-Hash: b0a701b705491ce4bfa325a5e33311e8 commit: b17af5ac5341940c9b87e44b33f7af4b9e6adcaf Author: Justin Lecher gentoo org> AuthorDate: Sun Mar 25 14:12:57 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Mar 25 14:12:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Db17af5ac Fix patches to be in line with tree (Portage version: 2.2.0_alpha95/git/Linux x86_64, unsigned Manifest commi= t) --- 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: $ =20 + 25 Mar 2012; Justin Lecher 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 ball-9999.ebuild: Correct usage of python.eclass =20 diff --git a/sci-chemistry/ball/ball-9999.ebuild b/sci-chemistry/ball/bal= l-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=3D"${RDEPEND} sys-devel/bison virtual/yacc" =20 +PATCHES=3D( + "${FILESDIR}"/${P}-multilib.patch + "${FILESDIR}"/${P}-libsvm.patch + ) + pkg_setup() { use python \ && python_set_active_version 2 \ && python_pkg_setup } =20 -src_prepare() { - sed \ - -e '/INSTALL_DIRECTORY/s:"lib":${CMAKE_INSTALL_LIBDIR}:g' \ - -i CMakeLists.txt || die - base_src_prepare -} - src_configure() { local mycmakeargs=3D( $(cmake-utils_use_use threads FFTW_THREADS) diff --git a/sci-chemistry/ball/files/ball-9999-libsvm.patch b/sci-chemis= try/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.jle= c@gentoo.org> +From: Justin Lecher +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() + =09 + //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_); + } + } +=20 diff --git a/sci-chemistry/ball/files/ball-9999-multilib.patch b/sci-chem= istry/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 +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") +--=20 +1.7.8.5 +