From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 937D11384B4 for ; Wed, 11 Nov 2015 14:38:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC01A21C02D; Wed, 11 Nov 2015 14:38:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02FF621C02D for ; Wed, 11 Nov 2015 14:38:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1EFD340691 for ; Wed, 11 Nov 2015 14:38:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FAD023BD for ; Wed, 11 Nov 2015 14:38:12 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1447252679.1899ece8f99460518e2ea401f288e60e062658eb.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/openbabel-python/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/openbabel-python/metadata.xml sci-chemistry/openbabel-python/openbabel-python-9999.ebuild X-VCS-Directories: sci-chemistry/openbabel-python/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 1899ece8f99460518e2ea401f288e60e062658eb X-VCS-Branch: master Date: Wed, 11 Nov 2015 14:38:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3a916c77-c77a-4612-bc36-dc326c1c79ee X-Archives-Hash: fc3e81620bd90e458ebe80404079a5dc commit: 1899ece8f99460518e2ea401f288e60e062658eb Author: Justin Lecher gentoo org> AuthorDate: Wed Nov 11 14:37:44 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Nov 11 14:37:59 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1899ece8 sci-chemistry/openbabel-python: Import tree changes Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher gentoo.org> sci-chemistry/openbabel-python/metadata.xml | 2 +- .../openbabel-python/openbabel-python-9999.ebuild | 23 ++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/sci-chemistry/openbabel-python/metadata.xml b/sci-chemistry/openbabel-python/metadata.xml index 66b2cb7..56c946c 100644 --- a/sci-chemistry/openbabel-python/metadata.xml +++ b/sci-chemistry/openbabel-python/metadata.xml @@ -1,4 +1,4 @@ - + sci-chemistry diff --git a/sci-chemistry/openbabel-python/openbabel-python-9999.ebuild b/sci-chemistry/openbabel-python/openbabel-python-9999.ebuild index 69c0acd..03c35f6 100644 --- a/sci-chemistry/openbabel-python/openbabel-python-9999.ebuild +++ b/sci-chemistry/openbabel-python/openbabel-python-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python2_7 python3_{3,4} ) inherit cmake-utils eutils git-r3 multilib python-r1 @@ -21,11 +21,9 @@ IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - !sci-chemistry/babel ~sci-chemistry/openbabel-${PV} sys-libs/zlib" DEPEND="${RDEPEND} - >=dev-util/cmake-2.4.8 >=dev-lang/swig-2" src_prepare() { @@ -40,6 +38,9 @@ src_prepare() { -outdir scripts/python \ scripts/openbabel-python.i \ || die "Regeneration of openbabel-python.cpp failed" + sed \ + -e '/__GNUC__/s:== 4:>= 4:g' \ + -i include/openbabel/shared_ptr.h || die } src_configure() { @@ -47,12 +48,14 @@ src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_RPATH= -DBINDINGS_ONLY=ON - -DBABEL_SYSTEM_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libopenbabel.so - -DOB_MODULE_PATH="${EPREFIX}"/usr/$(get_libdir)/openbabel/${PV} + -DBABEL_SYSTEM_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libopenbabel.so" + -DOB_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/openbabel/${PV}" + -DLIB_INSTALL_DIR="${D}$(python_get_sitedir)" -DPYTHON_BINDINGS=ON - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_INCLUDE_DIR="${EPREFIX}"/usr/include/"${EPYTHON}" - -DPYTHON_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/lib"${EPYTHON}".so + -DPYTHON_EXECUTABLE=${PYTHON} + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_INCLUDE_PATH="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" -DENABLE_TESTS=ON ) @@ -74,7 +77,7 @@ src_install() { my_impl_src_install() { cd "${BUILD_DIR}" || die - DESTDIR=${ED} cmake -DCOMPONENT=bindings_python -P cmake_install.cmake + cmake -DCOMPONENT=bindings_python -P cmake_install.cmake python_optimize }