[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/, sci-chemistry/avogadro2/files/

2022-03-04 Thread Andrew Ammerlaan
commit: ab3cb84f3330df13a11acbaf00ca4b2e4a20a0a8
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Mar  4 15:23:20 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Mar  4 17:38:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab3cb84f

sci-chemistry/avogadro2: add version 1.95.1

Closes: https://bugs.gentoo.org/834325
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-chemistry/avogadro2/Manifest   |  2 +
 sci-chemistry/avogadro2/avogadro2-1.95.1.ebuild| 82 ++
 .../avogadro2/files/avogadro2-1.95.1-qttest.patch  | 15 
 3 files changed, 99 insertions(+)

diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest
index cb54b5425a01..00bcc209d6dc 100644
--- a/sci-chemistry/avogadro2/Manifest
+++ b/sci-chemistry/avogadro2/Manifest
@@ -1 +1,3 @@
 DIST avogadro2-1.93.0.tar.gz 2905461 BLAKE2B 
db51e4574fdf2a31657b8bef7b06eb0d563484deaae1a6d75649187d6f5fd7b02a99506cfb850e09792555d7c27d9937d0df0f7172fafc3ddcbccaa7502c5bb6
 SHA512 
8e4e15b6c2d1935f8c585c83761b28a6397bc1dc22cd5f66464d59dd25327b1cffec809af492586be4b56793448f94f9375c16e8a4c4969f7b8f2591049cc5fc
+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

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 ..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 ..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_

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/, sci-chemistry/avogadro2/files/

2021-01-18 Thread David Seifert
commit: f4357eddb29cb2ed158217280e7a6b5ec2c6d286
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Jan 18 10:14:12 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jan 18 10:14:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4357edd

sci-chemistry/avogadro2: Remove old

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-chemistry/avogadro2/Manifest   |  1 -
 .../avogadro2/avogadro2-1.90.0_p20180211.ebuild| 61 --
 .../avogadro2-1.90.0_p20180211-qt-5.11b3.patch | 34 
 3 files changed, 96 deletions(-)

diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest
index dae68233edb..cb54b5425a0 100644
--- a/sci-chemistry/avogadro2/Manifest
+++ b/sci-chemistry/avogadro2/Manifest
@@ -1,2 +1 @@
-DIST avogadro2-1.90.0_p20180211.tar.gz 1099312 BLAKE2B 
fbf8e2006c46114632587615b48ac130e45a46ce2859a9c34270714091bc8397d9d7a93c3166bf58833f100e3e40afd1962012e479a8f92ba8ff9078200d51c5
 SHA512 
db9b0983d2161df493138ddf18c5dbda54cf2f8b75ebc944f1f57dab0f1e2048582362e5f46a78b1610aba080aaac8a66d2b2b71db748e031ffde306d3609856
 DIST avogadro2-1.93.0.tar.gz 2905461 BLAKE2B 
db51e4574fdf2a31657b8bef7b06eb0d563484deaae1a6d75649187d6f5fd7b02a99506cfb850e09792555d7c27d9937d0df0f7172fafc3ddcbccaa7502c5bb6
 SHA512 
8e4e15b6c2d1935f8c585c83761b28a6397bc1dc22cd5f66464d59dd25327b1cffec809af492586be4b56793448f94f9375c16e8a4c4969f7b8f2591049cc5fc

diff --git a/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild 
b/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild
deleted file mode 100644
index 8345cd9619e..000
--- a/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=avogadroapp
-COMMIT=d5e1f827be7e9d1cc6755fd68a2b42b0b1d2ec32
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Advanced molecule editor and visualizer 2"
-HOMEPAGE="https://www.openchemistry.org/";
-SRC_URI="https://github.com/OpenChemistry/${MY_PN}/archive/${COMMIT}.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="${DEPEND}
-   dev-cpp/eigen:3
-   test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${COMMIT}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )
-
-src_prepare() {
-   cmake-utils_src_prepare
-   sed -e "/LICENSE/d" -i CMakeLists.txt || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_DOCUMENTATION=$(usex doc)
-   -DAvogadro_ENABLE_RPC=$(usex rpc)
-   -DENABLE_TESTING=$(usex test)
-   -DUSE_VTK=$(usex vtk)
-   )
-   cmake-utils_src_configure
-}
-
-pkg_postinst() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}

diff --git 
a/sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch 
b/sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch
deleted file mode 100644
index 1e7a23f0b54..000
--- a/sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2c70d9bf7248d8da7691a5830ba6a0972fd9eea7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Tue, 17 Apr 2018 11:57:32 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-

- avogadro/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt
-index 115b798..f564eb5 100644
 a/avogadro/CMakeLists.txt
-+++ b/avogadro/CMakeLists.txt
-@@ -16,7 +16,7 @@ if(MSVC)
- endif()
- 
- # Find the Qt components we need.
--find_package(Qt5 COMPONENTS Widgets Network REQUIRED)
-+find_package(Qt5 REQUIRED COMPONENTS Concurrent Widgets Network CONFIG)
- 
- configure_file(avogadroappconfig.h.in avogadroappconfig.h)
- 
-@@ -88,7 +88,7 @@ endif()
- 
- add_executable(avogadro WIN32 MACOSX_BUNDLE
-   ${avogadro_srcs} ${ui_srcs} ${rcc_srcs})
--qt5_use_modules(avogadro Widgets Network Concurrent)
-+target_link_libraries(avogadro Qt5::Widgets Qt5::Network Qt5::Concurrent)
- if(WIN32)
-   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} 
/NODEFAULTLIB:MSVCRTD")
-   target_link_libraries(avogadro Qt5::WinMain)
--- 
-2.17.0
-



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/, sci-chemistry/avogadro2/files/

2015-12-29 Thread Justin Lecher
commit: 1a15a5bde69114333976660b2c9d7dbb2d1e53e1
Author: Justin Lecher  gentoo  org>
AuthorDate: Tue Dec 29 10:59:01 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Dec 29 11:00:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a15a5bd

sci-chemistry/avogadro2: Import from science overlay

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/avogadro2/Manifest   |   2 +
 sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild |  48 +++
 sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild |  58 +
 .../avogadro2/files/avogadro2-0.8.0-desktop.patch  |  16 +++
 .../avogadro2/files/avogadro2-0.8.0-vtk.patch  | 142 +
 sci-chemistry/avogadro2/metadata.xml   |  15 +++
 6 files changed, 281 insertions(+)

diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest
new file mode 100644
index 000..96307cd
--- /dev/null
+++ b/sci-chemistry/avogadro2/Manifest
@@ -0,0 +1,2 @@
+DIST avogadroapp-0.7.2.tar.gz 523935 SHA256 
f29db2f04aea8d9dfa0ab73bfa0c45fba18f45fba968a249f618024e8ab8fe63 SHA512 
fb798931b66827b0b0e27295b528483d258e15612dba729219874b6171be3e981bd18337add41eb93613d90653286d8d8aa0dbe5fb11577c5ee22ba25b65443b
 WHIRLPOOL 
bce0a6c8e0e10bedb332b68c08935ecaf2abe8fbc53cfb7eb53f206da89014f99e0f9ccd95c2ad6c876bb97090939b0807e0d10c7e62f58ebb3a3cc3254fd2a6
+DIST avogadroapp-0.8.0.tar.gz 1105596 SHA256 
d79840f0395c11c2081262ba9c1bc6d944c089bac162b434b94a3080bc90c221 SHA512 
cc8c6c1620f603b3ed48a45c13968dc451382d3c3947b743fc65c547d6af92ae1f7f1764ffba84e602a2b54a5be075473e58cb49b8061b9e41b728eadba1a5de
 WHIRLPOOL 
dc04714b0f830bf826b5253ceb1738500f48aed5e1c922bd2096d2273c88264bbcf27a796418eec80c4483c5905d6c46e8ad4af22e011ab1b451c70d0c087a38

diff --git a/sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild 
b/sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild
new file mode 100644
index 000..b3f00f8
--- /dev/null
+++ b/sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+MY_PN=avogadroapp
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Advanced molecule editor and visualizer 2"
+HOMEPAGE="http://www.openchemistry.org/";
+SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc rpc test"
+
+RDEPEND="
+   >=dev-cpp/eigen-3.2.0-r1
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   dev-qt/qtopengl:4
+   ~sci-libs/avogadrolibs-${PV}[qt4,opengl]
+   sci-libs/hdf5
+   rpc? ( sci-chemistry/molequeue )
+"
+DEPEND="${DEPEND}"
+
+RESTRICT=test
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+   sed '/COPYING/d' -i CMakeLists.txt || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_build doc DOCUMENTATION)
+   $(cmake-utils_use rpc Avogadro_ENABLE_RPC)
+   $(cmake-utils_use_enable test TESTING)
+   )
+   cmake-utils_src_configure
+}

diff --git a/sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild 
b/sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild
new file mode 100644
index 000..815f0e0
--- /dev/null
+++ b/sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+MY_PN=avogadroapp
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Advanced molecule editor and visualizer 2"
+HOMEPAGE="http://www.openchemistry.org/";
+SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc rpc test vtk"
+
+RDEPEND="
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtwidgets:5
+   ~sci-libs/avogadrolibs-${PV}[qt5,opengl]
+   sci-libs/hdf5
+   rpc? ( sci-chemistry/molequeue )
+"
+DEPEND="${DEPEND}
+   >=dev-cpp/eigen-3.2.0-r1
+   test? ( dev-qt/qttest:5 )"
+
+RESTRICT=test
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+   "${FILESDIR}"/${P}-desktop.patch
+   "${FILESDIR}"/${P}-vtk.patch
+)
+
+src_prepare() {
+   sed '/COPYING/d' -i CMakeLists.txt || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_build doc DOCUMENTATION)
+   $(cmake-utils_use rpc Avogadro_ENABLE_RPC)
+   $(cmake-utils_use_enable test TESTING)
+   $(cmake-utils_use_use vtk)
+   )
+   cmake-utils_src_configure
+}

diff --git a/sci-chemistry/avogadro2/files/avogadro2-0.8.0-desktop.patch 
b/sci-chemistry/avogadro2/files/avogadro2-0.8.