From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2CCB4138350 for ; Sat, 14 Mar 2020 17:32:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46A13E0CF9; Sat, 14 Mar 2020 17:32:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1ABCCE0CF9 for ; Sat, 14 Mar 2020 17:32:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E590C34EEAF for ; Sat, 14 Mar 2020 17:32:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D141178 for ; Sat, 14 Mar 2020 17:32:20 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1584207126.b12f2d6d85ef75556666ae930ec018380e7a7a22.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/avogadrolibs/Manifest sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch X-VCS-Directories: sci-libs/avogadrolibs/files/ sci-libs/avogadrolibs/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: b12f2d6d85ef75556666ae930ec018380e7a7a22 X-VCS-Branch: master Date: Sat, 14 Mar 2020 17:32:20 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 64e0093e-809d-49e0-afdb-025fe97533c1 X-Archives-Hash: dcf7d33c439e1d0dde1c4cb5c4d20de6 commit: b12f2d6d85ef75556666ae930ec018380e7a7a22 Author: Pacho Ramos gentoo org> AuthorDate: Sat Mar 14 17:30:13 2020 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sat Mar 14 17:32:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b12f2d6d sci-libs/avogadrolibs: Bump to 1.93.0 Closes: https://bugs.gentoo.org/652918 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Pacho Ramos gentoo.org> sci-libs/avogadrolibs/Manifest | 1 + sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild | 89 ++++++++++++++++++++++ ...vogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch | 11 +++ 3 files changed, 101 insertions(+) diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest index 3eb86b3019a..09c6bc5a759 100644 --- a/sci-libs/avogadrolibs/Manifest +++ b/sci-libs/avogadrolibs/Manifest @@ -1,2 +1,3 @@ DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B 526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008 SHA512 1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc +DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8 diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild new file mode 100644 index 00000000000..a1cbede0ed2 --- /dev/null +++ b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit cmake-utils flag-o-matic + +DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries" +HOMEPAGE="https://www.openchemistry.org/ https://github.com/OpenChemistry/avogadrolibs" +SRC_URI=" + https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern ) +" + +SLOT="0" +LICENSE="BSD GPL-2+" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +# static-plugins needs to be enabled until upstream fixes +# https://github.com/OpenChemistry/avogadrolibs/issues/436 +#IUSE="archive doc hdf5 qt5 static-plugins test vtk" +IUSE="archive doc hdf5 qt5 test vtk" +RESTRICT="!test? ( test )" + +REQUIRED_USE="vtk? ( qt5 )" + +# TODO: Not yet packaged: +# sci-libs/libmsym (https://github.com/mcodev31/libmsym) +# sci-libs/spglib (https://atztogo.github.io/spglib/) +RDEPEND=" + dev-libs/jsoncpp:= + >=sci-chemistry/molequeue-0.7 + sci-libs/spglib + archive? ( app-arch/libarchive ) + hdf5? ( sci-libs/hdf5:= ) + qt5? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + media-libs/glew:0= + virtual/opengl + ) + vtk? ( sci-libs/vtk[qt5,views] ) +" +DEPEND="${RDEPEND} + dev-cpp/eigen:3 + qt5? ( dev-qt/linguist-tools:5 ) + test? ( dev-cpp/gtest )" + +PATCHES=( + # https://github.com/OpenChemistry/avogadrolibs/issues/449 + "${FILESDIR}"/${PN}-1.93.0-fix_AvogadroLibsConfig.patch +) + +src_unpack() { + default + if use vtk; then + cp "${DISTDIR}"/linux64-genXrdPattern "${WORKDIR}/genXrdPattern" || die + fi +} + +src_configure() { + # -DBUILD_STATIC_PLUGINS=$(usex static-plugins) + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -DUSE_PROTOCALL=OFF + -DBUILD_GPL_PLUGINS=ON + -DUSE_MOLEQUEUE=ON + -DUSE_MMTF=OFF + -DUSE_LIBMSYM=OFF + -DUSE_SPGLIB=OFF + -DUSE_PYTHON=OFF + -DUSE_LIBARCHIVE=$(usex archive) + -DBUILD_DOCUMENTATION=$(usex doc) + -DUSE_HDF5=$(usex hdf5) + -DENABLE_TRANSLATIONS=$(usex qt5) + -DUSE_OPENGL=$(usex qt5) + -DUSE_QT=$(usex qt5) + -DBUILD_STATIC_PLUGINS=ON + -DENABLE_TESTING=$(usex test) + -DUSE_VTK=$(usex vtk) + ) + use vtk && mycmakeargs+=( + -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern" + ) + + cmake-utils_src_configure +} diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch new file mode 100644 index 00000000000..5eb316af941 --- /dev/null +++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch @@ -0,0 +1,11 @@ +--- a/cmake/AvogadroLibsConfig.cmake.orig.in 2016-12-01 22:17:48.000000000 +0100 ++++ b/cmake/AvogadroLibsConfig.cmake.in 2017-03-11 20:39:36.462581381 +0100 +@@ -10,7 +10,7 @@ + + set(AvogadroLibs_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") + set(AvogadroLibs_INCLUDE_DIRS "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_INCLUDE_DIR@") +-set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@@LIB_SUFFIX@") ++set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@") + set(AvogadroLibs_RUNTIME_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_RUNTIME_DIR@") + set(AvogadroLibs_CMAKE_DIR "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs") +