commit: be58a2e3da86e00b7b6f7b665e4ce41c91069613 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 24 19:04:14 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Nov 25 15:29:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be58a2e3
sci-libs/avogadrolibs: drop 1.95.1-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-libs/avogadrolibs/Manifest | 2 - .../avogadrolibs/avogadrolibs-1.95.1-r1.ebuild | 94 ---------------------- .../avogadrolibs-1.95.1-usability_backport.patch | 81 ------------------- 3 files changed, 177 deletions(-) diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest index 5f4bfd4d93d3..af9a44e3a35f 100644 --- a/sci-libs/avogadrolibs/Manifest +++ b/sci-libs/avogadrolibs/Manifest @@ -1,6 +1,4 @@ -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.95.1-r1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild deleted file mode 100644 index 330bb74633f7..000000000000 --- a/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2024 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-text/doxygen ) - qt5? ( dev-qt/linguist-tools:5 )" - -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() { - default - - if use vtk; then - cp "${DISTDIR}"/linux64-genXrdPattern-${P} "${WORKDIR}/genXrdPattern" || die - fi - - # hardcoded assumptions in - # avogadro/qtplugins/insertfragment/CMakeLists.txt - mv crystals-1.0.1 crystals || die - mv molecules-1.0.0 molecules || die -} - -src_configure() { - local mycmakeargs=( - -DUSE_LIBARCHIVE=$(usex archive) - -DBUILD_DOCUMENTATION=$(usex doc) - -DUSE_HDF5=$(usex hdf5) - -DENABLE_TRANSLATIONS=$(usex qt5) - -DUSE_OPENGL=$(usex qt5) - -DUSE_QT=$(usex qt5) - -DENABLE_TESTING=$(usex test) - -DUSE_VTK=$(usex vtk) - # disabled libraries - -DUSE_PYTHON=OFF - -DUSE_PROTOCALL=OFF - -DUSE_MMTF=OFF - -DUSE_LIBMSYM=OFF - # 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" - ) - - cmake_src_configure -} 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 deleted file mode 100644 index 07a32023600e..000000000000 --- a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 56c67fff7dd7ec84b2f2b5c2e5beaec13981e408 Mon Sep 17 00:00:00 2001 -From: Aritz Erkiaga <[email protected]> -Date: Sat, 3 Sep 2022 16:54:55 +0200 -Subject: [PATCH 1/3] Fix erratic editing behavior - -Signed-off-by: Aritz Erkiaga <[email protected]> ---- - 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 <[email protected]> -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 <[email protected]> ---- - 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 == &m_molecule->molecule()) { - // translate single atom position - RWAtom atom = m_molecule->atom(m_object.index); - Vector3f oldPos(atom.position3d().cast<float>()); --- -2.34.1 - - -From f38bfbc88f0722a66ab298ff26073874b5f73634 Mon Sep 17 00:00:00 2001 -From: Aritz Erkiaga <[email protected]> -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 <[email protected]> ---- - 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 = &m_molecule->molecule(); -- if (!ident.isValid() || ident.molecule != mol) -+ if (!ident.isValid() || ident.molecule != &m_molecule->molecule()) - return nullptr; - - // If the hit is a left click on a bond, make it the selected bond and map --- -2.34.1 -
