commit: e8ae9452197df889ba3309fb72d90cc5a5bd10d5 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Wed Jan 6 07:23:42 2016 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Wed Jan 6 07:23:42 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=e8ae9452
sci-chemistry/openbabel: Respect CXXFLAGS drop usage of dohtml Package-Manager: portage-2.2.26 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> sci-chemistry/openbabel/metadata.xml | 2 +- sci-chemistry/openbabel/openbabel-9999.ebuild | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sci-chemistry/openbabel/metadata.xml b/sci-chemistry/openbabel/metadata.xml index 0e989df..9712658 100644 --- a/sci-chemistry/openbabel/metadata.xml +++ b/sci-chemistry/openbabel/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <herd>sci-chemistry</herd> diff --git a/sci-chemistry/openbabel/openbabel-9999.ebuild b/sci-chemistry/openbabel/openbabel-9999.ebuild index c871b14..660e3a7 100644 --- a/sci-chemistry/openbabel/openbabel-9999.ebuild +++ b/sci-chemistry/openbabel/openbabel-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -50,6 +50,7 @@ src_configure() { local mycmakeargs="" mycmakeargs="${mycmakeargs} -DOPENBABEL_USE_SYSTEM_INCHI=ON + -DOPTIMIZE_NATIVE=OFF $(cmake-utils_use_enable openmp OPENMP) $(cmake-utils_use wxwidgets BUILD_GUI)" @@ -60,6 +61,7 @@ src_test() { local mycmakeargs="" mycmakeargs="${mycmakeargs} -DOPENBABEL_USE_SYSTEM_INCHI=ON + -DOPTIMIZE_NATIVE=OFF -DPYTHON_EXECUTABLE=false $(cmake-utils_use wxwidgets BUILD_GUI) $(cmake-utils_use_enable openmp OPENMP) @@ -71,18 +73,20 @@ src_test() { } src_install() { - dohtml doc/{*.html,*.png} - if use doc ; then - insinto /usr/share/doc/${PF}/API/html - doins doc/API/html/* + docinto html + dodoc doc/{*.html,*.png} + if use doc; then + docinto html/API + dodoc doc/API/html/* fi + cmake-utils_src_install # Ensure that modules are allways in openbabel/${PV} - pushd "${ED}/usr/$(get_libdir)/openbabel" + pushd "${ED}/usr/$(get_libdir)/openbabel" > /dev/null || die ver=$(ls -d * | grep -E '([0-9]+[.]){2}[0-9]+') if [ "${ver}" != "${PV}" ] ; then - ln -s ${ver} ${PV} + ln -s ${ver} ${PV} || die fi - popd + popd > /dev/null || die }
