public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/, sci-chemistry/avogadro2/files/
@ 2015-12-29 11:01 Justin Lecher
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-12-29 11:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1a15a5bde69114333976660b2c9d7dbb2d1e53e1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 10:59:01 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 11:00:52 2015 +0000
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 <jlec <AT> 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 0000000..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 0000000..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 0000000..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.0-desktop.patch
new file mode 100644
index 0000000..24738fb
--- /dev/null
+++ b/sci-chemistry/avogadro2/files/avogadro2-0.8.0-desktop.patch
@@ -0,0 +1,16 @@
+ avogadro/icons/avogadro2.desktop | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/avogadro/icons/avogadro2.desktop b/avogadro/icons/avogadro2.desktop
+index 940a21b..a88c5fb 100644
+--- a/avogadro/icons/avogadro2.desktop
++++ b/avogadro/icons/avogadro2.desktop
+@@ -6,6 +6,6 @@ Exec=avogadro2 %f
+ Icon=avogadro2
+ Terminal=false
+ Type=Application
+-Categories=Qt;Science;Chemistry;Physics;Education;
++Categories=Qt;Science;Chemistry;Physics;
+ StartupNotify=true
+-MimeType=chemical/x-cml;chemical/x-xyz
++MimeType=chemical/x-cml;chemical/x-xyz;

diff --git a/sci-chemistry/avogadro2/files/avogadro2-0.8.0-vtk.patch b/sci-chemistry/avogadro2/files/avogadro2-0.8.0-vtk.patch
new file mode 100644
index 0000000..fd872ce
--- /dev/null
+++ b/sci-chemistry/avogadro2/files/avogadro2-0.8.0-vtk.patch
@@ -0,0 +1,142 @@
+commit 23a9474aad8eba503bcfe54584fd7cad106bda17
+Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
+Date:   Mon Sep 21 12:03:07 2015 -0400
+
+    Made VTK truly optional for Avogadro application
+
+diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt
+index 90534ea..24bdd46 100644
+--- a/avogadro/CMakeLists.txt
++++ b/avogadro/CMakeLists.txt
+@@ -8,6 +8,7 @@ option(USE_VTK "Build with VTK support" OFF)
+ if(USE_VTK)
+   find_package(VTK COMPONENTS vtkGUISupportQt vtkRenderingOpenGL REQUIRED)
+   include(${VTK_USE_FILE})
++  add_definitions(-DAVO_USE_VTK)
+ endif()
+ 
+ if(MSVC)
+diff --git a/avogadro/mainwindow.cpp b/avogadro/mainwindow.cpp
+index a1c09e8..8fe3038 100644
+--- a/avogadro/mainwindow.cpp
++++ b/avogadro/mainwindow.cpp
+@@ -81,7 +81,9 @@
+ # include <molequeue/client/client.h>
+ #endif // Avogadro_ENABLE_RPC
+ 
+-#include <avogadro/vtk/vtkglwidget.h>
++#ifdef AVO_USE_VTK
++# include <avogadro/vtk/vtkglwidget.h>
++#endif
+ 
+ namespace Avogadro {
+ 
+@@ -198,8 +200,10 @@ using QtGui::ToolPluginFactory;
+ using QtGui::ExtensionPlugin;
+ using QtGui::ExtensionPluginFactory;
+ using QtOpenGL::GLWidget;
+-using VTK::vtkGLWidget;
+ using QtPlugins::PluginManager;
++#ifdef AVO_USE_VTK
++using VTK::vtkGLWidget;
++#endif
+ 
+ MainWindow::MainWindow(const QStringList &fileNames, bool disableSettings)
+   : m_molecule(NULL),
+@@ -434,9 +438,11 @@ void MainWindow::setMolecule(Molecule *mol)
+   if (GLWidget *glWidget = qobject_cast<QtOpenGL::GLWidget *>(w)) {
+     setWidgetMolecule(glWidget, mol);
+   }
++#ifdef AVO_USE_VTK
+   else if (vtkGLWidget *vtkWidget = qobject_cast<vtkGLWidget *>(w)) {
+     setWidgetMolecule(vtkWidget, mol);
+   }
++#endif
+ }
+ 
+ void MainWindow::markMoleculeDirty()
+@@ -831,6 +837,7 @@ void MainWindow::viewActivated(QWidget *widget)
+       m_moleculeModel->setActiveMolecule(m_molecule);
+     }
+   }
++#ifdef AVO_USE_VTK
+   else if (vtkGLWidget *vtkWidget = qobject_cast<vtkGLWidget*>(widget)) {
+     bool firstRun = populatePluginModel(vtkWidget->sceneModel());
+     m_sceneTreeView->setModel(&vtkWidget->sceneModel());
+@@ -851,6 +858,7 @@ void MainWindow::viewActivated(QWidget *widget)
+       m_moleculeModel->setActiveMolecule(m_molecule);
+     }
+   }
++#endif
+   updateWindowTitle();
+   activeMoleculeEdited();
+ }
+@@ -1194,14 +1202,18 @@ void MainWindow::setActiveDisplayTypes(QStringList displayTypes)
+ {
+   ScenePluginModel *scenePluginModel(NULL);
+   GLWidget *glWidget(NULL);
++#ifdef AVO_USE_VTK
+   VTK::vtkGLWidget *vtkWidget(NULL);
++#endif
+   if ((glWidget = qobject_cast<GLWidget *>(m_multiViewWidget->activeWidget()))) {
+     scenePluginModel = &glWidget->sceneModel();
+   }
++#ifdef AVO_USE_VTK
+   else if ((vtkWidget =
+            qobject_cast<VTK::vtkGLWidget *>(m_multiViewWidget->activeWidget()))) {
+     scenePluginModel = &vtkWidget->sceneModel();
+   }
++#endif
+ 
+   foreach (ScenePlugin *scene, scenePluginModel->scenePlugins())
+     scene->setEnabled(false);
+@@ -1211,8 +1223,10 @@ void MainWindow::setActiveDisplayTypes(QStringList displayTypes)
+         scene->setEnabled(true);
+   if (glWidget)
+     glWidget->updateScene();
++#ifdef AVO_USE_VTK
+   else if (vtkWidget)
+     vtkWidget->updateScene();
++#endif
+ }
+ 
+ void MainWindow::undoEdit()
+diff --git a/avogadro/viewfactory.cpp b/avogadro/viewfactory.cpp
+index 28009be..15c6a44 100644
+--- a/avogadro/viewfactory.cpp
++++ b/avogadro/viewfactory.cpp
+@@ -17,7 +17,9 @@
+ #include "viewfactory.h"
+ 
+ #include <avogadro/qtopengl/glwidget.h>
+-#include <avogadro/vtk/vtkglwidget.h>
++#ifdef AVO_USE_VTK
++# include <avogadro/vtk/vtkglwidget.h>
++#endif
+ 
+ namespace Avogadro {
+ 
+@@ -31,15 +33,22 @@ ViewFactory::~ViewFactory()
+ 
+ QStringList ViewFactory::views() const
+ {
+-  return QStringList() << "3D View" << "VTK";
++  QStringList views;
++  views << "3D View";
++#ifdef AVO_USE_VTK
++  views << "VTK";
++#endif
++  return views;
+ }
+ 
+ QWidget * ViewFactory::createView(const QString &view)
+ {
+   if (view == "3D View")
+     return new QtOpenGL::GLWidget;
++#ifdef AVO_USE_VTK
+   else if (view == "VTK")
+     return new VTK::vtkGLWidget;
++#endif
+   return NULL;
+ }
+ 

diff --git a/sci-chemistry/avogadro2/metadata.xml b/sci-chemistry/avogadro2/metadata.xml
new file mode 100644
index 0000000..0c84b64
--- /dev/null
+++ b/sci-chemistry/avogadro2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="rpc">Enable RPC server</flag>
+    <flag name="vtk">include vtk support</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">avogadro</remote-id>
+  </upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/, sci-chemistry/avogadro2/files/
@ 2021-01-18 10:14 David Seifert
  0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-01-18 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     f4357eddb29cb2ed158217280e7a6b5ec2c6d286
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Jan 18 10:14:12 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 10:14:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4357edd

sci-chemistry/avogadro2: Remove old

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> 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..00000000000
--- 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..00000000000
--- 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 <asturm@gentoo.org>
-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
-


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/, sci-chemistry/avogadro2/files/
@ 2022-03-04 17:38 Andrew Ammerlaan
  0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-03-04 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     ab3cb84f3330df13a11acbaf00ca4b2e4a20a0a8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  4 15:23:20 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Mar  4 17:38:14 2022 +0000
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 <andrewammerlaan <AT> 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 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()


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-03-04 17:38 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-04 17:38 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/, sci-chemistry/avogadro2/files/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2021-01-18 10:14 David Seifert
2015-12-29 11:01 Justin Lecher

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