[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: 9e97c03aece8465ab60bf30fc1807267e2238d21
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Sep 7 09:33:34 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Sep 7 09:54:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e97c03a
sci-libs/avogadrolibs: add 1.97.0
Bug: https://bugs.gentoo.org/832528
Bug: https://bugs.gentoo.org/712962
Bug: https://bugs.gentoo.org/868132
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-libs/avogadrolibs/Manifest | 2 +
sci-libs/avogadrolibs/avogadrolibs-1.97.0.ebuild | 93
2 files changed, 95 insertions(+)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 5b03e8ff5f44..5f4bfd4d93d3 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,4 +1,6 @@
DIST avogadrolibs-1.95.1.tar.gz 11015910 BLAKE2B
27cb43a22e489c0279e1ed912b1e81f3c850983f367ffb89bef3a63d11204cbf761f2bce6501988ed5ef9b21b44cc5194dad4367da3ae6af65efd0cec5e7d711
SHA512
b4734c732b1686eba74055c4834fef2f9fb66d4a67cd1199c84e81965c3f6e783911e7c7c8d09386c4ff9f1322bab91fe490d3606784ae49acf5531a65a58beb
+DIST avogadrolibs-1.97.0.tar.gz 11456702 BLAKE2B
2f9229a0525dc151ef636c4c101ea21d3713efb033f6a007c43689bfd078b07081d695bb3ec32715c3ccf9d67e7bb85a617a08eeb0e6fc8c80e479a3cb3f1553
SHA512
a0ad3ba294db5f0fff35087ff0f616fdcaefc7b4abfa470c9fd26326ad14f73e3584c18a7111b671998d8a23a50091307520f01f79295fc7ea52ae2d78716c7e
DIST avogadrolibs-crystals-1.0.1.tar.gz 151829 BLAKE2B
0a1353392a4c087977452f50ffb7db0b2976a2993651b6f7e0df7a9ce6fa8f7960223cac2916dd9f667d37518b85606d73d05e86f7489193a6a609700fc60223
SHA512
c5d6500d8472807b8d2e62888e4a09279c6aeafec81bc4981edaa74e36724b1e7f0381250c79ad297f9f0331bcb5cd8a45fce3f13ad65b9870e901a6424c0650
DIST avogadrolibs-molecules-1.0.0.tar.gz 206924 BLAKE2B
70eea3d5eb440ab2c7f29c56111f2b8cf780cc84983aa145bc4f2fe144c981978218333ba3c33cf1f620dd3180cca706dfa4e94ffaee6167f89bd3e372172218
SHA512
06891ea7ad3e65c5b0c0ad73ea01916478fcd13fd9ff0d6905d28159678a50371ba9fa2c1f68ef32604dee0c2165de29bd5d50ffbc345bfe752ef0bcb13126f2
DIST linux64-genXrdPattern-avogadrolibs-1.95.1 7480152 BLAKE2B
dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb
SHA512
538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
+DIST linux64-genXrdPattern-avogadrolibs-1.97.0 7480152 BLAKE2B
dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb
SHA512
538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.97.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.97.0.ebuild
new file mode 100644
index ..e702d214d629
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.97.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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
+
https://github.com/OpenChemistry/molecules/archive/refs/tags/1.0.0.tar.gz ->
${PN}-molecules-1.0.0.tar.gz
+
https://github.com/OpenChemistry/crystals/archive/refs/tags/1.0.1.tar.gz ->
${PN}-crystals-1.0.1.tar.gz
+ vtk? (
https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern
-> linux64-genXrdPattern-${P} )"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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)
+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/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-libs/glew:0=
+ virtual/opengl
+ )
+ vtk? ( sci-libs/vtk[qt5,views] )"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3
+ test? ( dev-cpp/gtest )"
+BDEPEND="
+ doc? ( app-doc/doxygen[dot] )
+ qt5? ( dev-qt/linguist-tools:5 )"
+
+PATCHES=(
+ "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
+ "${FILESDIR}/"${PN}-1.95.1-tests.patch
+)
+
+src_unpack() {
+ default
+
+ if use vtk; then
+ cp "${DISTDIR}"/linux64-genXrdPattern-${P}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
commit: 99722c1e15796d7b5b60d59a43b1bc73f0657eea
Author: Aritz Erkiaga gmail com>
AuthorDate: Sat Sep 3 15:57:03 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Sep 7 09:54:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99722c1e
Backport critical fixes to sci-libs/avogadrolibs
Signed-off-by: Aritz Erkiaga gmail.com>
Closes: https://bugs.gentoo.org/868132
Closes: https://github.com/gentoo/gentoo/pull/27128
Signed-off-by: Andrew Ammerlaan gentoo.org>
...1.95.1.ebuild => avogadrolibs-1.95.1-r1.ebuild} | 1 +
.../avogadrolibs-1.95.1-usability_backport.patch | 81 ++
2 files changed, 82 insertions(+)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild
similarity index 97%
rename from sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
rename to sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild
index 2a3a1c7cdb9b..ea0659f222d9 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild
@@ -47,6 +47,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
"${FILESDIR}/"${PN}-1.95.1-tests.patch
+ "${FILESDIR}/"${PN}-1.95.1-usability_backport.patch
)
src_unpack() {
diff --git
a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch
b/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch
new file mode 100644
index ..07a32023600e
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch
@@ -0,0 +1,81 @@
+From 56c67fff7dd7ec84b2f2b5c2e5beaec13981e408 Mon Sep 17 00:00:00 2001
+From: Aritz Erkiaga
+Date: Sat, 3 Sep 2022 16:54:55 +0200
+Subject: [PATCH 1/3] Fix erratic editing behavior
+
+Signed-off-by: Aritz Erkiaga
+---
+ avogadro/qtgui/rwmolecule_undo.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avogadro/qtgui/rwmolecule_undo.h
b/avogadro/qtgui/rwmolecule_undo.h
+index de5bdd33..20768066 100644
+--- a/avogadro/qtgui/rwmolecule_undo.h
b/avogadro/qtgui/rwmolecule_undo.h
+@@ -89,7 +89,7 @@ public:
+ {
+ assert(m_molecule.atomCount() == m_atomId);
+ if (m_usingPositions)
+- m_molecule.addAtom(m_atomicNumber, Vector3::Zero(), m_atomId);
++ m_molecule.addAtom(m_atomicNumber, Vector3::Zero(), m_atomUid);
+ else
+ m_molecule.addAtom(m_atomicNumber, m_atomUid);
+ m_molecule.layer().addAtom(m_layer, m_atomId);
+--
+2.34.1
+
+
+From 5159ea1a9629ad82130670767cc25c5065f9627c Mon Sep 17 00:00:00 2001
+From: Aritz Erkiaga
+Date: Sat, 3 Sep 2022 16:55:26 +0200
+Subject: [PATCH 2/3] Fix Manipulator Tool not working at all
+
+Signed-off-by: Aritz Erkiaga
+---
+ avogadro/qtplugins/manipulator/manipulator.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avogadro/qtplugins/manipulator/manipulator.cpp
b/avogadro/qtplugins/manipulator/manipulator.cpp
+index 19dc51ac..29559dd0 100644
+--- a/avogadro/qtplugins/manipulator/manipulator.cpp
b/avogadro/qtplugins/manipulator/manipulator.cpp
+@@ -129,7 +129,7 @@ QUndoCommand* Manipulator::mouseMoveEvent(QMouseEvent* e)
+ Vector2f windowPos(e->localPos().x(), e->localPos().y());
+
+ if (mol->isSelectionEmpty() && m_object.type == Rendering::AtomType &&
+- m_object.molecule == mol) {
++ m_object.molecule == _molecule->molecule()) {
+ // translate single atom position
+ RWAtom atom = m_molecule->atom(m_object.index);
+ Vector3f oldPos(atom.position3d().cast());
+--
+2.34.1
+
+
+From f38bfbc88f0722a66ab298ff26073874b5f73634 Mon Sep 17 00:00:00 2001
+From: Aritz Erkiaga
+Date: Sat, 3 Sep 2022 16:55:59 +0200
+Subject: [PATCH 3/3] Fix Bond Centric Tool not working at all
+
+Signed-off-by: Aritz Erkiaga
+---
+ avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp
b/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp
+index 79112899..3a853057 100644
+--- a/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp
b/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp
+@@ -342,8 +342,7 @@ QUndoCommand*
BondCentricTool::mousePressEvent(QMouseEvent* e)
+ Rendering::Identifier ident = m_renderer->hit(e->pos().x(), e->pos().y());
+
+ // If no hits, return. Also ensure that the hit molecule is the one we
expect.
+- const Core::Molecule* mol = _molecule->molecule();
+- if (!ident.isValid() || ident.molecule != mol)
++ if (!ident.isValid() || ident.molecule != _molecule->molecule())
+ return nullptr;
+
+ // If the hit is a left click on a bond, make it the selected bond and map
+--
+2.34.1
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: 6739b0456605499455c974f320425fbe9844d935
Author: David Seifert gentoo org>
AuthorDate: Tue Mar 1 13:54:32 2022 +
Commit: David Seifert gentoo org>
CommitDate: Tue Mar 1 13:54:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6739b045
sci-libs/avogadrolibs: fix doc and qt5 args
Closes: https://bugs.gentoo.org/834441
Closes: https://bugs.gentoo.org/834442
Signed-off-by: David Seifert gentoo.org>
sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
index afbd3b62a290..2a3a1c7cdb9b 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
@@ -40,7 +40,9 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-cpp/eigen:3
test? ( dev-cpp/gtest )"
-BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ qt5? ( dev-qt/linguist-tools:5 )"
PATCHES=(
"${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
@@ -62,14 +64,11 @@ src_unpack() {
src_configure() {
local mycmakeargs=(
- -DBUILD_GPL_PLUGINS=ON
- -DBUILD_STATIC_PLUGINS=ON
-DUSE_LIBARCHIVE=$(usex archive)
-DBUILD_DOCUMENTATION=$(usex doc)
-DUSE_HDF5=$(usex hdf5)
-DENABLE_TRANSLATIONS=$(usex qt5)
-DUSE_OPENGL=$(usex qt5)
- -DOpenGL_GL_PREFERENCE=GLVND
-DUSE_QT=$(usex qt5)
-DENABLE_TESTING=$(usex test)
-DUSE_VTK=$(usex vtk)
@@ -81,6 +80,11 @@ src_configure() {
# find_package(Spglib) completely broken
-DUSE_SPGLIB=OFF
)
+ use qt5 && mycmakeargs+=(
+ -DBUILD_GPL_PLUGINS=ON
+ -DBUILD_STATIC_PLUGINS=ON
+ -DOpenGL_GL_PREFERENCE=GLVND
+ )
use vtk && mycmakeargs+=(
-DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
)
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: e1ae4126225775258f6cf5334a286763bf7e1469
Author: David Seifert gentoo org>
AuthorDate: Tue Mar 1 12:29:48 2022 +
Commit: David Seifert gentoo org>
CommitDate: Tue Mar 1 12:29:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ae4126
sci-libs/avogadrolibs: remove USE=static-plugins
Signed-off-by: David Seifert gentoo.org>
sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
index f396fb04e2d9..afbd3b62a290 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="archive doc hdf5 qt5 static-plugins test vtk"
+IUSE="archive doc hdf5 qt5 test vtk"
RESTRICT="!test? ( test )"
REQUIRED_USE="vtk? ( qt5 )"
@@ -63,7 +63,7 @@ src_unpack() {
src_configure() {
local mycmakeargs=(
-DBUILD_GPL_PLUGINS=ON
- -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
+ -DBUILD_STATIC_PLUGINS=ON
-DUSE_LIBARCHIVE=$(usex archive)
-DBUILD_DOCUMENTATION=$(usex doc)
-DUSE_HDF5=$(usex hdf5)
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
commit: b9e6d8c7a9ee81fc5e72043d1b3ed399ae8273fd
Author: David Seifert gentoo org>
AuthorDate: Tue Mar 1 12:12:25 2022 +
Commit: David Seifert gentoo org>
CommitDate: Tue Mar 1 12:12:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e6d8c7
sci-libs/avogadrolibs: drop 1.93.0
Closes: https://bugs.gentoo.org/765811
Closes: https://bugs.gentoo.org/810505
Closes: https://bugs.gentoo.org/820767
Closes: https://bugs.gentoo.org/834116
Signed-off-by: David Seifert gentoo.org>
sci-libs/avogadrolibs/Manifest | 2 -
sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild | 95 --
...vogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch | 11 ---
3 files changed, 108 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 638cbecca2f4..5b03e8ff5f44 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,6 +1,4 @@
-DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B
b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6
SHA512
1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
DIST avogadrolibs-1.95.1.tar.gz 11015910 BLAKE2B
27cb43a22e489c0279e1ed912b1e81f3c850983f367ffb89bef3a63d11204cbf761f2bce6501988ed5ef9b21b44cc5194dad4367da3ae6af65efd0cec5e7d711
SHA512
b4734c732b1686eba74055c4834fef2f9fb66d4a67cd1199c84e81965c3f6e783911e7c7c8d09386c4ff9f1322bab91fe490d3606784ae49acf5531a65a58beb
DIST avogadrolibs-crystals-1.0.1.tar.gz 151829 BLAKE2B
0a1353392a4c087977452f50ffb7db0b2976a2993651b6f7e0df7a9ce6fa8f7960223cac2916dd9f667d37518b85606d73d05e86f7489193a6a609700fc60223
SHA512
c5d6500d8472807b8d2e62888e4a09279c6aeafec81bc4981edaa74e36724b1e7f0381250c79ad297f9f0331bcb5cd8a45fce3f13ad65b9870e901a6424c0650
DIST avogadrolibs-molecules-1.0.0.tar.gz 206924 BLAKE2B
70eea3d5eb440ab2c7f29c56111f2b8cf780cc84983aa145bc4f2fe144c981978218333ba3c33cf1f620dd3180cca706dfa4e94ffaee6167f89bd3e372172218
SHA512
06891ea7ad3e65c5b0c0ad73ea01916478fcd13fd9ff0d6905d28159678a50371ba9fa2c1f68ef32604dee0c2165de29bd5d50ffbc345bfe752ef0bcb13126f2
-DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B
dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb
SHA512
538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
DIST linux64-genXrdPattern-avogadrolibs-1.95.1 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
deleted file mode 100644
index 4db9d9a0c2b9..
--- a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 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
-> linux64-genXrdPattern-${P} )
-"
-
-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
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
commit: 68245b30229ce2756c08706b5b075fd0422a40d8
Author: David Seifert gentoo org>
AuthorDate: Tue Mar 1 12:12:24 2022 +
Commit: David Seifert gentoo org>
CommitDate: Tue Mar 1 12:12:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68245b30
sci-libs/avogadrolibs: add 1.95.1
Bug: https://bugs.gentoo.org/765811
Bug: https://bugs.gentoo.org/834116
Signed-off-by: David Seifert gentoo.org>
sci-libs/avogadrolibs/Manifest | 4 +
sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild | 89 ++
.../files/avogadrolibs-1.95.1-tests.patch | 13
3 files changed, 106 insertions(+)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 9de9f0dac5a1..638cbecca2f4 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,2 +1,6 @@
DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B
b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6
SHA512
1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
+DIST avogadrolibs-1.95.1.tar.gz 11015910 BLAKE2B
27cb43a22e489c0279e1ed912b1e81f3c850983f367ffb89bef3a63d11204cbf761f2bce6501988ed5ef9b21b44cc5194dad4367da3ae6af65efd0cec5e7d711
SHA512
b4734c732b1686eba74055c4834fef2f9fb66d4a67cd1199c84e81965c3f6e783911e7c7c8d09386c4ff9f1322bab91fe490d3606784ae49acf5531a65a58beb
+DIST avogadrolibs-crystals-1.0.1.tar.gz 151829 BLAKE2B
0a1353392a4c087977452f50ffb7db0b2976a2993651b6f7e0df7a9ce6fa8f7960223cac2916dd9f667d37518b85606d73d05e86f7489193a6a609700fc60223
SHA512
c5d6500d8472807b8d2e62888e4a09279c6aeafec81bc4981edaa74e36724b1e7f0381250c79ad297f9f0331bcb5cd8a45fce3f13ad65b9870e901a6424c0650
+DIST avogadrolibs-molecules-1.0.0.tar.gz 206924 BLAKE2B
70eea3d5eb440ab2c7f29c56111f2b8cf780cc84983aa145bc4f2fe144c981978218333ba3c33cf1f620dd3180cca706dfa4e94ffaee6167f89bd3e372172218
SHA512
06891ea7ad3e65c5b0c0ad73ea01916478fcd13fd9ff0d6905d28159678a50371ba9fa2c1f68ef32604dee0c2165de29bd5d50ffbc345bfe752ef0bcb13126f2
DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B
dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb
SHA512
538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
+DIST linux64-genXrdPattern-avogadrolibs-1.95.1 7480152 BLAKE2B
dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb
SHA512
538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
new file mode 100644
index ..f396fb04e2d9
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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
+
https://github.com/OpenChemistry/molecules/archive/refs/tags/1.0.0.tar.gz ->
${PN}-molecules-1.0.0.tar.gz
+
https://github.com/OpenChemistry/crystals/archive/refs/tags/1.0.1.tar.gz ->
${PN}-crystals-1.0.1.tar.gz
+ vtk? (
https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern
-> linux64-genXrdPattern-${P} )"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="archive doc hdf5 qt5 static-plugins test vtk"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vtk? ( qt5 )"
+
+# TODO: Not yet packaged:
+# sci-libs/libmsym (https://github.com/mcodev31/libmsym)
+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/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-libs/glew:0=
+ virtual/opengl
+ )
+ vtk? ( sci-libs/vtk[qt5,views] )"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3
+ test? ( dev-cpp/gtest )"
+BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
+
+PATCHES=(
+ "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
+ "${FILESDIR}/"${PN}-1.95.1-tests.patch
+)
+
+src_unpack() {
+ default
+
+ if use vtk; then
+ cp "${DISTDIR}"/linux64-genXrdPattern-${P}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: 4ea14acad668034f2a333794fe63b773ac99fe1f
Author: Sam James gentoo org>
AuthorDate: Tue Oct 12 07:04:24 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 12 07:04:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea14aca
sci-libs/avogadrolibs: apply (upstream) workaround for older hdf5lib API
Bug: https://bugs.gentoo.org/810505
Signed-off-by: Sam James gentoo.org>
sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
index a2872894639..4db9d9a0c2b 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -62,6 +62,11 @@ src_unpack() {
}
src_configure() {
+ # Seems to be what upstream are using too. Apply the old hdf5lib
workaround.
+ #
https://github.com/OpenChemistry/avogadrolibs/commit/32e3dd8ce9f48f74e3960dc9afcc614496d87c7f
+ # bug #810505
+ append-cppflags -DH5_USE_110_API
+
# -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
local mycmakeargs=(
-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
commit: 36581d60d80d37c288b32c6568a1f748f50e47df
Author: Jakov Smolic sartura hr>
AuthorDate: Sun Jan 17 11:51:35 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jan 17 11:51:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36581d60
sci-libs/avogadrolibs: Remove old
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
sci-libs/avogadrolibs/Manifest | 2 -
.../avogadrolibs-1.91.0_pre20180415.ebuild | 86 -
.../files/avogadrolibs-0.7.2-6464.patch| 16 ---
...olibs-1.91.0_pre20180406-unbundle-jsoncpp.patch | 143 -
...gadrolibs-1.91.0_pre20180406-underlinking.patch | 18 ---
...avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch | 93 --
sci-libs/avogadrolibs/metadata.xml | 1 -
7 files changed, 359 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index e7bc6b930bc..9de9f0dac5a 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,4 +1,2 @@
-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
DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B
dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb
SHA512
538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
deleted file mode 100644
index f27d9ea8207..000
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=606debb5d7c2c4020478264c609f895584fc5e38
-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
- 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"
-IUSE="archive doc hdf5 qt5 static-plugins 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
- 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 )"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.2-6464.patch
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-underlinking.patch
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-unbundle-jsoncpp.patch
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
- "${FILESDIR}/"${P}-qt-5.11b3.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- if use vtk; then
- cp "${DISTDIR}"/linux64-genXrdPattern
"${WORKDIR}/genXrdPattern" || die
- fi
-}
-
-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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: d3c212df2f7002f9601f68ef6f640df0625718de
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Jun 29 16:30:14 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Jun 29 16:30:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c212df
sci-libs/avogadrolibs: Bundled file patch is still needed in 1.93.0
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
index a120af12f33..a2872894639 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
PATCHES=(
# https://github.com/OpenChemistry/avogadrolibs/issues/449
"${FILESDIR}"/${PN}-1.93.0-fix_AvogadroLibsConfig.patch
+ "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
)
src_unpack() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: a8dc60b2dccf6472775f7abe8a6b4c544fd344a9
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Jun 29 15:50:20 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Jun 29 15:51:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8dc60b2
sci-libs/avogadrolibs: genXrdPattern changed upstream
genXrdPattern changed upstream, so an update will fail if there's
already a file in DISTDIR. Store the file versioned in the Gentoo
mirror system.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/avogadrolibs/Manifest | 1 +
sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 09c6bc5a759..e7bc6b930bc 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,3 +1,4 @@
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
+DIST linux64-genXrdPattern-avogadrolibs-1.93.0 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
index a1cbede0ed2..a120af12f33 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
@@ -8,7 +8,7 @@ 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
)
+ vtk? (
https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern
-> linux64-genXrdPattern-${P} )
"
SLOT="0"
@@ -56,7 +56,7 @@ PATCHES=(
src_unpack() {
default
if use vtk; then
- cp "${DISTDIR}"/linux64-genXrdPattern
"${WORKDIR}/genXrdPattern" || die
+ cp "${DISTDIR}"/linux64-genXrdPattern-${P}
"${WORKDIR}/genXrdPattern" || die
fi
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
commit: b12f2d6d85ef7555ae930ec018380e7a7a22
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Mar 14 17:30:13 2020 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Mar 14 17:32:06 2020 +
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 000..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"
+ )
+
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
commit: 8eb6b1584b942c1d81ecedc7e87868e14a85f280
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 17 13:30:08 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 17 13:30:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb6b158
sci-libs/avogadrolibs: Update patch after review, drop unused DEPEND
Package-Manager: Portage-2.3.29, Repoman-2.3.9
.../avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild | 5 +
.../avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch | 17 +
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
index df8f4182395..0936e94a44c 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
@@ -39,10 +39,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-cpp/eigen:3
- qt5? (
- dev-qt/linguist-tools:5
- dev-qt/qtopengl:5
- )
+ qt5? ( dev-qt/linguist-tools:5 )
test? ( dev-cpp/gtest )"
S="${WORKDIR}/${PN}-${COMMIT}"
diff --git
a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
index 2aacee8e5b7..11816e438c2 100644
---
a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
+++
b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
@@ -1,4 +1,4 @@
-From fdac6931c24986d377e06d77dbc607bb3c1654dd Mon Sep 17 00:00:00 2001
+From 03dd55beb878b5e15d891535a3c8b7ffa6133c92 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner
Date: Tue, 17 Apr 2018 11:31:22 +0200
Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
@@ -9,8 +9,8 @@ Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping
qt5_use_modules)
avogadro/qtopengl/CMakeLists.txt | 3 +--
avogadro/vtk/CMakeLists.txt | 3 +--
tests/qtgui/CMakeLists.txt| 3 +--
- tests/qtopengl/CMakeLists.txt | 5 ++---
- 6 files changed, 7 insertions(+), 13 deletions(-)
+ tests/qtopengl/CMakeLists.txt | 2 --
+ 6 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/avogadro/molequeue/CMakeLists.txt
b/avogadro/molequeue/CMakeLists.txt
index 43a9195..37431cd 100644
@@ -76,10 +76,10 @@ index 1cfd51a..da08078 100644
# Now add all of the tests, using the gtest_filter argument so that only those
# cases are run in each test invocation.
diff --git a/tests/qtopengl/CMakeLists.txt b/tests/qtopengl/CMakeLists.txt
-index 370f28f..5843a38 100644
+index 370f28f..60fc5ae 100644
--- a/tests/qtopengl/CMakeLists.txt
+++ b/tests/qtopengl/CMakeLists.txt
-@@ -44,13 +44,12 @@ create_test_sourcelist(testDriver qtopengltests.cpp
${testSrcs})
+@@ -44,8 +44,6 @@ create_test_sourcelist(testDriver qtopengltests.cpp
${testSrcs})
add_executable(AvogadroQtOpenGLTests ${testDriver})
@@ -88,13 +88,6 @@ index 370f28f..5843a38 100644
target_link_libraries(AvogadroQtOpenGLTests
AvogadroQtOpenGL
vtkImagingCore
- vtkIOImage
-- vtkRenderingQt)
-+ vtkRenderingQt
-+ Qt5::OpenGL)
-
- foreach(test ${tests})
- string(TOLOWER ${test} testname)
--
2.17.0
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
commit: 74df936f8a7b205cc8c94c121de6cb84c5823a58
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 17 09:38:45 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 17 12:02:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74df936f
sci-libs/avogadrolibs: Add 1.91.0_pre20180415, build w/ Qt 5.11_beta3
Package-Manager: Portage-2.3.29, Repoman-2.3.9
sci-libs/avogadrolibs/Manifest | 1 +
.../avogadrolibs-1.91.0_pre20180415.ebuild | 88 ++
...avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch | 100 +
3 files changed, 189 insertions(+)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 1651cd867a2..e748fcaf356 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,2 +1,3 @@
DIST avogadrolibs-1.91.0_pre20180406.tar.gz 857345 BLAKE2B
8e5c6b0a838a2a6b7dc925c1b544ab4d4de8b7769b1fe8d787127a1014b1243da89a2a6f6cfc871181f81a443c3ee63d758369f003afaf591c9373c9d5122ee3
SHA512
1814b2105615aabc1df78b14c581e78fea20a1e4ace8979bb2ad123ab0994d90c3935e37f0cc58b60d3307ffe682599a93d8cadddc22b4ba524caaec1a2c5319
+DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B
526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008
SHA512
1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc
DIST linux64-genXrdPattern 7480152 BLAKE2B
dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb
SHA512
538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
new file mode 100644
index 000..df8f4182395
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=606debb5d7c2c4020478264c609f895584fc5e38
+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
+ 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"
+IUSE="archive doc hdf5 qt5 static-plugins test vtk"
+
+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
+ 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
+ dev-qt/qtopengl:5
+ )
+ test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.7.2-6464.patch
+ "${FILESDIR}/"${PN}-1.91.0_pre20180406-underlinking.patch
+ "${FILESDIR}/"${PN}-1.91.0_pre20180406-unbundle-jsoncpp.patch
+ "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
+ "${FILESDIR}/"${P}-qt-5.11b3.patch
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ if use vtk; then
+ cp "${DISTDIR}"/linux64-genXrdPattern
"${WORKDIR}/genXrdPattern" || die
+ fi
+}
+
+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)
+ -DENABLE_TRANSLATIONS=$(usex qt5)
+ -DUSE_OPENGL=$(usex qt5)
+ -DUSE_QT=$(usex qt5)
+ -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
+ -DENABLE_TESTING=$(usex test)
+ -DUSE_VTK=$(usex vtk)
+ )
+ use vtk && mycmakeargs+=(
+ -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
+ )
+
+ cmake-utils_src_configure
+}
diff --git
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
commit: 60040aee5be51113a6d9d42e0ef1dcfa6815d89b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 17 09:39:22 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 17 12:02:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60040aee
sci-libs/avogadrolibs: Drop old snapshot
Package-Manager: Portage-2.3.29, Repoman-2.3.9
sci-libs/avogadrolibs/Manifest | 1 -
.../avogadrolibs-1.91.0_pre20180406-r1.ebuild | 84 --
.../avogadrolibs-1.91.0_pre20180406-qt-5.11.patch | 29
3 files changed, 114 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index e748fcaf356..3eb86b3019a 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,3 +1,2 @@
-DIST avogadrolibs-1.91.0_pre20180406.tar.gz 857345 BLAKE2B
8e5c6b0a838a2a6b7dc925c1b544ab4d4de8b7769b1fe8d787127a1014b1243da89a2a6f6cfc871181f81a443c3ee63d758369f003afaf591c9373c9d5122ee3
SHA512
1814b2105615aabc1df78b14c581e78fea20a1e4ace8979bb2ad123ab0994d90c3935e37f0cc58b60d3307ffe682599a93d8cadddc22b4ba524caaec1a2c5319
DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B
526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008
SHA512
1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc
DIST linux64-genXrdPattern 7480152 BLAKE2B
dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb
SHA512
538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
deleted file mode 100644
index 377cfc965c5..000
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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
- 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"
-IUSE="archive doc hdf5 qt5 static-plugins test vtk"
-
-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
- 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
- dev-qt/qtopengl:5
- test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.2-6464.patch
- "${FILESDIR}/"${P}-underlinking.patch
- "${FILESDIR}/"${P}-unbundle-jsoncpp.patch
- "${FILESDIR}/"${P}-bundled-genxrdpattern.patch
- "${FILESDIR}/"${P}-qt-5.11.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- if use vtk; then
- cp "${DISTDIR}"/linux64-genXrdPattern
"${WORKDIR}/genXrdPattern" || die
- fi
-}
-
-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)
- )
- use vtk && mycmakeargs+=(
- -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
- )
-
- cmake-utils_src_configure
-}
diff --git
a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
deleted file mode 100644
index 437b1e755af..000
---
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: f29cfd49cd5582c7cc2939f439177b91c89659ec
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 10 20:35:57 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 10 20:35:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f29cfd49
sci-libs/avogadrolibs: Add missing DEPEND on sci-libs/vtk[views]
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
index ae8508ba74d..377cfc965c5 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
media-libs/glew:0=
virtual/opengl
)
- vtk? ( sci-libs/vtk[qt5] )
+ vtk? ( sci-libs/vtk[qt5,views] )
"
DEPEND="${RDEPEND}
dev-cpp/eigen:3
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: 9f8b03616f6e303f9870d7c72c969797e6d12b40
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 10 20:08:34 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 10 20:09:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8b0361
sci-libs/avogadrolibs: Add missing DEPEND
Closes: https://bugs.gentoo.org/652918
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
index bd5274cca9b..ae8508ba74d 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
@@ -39,6 +39,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-cpp/eigen:3
+ dev-qt/qtopengl:5
test? ( dev-cpp/gtest )"
S="${WORKDIR}/${PN}-${COMMIT}"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
commit: 19116434ada2eeffdf6470d941acd374609b1cfe
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 10 19:48:24 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 10 20:09:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19116434
sci-libs/avogadrolibs: Fix build with Qt-5.11
Package-Manager: Portage-2.3.28, Repoman-2.3.9
...d => avogadrolibs-1.91.0_pre20180406-r1.ebuild} | 1 +
.../avogadrolibs-1.91.0_pre20180406-qt-5.11.patch | 29 ++
2 files changed, 30 insertions(+)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
similarity index 98%
rename from sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
rename to sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
index f7417ab49bf..bd5274cca9b 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}/"${P}-underlinking.patch
"${FILESDIR}/"${P}-unbundle-jsoncpp.patch
"${FILESDIR}/"${P}-bundled-genxrdpattern.patch
+ "${FILESDIR}/"${P}-qt-5.11.patch
)
src_unpack() {
diff --git
a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
new file mode 100644
index 000..437b1e755af
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
@@ -0,0 +1,29 @@
+From 5d70cd5ec5ac8460ff5d3d6b0b47b9c60e1f3ca2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Tue, 10 Apr 2018 21:59:32 +0200
+Subject: [PATCH] Fix build with Qt-5.11
+
+---
+ avogadro/qtplugins/gamessinput/gamessinput.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/avogadro/qtplugins/gamessinput/gamessinput.cpp
b/avogadro/qtplugins/gamessinput/gamessinput.cpp
+index 779d2d4..0b2e106 100644
+--- a/avogadro/qtplugins/gamessinput/gamessinput.cpp
b/avogadro/qtplugins/gamessinput/gamessinput.cpp
+@@ -24,9 +24,9 @@
+
+ #include
+
+-#include
+-
+-#include
++#include
++#include
++#include
+
+ namespace Avogadro {
+ namespace Core {
+--
+2.17.0
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
commit: d38044ae854dae2c28301beeb32066b2c75089ba
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 7 21:31:38 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 8 09:53:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d38044ae
sci-libs/avogadrolibs: Drop 0.9.0, fails to build
Bug: https://bugs.gentoo.org/645248
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-libs/avogadrolibs/Manifest | 1 -
sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild| 66 --
.../files/avogadrolibs-0.8.0-underlinking.patch| 34 ---
3 files changed, 101 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 1a7ac4c9fe8..1651cd867a2 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,3 +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
DIST linux64-genXrdPattern 7480152 BLAKE2B
dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb
SHA512
538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
deleted file mode 100644
index 7c4a4362b85..000
--- a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
-HOMEPAGE="http://www.openchemistry.org/;
-SRC_URI="https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc hdf5 opengl qt5 static-plugins test vtk"
-
-REQUIRED_USE="qt5? ( opengl )"
-
-RDEPEND="
- >=sci-chemistry/molequeue-0.7
- sci-libs/chemkit
- hdf5? ( sci-libs/hdf5:= )
- opengl? (
- dev-qt/qtopengl:5
- media-libs/glew
- )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- )
- vtk? ( sci-libs/vtk )
-"
-DEPEND="${RDEPEND}
- dev-cpp/eigen:3
- test? ( dev-cpp/gtest )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.2-6464.patch
- "${FILESDIR}/"${PN}-0.8.0-underlinking.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_PROTOCALL=OFF
- -DBUILD_GPL_PLUGINS=ON
- -DUSE_MOLEQUEUE=ON
- -DUSE_HDF5=$(usex hdf5)
- -DBUILD_DOCUMENTATION=$(usex doc)
- -DUSE_OPENGL=$(usex opengl)
- -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-0.8.0-underlinking.patch
b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
deleted file mode 100644
index b29f3afe761..000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix underlinking problems in shared libraries.
-
avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt
-+++ avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt
-@@ -23,4 +23,4 @@
- "${apbs_uis}"
- )
-
--target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient)
-+target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient
AvogadroMoleQueue)
avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt
-+++ avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt
-@@ -7,3 +7,5 @@
- ""
- playertool.qrc
- )
-+
-+target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL)
avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt
-+++ avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt
-@@ -8,3 +8,5 @@
- "povray.cpp"
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
commit: 9a80747f1a93efa92be9944ba77feafd4650c7ea
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 7 19:01:22 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 8 09:53:52 2018 +
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 000..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 000..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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
commit: 1255c53cc64cb280bff21ad7ae82ab91ec595123
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 8 00:25:18 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 8 09:53:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1255c53c
sci-libs/avogadrolibs: Unbundle jsoncpp, fix USE=vtk
Bug: https://bugs.gentoo.org/649860
Closes: https://bugs.gentoo.org/624242
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-libs/avogadrolibs/Manifest | 1 +
.../avogadrolibs-1.91.0_pre20180406.ebuild | 29 +++--
...-1.91.0_pre20180406-bundled-genxrdpattern.patch | 44 +++
...olibs-1.91.0_pre20180406-unbundle-jsoncpp.patch | 143 +
4 files changed, 208 insertions(+), 9 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index bbf158508b8..1a7ac4c9fe8 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,2 +1,3 @@
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
+DIST linux64-genXrdPattern 7480152 BLAKE2B
dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb
SHA512
538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
index 6671ed518ff..f7417ab49bf 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
@@ -8,17 +8,21 @@ 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"
+SRC_URI="https://github.com/OpenChemistry/${PN}/archive/${COMMIT}.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"
IUSE="archive doc hdf5 qt5 static-plugins test vtk"
+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
archive? ( app-arch/libarchive )
hdf5? ( sci-libs/hdf5:= )
@@ -29,8 +33,9 @@ RDEPEND="
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
media-libs/glew:0=
+ virtual/opengl
)
- vtk? ( sci-libs/vtk )
+ vtk? ( sci-libs/vtk[qt5] )
"
DEPEND="${RDEPEND}
dev-cpp/eigen:3
@@ -41,8 +46,17 @@ S="${WORKDIR}/${PN}-${COMMIT}"
PATCHES=(
"${FILESDIR}"/${PN}-0.7.2-6464.patch
"${FILESDIR}/"${P}-underlinking.patch
+ "${FILESDIR}/"${P}-unbundle-jsoncpp.patch
+ "${FILESDIR}/"${P}-bundled-genxrdpattern.patch
)
+src_unpack() {
+ unpack ${P}.tar.gz
+ if use vtk; then
+ cp "${DISTDIR}"/linux64-genXrdPattern
"${WORKDIR}/genXrdPattern" || die
+ fi
+}
+
src_configure() {
local mycmakeargs=(
-DUSE_PROTOCALL=OFF
@@ -60,12 +74,9 @@ src_configure() {
-DENABLE_TESTING=$(usex test)
-DUSE_VTK=$(usex vtk)
)
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
+ use vtk && mycmakeargs+=(
+ -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
+ )
- # TODO: bundles jsoncpp
- rm "${ED%/}"/usr/lib64/libjsoncpp.a || die
+ cmake-utils_src_configure
}
diff --git
a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-bundled-genxrdpattern.patch
b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-bundled-genxrdpattern.patch
new file mode 100644
index 000..2072b8fa9b6
--- /dev/null
+++
b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-bundled-genxrdpattern.patch
@@ -0,0 +1,44 @@
+From 0287e83eb8706f5237d66873cb6a1b3730891c07 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 8 Apr 2018 11:21:17 +0200
+Subject:
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: f30b5ae726b9109ca13925c3c7d83e7a5204c305
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 7 20:41:38 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 7 20:48:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30b5ae7
sci-libs/avogadrolibs: Fix DEPEND
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
index ea71fa95ce6..7c4a4362b85 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -33,7 +33,7 @@ RDEPEND="
)
vtk? ( sci-libs/vtk )
"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
dev-cpp/eigen:3
test? ( dev-cpp/gtest )"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: 7537596878893bff34c5b44373336adef955b2c9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jan 14 01:30:40 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jan 14 09:42:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75375968
sci-libs/avogadrolibs: Drop old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-libs/avogadrolibs/Manifest | 2 -
sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild | 50
sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild| 55 --
3 files changed, 107 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 98254906641..1d04e63cc1b 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,3 +1 @@
-DIST avogadrolibs-0.7.2.tar.gz 637001 BLAKE2B
4bcb57b81ed11e6132f3748ac19119cbeff5c5ce80764659813650369bebeb439348f50e7b1c6ffe0a177035d441f43d18eedb0bcbb78a86a85d5fa845f384bb
SHA512
a796af1ab3eb77eb2e5484e9e9cb9d7cf68759c9afbd48ddeb237513583e2c207c7c70b2e87b37843886fc737410456ee451e8fe5a21707bdc01fdf600d4cbb8
-DIST avogadrolibs-0.8.0.tar.bz2 619784 BLAKE2B
d94b726bc7a6a91b2cd69d3ac4f8002bf33310c8d72e154b4022ec026cac4af8cde18f1d2d3046db811c171e35b4c6529757761bb5f7b97c6b645f3d5045744b
SHA512
edcd220e7c05962543b3cdd61faacb838060a69acb61677150256e2e8f36cad513f58a5071b6ef20510aa4aa6699e517c57d70017d8f1b57936c7f87c9da21c7
DIST avogadrolibs-0.9.0.tar.gz 742370 BLAKE2B
cd104cea48b82a1ac86fdb9e93717e2647f57a0d713673d8b340d259f73d6d9985decf0c4e4d83f13d54d12ae2aefee8e75b5d04861f8ab67b9b42690c3c74f7
SHA512
7cb000cd6399f33483c38b4f8a9c4a4688f5054cba35e101bed0f2371cea614ace6b3fc65c3ed1418976afef4462a09be868500435a5ae9c98a7ac496c10c36f
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild
deleted file mode 100644
index ea3c49c5231..000
--- a/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
-HOMEPAGE="http://www.openchemistry.org/;
-SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc opengl qt4 static-plugins test vtk"
-
-REQUIRED_USE="qt4? ( opengl )"
-
-RDEPEND="
- >=sci-chemistry/molequeue-0.7
- sci-libs/chemkit
- sci-libs/hdf5:=
- opengl? (
- dev-qt/qtopengl:4
- media-libs/glew
- )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- vtk? ( sci-libs/vtk )
-"
-DEPEND="${DEPEND}
- test? ( dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}"/${P}-6464.patch )
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_PROTOCALL=OFF
- -DBUILD_GPL_PLUGINS=ON
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use_use opengl OPENGL)
- $(cmake-utils_use_use qt4 QT)
- $(cmake-utils_use_build static-plugins STATIC_PLUGINS)
- $(cmake-utils_use_enable test TESTING)
- $(cmake-utils_use_use vtk VTK)
- )
- cmake-utils_src_configure
-}
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
deleted file mode 100644
index 489784bb173..000
--- a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
-HOMEPAGE="http://www.openchemistry.org/;
-SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc opengl qt5 static-plugins test vtk"
-
-REQUIRED_USE="qt5? ( opengl )"
-
-RDEPEND="
- >=sci-chemistry/molequeue-0.7
- sci-libs/chemkit
- sci-libs/hdf5:=
- opengl? (
- dev-qt/qtopengl:5
- media-libs/glew
- )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- )
- vtk? ( sci-libs/vtk )
-"
-DEPEND="${DEPEND}
- dev-cpp/eigen:3
- test? ( dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch
"${FILESDIR}/"${P}-underlinking.patch )
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_PROTOCALL=OFF
- -DBUILD_GPL_PLUGINS=ON
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: 65bdba14d533877a513dbef0b7469a1a1693ec1e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 25 01:15:23 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 25 01:16:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65bdba14
sci-libs/avogadrolibs: D -> ED
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
index 0b8014cfa2d..ea71fa95ce6 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
@@ -62,5 +62,5 @@ src_install() {
cmake-utils_src_install
# TODO: bundles jsoncpp
- rm "${D}"/usr/lib64/libjsoncpp.a || die
+ rm "${ED%/}"/usr/lib64/libjsoncpp.a || die
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: 0fa9889ed6070815329778bfd0092c85db5eb2fb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 25 00:53:58 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 25 00:54:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa9889e
sci-libs/avogadrolibs: Adjust Qt5 dependencies
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
index b83d2422415..0b8014cfa2d 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
@@ -27,8 +27,8 @@ RDEPEND="
qt5? (
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
+ dev-qt/qtgui:5
dev-qt/qtnetwork:5
- dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
)
vtk? ( sci-libs/vtk )
@@ -62,5 +62,5 @@ src_install() {
cmake-utils_src_install
# TODO: bundles jsoncpp
- rm ${D}/usr/lib64/libjsoncpp.a || die
+ rm "${D}"/usr/lib64/libjsoncpp.a || die
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: f3ed53eedcd15825be0905ec64ca8f1e18a0b92d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 25 00:28:00 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 25 00:36:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ed53ee
sci-libs/avogadrolibs: 0.9.0 version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/avogadrolibs/Manifest | 1 +
sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild | 66 +
sci-libs/avogadrolibs/metadata.xml | 24 +
3 files changed, 78 insertions(+), 13 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 1e91026fd07..e0499c9f9a7 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,2 +1,3 @@
DIST avogadrolibs-0.7.2.tar.gz 637001 SHA256
217eb5d62082bbaacefe8ad3c8c8ddbbd41931d306038774f761c0155aeccc76 SHA512
a796af1ab3eb77eb2e5484e9e9cb9d7cf68759c9afbd48ddeb237513583e2c207c7c70b2e87b37843886fc737410456ee451e8fe5a21707bdc01fdf600d4cbb8
WHIRLPOOL
81f0d1949c0a93b9efd1f47f276929b01ca761a5875015be3feafb493be3629b0b8e00c0ba930e1ca73b79fc621a67f7e2ab41ae5e4fc1018449238d933f
DIST avogadrolibs-0.8.0.tar.bz2 619784 SHA256
0f9a39e3469c4b4622a55ceeace3565c5f7f4df13fdadb73aa1f7d9bba43856c SHA512
edcd220e7c05962543b3cdd61faacb838060a69acb61677150256e2e8f36cad513f58a5071b6ef20510aa4aa6699e517c57d70017d8f1b57936c7f87c9da21c7
WHIRLPOOL
87ea3436af93ec860e90bdbe1b7c24408dae69e17755300f526a03b4e5d0f76217d0d3b695e917c5bf315758b4e2d3ee0c1511734d13e58251ade1d63709949b
+DIST avogadrolibs-0.9.0.tar.gz 742370 SHA256
be627991148ebcc50153ff5838ac147b6de2d90d25f1eeba700619810d353f69 SHA512
7cb000cd6399f33483c38b4f8a9c4a4688f5054cba35e101bed0f2371cea614ace6b3fc65c3ed1418976afef4462a09be868500435a5ae9c98a7ac496c10c36f
WHIRLPOOL
9f7d10b2748b370a77ea22aa14abc50afefc49f23554e84600061d52b8c06c36953d1540d142068e4afa9a626b57a201720d9fae567d9a01bce9fca8e191e635
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
new file mode 100644
index 000..b83d2422415
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
+HOMEPAGE="http://www.openchemistry.org/;
+SRC_URI="https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc hdf5 opengl qt5 static-plugins test vtk"
+
+REQUIRED_USE="qt5? ( opengl )"
+
+RDEPEND="
+ >=sci-chemistry/molequeue-0.7
+ sci-libs/chemkit
+ hdf5? ( sci-libs/hdf5:= )
+ opengl? (
+ dev-qt/qtopengl:5
+ media-libs/glew
+ )
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ )
+ vtk? ( sci-libs/vtk )
+"
+DEPEND="${DEPEND}
+ dev-cpp/eigen:3
+ test? ( dev-cpp/gtest )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.7.2-6464.patch
+ "${FILESDIR}/"${PN}-0.8.0-underlinking.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_PROTOCALL=OFF
+ -DBUILD_GPL_PLUGINS=ON
+ -DUSE_MOLEQUEUE=ON
+ -DUSE_HDF5=$(usex hdf5)
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ -DUSE_OPENGL=$(usex opengl)
+ -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 ${D}/usr/lib64/libjsoncpp.a || die
+}
diff --git a/sci-libs/avogadrolibs/metadata.xml
b/sci-libs/avogadrolibs/metadata.xml
index b9237e1612a..4b3dfdb2230 100644
--- a/sci-libs/avogadrolibs/metadata.xml
+++ b/sci-libs/avogadrolibs/metadata.xml
@@ -1,17 +1,15 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
-sci-chemis...@gentoo.org
-Gentoo Chemistry Project
-
-
-
- build all plugins statically into main plugin modules
-
-include vtk support
-
-
-avogadro
-
+
+ sci-chemis...@gentoo.org
+ Gentoo Chemistry Project
+
+
+ Build all plugins statically into
main plugin modules
+ include vtk support
+
+
+ OpenChemistry/avogadrolibs
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
commit: a339afeb7a5fa0b9a1353875b2792eb56b94c565
Author: Ted Tanberry gmail com>
AuthorDate: Mon Dec 28 22:08:53 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Dec 28 22:10:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a339afeb
sci-libs/avogadrolibs: Add patch to fix underlinking with -Wl,--no-undefined.
Package-Manager: portage-2.2.26
sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild| 2 +-
.../files/avogadrolibs-0.8.0-underlinking.patch| 34 ++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
index 2472a69..f2a19da 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
@@ -38,7 +38,7 @@ DEPEND="${DEPEND}
dev-cpp/eigen:3
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch
"${FILESDIR}/"${P}-underlinking.patch )
src_configure() {
local mycmakeargs=(
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
new file mode 100644
index 000..b29f3af
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
@@ -0,0 +1,34 @@
+Fix underlinking problems in shared libraries.
+
+--- avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt
avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt
+@@ -23,4 +23,4 @@
+ "${apbs_uis}"
+ )
+
+-target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient)
++target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient
AvogadroMoleQueue)
+--- avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt
avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt
+@@ -7,3 +7,5 @@
+ ""
+ playertool.qrc
+ )
++
++target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL)
+--- avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt
avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt
+@@ -8,3 +8,5 @@
+ "povray.cpp"
+ ""
+ )
++
++target_link_libraries(POVRay LINK_PRIVATE AvogadroRendering)
+--- avogadrolibs-0.8.0/avogadro/qtplugins/qtaim/CMakeLists.txt
avogadrolibs-0.8.0/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})
[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/
commit: 3d4af0d6673e91a75d509342740f60e5c227520f
Author: Justin Lecher gentoo org>
AuthorDate: Mon Dec 28 14:03:56 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Dec 28 14:50:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4af0d6
sci-libs/avogadrolibs: Version Bump
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher gentoo.org>
sci-libs/avogadrolibs/Manifest | 1 +
sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild | 56 +
2 files changed, 57 insertions(+)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index b8ef93d..1e91026 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1 +1,2 @@
DIST avogadrolibs-0.7.2.tar.gz 637001 SHA256
217eb5d62082bbaacefe8ad3c8c8ddbbd41931d306038774f761c0155aeccc76 SHA512
a796af1ab3eb77eb2e5484e9e9cb9d7cf68759c9afbd48ddeb237513583e2c207c7c70b2e87b37843886fc737410456ee451e8fe5a21707bdc01fdf600d4cbb8
WHIRLPOOL
81f0d1949c0a93b9efd1f47f276929b01ca761a5875015be3feafb493be3629b0b8e00c0ba930e1ca73b79fc621a67f7e2ab41ae5e4fc1018449238d933f
+DIST avogadrolibs-0.8.0.tar.bz2 619784 SHA256
0f9a39e3469c4b4622a55ceeace3565c5f7f4df13fdadb73aa1f7d9bba43856c SHA512
edcd220e7c05962543b3cdd61faacb838060a69acb61677150256e2e8f36cad513f58a5071b6ef20510aa4aa6699e517c57d70017d8f1b57936c7f87c9da21c7
WHIRLPOOL
87ea3436af93ec860e90bdbe1b7c24408dae69e17755300f526a03b4e5d0f76217d0d3b695e917c5bf315758b4e2d3ee0c1511734d13e58251ade1d63709949b
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
new file mode 100644
index 000..2472a69
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
+HOMEPAGE="http://www.openchemistry.org/;
+SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc opengl qt5 static-plugins test vtk"
+
+REQUIRED_USE="qt5? ( opengl )"
+
+RDEPEND="
+ >=sci-chemistry/molequeue-0.7
+ sci-libs/chemkit
+ sci-libs/hdf5:=
+ opengl? (
+ dev-qt/qtopengl:5
+ media-libs/glew
+ )
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ )
+ vtk? ( sci-libs/vtk )
+"
+DEPEND="${DEPEND}
+ dev-cpp/eigen:3
+ test? ( dev-cpp/gtest )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_PROTOCALL=OFF
+ -DBUILD_GPL_PLUGINS=ON
+ -DUSE_MOLEQUEUE=ON
+ $(cmake-utils_use_build doc DOCUMENTATION)
+ $(cmake-utils_use_use opengl OPENGL)
+ $(cmake-utils_use_use qt5 QT)
+ $(cmake-utils_use_build static-plugins STATIC_PLUGINS)
+ $(cmake-utils_use_enable test TESTING)
+ $(cmake-utils_use_use vtk VTK)
+ )
+ cmake-utils_src_configure
+}
