From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1016091-garchives=archives.gentoo.org@lists.gentoo.org> 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 C0454138332 for <garchives@archives.gentoo.org>; Sun, 8 Apr 2018 09:55:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3C14E095F; Sun, 8 Apr 2018 09:55:16 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9D32FE0954 for <gentoo-commits@lists.gentoo.org>; Sun, 8 Apr 2018 09:55:16 +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 35291335C30 for <gentoo-commits@lists.gentoo.org>; Sun, 8 Apr 2018 09:55:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FF0D264 for <gentoo-commits@lists.gentoo.org>; Sun, 8 Apr 2018 09:55:13 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1523181232.9a80747f1a93efa92be9944ba77feafd4650c7ea.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/avogadrolibs/Manifest sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch sci-libs/avogadrolibs/metadata.xml X-VCS-Directories: sci-libs/avogadrolibs/files/ sci-libs/avogadrolibs/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9a80747f1a93efa92be9944ba77feafd4650c7ea X-VCS-Branch: master Date: Sun, 8 Apr 2018 09:55:13 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 85da5c9d-009a-49a7-a6f3-5aead82c8412 X-Archives-Hash: da4988e1c6a451d9797fd3608fe0a90d commit: 9a80747f1a93efa92be9944ba77feafd4650c7ea Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 7 19:01:22 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Apr 8 09:53:52 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a80747f sci-libs/avogadrolibs: Add 1.91.0_p20180406 snapshot Closes: https://bugs.gentoo.org/645248 Closes: https://bugs.gentoo.org/649862 Closes: https://bugs.gentoo.org/588706 Closes: https://bugs.gentoo.org/577214 Package-Manager: Portage-2.3.28, Repoman-2.3.9 sci-libs/avogadrolibs/Manifest | 1 + .../avogadrolibs-1.91.0_pre20180406.ebuild | 71 ++++++++++++++++++++++ ...gadrolibs-1.91.0_pre20180406-underlinking.patch | 18 ++++++ sci-libs/avogadrolibs/metadata.xml | 3 +- 4 files changed, 92 insertions(+), 1 deletion(-) diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest index 1d04e63cc1b..bbf158508b8 100644 --- a/sci-libs/avogadrolibs/Manifest +++ b/sci-libs/avogadrolibs/Manifest @@ -1 +1,2 @@ DIST avogadrolibs-0.9.0.tar.gz 742370 BLAKE2B cd104cea48b82a1ac86fdb9e93717e2647f57a0d713673d8b340d259f73d6d9985decf0c4e4d83f13d54d12ae2aefee8e75b5d04861f8ab67b9b42690c3c74f7 SHA512 7cb000cd6399f33483c38b4f8a9c4a4688f5054cba35e101bed0f2371cea614ace6b3fc65c3ed1418976afef4462a09be868500435a5ae9c98a7ac496c10c36f +DIST avogadrolibs-1.91.0_pre20180406.tar.gz 857345 BLAKE2B 8e5c6b0a838a2a6b7dc925c1b544ab4d4de8b7769b1fe8d787127a1014b1243da89a2a6f6cfc871181f81a443c3ee63d758369f003afaf591c9373c9d5122ee3 SHA512 1814b2105615aabc1df78b14c581e78fea20a1e4ace8979bb2ad123ab0994d90c3935e37f0cc58b60d3307ffe682599a93d8cadddc22b4ba524caaec1a2c5319 diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild new file mode 100644 index 00000000000..6671ed518ff --- /dev/null +++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +COMMIT=f414794a168712f72884cdcfba818def5f42e721 +inherit cmake-utils + +DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries" +HOMEPAGE="https://www.openchemistry.org/" +SRC_URI="https://github.com/OpenChemistry/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="BSD GPL-2+" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="archive doc hdf5 qt5 static-plugins test vtk" + +# TODO: Not yet packaged: +# sci-libs/libmsym (https://github.com/mcodev31/libmsym) +# sci-libs/spglib (https://atztogo.github.io/spglib/) +RDEPEND=" + >=sci-chemistry/molequeue-0.7 + 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= + ) + vtk? ( sci-libs/vtk ) +" +DEPEND="${RDEPEND} + dev-cpp/eigen:3 + test? ( dev-cpp/gtest )" + +S="${WORKDIR}/${PN}-${COMMIT}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.7.2-6464.patch + "${FILESDIR}/"${P}-underlinking.patch +) + +src_configure() { + local mycmakeargs=( + -DUSE_PROTOCALL=OFF + -DBUILD_GPL_PLUGINS=ON + -DUSE_MOLEQUEUE=ON + -DUSE_LIBMSYM=OFF + -DUSE_LIBSPG=OFF + -DUSE_PYTHON=OFF + -DUSE_LIBARCHIVE=$(usex archive) + -DBUILD_DOCUMENTATION=$(usex doc) + -DUSE_HDF5=$(usex hdf5) + -DUSE_OPENGL=$(usex qt5) + -DUSE_QT=$(usex qt5) + -DBUILD_STATIC_PLUGINS=$(usex static-plugins) + -DENABLE_TESTING=$(usex test) + -DUSE_VTK=$(usex vtk) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + # TODO: bundles jsoncpp + rm "${ED%/}"/usr/lib64/libjsoncpp.a || die +} diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch new file mode 100644 index 00000000000..f6f39c9e6b7 --- /dev/null +++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch @@ -0,0 +1,18 @@ +Fix underlinking problems in shared libraries. + +--- a/avogadro/qtplugins/playertool/CMakeLists.txt ++++ b/avogadro/qtplugins/playertool/CMakeLists.txt +@@ -7,3 +7,5 @@ + "" + playertool.qrc + ) ++ ++target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL) +--- a/avogadro/qtplugins/qtaim/CMakeLists.txt ++++ b/avogadro/qtplugins/qtaim/CMakeLists.txt +@@ -34,3 +34,5 @@ + + target_link_libraries(QTAIMScenePlugin + LINK_PRIVATE AvogadroRendering ${Qt5Concurrent_LIBRARIES}) ++target_link_libraries(QTAIMExtension ++ LINK_PRIVATE ${Qt5Concurrent_LIBRARIES}) diff --git a/sci-libs/avogadrolibs/metadata.xml b/sci-libs/avogadrolibs/metadata.xml index ea8e4fdee06..ff1789dfa77 100644 --- a/sci-libs/avogadrolibs/metadata.xml +++ b/sci-libs/avogadrolibs/metadata.xml @@ -6,8 +6,9 @@ <name>Gentoo Chemistry Project</name> </maintainer> <use> + <flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag> <flag name="static-plugins">Build all plugins statically into main plugin modules</flag> - <flag name="vtk">include vtk support</flag> + <flag name="vtk">Enable <pkg>sci-libs/vtk</pkg> support</flag> </use> <upstream> <remote-id type="github">OpenChemistry/avogadrolibs</remote-id>