diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /sci-chemistry/avogadro2 | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'sci-chemistry/avogadro2')
-rw-r--r-- | sci-chemistry/avogadro2/Manifest | 6 | ||||
-rw-r--r-- | sci-chemistry/avogadro2/avogadro2-1.93.0.ebuild | 56 | ||||
-rw-r--r-- | sci-chemistry/avogadro2/avogadro2-1.95.1.ebuild | 82 | ||||
-rw-r--r-- | sci-chemistry/avogadro2/files/avogadro2-1.95.1-qttest.patch | 15 |
4 files changed, 101 insertions, 58 deletions
diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest index 86f6632f51a3..a6a5dc3e81ad 100644 --- a/sci-chemistry/avogadro2/Manifest +++ b/sci-chemistry/avogadro2/Manifest @@ -1,3 +1,5 @@ -DIST avogadro2-1.93.0.tar.gz 2905461 BLAKE2B db51e4574fdf2a31657b8bef7b06eb0d563484deaae1a6d75649187d6f5fd7b02a99506cfb850e09792555d7c27d9937d0df0f7172fafc3ddcbccaa7502c5bb6 SHA512 8e4e15b6c2d1935f8c585c83761b28a6397bc1dc22cd5f66464d59dd25327b1cffec809af492586be4b56793448f94f9375c16e8a4c4969f7b8f2591049cc5fc -EBUILD avogadro2-1.93.0.ebuild 1225 BLAKE2B 7dd01683f6f875b7e66457c6debd02f40ba7860f44e1ac1744088496524074944356518ffcac04603b7b86b09f9172268d1f0b67d4afdcf78f0fc9faeaedca0a SHA512 726f46a48c7087a34eed8fe7ad6ce7a9f4b0bb001850a2915ad6a2b47c0e17d4a082cc10bc4317fa4fe64ba44bc8e132e55ae1a389745d2751fa7bd43602bce7 +AUX avogadro2-1.95.1-qttest.patch 522 BLAKE2B f7a61dfc89e2066340a2e73deab81439d88b3d2e28853ec4df538a699e90189075d3c647e4d09b791771f3d24d108e6ebe8ebe25cf66b1104c78c2f110cd57a2 SHA512 c3507fcb4d9e57800a405683a05b84009c65b0bf488294b9fdf94ebc872c4019d296e59a9b3479da0696ac6e495754b517ed08274a5640737f96c79bd5f53c47 +DIST avogadro2-1.95.1-i18n.tar.gz 800520 BLAKE2B f68edce572335621deb9698d1cc97d4d8e900ea91bb7a428a4da63d9060c38b31181b91b868378ab5da29c7a61ccb0f6efd9b422bba2d9dc9bb86578c23152c4 SHA512 1182578a9b91f49d114fa3a201e5fe5c37d3abdd10dff82be04f6d5fd193dd3b1140e7abdf2cf721523f523d762fbdc97780887184b83edbc9d3fa87fd8f7428 +DIST avogadro2-1.95.1.tar.gz 2888376 BLAKE2B 00ad2b9daccec77207d42bd0db0cf404bd5b92941385f19ac35400cf497884d198785da60f87fd68e92f6d864abea31f07526c2053b34cbf75d1202fd9232694 SHA512 15300da0ecc85be0e369758aafa50ca5c236132988da68611f198637ea49f4a88da93d58ecd177aeb3c2ac363c0da79b91064156e61c828a059277aa09245604 +EBUILD avogadro2-1.95.1.ebuild 1924 BLAKE2B ce0ce22884425351e6f1e6eefab52f16ff3d9b74c373985edbe929325927b1709aa7ec3bd0db89d46d340058e584e97be5c313b5051cb9a519ec7a36f3b12d3e SHA512 3fb570d830111e918bcb5b4d16a11717b115a0e5231db44960028ca09208ba4a27e7428d7bfb8ae40fd1518cdde664139134865a3bd2f6822869de9b20ab59b8 MISC metadata.xml 514 BLAKE2B 0a88a4b92fef923690f6e9767c572875d86c8522936aff89354f4b08ee74fe7c2f49e1eba143c850753d8f2cb5a7e7dc063e9864e433b70068ef7edcd0163683 SHA512 e7729ed111cfade53f238b9b49067c55c1a229489dbc1665d428ba8643c0f9ad0af402e8bf4c81399df1d1a786c7831a7a769bf9a5608157642546a1d0f45ee9 diff --git a/sci-chemistry/avogadro2/avogadro2-1.93.0.ebuild b/sci-chemistry/avogadro2/avogadro2-1.93.0.ebuild deleted file mode 100644 index 82feebc5aff7..000000000000 --- a/sci-chemistry/avogadro2/avogadro2-1.93.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -MY_PN=avogadroapp - -inherit desktop cmake-utils xdg - -DESCRIPTION="Advanced molecule editor and visualizer 2" -HOMEPAGE="https://www.openchemistry.org/" -SRC_URI="https://github.com/OpenChemistry/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="BSD GPL-2+" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc rpc test vtk" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - >=sci-libs/avogadrolibs-${PV}[qt5,vtk?] - sci-libs/hdf5:= - rpc? ( sci-chemistry/molequeue ) -" -DEPEND="${RDEPEND} - dev-cpp/eigen:3 - test? ( dev-qt/qttest:5 ) -" - -RESTRICT="test" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - cmake-utils_src_prepare - sed -e "/LICENSE/d" -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DBUILD_DOCUMENTATION=$(usex doc) - -DAvogadro_ENABLE_RPC=$(usex rpc) - -DENABLE_TESTING=$(usex test) - -DUSE_VTK=$(usex vtk) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - for size in 64 128 256 512; do - newicon -s "${size}" avogadro/icons/"${PN}"_"${size}".png "${PN}".png - done -} diff --git a/sci-chemistry/avogadro2/avogadro2-1.95.1.ebuild b/sci-chemistry/avogadro2/avogadro2-1.95.1.ebuild new file mode 100644 index 000000000000..e4a5c22f11fc --- /dev/null +++ b/sci-chemistry/avogadro2/avogadro2-1.95.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +MY_PN=avogadroapp + +DOCS_BUILDER="doxygen" +DOCS_DEPEND="media-gfx/graphviz" +DOCS_DIR="${WORKDIR}/${MY_PN}-${PV}_build/docs" +# docs/CMakeLists.txt overwrites docs.eclass outdir if we do not set this +DOCS_OUTDIR="${DOCS_DIR}/html" +DOCS_CONFIG_NAME="doxyfile" +inherit desktop docs cmake xdg + +I18N_COMMIT="3b8a86cc37e988b043d1503d2f11068389b0aca3" + +DESCRIPTION="Advanced molecule editor and visualizer 2" +HOMEPAGE="https://www.openchemistry.org/" +SRC_URI=" + https://github.com/OpenChemistry/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/OpenChemistry/avogadro-i18n/archive/${I18N_COMMIT}.tar.gz -> ${P}-i18n.tar.gz +" +S="${WORKDIR}/${MY_PN}-${PV}" + +SLOT="0" +LICENSE="BSD GPL-2+" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="rpc test vtk" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + >=sci-libs/avogadrolibs-${PV}[qt5,vtk?] + sci-libs/hdf5:= + rpc? ( sci-chemistry/molequeue ) +" +DEPEND="${RDEPEND} + dev-cpp/eigen:3 + test? ( dev-qt/qttest:5 ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${P}-qttest.patch" +) + +src_unpack() { + default + mv "${WORKDIR}/avogadro-i18n-${I18N_COMMIT}" "${WORKDIR}/avogadro-i18n" || die +} + +src_prepare() { + cmake_src_prepare + sed -e "/LICENSE/d" -i CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DBUILD_DOCUMENTATION=$(usex doc) + -DAvogadro_ENABLE_RPC=$(usex rpc) + -DENABLE_TESTING=$(usex test) + -DUSE_VTK=$(usex vtk) + ) + # Need this to prevent overwriting the documentation OUTDIR + use doc && mycmakeargs+=( -DChemData_BINARY_DIR="${DOCS_OUTDIR}" ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + docs_compile +} + +src_install() { + cmake_src_install + for size in 64 128 256 512; do + newicon -s "${size}" avogadro/icons/"${PN}"_"${size}".png "${PN}".png + done +} diff --git a/sci-chemistry/avogadro2/files/avogadro2-1.95.1-qttest.patch b/sci-chemistry/avogadro2/files/avogadro2-1.95.1-qttest.patch new file mode 100644 index 000000000000..ed12da21e3f6 --- /dev/null +++ b/sci-chemistry/avogadro2/files/avogadro2-1.95.1-qttest.patch @@ -0,0 +1,15 @@ +diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt +index d2245ff..fe1857c 100644 +--- a/avogadro/CMakeLists.txt ++++ b/avogadro/CMakeLists.txt +@@ -80,8 +80,8 @@ endif() + + if(ENABLE_TESTING) + find_package(Qt5 COMPONENTS Test REQUIRED) +- find_package(QtTesting REQUIRED NO_MODULE) +- include_directories(${QtTesting_INCLUDE_DIRS}) ++ find_package(Qt5Test REQUIRED NO_MODULE) ++ include_directories(${Qt5Test_INCLUDE_DIRS}) + link_directories(${QtTesting_LIBRARY_DIR}) + add_definitions(-DQTTESTING) + endif() |