summaryrefslogtreecommitdiff
path: root/sci-libs/avogadrolibs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-22 20:28:19 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-22 20:28:19 +0000
commitabaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
treeeca3dd248b73b92013cba00a0fcc1edf2696e19a /sci-libs/avogadrolibs
parent24fd814c326e282c4321965c31f341dad77e270d (diff)
gentoo resync : 22.01.2021
Diffstat (limited to 'sci-libs/avogadrolibs')
-rw-r--r--sci-libs/avogadrolibs/Manifest9
-rw-r--r--sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild86
-rw-r--r--sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch16
-rw-r--r--sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch143
-rw-r--r--sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch18
-rw-r--r--sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch93
-rw-r--r--sci-libs/avogadrolibs/metadata.xml1
7 files changed, 1 insertions, 365 deletions
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index fe6af898c915..83703783fd4f 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,13 +1,6 @@
-AUX avogadrolibs-0.7.2-6464.patch 902 BLAKE2B 29a06e0d5e814aee4c1aff30af3642e374d32813e4e9837706ef652f89ffde173ff043fc3589fc08b22592e3ded2c0d8ef9c544e54a561ac658ae43651403633 SHA512 3851a3c5f7c599e439b4faa491ea080264e60bf2a7c4d35e01a10726f901a5797026bf32535107b46ca44335c5723d9ec7f0b6a46e9eebf7ffd9f90c7f2103d3
AUX avogadrolibs-1.91.0_pre20180406-bundled-genxrdpattern.patch 1644 BLAKE2B 3b25bc2648b323b803b5d0b6e10be2689ef9e4c988d0c55abe172bf4312da8f5f9b527262a2f8e48d0b2391b01a03a976bc36cc22c467ac9a44fb85cc43c7a6d SHA512 515c7029e6f99c5e88a37f43387e656b2873b99e14e8d8e9b1b20bf82604f70be8f669d8b97383e80969b0f80d43439647fdfd17566bbf6fbd32cb75ce2fb4e3
-AUX avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch 5377 BLAKE2B 5de00cdcd90d7642ddb82aa8ae0e6685ad17c2a6332a4ef9ba28be66f48a6eabf51d557173a6129b588b9eafb394db74d332fc178b2a323d29777e88e37174a7 SHA512 b4445aa7377370fd1336b7fdf0aa3dfa93b6d538efa70ca383cdcf85d9f54e64a6bd0c2af5e0f5c80ed731d4babd4c2a1f7a4e909fb5cf2a30bf72224737870a
-AUX avogadrolibs-1.91.0_pre20180406-underlinking.patch 549 BLAKE2B e773e8994677a4cc0880013455efbe153ecdf92061599b787e3486638a6a2a0b5ebe731387a6f79357ff8f049c74b2a5efdeec0ed886b89e02f5160268dda4a2 SHA512 05d7ef99d1d5d395962def8896fb0c61ae437aeb0199ea8ce26a6076abba0559973aff5a4a4620f5c7dbe6413c80237490ad6b80f8a7503a8b2d3ae92f81fbf4
-AUX avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch 3887 BLAKE2B 3803af011ecd8df2cc8cc969623d37237ed398cfd82baaf06d6d59da7dfdda3c8a042ffe2b5e15e9571cb3d74ae0eba4e3d80c9cbd9a6fd53a0035340257a382 SHA512 d49da2a4f215a74f1267de1fe74a19e1f2c4fdd61d583a05c04ca3d8309fd0ed431ac10164a0130fa5a1a2c85f23b5de5445a75dbe0e0e83d7060521454507b1
AUX avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch 695 BLAKE2B 40feb1bfe132fe5ddbef435b4d611a55650c0348c943f0796a87fc0761c99c4aebcbc54fb4d29e545c66384ad7352067f3ff5549e9e26bdd2cfe602974f56425 SHA512 7e5198bb3b6c7e83372bd6b54d3f50347ff8519fd24adcb0c59fdc50593be1c08cc2b1d7d12dc530de10c80bfaacad17679a6b1b90ded82947fe94d6dfa51f56
-DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B 526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008 SHA512 1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc
DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
-DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
-EBUILD avogadrolibs-1.91.0_pre20180415.ebuild 2223 BLAKE2B 6a9201d8b944a49fca4a0ef06f227e3d941539666d14a60a12cd72531ff46b1a5845a1543c44a8117b843174a2dacb4b3605e7a5afd4fc893b404bcb9b72304e SHA512 cad3ea94243eccc4f734368a5a8ebdfef1ec7ece172ab6b97e2470b3bc4b5e05c7da2b5ca8c898d4f05ebf5a8531aca6dfbcceea39987dbe5754617bbbe0293e
EBUILD avogadrolibs-1.93.0.ebuild 2422 BLAKE2B 911019bbe695b030064bd0c23159402d22ddfae058f3a7bcbc87427b76616b125ae283ab0ed35afe16d915957f7468974afc74b8dfb8c4ff3bbb976987ea918e SHA512 a360095e50bee771e34c4be736a1afd5ccf6ad4687a8f0294093a18a095cf2bea6ec4443b79bae2e75ae3edcbeb77439af54d3d0d1a32930554727b7d62acdfc
-MISC metadata.xml 670 BLAKE2B 39737e6ffacaf9284506e41dfa1154f233a6bf37dd514c0eafe6bdf7bd7129a43d81cf4c3e510759b7888277bb403ad933e21abf0ba4dbedd43fda2aa2b55edd SHA512 781b3e67a291253d83d6c2e11124b07dbae652267de2702a1a2b10680f7db19cf35bda8964b320658d849091bd9ead07eeb5fc682a8817101dd1e7a1e9e20757
+MISC metadata.xml 579 BLAKE2B 59aa6538e67637b222e3147e245431ab0ea8efc1436ba0662f55630e917a0e2665a561653d50c72063c3797f378c6113596fd2b798ec24b2832e3b5acfe1fce5 SHA512 b05aaa97f0c7f7e205cdbafea4301f3dfcc587b7a7ce5907be5da472f67b757c9f254114c68766a4f0e0e58e274f3146221418f6cec7afa4bf5db62c2d1b1fa4
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
deleted file mode 100644
index f27d9ea8207e..000000000000
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=606debb5d7c2c4020478264c609f895584fc5e38
-inherit cmake-utils
-
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
-HOMEPAGE="https://www.openchemistry.org/"
-SRC_URI="https://github.com/OpenChemistry/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
- vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern )"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="archive doc hdf5 qt5 static-plugins test vtk"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="vtk? ( qt5 )"
-
-# TODO: Not yet packaged:
-# sci-libs/libmsym (https://github.com/mcodev31/libmsym)
-# sci-libs/spglib (https://atztogo.github.io/spglib/)
-RDEPEND="
- dev-libs/jsoncpp:=
- >=sci-chemistry/molequeue-0.7
- archive? ( app-arch/libarchive )
- hdf5? ( sci-libs/hdf5:= )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- media-libs/glew:0=
- virtual/opengl
- )
- vtk? ( sci-libs/vtk[qt5,views] )
-"
-DEPEND="${RDEPEND}
- dev-cpp/eigen:3
- qt5? ( dev-qt/linguist-tools:5 )
- test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.2-6464.patch
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-underlinking.patch
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-unbundle-jsoncpp.patch
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
- "${FILESDIR}/"${P}-qt-5.11b3.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- if use vtk; then
- cp "${DISTDIR}"/linux64-genXrdPattern "${WORKDIR}/genXrdPattern" || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_PROTOCALL=OFF
- -DBUILD_GPL_PLUGINS=ON
- -DUSE_MOLEQUEUE=ON
- -DUSE_LIBMSYM=OFF
- -DUSE_LIBSPG=OFF
- -DUSE_PYTHON=OFF
- -DUSE_LIBARCHIVE=$(usex archive)
- -DBUILD_DOCUMENTATION=$(usex 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-0.7.2-6464.patch b/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch
deleted file mode 100644
index f763c242cc48..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- cmake/AvogadroLibsConfig.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/AvogadroLibsConfig.cmake.in b/cmake/AvogadroLibsConfig.cmake.in
-index ad57195..8a63400 100644
---- a/cmake/AvogadroLibsConfig.cmake.in
-+++ b/cmake/AvogadroLibsConfig.cmake.in
-@@ -10,7 +10,7 @@ set(AvogadroLibs_VERSION "${AvogadroLibs_VERSION_MAJOR}.${AvogadroLibs_V
-
- 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")
-
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
deleted file mode 100644
index 3b5280cdc47e..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-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
-
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch
deleted file mode 100644
index f6f39c9e6b7b..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix underlinking problems in shared libraries.
-
---- a/avogadro/qtplugins/playertool/CMakeLists.txt
-+++ b/avogadro/qtplugins/playertool/CMakeLists.txt
-@@ -7,3 +7,5 @@
- ""
- playertool.qrc
- )
-+
-+target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL)
---- a/avogadro/qtplugins/qtaim/CMakeLists.txt
-+++ b/avogadro/qtplugins/qtaim/CMakeLists.txt
-@@ -34,3 +34,5 @@
-
- target_link_libraries(QTAIMScenePlugin
- LINK_PRIVATE AvogadroRendering ${Qt5Concurrent_LIBRARIES})
-+target_link_libraries(QTAIMExtension
-+ LINK_PRIVATE ${Qt5Concurrent_LIBRARIES})
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
deleted file mode 100644
index 11816e438c28..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 03dd55beb878b5e15d891535a3c8b7ffa6133c92 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 | 2 --
- 6 files changed, 5 insertions(+), 12 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..60fc5ae 100644
---- a/tests/qtopengl/CMakeLists.txt
-+++ b/tests/qtopengl/CMakeLists.txt
-@@ -44,8 +44,6 @@ create_test_sourcelist(testDriver qtopengltests.cpp ${testSrcs})
-
- add_executable(AvogadroQtOpenGLTests ${testDriver})
-
--qt5_use_modules(AvogadroQtOpenGLTests OpenGL)
--
- target_link_libraries(AvogadroQtOpenGLTests
- AvogadroQtOpenGL
- vtkImagingCore
---
-2.17.0
-
diff --git a/sci-libs/avogadrolibs/metadata.xml b/sci-libs/avogadrolibs/metadata.xml
index ff1789dfa774..8e2ba3ed6642 100644
--- a/sci-libs/avogadrolibs/metadata.xml
+++ b/sci-libs/avogadrolibs/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
- <flag name="static-plugins">Build all plugins statically into main plugin modules</flag>
<flag name="vtk">Enable <pkg>sci-libs/vtk</pkg> support</flag>
</use>
<upstream>