* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
@ 2018-04-08 9:55 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-04-08 9:55 UTC (permalink / raw
To: gentoo-commits
commit: d38044ae854dae2c28301beeb32066b2c75089ba
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 7 21:31:38 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 09:53:53 2018 +0000
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..00000000000
--- 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..00000000000
--- 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"
- ""
- )
-+
-+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})
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
@ 2018-04-08 9:55 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-04-08 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 1255c53cc64cb280bff21ad7ae82ab91ec595123
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 8 00:25:18 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 09:53:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=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 00000000000..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 <andreas.sturmlechner@gmail.com>
+Date: Sun, 8 Apr 2018 11:21:17 +0200
+Subject: [PATCH] Provide overrideable BUNDLED_GENXRDPATTERN location
+
+---
+ cmake/DownloadGenXrdPattern.cmake | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/DownloadGenXrdPattern.cmake b/cmake/DownloadGenXrdPattern.cmake
+index ab5c5f0..7d4ecb4 100644
+--- a/cmake/DownloadGenXrdPattern.cmake
++++ b/cmake/DownloadGenXrdPattern.cmake
+@@ -10,8 +10,12 @@ macro(DownloadGenXrdPattern)
+ set(GENXRDPATTERN_NAME "genXrdPattern")
+ endif(WIN32)
+
++ if(NOT BUNDLED_GENXRDPATTERN)
++ set(BUNDLED_GENXRDPATTERN "${CMAKE_CURRENT_BINARY_DIR}/bin/${GENXRDPATTERN_NAME}")
++ endif()
++
+ # If it already exists, don't download it again
+- if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/bin/${GENXRDPATTERN_NAME}")
++ if(NOT EXISTS "${BUNDLED_GENXRDPATTERN}")
+ set(GENXRDPATTERN_V "1.0-static")
+ # Linux
+ if(UNIX AND NOT APPLE)
+@@ -52,11 +56,11 @@ macro(DownloadGenXrdPattern)
+ # Now remove the temporary directory
+ file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/tmp")
+
+- endif(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/bin/${GENXRDPATTERN_NAME}")
++ endif(NOT EXISTS "${BUNDLED_GENXRDPATTERN}")
+
+ set(GENXRDPATTERN_DESTINATION "bin")
+
+- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bin/${GENXRDPATTERN_NAME}"
++ install(FILES "${BUNDLED_GENXRDPATTERN}"
+ DESTINATION "${GENXRDPATTERN_DESTINATION}"
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+--
+2.17.0
+
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch
new file mode 100644
index 00000000000..3b5280cdc47
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch
@@ -0,0 +1,143 @@
+From 7e01a11dde25af75b21090fdaa2ca574ef703e53 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 8 Apr 2018 01:48:27 +0200
+Subject: [PATCH 1/2] Drop bogus jsoncpp.cpp include from spectra.cpp
+
+---
+ avogadro/qtplugins/spectra/spectra.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/avogadro/qtplugins/spectra/spectra.cpp b/avogadro/qtplugins/spectra/spectra.cpp
+index 043b52e..aa9c641 100644
+--- a/avogadro/qtplugins/spectra/spectra.cpp
++++ b/avogadro/qtplugins/spectra/spectra.cpp
+@@ -26,8 +26,6 @@
+ #include <QtWidgets/QFileDialog>
+ #include <avogadro/qtgui/molecule.h>
+
+-#include <jsoncpp.cpp>
+-
+ namespace Avogadro {
+ namespace QtPlugins {
+
+--
+2.17.0
+
+
+From 52cd35662aa2094db77ab4002b7c44f3dab2802d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 8 Apr 2018 02:00:30 +0200
+Subject: [PATCH 2/2] Use pkgconfig to find system-jsoncpp
+
+---
+ CMakeLists.txt | 5 ++++-
+ avogadro/io/CMakeLists.txt | 4 ++--
+ avogadro/qtplugins/importpqr/CMakeLists.txt | 4 ++--
+ avogadro/qtplugins/plugindownloader/CMakeLists.txt | 4 ++--
+ avogadro/qtplugins/spectra/CMakeLists.txt | 2 +-
+ avogadro/quantumio/CMakeLists.txt | 4 ++--
+ 6 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7574fa0..7ce80b0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,8 +52,11 @@ option(USE_PROTOCALL "Enable libraries that use ProtoCall" OFF)
+ option(USE_MOLEQUEUE "Enable the MoleQueue dependent functionality" ON)
+ option(USE_PYTHON "Use Python to wrap some of our API" OFF)
+
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(JSONCPP jsoncpp)
++
+ add_subdirectory(utilities)
+-add_subdirectory(thirdparty)
++# add_subdirectory(thirdparty)
+ add_subdirectory(avogadro)
+
+ if(ENABLE_TESTING)
+diff --git a/avogadro/io/CMakeLists.txt b/avogadro/io/CMakeLists.txt
+index 1dd7967..10ddbb6 100644
+--- a/avogadro/io/CMakeLists.txt
++++ b/avogadro/io/CMakeLists.txt
+@@ -15,7 +15,7 @@ endif()
+ # compilers that support that notion.
+ include_directories(SYSTEM "${EIGEN3_INCLUDE_DIR}"
+ "${AvogadroLibs_SOURCE_DIR}/thirdparty/pugixml"
+- "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
++ "${JSONCPP_INCLUDE_DIRS}")
+
+ if(DEFINED AvogadroLibs_MEMORY_INCLUDE_DIRS)
+ # The smart pointer classes just require headers.
+@@ -51,7 +51,7 @@ endif()
+
+ avogadro_add_library(AvogadroIO ${HEADERS} ${SOURCES})
+
+-target_link_libraries(AvogadroIO LINK_PUBLIC AvogadroCore LINK_PRIVATE jsoncpp)
++target_link_libraries(AvogadroIO LINK_PUBLIC AvogadroCore LINK_PRIVATE ${JSONCPP_LIBRARIES})
+ if(USE_HDF5)
+ target_link_libraries(AvogadroIO LINK_PRIVATE ${HDF5_LIBRARIES})
+ endif()
+diff --git a/avogadro/qtplugins/importpqr/CMakeLists.txt b/avogadro/qtplugins/importpqr/CMakeLists.txt
+index ee27da9..365c51a 100644
+--- a/avogadro/qtplugins/importpqr/CMakeLists.txt
++++ b/avogadro/qtplugins/importpqr/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-include_directories(SYSTEM "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
++include_directories(SYSTEM ${JSONCPP_INCLUDE_DIRS})
+
+ # Extension
+ set(importpqr_srcs
+@@ -17,4 +17,4 @@ avogadro_plugin(ImportPQR
+ ""
+ )
+
+-target_link_libraries(ImportPQR LINK_PRIVATE ${Qt5Network_LIBRARIES} jsoncpp)
++target_link_libraries(ImportPQR LINK_PRIVATE ${Qt5Network_LIBRARIES} ${JSONCPP_LIBRARIES})
+diff --git a/avogadro/qtplugins/plugindownloader/CMakeLists.txt b/avogadro/qtplugins/plugindownloader/CMakeLists.txt
+index 4b07a53..ab4c661 100644
+--- a/avogadro/qtplugins/plugindownloader/CMakeLists.txt
++++ b/avogadro/qtplugins/plugindownloader/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-include_directories(SYSTEM "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
++include_directories(SYSTEM ${JSONCPP_INCLUDE_DIRS})
+
+ find_package(LibArchive REQUIRED)
+ include_directories(SYSTEM ${LIBARCHIVE_INCLUDE_DIRS})
+@@ -20,4 +20,4 @@ avogadro_plugin(PluginDownloader
+ )
+
+ target_link_libraries(PluginDownloader LINK_PRIVATE ${Qt5Network_LIBRARIES}
+- ${LIBARCHIVE_LIBRARIES} jsoncpp)
++ ${LIBARCHIVE_LIBRARIES} ${JSONCPP_LIBRARIES})
+diff --git a/avogadro/qtplugins/spectra/CMakeLists.txt b/avogadro/qtplugins/spectra/CMakeLists.txt
+index a2216b8..09d8fc9 100644
+--- a/avogadro/qtplugins/spectra/CMakeLists.txt
++++ b/avogadro/qtplugins/spectra/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-include_directories(SYSTEM "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
++include_directories(SYSTEM ${JSONCPP_INCLUDE_DIRS})
+
+ set(plugin_srcs
+ vibrationdialog.cpp
+diff --git a/avogadro/quantumio/CMakeLists.txt b/avogadro/quantumio/CMakeLists.txt
+index 15073e8..35fc766 100644
+--- a/avogadro/quantumio/CMakeLists.txt
++++ b/avogadro/quantumio/CMakeLists.txt
+@@ -2,7 +2,7 @@ find_package(Eigen3 REQUIRED)
+ # Add as "system headers" to avoid warnings generated by them with
+ # compilers that support that notion.
+ include_directories(SYSTEM "${EIGEN3_INCLUDE_DIR}"
+- "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
++ ${JSONCPP_INCLUDE_DIRS})
+
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+@@ -30,4 +30,4 @@ set(SOURCES
+ )
+
+ avogadro_add_library(AvogadroQuantumIO ${HEADERS} ${SOURCES})
+-target_link_libraries(AvogadroQuantumIO LINK_PUBLIC AvogadroIO LINK_PRIVATE jsoncpp)
++target_link_libraries(AvogadroQuantumIO LINK_PUBLIC AvogadroIO LINK_PRIVATE ${JSONCPP_LIBRARIES})
+--
+2.17.0
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
@ 2018-04-17 12:10 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-04-17 12:10 UTC (permalink / raw
To: gentoo-commits
commit: 74df936f8a7b205cc8c94c121de6cb84c5823a58
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 09:38:45 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 12:02:22 2018 +0000
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 00000000000..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 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
new file mode 100644
index 00000000000..2aacee8e5b7
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
@@ -0,0 +1,100 @@
+From fdac6931c24986d377e06d77dbc607bb3c1654dd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 17 Apr 2018 11:31:22 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ avogadro/molequeue/CMakeLists.txt | 3 +--
+ avogadro/qtgui/CMakeLists.txt | 3 +--
+ 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(-)
+
+diff --git a/avogadro/molequeue/CMakeLists.txt b/avogadro/molequeue/CMakeLists.txt
+index 43a9195..37431cd 100644
+--- a/avogadro/molequeue/CMakeLists.txt
++++ b/avogadro/molequeue/CMakeLists.txt
+@@ -41,6 +41,5 @@ qt5_wrap_ui(UI_SOURCES ${UIS})
+ list(APPEND SOURCES ${UI_SOURCES})
+
+ avogadro_add_library(AvogadroMoleQueue ${HEADERS} ${SOURCES})
+-qt5_use_modules(AvogadroMoleQueue Widgets Network)
+ set_target_properties(AvogadroMoleQueue PROPERTIES AUTOMOC TRUE)
+-target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient)
++target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient Qt5::Widgets Qt5::Network)
+diff --git a/avogadro/qtgui/CMakeLists.txt b/avogadro/qtgui/CMakeLists.txt
+index e6cf8d3..3365261 100644
+--- a/avogadro/qtgui/CMakeLists.txt
++++ b/avogadro/qtgui/CMakeLists.txt
+@@ -99,5 +99,4 @@ qt5_add_resources(RC_SOURCES ${RCS})
+ list(APPEND SOURCES ${RC_SOURCES})
+
+ avogadro_add_library(AvogadroQtGui ${HEADERS} ${SOURCES})
+-qt5_use_modules(AvogadroQtGui Widgets)
+-target_link_libraries(AvogadroQtGui AvogadroIO)
++target_link_libraries(AvogadroQtGui AvogadroIO Qt5::Widgets)
+diff --git a/avogadro/qtopengl/CMakeLists.txt b/avogadro/qtopengl/CMakeLists.txt
+index 354638c..28a473e 100644
+--- a/avogadro/qtopengl/CMakeLists.txt
++++ b/avogadro/qtopengl/CMakeLists.txt
+@@ -16,5 +16,4 @@ set(SOURCES
+ )
+
+ avogadro_add_library(AvogadroQtOpenGL ${HEADERS} ${SOURCES})
+-qt5_use_modules(AvogadroQtOpenGL Widgets)
+-target_link_libraries(AvogadroQtOpenGL AvogadroRendering AvogadroQtGui)
++target_link_libraries(AvogadroQtOpenGL AvogadroRendering AvogadroQtGui Qt5::Widgets)
+diff --git a/avogadro/vtk/CMakeLists.txt b/avogadro/vtk/CMakeLists.txt
+index abac5a1..498529c 100644
+--- a/avogadro/vtk/CMakeLists.txt
++++ b/avogadro/vtk/CMakeLists.txt
+@@ -30,8 +30,7 @@ set(SOURCES
+ )
+
+ avogadro_add_library(AvogadroVtk ${HEADERS} ${SOURCES})
+-qt5_use_modules(AvogadroVtk Widgets)
+ set_target_properties(AvogadroVtk PROPERTIES AUTOMOC TRUE)
+ target_link_libraries(AvogadroVtk AvogadroRendering AvogadroQtGui
+ vtkRenderingOpenGL2 vtkGUISupportQt vtkRenderingVolumeOpenGL2
+- vtkRenderingFreeType vtkInteractionStyle)
++ vtkRenderingFreeType vtkInteractionStyle Qt5::Widgets)
+diff --git a/tests/qtgui/CMakeLists.txt b/tests/qtgui/CMakeLists.txt
+index 1cfd51a..da08078 100644
+--- a/tests/qtgui/CMakeLists.txt
++++ b/tests/qtgui/CMakeLists.txt
+@@ -49,9 +49,8 @@ endforeach()
+
+ # Add a single executable for all of our tests.
+ add_executable(AvogadroQtGuiTests ${testSrcs})
+-qt5_use_modules(AvogadroQtGuiTests Widgets Test)
+ target_link_libraries(AvogadroQtGuiTests AvogadroQtGui AvogadroMoleQueue
+- MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB})
++ MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB} Qt5::Widgets Qt5::Test)
+
+ # 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
+--- a/tests/qtopengl/CMakeLists.txt
++++ b/tests/qtopengl/CMakeLists.txt
+@@ -44,13 +44,12 @@ create_test_sourcelist(testDriver qtopengltests.cpp ${testSrcs})
+
+ add_executable(AvogadroQtOpenGLTests ${testDriver})
+
+-qt5_use_modules(AvogadroQtOpenGLTests OpenGL)
+-
+ target_link_libraries(AvogadroQtOpenGLTests
+ AvogadroQtOpenGL
+ vtkImagingCore
+ vtkIOImage
+- vtkRenderingQt)
++ vtkRenderingQt
++ Qt5::OpenGL)
+
+ foreach(test ${tests})
+ string(TOLOWER ${test} testname)
+--
+2.17.0
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
@ 2018-04-17 12:10 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-04-17 12:10 UTC (permalink / raw
To: gentoo-commits
commit: 60040aee5be51113a6d9d42e0ef1dcfa6815d89b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 09:39:22 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 12:02:22 2018 +0000
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..00000000000
--- 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..00000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5d70cd5ec5ac8460ff5d3d6b0b47b9c60e1f3ca2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-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 <molequeue/client/jobobject.h>
-
--#include <QtCore/QDebug>
--
--#include <QtWidgets/QMessageBox>
-+#include <QAction>
-+#include <QDebug>
-+#include <QMessageBox>
-
- namespace Avogadro {
- namespace Core {
---
-2.17.0
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
@ 2020-03-14 17:32 Pacho Ramos
0 siblings, 0 replies; 9+ messages in thread
From: Pacho Ramos @ 2020-03-14 17:32 UTC (permalink / raw
To: gentoo-commits
commit: b12f2d6d85ef75556666ae930ec018380e7a7a22
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 14 17:30:13 2020 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 17:32:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b12f2d6d
sci-libs/avogadrolibs: Bump to 1.93.0
Closes: https://bugs.gentoo.org/652918
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
sci-libs/avogadrolibs/Manifest | 1 +
sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild | 89 ++++++++++++++++++++++
...vogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch | 11 +++
3 files changed, 101 insertions(+)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 3eb86b3019a..09c6bc5a759 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,2 +1,3 @@
DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B 526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008 SHA512 1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc
+DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
new file mode 100644
index 00000000000..a1cbede0ed2
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
+HOMEPAGE="https://www.openchemistry.org/ https://github.com/OpenChemistry/avogadrolibs"
+SRC_URI="
+ https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern )
+"
+
+SLOT="0"
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# static-plugins needs to be enabled until upstream fixes
+# https://github.com/OpenChemistry/avogadrolibs/issues/436
+#IUSE="archive doc hdf5 qt5 static-plugins test vtk"
+IUSE="archive doc hdf5 qt5 test vtk"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="vtk? ( qt5 )"
+
+# TODO: Not yet packaged:
+# sci-libs/libmsym (https://github.com/mcodev31/libmsym)
+# sci-libs/spglib (https://atztogo.github.io/spglib/)
+RDEPEND="
+ dev-libs/jsoncpp:=
+ >=sci-chemistry/molequeue-0.7
+ sci-libs/spglib
+ archive? ( app-arch/libarchive )
+ hdf5? ( sci-libs/hdf5:= )
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ media-libs/glew:0=
+ virtual/opengl
+ )
+ vtk? ( sci-libs/vtk[qt5,views] )
+"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3
+ qt5? ( dev-qt/linguist-tools:5 )
+ test? ( dev-cpp/gtest )"
+
+PATCHES=(
+ # https://github.com/OpenChemistry/avogadrolibs/issues/449
+ "${FILESDIR}"/${PN}-1.93.0-fix_AvogadroLibsConfig.patch
+)
+
+src_unpack() {
+ default
+ if use vtk; then
+ cp "${DISTDIR}"/linux64-genXrdPattern "${WORKDIR}/genXrdPattern" || die
+ fi
+}
+
+src_configure() {
+ # -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ -DUSE_PROTOCALL=OFF
+ -DBUILD_GPL_PLUGINS=ON
+ -DUSE_MOLEQUEUE=ON
+ -DUSE_MMTF=OFF
+ -DUSE_LIBMSYM=OFF
+ -DUSE_SPGLIB=OFF
+ -DUSE_PYTHON=OFF
+ -DUSE_LIBARCHIVE=$(usex archive)
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ -DUSE_HDF5=$(usex hdf5)
+ -DENABLE_TRANSLATIONS=$(usex qt5)
+ -DUSE_OPENGL=$(usex qt5)
+ -DUSE_QT=$(usex qt5)
+ -DBUILD_STATIC_PLUGINS=ON
+ -DENABLE_TESTING=$(usex test)
+ -DUSE_VTK=$(usex vtk)
+ )
+ use vtk && mycmakeargs+=(
+ -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch
new file mode 100644
index 00000000000..5eb316af941
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch
@@ -0,0 +1,11 @@
+--- a/cmake/AvogadroLibsConfig.cmake.orig.in 2016-12-01 22:17:48.000000000 +0100
++++ b/cmake/AvogadroLibsConfig.cmake.in 2017-03-11 20:39:36.462581381 +0100
+@@ -10,7 +10,7 @@
+
+ set(AvogadroLibs_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
+ set(AvogadroLibs_INCLUDE_DIRS "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_INCLUDE_DIR@")
+-set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@@LIB_SUFFIX@")
++set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@")
+ set(AvogadroLibs_RUNTIME_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_RUNTIME_DIR@")
+ set(AvogadroLibs_CMAKE_DIR "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs")
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
@ 2022-03-01 12:12 David Seifert
0 siblings, 0 replies; 9+ messages in thread
From: David Seifert @ 2022-03-01 12:12 UTC (permalink / raw
To: gentoo-commits
commit: b9e6d8c7a9ee81fc5e72043d1b3ed399ae8273fd
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 12:12:25 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 12:12:25 2022 +0000
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 <soap <AT> 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..000000000000
--- 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
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
-)
-
-src_unpack() {
- default
- if use vtk; then
- cp "${DISTDIR}"/linux64-genXrdPattern-${P} "${WORKDIR}/genXrdPattern" || die
- fi
-}
-
-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}"
- -DUSE_PROTOCALL=OFF
- -DBUILD_GPL_PLUGINS=ON
- -DUSE_MOLEQUEUE=ON
- -DUSE_MMTF=OFF
- -DUSE_LIBMSYM=OFF
- -DUSE_SPGLIB=OFF
- -DUSE_PYTHON=OFF
- -DUSE_LIBARCHIVE=$(usex archive)
- -DBUILD_DOCUMENTATION=$(usex doc)
- -DUSE_HDF5=$(usex hdf5)
- -DENABLE_TRANSLATIONS=$(usex qt5)
- -DUSE_OPENGL=$(usex qt5)
- -DUSE_QT=$(usex qt5)
- -DBUILD_STATIC_PLUGINS=ON
- -DENABLE_TESTING=$(usex test)
- -DUSE_VTK=$(usex vtk)
- )
- use vtk && mycmakeargs+=(
- -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
- )
-
- cmake-utils_src_configure
-}
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch
deleted file mode 100644
index 5eb316af9414..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/AvogadroLibsConfig.cmake.orig.in 2016-12-01 22:17:48.000000000 +0100
-+++ b/cmake/AvogadroLibsConfig.cmake.in 2017-03-11 20:39:36.462581381 +0100
-@@ -10,7 +10,7 @@
-
- set(AvogadroLibs_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
- set(AvogadroLibs_INCLUDE_DIRS "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_INCLUDE_DIR@")
--set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@@LIB_SUFFIX@")
-+set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@")
- set(AvogadroLibs_RUNTIME_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_RUNTIME_DIR@")
- set(AvogadroLibs_CMAKE_DIR "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs")
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
@ 2022-03-01 12:12 David Seifert
0 siblings, 0 replies; 9+ messages in thread
From: David Seifert @ 2022-03-01 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 68245b30229ce2756c08706b5b075fd0422a40d8
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 12:12:24 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 12:12:24 2022 +0000
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 <soap <AT> 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 000000000000..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} "${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=(
+ -DBUILD_GPL_PLUGINS=ON
+ -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
+ -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)
+ # disabled libraries
+ -DUSE_PYTHON=OFF
+ -DUSE_PROTOCALL=OFF
+ -DUSE_MMTF=OFF
+ -DUSE_LIBMSYM=OFF
+ # find_package(Spglib) completely broken
+ -DUSE_SPGLIB=OFF
+ )
+ use vtk && mycmakeargs+=(
+ -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
+ )
+
+ cmake_src_configure
+}
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-tests.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-tests.patch
new file mode 100644
index 000000000000..5feea804632e
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-tests.patch
@@ -0,0 +1,13 @@
+exclude test that unconditionally requires sci-libs/spglib
+* https://bugs.gentoo.org/765811
+
+--- a/tests/core/CMakeLists.txt
++++ b/tests/core/CMakeLists.txt
+@@ -15,7 +15,6 @@
+ Molecule
+ Mutex
+ RingPerceiver
+- Spacegroup
+ Utilities
+ UnitCell
+ Variant
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
@ 2025-03-24 9:30 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2025-03-24 9:30 UTC (permalink / raw
To: gentoo-commits
commit: 8b295bba664c496c6e923c02313b3808300cd75a
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Tue Mar 11 14:28:07 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 24 09:30:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b295bba
sci-libs/avogadrolibs: add 1.100.0, qt6
update HOMEPAGE
switch to qt6
iuse : add spglib (Hall number for a crystal using sci-libs/spglib)
fetch avogadrodata for more tests
deps :
rm molequeue, abandoned and without Qt6 support, client-only bundled
rm linguist-tools, no longer required (qm)
add dev-cpp/nlohmann_json (since 1.98)
add dev-libs/pugixml (since 1.98)
add sci-chemistry/openbabel[json] (qtplugins)
add dev-libs/mmtf-cpp (mmtf useflag)
build opt :
rm USE_PROTOCALL (dropped since 1.98.0)
rm BUILD_STATIC_PLUGINS, on by default
rm OpenGL_GL_PREFERENCE=GLVND, value by default
add USE_SYSTEM_GENXRDPATTERN=OFF to use workaround w/ DownloadGenXrdPattern
patches :
cmake detection for openbabel
conditionnal test: Spacegroup (spglib)
Closes: https://bugs.gentoo.org/926352
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/avogadrolibs/Manifest | 7 +
sci-libs/avogadrolibs/avogadrolibs-1.100.0.ebuild | 174 +++++++++++++++++++++
.../files/avogadrolibs-1.100-fix-openbabel3.patch | 13 ++
.../files/avogadrolibs-1.100-tests.patch | 21 +++
sci-libs/avogadrolibs/metadata.xml | 2 +
5 files changed, 217 insertions(+)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index af9a44e3a35f..c615c4afbd3c 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,4 +1,11 @@
+DIST avogadrolibs-1.100.0-data.tar.gz 17378761 BLAKE2B 6900869f5056b02648a95bcacb98f35689f6b90f57f920c2678a0b8f7c043d4adc37b5c83de671ba7554b040a898bcaaa6cb36f29df84ce5221ee9f706ee93ff SHA512 71616ab1c197919fe1337654e698c0a52d86266bf64ca9453b89913c957b473c74e58a8a9483682dbaba56d296a2f56154bd94e5fdf9e4795b7457371215b0c3
+DIST avogadrolibs-1.100.0.tar.gz 4979722 BLAKE2B 1a47d9636ff5c978e2fbe84f782b8bd9b24fd23b44de93bd2b9f7790d3e077a92e2ac62a3823466ffd0e8ec664514d18c47ef5d0ff874d83b4c7571e046960d2 SHA512 8f0e9a6659a3190b12667da948468b83952e5017929ab802e4153682ed8b1a8ac97e874c20773c45e6e5c67fb3d2fd0ae55e99e49a8d03305b5a66e87ccbd2fd
DIST avogadrolibs-1.97.0.tar.gz 11456702 BLAKE2B 2f9229a0525dc151ef636c4c101ea21d3713efb033f6a007c43689bfd078b07081d695bb3ec32715c3ccf9d67e7bb85a617a08eeb0e6fc8c80e479a3cb3f1553 SHA512 a0ad3ba294db5f0fff35087ff0f616fdcaefc7b4abfa470c9fd26326ad14f73e3584c18a7111b671998d8a23a50091307520f01f79295fc7ea52ae2d78716c7e
+DIST avogadrolibs-avogenerators-1.98.0.tar.gz 15676 BLAKE2B 647050636cd93e2055dacbd5c8c1c7b98b1c61ac891b836ec990d75be80ff62c452f54d7225550b9fd5e4126c1b9cf3d806121d759aabca571bfff5e6bc69028 SHA512 87f42a538af6418ce33813b8e263ca349dca455142f476413b93ba9b0c5762b7e66f8fc1cd2535a5e284b6df3e7acc226fd7c223d1d20318fca9fa69536c6f4e
DIST avogadrolibs-crystals-1.0.1.tar.gz 151829 BLAKE2B 0a1353392a4c087977452f50ffb7db0b2976a2993651b6f7e0df7a9ce6fa8f7960223cac2916dd9f667d37518b85606d73d05e86f7489193a6a609700fc60223 SHA512 c5d6500d8472807b8d2e62888e4a09279c6aeafec81bc4981edaa74e36724b1e7f0381250c79ad297f9f0331bcb5cd8a45fce3f13ad65b9870e901a6424c0650
+DIST avogadrolibs-crystals-1.98.0.tar.gz 55935019 BLAKE2B 1750369af8a259bdccb3b0babf4e46ecc7f780f12ff8d00fcc230c7d3689bdc690bd9856ece49afca1b0f4b717360462577e618a54351c80c983a1d90de58065 SHA512 3ed07b598841c8dbc1536bd8f2a992abe73e1dc13bb9c14a4db0b60be7ba085c834d982ceb22ade3a5f0f4d05a7681567bd0c926995e78ebb9d56e2923bd4706
+DIST avogadrolibs-fragments-1.99.0.tar.gz 2553232 BLAKE2B 3d2b25bbf73e0c239634726005fb737a88199882059a8f0f57638749e06593d6156df382957126d8bc010ab75b1de872de64e559d56921a51d442d915c9cd389 SHA512 fa1341a482f184960a0167c601e3bd8faac2f4e312c7a603146c63ad563cb3b943e37c0d3fe785eb134c0bf4dd3dda6e21b8276e760237f5b6b2e883af5a268a
+DIST avogadrolibs-linux64-genXrdPattern-1.1 14315976 BLAKE2B bed67aa2bb015843c20af8b89e1276a3e509cbebb32b36bb4002cb8fcfa557acfeefff37ccae2b7d67ca80e09f654c924c6d6227d1d0e1fcfa43438aef81de08 SHA512 e98395e1dd831779af7a613e9c6460a4f048e0a7973d6156e8ebd0bebe2d32b4c19df9875e91185b73ddc6f0d3637d35e955b3bd393c0893986555763b61492a
DIST avogadrolibs-molecules-1.0.0.tar.gz 206924 BLAKE2B 70eea3d5eb440ab2c7f29c56111f2b8cf780cc84983aa145bc4f2fe144c981978218333ba3c33cf1f620dd3180cca706dfa4e94ffaee6167f89bd3e372172218 SHA512 06891ea7ad3e65c5b0c0ad73ea01916478fcd13fd9ff0d6905d28159678a50371ba9fa2c1f68ef32604dee0c2165de29bd5d50ffbc345bfe752ef0bcb13126f2
+DIST avogadrolibs-molecules-1.98.0.tar.gz 9953630 BLAKE2B eabc9604a68efb5db912c45ec19b731e51d5405e50dad597289f07ce1faeca9c2c296b9005ecfe21c2695ca9d536d79ec42e7e58aa6fb67f753187abc6f96649 SHA512 297bf73b290c099267ff011c68f40c636094a9ca632be7bc6d71db99d55eb16bfa9b1eee7504ada8a15534690aa80840e7d731880346fcd8b68e08b00b1e2bf6
DIST linux64-genXrdPattern-avogadrolibs-1.97.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.100.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.100.0.ebuild
new file mode 100644
index 000000000000..19472b5c3b31
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.100.0.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV_AVOGEN=1.98.0
+MY_PV_CRYSTALS=1.98.0
+MY_PV_FRAGMENTS=1.99.0
+MY_PV_GENXRD=1.1
+MY_PV_MOLECULES=1.98.0
+
+DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
+HOMEPAGE="https://two.avogadro.cc/ https://www.openchemistry.org/"
+SRC_URI="
+ https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz
+ qt6? (
+ https://github.com/OpenChemistry/avogenerators/archive/refs/tags/${MY_PV_AVOGEN}.tar.gz
+ -> ${PN}-avogenerators-${MY_PV_AVOGEN}.tar.gz
+ https://github.com/OpenChemistry/crystals/archive/refs/tags/${MY_PV_CRYSTALS}.tar.gz
+ -> ${PN}-crystals-${MY_PV_CRYSTALS}.tar.gz
+ https://github.com/OpenChemistry/fragments/archive/refs/tags/${MY_PV_FRAGMENTS}.tar.gz
+ -> ${PN}-fragments-${MY_PV_FRAGMENTS}.tar.gz
+ https://github.com/OpenChemistry/molecules/archive/refs/tags/${MY_PV_MOLECULES}.tar.gz
+ -> ${PN}-molecules-${MY_PV_MOLECULES}.tar.gz
+ )
+ test? ( https://github.com/OpenChemistry/avogadrodata/archive/refs/tags/${PV}.tar.gz
+ -> ${P}-data.tar.gz )
+ vtk? ( https://github.com/psavery/genXrdPattern/releases/download/${MY_PV_GENXRD}-linux/linux64-genXrdPattern
+ -> ${PN}-linux64-genXrdPattern-${MY_PV_GENXRD} )
+"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="archive doc hdf5 mmtf qt6 spglib test vtk"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ test? ( qt6 )
+ vtk? ( qt6 )
+"
+
+# TODO: Not yet packaged:
+# sci-libs/libmsym (https://github.com/mcodev31/libmsym)
+RDEPEND="
+ dev-cpp/nlohmann_json
+ dev-libs/pugixml
+ hdf5? ( sci-libs/hdf5:= )
+ qt6? (
+ >=sci-chemistry/openbabel-3.1.1_p20241221:=[json]
+ dev-qt/qtbase:6[concurrent,gui,network,opengl,widgets]
+ dev-qt/qtsvg:6
+ media-libs/glew:0=
+ virtual/opengl
+ archive? ( app-arch/libarchive:= )
+ )
+ spglib? ( >=sci-libs/spglib-2.6.0:= )
+ vtk? ( sci-libs/vtk:=[qt6,views] )
+"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3
+ mmtf? ( dev-libs/mmtf-cpp )
+"
+BDEPEND="
+ doc? ( app-text/doxygen )
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
+ "${FILESDIR}/"${PN}-1.100-tests.patch
+ # https://github.com/OpenChemistry/avogadrolibs/issues/1633
+ "${FILESDIR}/"${PN}-1.100-fix-openbabel3.patch
+)
+
+# Static binary (requires ObjCryst++ to build otherwise)
+QA_FLAGS_IGNORED="usr/bin/genXrdPattern"
+
+src_unpack() {
+ default
+
+ rm -rf thirdparty/{nlohmann,pugixml} || die
+
+ if use vtk; then
+ cp "${DISTDIR}"/${PN}-linux64-genXrdPattern-${MY_PV_GENXRD} "${WORKDIR}/genXrdPattern" || die
+ fi
+
+ if use qt6; then
+ # hardcoded assumptions in
+ # avogadro/qtplugins/insertfragment/CMakeLists.txt
+ mv crystals-${MY_PV_CRYSTALS} crystals || die
+ mv molecules-${MY_PV_MOLECULES} molecules || die
+ # avogadro/qtplugins/quantuminput/CMakeLists.txt
+ mv avogenerators-${MY_PV_AVOGEN} avogadrogenerators || die
+ # avogadro/qtplugins/templatetool/CMakeLists.txt
+ mv fragments-${MY_PV_FRAGMENTS} fragments || die
+ fi
+
+ if use test; then
+ mv avogadrodata-${PV} avogadrodata || die
+ fi
+}
+
+src_prepare() {
+ # fix default value for BABEL_LIBDIR
+ sed -i -e "s:/../lib/openbabel:/../$(get_libdir)/openbabel:g" \
+ avogadro/qtplugins/forcefield/obenergy.cpp \
+ avogadro/qtplugins/forcefield/obmmenergy.cpp \
+ avogadro/qtplugins/openbabel/obprocess.cpp || die
+
+ if use doc; then
+ doxygen -u docs/doxyfile.in 2>/dev/null || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON
+ -DUSE_EXTERNAL_NLOHMANN=ON
+ -DUSE_EXTERNAL_PUGIXML=ON
+ -DUSE_LIBARCHIVE=$(usex archive $(usex qt6))
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ -DUSE_HDF5=$(usex hdf5)
+ -DUSE_MMTF=$(usex mmtf)
+ -DUSE_OPENGL=$(usex qt6)
+ -DUSE_QT=$(usex qt6)
+ -DUSE_SPGLIB=$(usex spglib)
+ -DENABLE_TESTING=$(usex test)
+ -DUSE_VTK=$(usex vtk)
+ # disabled libraries
+ -DUSE_PYTHON=OFF
+ -DUSE_LIBMSYM=OFF
+ )
+
+ use qt6 && mycmakeargs+=(
+ -DBUILD_GPL_PLUGINS=ON
+ -DQT_VERSION=6
+ )
+
+ use vtk && mycmakeargs+=(
+ -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
+ -DUSE_SYSTEM_GENXRDPATTERN=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ use doc && cmake_build documentation
+}
+
+src_test() {
+ local -x LD_LIBRARY_PATH="${BUILD_DIR}/lib"
+ cmake_src_test
+}
+
+src_install() {
+ if use doc; then
+ local DOCS+=( "${BUILD_DIR}"/docs/xml )
+ local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+ docompress -x /usr/share/doc/${PF}/xml
+ fi
+
+ cmake_src_install
+
+ # remove CONTRIBUTING, LICENSE and duplicate README
+ rm -r "${ED}/usr/share/doc/${PF}/avogadrolibs" || die
+}
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.100-fix-openbabel3.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.100-fix-openbabel3.patch
new file mode 100644
index 000000000000..6395dc83359b
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.100-fix-openbabel3.patch
@@ -0,0 +1,13 @@
+FindOpenBabel3.cmake is not fully functional
+(confusion between OpenBabel3_INCLUDE_DIR / OPENBABEL3_INCLUDE_DIR)
+The easiest way is to amend here.
+--- a/cmake/FindOpenBabel3.cmake
++++ b/cmake/FindOpenBabel3.cmake
+@@ -26,6 +26,6 @@
+ set_target_properties(OpenBabel3 PROPERTIES
+ IMPORTED_LOCATION "${OpenBabel3_LIBRARY}"
+ IMPORTED_IMPLIB "${OpenBabel3_LIBRARY}"
+- INTERFACE_INCLUDE_DIRECTORIES "${OpenBabel3_INCLUDE_DIR}")
++ INTERFACE_INCLUDE_DIRECTORIES "${OpenBabel3_INCLUDE_DIR}/openbabel3")
+ endif()
+ endif()
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.100-tests.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.100-tests.patch
new file mode 100644
index 000000000000..6c9cc4faf99d
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.100-tests.patch
@@ -0,0 +1,21 @@
+Spacegroup test requires spglib feature, see tests/core/spacegrouptest.cpp:17
+--- a/tests/core/CMakeLists.txt
++++ b/tests/core/CMakeLists.txt
+@@ -16,13 +16,16 @@
+ Mutex
+ NeighborPerceiver
+ RingPerceiver
+- Spacegroup
+ Utilities
+ UnitCell
+ Variant
+ VariantMap
+ )
+
++if(USE_SPGLIB)
++ list(APPEND tests Spacegroup)
++endif()
++
+ # Build up the source file names.
+ set(testSrcs "")
+ foreach(TestName ${tests})
diff --git a/sci-libs/avogadrolibs/metadata.xml b/sci-libs/avogadrolibs/metadata.xml
index 672fc1a05040..ff776fffbddf 100644
--- a/sci-libs/avogadrolibs/metadata.xml
+++ b/sci-libs/avogadrolibs/metadata.xml
@@ -7,6 +7,8 @@
</maintainer>
<use>
<flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
+ <flag name="mmtf">Enable support of MMTF format using <pkg>dev-libs/mmtf-cpp</pkg></flag>
+ <flag name="spglib">Find and set the Hall number for a crystal using <pkg>sci-libs/spglib</pkg></flag>
<flag name="vtk">Enable <pkg>sci-libs/vtk</pkg> support</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/
@ 2025-03-24 18:04 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2025-03-24 18:04 UTC (permalink / raw
To: gentoo-commits
commit: 7a47ff8bbf2b3539badfa02788fd430251ca38fc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 24 15:54:09 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 24 18:03:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a47ff8b
sci-libs/avogadrolibs: drop 1.97.0-r1
Closes: https://bugs.gentoo.org/926352
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/avogadrolibs/Manifest | 4 -
.../avogadrolibs/avogadrolibs-1.97.0-r1.ebuild | 93 ----------------------
.../files/avogadrolibs-1.95.1-tests.patch | 13 ---
3 files changed, 110 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index c615c4afbd3c..e687a41a7026 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,11 +1,7 @@
DIST avogadrolibs-1.100.0-data.tar.gz 17378761 BLAKE2B 6900869f5056b02648a95bcacb98f35689f6b90f57f920c2678a0b8f7c043d4adc37b5c83de671ba7554b040a898bcaaa6cb36f29df84ce5221ee9f706ee93ff SHA512 71616ab1c197919fe1337654e698c0a52d86266bf64ca9453b89913c957b473c74e58a8a9483682dbaba56d296a2f56154bd94e5fdf9e4795b7457371215b0c3
DIST avogadrolibs-1.100.0.tar.gz 4979722 BLAKE2B 1a47d9636ff5c978e2fbe84f782b8bd9b24fd23b44de93bd2b9f7790d3e077a92e2ac62a3823466ffd0e8ec664514d18c47ef5d0ff874d83b4c7571e046960d2 SHA512 8f0e9a6659a3190b12667da948468b83952e5017929ab802e4153682ed8b1a8ac97e874c20773c45e6e5c67fb3d2fd0ae55e99e49a8d03305b5a66e87ccbd2fd
-DIST avogadrolibs-1.97.0.tar.gz 11456702 BLAKE2B 2f9229a0525dc151ef636c4c101ea21d3713efb033f6a007c43689bfd078b07081d695bb3ec32715c3ccf9d67e7bb85a617a08eeb0e6fc8c80e479a3cb3f1553 SHA512 a0ad3ba294db5f0fff35087ff0f616fdcaefc7b4abfa470c9fd26326ad14f73e3584c18a7111b671998d8a23a50091307520f01f79295fc7ea52ae2d78716c7e
DIST avogadrolibs-avogenerators-1.98.0.tar.gz 15676 BLAKE2B 647050636cd93e2055dacbd5c8c1c7b98b1c61ac891b836ec990d75be80ff62c452f54d7225550b9fd5e4126c1b9cf3d806121d759aabca571bfff5e6bc69028 SHA512 87f42a538af6418ce33813b8e263ca349dca455142f476413b93ba9b0c5762b7e66f8fc1cd2535a5e284b6df3e7acc226fd7c223d1d20318fca9fa69536c6f4e
-DIST avogadrolibs-crystals-1.0.1.tar.gz 151829 BLAKE2B 0a1353392a4c087977452f50ffb7db0b2976a2993651b6f7e0df7a9ce6fa8f7960223cac2916dd9f667d37518b85606d73d05e86f7489193a6a609700fc60223 SHA512 c5d6500d8472807b8d2e62888e4a09279c6aeafec81bc4981edaa74e36724b1e7f0381250c79ad297f9f0331bcb5cd8a45fce3f13ad65b9870e901a6424c0650
DIST avogadrolibs-crystals-1.98.0.tar.gz 55935019 BLAKE2B 1750369af8a259bdccb3b0babf4e46ecc7f780f12ff8d00fcc230c7d3689bdc690bd9856ece49afca1b0f4b717360462577e618a54351c80c983a1d90de58065 SHA512 3ed07b598841c8dbc1536bd8f2a992abe73e1dc13bb9c14a4db0b60be7ba085c834d982ceb22ade3a5f0f4d05a7681567bd0c926995e78ebb9d56e2923bd4706
DIST avogadrolibs-fragments-1.99.0.tar.gz 2553232 BLAKE2B 3d2b25bbf73e0c239634726005fb737a88199882059a8f0f57638749e06593d6156df382957126d8bc010ab75b1de872de64e559d56921a51d442d915c9cd389 SHA512 fa1341a482f184960a0167c601e3bd8faac2f4e312c7a603146c63ad563cb3b943e37c0d3fe785eb134c0bf4dd3dda6e21b8276e760237f5b6b2e883af5a268a
DIST avogadrolibs-linux64-genXrdPattern-1.1 14315976 BLAKE2B bed67aa2bb015843c20af8b89e1276a3e509cbebb32b36bb4002cb8fcfa557acfeefff37ccae2b7d67ca80e09f654c924c6d6227d1d0e1fcfa43438aef81de08 SHA512 e98395e1dd831779af7a613e9c6460a4f048e0a7973d6156e8ebd0bebe2d32b4c19df9875e91185b73ddc6f0d3637d35e955b3bd393c0893986555763b61492a
-DIST avogadrolibs-molecules-1.0.0.tar.gz 206924 BLAKE2B 70eea3d5eb440ab2c7f29c56111f2b8cf780cc84983aa145bc4f2fe144c981978218333ba3c33cf1f620dd3180cca706dfa4e94ffaee6167f89bd3e372172218 SHA512 06891ea7ad3e65c5b0c0ad73ea01916478fcd13fd9ff0d6905d28159678a50371ba9fa2c1f68ef32604dee0c2165de29bd5d50ffbc345bfe752ef0bcb13126f2
DIST avogadrolibs-molecules-1.98.0.tar.gz 9953630 BLAKE2B eabc9604a68efb5db912c45ec19b731e51d5405e50dad597289f07ce1faeca9c2c296b9005ecfe21c2695ca9d536d79ec42e7e58aa6fb67f753187abc6f96649 SHA512 297bf73b290c099267ff011c68f40c636094a9ca632be7bc6d71db99d55eb16bfa9b1eee7504ada8a15534690aa80840e7d731880346fcd8b68e08b00b1e2bf6
-DIST linux64-genXrdPattern-avogadrolibs-1.97.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.97.0-r1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.97.0-r1.ebuild
deleted file mode 100644
index cff667099a12..000000000000
--- a/sci-libs/avogadrolibs/avogadrolibs-1.97.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2025 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[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} "${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-tests.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-tests.patch
deleted file mode 100644
index 5feea804632e..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-exclude test that unconditionally requires sci-libs/spglib
-* https://bugs.gentoo.org/765811
-
---- a/tests/core/CMakeLists.txt
-+++ b/tests/core/CMakeLists.txt
-@@ -15,7 +15,6 @@
- Molecule
- Mutex
- RingPerceiver
-- Spacegroup
- Utilities
- UnitCell
- Variant
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-03-24 18:04 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-08 9:55 [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-04-08 9:55 Andreas Sturmlechner
2018-04-17 12:10 Andreas Sturmlechner
2018-04-17 12:10 Andreas Sturmlechner
2020-03-14 17:32 Pacho Ramos
2022-03-01 12:12 David Seifert
2022-03-01 12:12 David Seifert
2025-03-24 9:30 Sam James
2025-03-24 18:04 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox