1 |
commit: b9e6d8c7a9ee81fc5e72043d1b3ed399ae8273fd |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 1 12:12:25 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 1 12:12:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e6d8c7 |
7 |
|
8 |
sci-libs/avogadrolibs: drop 1.93.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/765811 |
11 |
Closes: https://bugs.gentoo.org/810505 |
12 |
Closes: https://bugs.gentoo.org/820767 |
13 |
Closes: https://bugs.gentoo.org/834116 |
14 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
15 |
|
16 |
sci-libs/avogadrolibs/Manifest | 2 - |
17 |
sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild | 95 ---------------------- |
18 |
...vogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch | 11 --- |
19 |
3 files changed, 108 deletions(-) |
20 |
|
21 |
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest |
22 |
index 638cbecca2f4..5b03e8ff5f44 100644 |
23 |
--- a/sci-libs/avogadrolibs/Manifest |
24 |
+++ b/sci-libs/avogadrolibs/Manifest |
25 |
@@ -1,6 +1,4 @@ |
26 |
-DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae |
27 |
DIST avogadrolibs-1.95.1.tar.gz 11015910 BLAKE2B 27cb43a22e489c0279e1ed912b1e81f3c850983f367ffb89bef3a63d11204cbf761f2bce6501988ed5ef9b21b44cc5194dad4367da3ae6af65efd0cec5e7d711 SHA512 b4734c732b1686eba74055c4834fef2f9fb66d4a67cd1199c84e81965c3f6e783911e7c7c8d09386c4ff9f1322bab91fe490d3606784ae49acf5531a65a58beb |
28 |
DIST avogadrolibs-crystals-1.0.1.tar.gz 151829 BLAKE2B 0a1353392a4c087977452f50ffb7db0b2976a2993651b6f7e0df7a9ce6fa8f7960223cac2916dd9f667d37518b85606d73d05e86f7489193a6a609700fc60223 SHA512 c5d6500d8472807b8d2e62888e4a09279c6aeafec81bc4981edaa74e36724b1e7f0381250c79ad297f9f0331bcb5cd8a45fce3f13ad65b9870e901a6424c0650 |
29 |
DIST avogadrolibs-molecules-1.0.0.tar.gz 206924 BLAKE2B 70eea3d5eb440ab2c7f29c56111f2b8cf780cc84983aa145bc4f2fe144c981978218333ba3c33cf1f620dd3180cca706dfa4e94ffaee6167f89bd3e372172218 SHA512 06891ea7ad3e65c5b0c0ad73ea01916478fcd13fd9ff0d6905d28159678a50371ba9fa2c1f68ef32604dee0c2165de29bd5d50ffbc345bfe752ef0bcb13126f2 |
30 |
-DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8 |
31 |
DIST linux64-genXrdPattern-avogadrolibs-1.95.1 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8 |
32 |
|
33 |
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild |
34 |
deleted file mode 100644 |
35 |
index 4db9d9a0c2b9..000000000000 |
36 |
--- a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,95 +0,0 @@ |
39 |
-# Copyright 1999-2021 Gentoo Authors |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=7 |
43 |
-inherit cmake-utils flag-o-matic |
44 |
- |
45 |
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries" |
46 |
-HOMEPAGE="https://www.openchemistry.org/ https://github.com/OpenChemistry/avogadrolibs" |
47 |
-SRC_URI=" |
48 |
- https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
49 |
- vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern -> linux64-genXrdPattern-${P} ) |
50 |
-" |
51 |
- |
52 |
-SLOT="0" |
53 |
-LICENSE="BSD GPL-2+" |
54 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
55 |
- |
56 |
-# static-plugins needs to be enabled until upstream fixes |
57 |
-# https://github.com/OpenChemistry/avogadrolibs/issues/436 |
58 |
-#IUSE="archive doc hdf5 qt5 static-plugins test vtk" |
59 |
-IUSE="archive doc hdf5 qt5 test vtk" |
60 |
-RESTRICT="!test? ( test )" |
61 |
- |
62 |
-REQUIRED_USE="vtk? ( qt5 )" |
63 |
- |
64 |
-# TODO: Not yet packaged: |
65 |
-# sci-libs/libmsym (https://github.com/mcodev31/libmsym) |
66 |
-# sci-libs/spglib (https://atztogo.github.io/spglib/) |
67 |
-RDEPEND=" |
68 |
- dev-libs/jsoncpp:= |
69 |
- >=sci-chemistry/molequeue-0.7 |
70 |
- sci-libs/spglib |
71 |
- archive? ( app-arch/libarchive ) |
72 |
- hdf5? ( sci-libs/hdf5:= ) |
73 |
- qt5? ( |
74 |
- dev-qt/qtconcurrent:5 |
75 |
- dev-qt/qtcore:5 |
76 |
- dev-qt/qtgui:5 |
77 |
- dev-qt/qtnetwork:5 |
78 |
- dev-qt/qtwidgets:5 |
79 |
- media-libs/glew:0= |
80 |
- virtual/opengl |
81 |
- ) |
82 |
- vtk? ( sci-libs/vtk[qt5,views] ) |
83 |
-" |
84 |
-DEPEND="${RDEPEND} |
85 |
- dev-cpp/eigen:3 |
86 |
- qt5? ( dev-qt/linguist-tools:5 ) |
87 |
- test? ( dev-cpp/gtest )" |
88 |
- |
89 |
-PATCHES=( |
90 |
- # https://github.com/OpenChemistry/avogadrolibs/issues/449 |
91 |
- "${FILESDIR}"/${PN}-1.93.0-fix_AvogadroLibsConfig.patch |
92 |
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch |
93 |
-) |
94 |
- |
95 |
-src_unpack() { |
96 |
- default |
97 |
- if use vtk; then |
98 |
- cp "${DISTDIR}"/linux64-genXrdPattern-${P} "${WORKDIR}/genXrdPattern" || die |
99 |
- fi |
100 |
-} |
101 |
- |
102 |
-src_configure() { |
103 |
- # Seems to be what upstream are using too. Apply the old hdf5lib workaround. |
104 |
- # https://github.com/OpenChemistry/avogadrolibs/commit/32e3dd8ce9f48f74e3960dc9afcc614496d87c7f |
105 |
- # bug #810505 |
106 |
- append-cppflags -DH5_USE_110_API |
107 |
- |
108 |
- # -DBUILD_STATIC_PLUGINS=$(usex static-plugins) |
109 |
- local mycmakeargs=( |
110 |
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" |
111 |
- -DUSE_PROTOCALL=OFF |
112 |
- -DBUILD_GPL_PLUGINS=ON |
113 |
- -DUSE_MOLEQUEUE=ON |
114 |
- -DUSE_MMTF=OFF |
115 |
- -DUSE_LIBMSYM=OFF |
116 |
- -DUSE_SPGLIB=OFF |
117 |
- -DUSE_PYTHON=OFF |
118 |
- -DUSE_LIBARCHIVE=$(usex archive) |
119 |
- -DBUILD_DOCUMENTATION=$(usex doc) |
120 |
- -DUSE_HDF5=$(usex hdf5) |
121 |
- -DENABLE_TRANSLATIONS=$(usex qt5) |
122 |
- -DUSE_OPENGL=$(usex qt5) |
123 |
- -DUSE_QT=$(usex qt5) |
124 |
- -DBUILD_STATIC_PLUGINS=ON |
125 |
- -DENABLE_TESTING=$(usex test) |
126 |
- -DUSE_VTK=$(usex vtk) |
127 |
- ) |
128 |
- use vtk && mycmakeargs+=( |
129 |
- -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern" |
130 |
- ) |
131 |
- |
132 |
- cmake-utils_src_configure |
133 |
-} |
134 |
|
135 |
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch |
136 |
deleted file mode 100644 |
137 |
index 5eb316af9414..000000000000 |
138 |
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch |
139 |
+++ /dev/null |
140 |
@@ -1,11 +0,0 @@ |
141 |
---- a/cmake/AvogadroLibsConfig.cmake.orig.in 2016-12-01 22:17:48.000000000 +0100 |
142 |
-+++ b/cmake/AvogadroLibsConfig.cmake.in 2017-03-11 20:39:36.462581381 +0100 |
143 |
-@@ -10,7 +10,7 @@ |
144 |
- |
145 |
- set(AvogadroLibs_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") |
146 |
- set(AvogadroLibs_INCLUDE_DIRS "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_INCLUDE_DIR@") |
147 |
--set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@@LIB_SUFFIX@") |
148 |
-+set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@") |
149 |
- set(AvogadroLibs_RUNTIME_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_RUNTIME_DIR@") |
150 |
- set(AvogadroLibs_CMAKE_DIR "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs") |
151 |
- |