From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- sci-libs/avogadrolibs/Manifest | 6 +- .../avogadrolibs-1.91.0_pre20180406-r1.ebuild | 84 ------------------- .../avogadrolibs-1.91.0_pre20180415.ebuild | 85 ++++++++++++++++++++ .../avogadrolibs-1.91.0_pre20180406-qt-5.11.patch | 29 ------- ...avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch | 93 ++++++++++++++++++++++ 5 files changed, 181 insertions(+), 116 deletions(-) delete mode 100644 sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild create mode 100644 sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild delete mode 100644 sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch create mode 100644 sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch (limited to 'sci-libs/avogadrolibs') diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest index 756b149e2612..d84c6884a422 100644 --- a/sci-libs/avogadrolibs/Manifest +++ b/sci-libs/avogadrolibs/Manifest @@ -1,9 +1,9 @@ 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-qt-5.11.patch 797 BLAKE2B 80459a969efbcf8ffe257a21359df298eda3bc191d8eddbc239b807b0d3090057bf8cba69caa0fe734821174e0bb98f24d0dc05c99c16c327a157fa588c6b3db SHA512 ef6fde385be85e101039a3ce555ea9d3fb4294fa47153cbf7faae5fd10fdc3601e000d8e83676c5da222dfe1cfedf338376532b055d0f2357f660f6b36665c6c 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 -DIST avogadrolibs-1.91.0_pre20180406.tar.gz 857345 BLAKE2B 8e5c6b0a838a2a6b7dc925c1b544ab4d4de8b7769b1fe8d787127a1014b1243da89a2a6f6cfc871181f81a443c3ee63d758369f003afaf591c9373c9d5122ee3 SHA512 1814b2105615aabc1df78b14c581e78fea20a1e4ace8979bb2ad123ab0994d90c3935e37f0cc58b60d3307ffe682599a93d8cadddc22b4ba524caaec1a2c5319 +AUX avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch 3887 BLAKE2B 3803af011ecd8df2cc8cc969623d37237ed398cfd82baaf06d6d59da7dfdda3c8a042ffe2b5e15e9571cb3d74ae0eba4e3d80c9cbd9a6fd53a0035340257a382 SHA512 d49da2a4f215a74f1267de1fe74a19e1f2c4fdd61d583a05c04ca3d8309fd0ed431ac10164a0130fa5a1a2c85f23b5de5445a75dbe0e0e83d7060521454507b1 +DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B 526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008 SHA512 1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8 -EBUILD avogadrolibs-1.91.0_pre20180406-r1.ebuild 2086 BLAKE2B 5e01df80ef83ec255b6468531ab46efbcd798b786d9b8483bc8faa399262a3df7682b75d8f722c7becac1286cdd2556ef2fb28c6d8cffc2205f611285e5d94e6 SHA512 7490e3e4c909cb1963a869619b7aaa717af3dc59c4ebd50551570af9c7ab50c3f16931b5e52ad7bcf8368f1e8101a7193f86115f7d0c8beb206c3759d972412d +EBUILD avogadrolibs-1.91.0_pre20180415.ebuild 2199 BLAKE2B 429a805feb4f028418bd9d66dc2a27cf1dc4969fc03812f52b1be2bb6996d96d918bf2eaa8658ce3997d8a794683a0a12fcba0d96c2ed693e4f181160abf317c SHA512 3c93329d1873ad9f06dec643681964b280f3718c17319e0fc9eea9003de87b217665e6acfd2c618b27f3e5746b453ea5428d90ba0ec30699f5785645e54d3b63 MISC metadata.xml 670 BLAKE2B 39737e6ffacaf9284506e41dfa1154f233a6bf37dd514c0eafe6bdf7bd7129a43d81cf4c3e510759b7888277bb403ad933e21abf0ba4dbedd43fda2aa2b55edd SHA512 781b3e67a291253d83d6c2e11124b07dbae652267de2702a1a2b10680f7db19cf35bda8964b320658d849091bd9ead07eeb5fc682a8817101dd1e7a1e9e20757 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 377cfc965c57..000000000000 --- 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/avogadrolibs-1.91.0_pre20180415.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild new file mode 100644 index 000000000000..0936e94a44ca --- /dev/null +++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild @@ -0,0 +1,85 @@ +# 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 ) + 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_pre20180406-qt-5.11.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch deleted file mode 100644 index 437b1e755af8..000000000000 --- 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 -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 - --#include -- --#include -+#include -+#include -+#include - - namespace Avogadro { - namespace Core { --- -2.17.0 - 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 000000000000..11816e438c28 --- /dev/null +++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch @@ -0,0 +1,93 @@ +From 03dd55beb878b5e15d891535a3c8b7ffa6133c92 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +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 + -- cgit v1.2.3