[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [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; 7+ 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] 7+ 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; 7+ 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] 7+ 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; 7+ 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] 7+ 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; 7+ 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] 7+ 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; 7+ 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] 7+ 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; 7+ 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] 7+ 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; 7+ 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] 7+ messages in thread

end of thread, other threads:[~2022-03-01 12:12 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-14 17:32 [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2022-03-01 12:12 David Seifert
2022-03-01 12:12 David Seifert
2018-04-17 12:10 Andreas Sturmlechner
2018-04-17 12:10 Andreas Sturmlechner
2018-04-08  9:55 Andreas Sturmlechner
2018-04-08  9:55 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox