commit: fdcf49cabeda32968c14b6e97bb890a9887dfe3f
Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 08:40:17 2016 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 08:40:17 2016 +0000
URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=fdcf49ca
bump avogadro2 and its rev-deps
sci-chemistry/avogadro2/Manifest | 1 +
sci-chemistry/avogadro2/avogadro2-0.9.0.ebuild | 53 +++++++++++++++++++
sci-chemistry/avogadro2/metadata.xml | 15 ++++++
sci-libs/avogadrolibs/Manifest | 1 +
sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild | 59 ++++++++++++++++++++++
.../files/avogadrolibs-0.8.0-underlinking.patch | 34 +++++++++++++
.../avogadrolibs-0.9.0-fix-cmake-libdir.patch | 13 +++++
sci-libs/avogadrolibs/metadata.xml | 17 +++++++
8 files changed, 193 insertions(+)
diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest
new file mode 100644
index 0000000..6b72131
--- /dev/null
+++ b/sci-chemistry/avogadro2/Manifest
@@ -0,0 +1 @@
+DIST avogadroapp-0.9.0.tar.gz 1105704 SHA256
b67bdf27975a5ebdb8b54fcfd079e3caceece466ba21c0d0d02b384144efa796 SHA512
22ab7a1115255d55e9a149ebed0f330af10d748bacf9c86b5a23d147d7605b8f180aac2adef22dabdaece703f456609d4db2e72e130964ad013c6a109e6456f6
WHIRLPOOL
b6c3dfa776ca20740973f64e626ebf67e7046f1c369f8e57195bf5c09d4745cff3daf03a543e0207075f538214ab3dd3223a099e062000cd705faa52436f5377
diff --git a/sci-chemistry/avogadro2/avogadro2-0.9.0.ebuild
b/sci-chemistry/avogadro2/avogadro2-0.9.0.ebuild
new file mode 100644
index 0000000..a8647f7
--- /dev/null
+++ b/sci-chemistry/avogadro2/avogadro2-0.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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}
+
+src_prepare() {
+ sed '/COPYING/d' -i CMakeLists.txt || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOCUMENTATION="$(usex doc)"
+ -DUSE_VTK="$(usex vtk)"
+ -DUSE_Avogadro_ENABLE_RPC="$(usex rpc)"
+ -DENABLE_TESTING="$(usex test)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/sci-chemistry/avogadro2/metadata.xml
b/sci-chemistry/avogadro2/metadata.xml
new file mode 100644
index 0000000..89ea8dc
--- /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>
+ <maintainer type="project">
+ <email>sci-chemis...@gentoo.org</email>
+ <name>Gentoo Chemistry Project</name>
+ </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>
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
new file mode 100644
index 0000000..9167e4d
--- /dev/null
+++ b/sci-libs/avogadrolibs/Manifest
@@ -0,0 +1 @@
+DIST avogadrolibs-0.9.0.tar.bz2 630869 SHA256
912a15dd02711992d96356203455b5084c24243d9826053206ac7d9998e6b40c SHA512
d4deca3a7f47f1ff41f9a295eea79fff090768a6b9a095ec472cf96ddbd7b9b812b1e9430ea182f856bf902131671e371e5516cbf5b7026c286d0479bae677df
WHIRLPOOL
328247278f8ac336266086281237895b63faff2effbdf99a0d6aeaf4c308d1317bdd7a7eff73e504e4266423e0853c8b70dc436f573ba0eb15168d9a64ca19e4
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
new file mode 100644
index 0000000..1fa1522
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
+HOMEPAGE="http://www.openchemistry.org/";
+SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc opengl qt5 static-plugins test vtk"
+
+REQUIRED_USE="qt5? ( opengl )"
+
+RDEPEND="
+ >=sci-chemistry/molequeue-0.7
+ sci-libs/chemkit
+ sci-libs/hdf5:=
+ opengl? (
+ dev-qt/qtopengl:5
+ media-libs/glew
+ )
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ )
+ vtk? ( sci-libs/vtk )
+"
+DEPEND="${DEPEND}
+ dev-cpp/eigen:3
+ test? ( dev-cpp/gtest )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.8.0-underlinking.patch"
+ "${FILESDIR}/${P}-fix-cmake-libdir.patch"
+ )
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_PROTOCALL=OFF
+ -DBUILD_GPL_PLUGINS=ON
+ -DUSE_MOLEQUEUE=ON
+ -DBUILD_DOCUMENTATION="$(usex doc)"
+ -DBUILD_STATIC_PLUGINS="$(usex static-plugins)"
+ -DUSE_OPENGL="$(usex opengl)"
+ -DUSE_QT="$(usex qt5)"
+ -DUSE_VTK="$(usex vtk)"
+ -DENABLE_TESTING="$(usex test)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
new file mode 100644
index 0000000..b29f3af
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
@@ -0,0 +1,34 @@
+Fix underlinking problems in shared libraries.
+
+--- avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt
++++ avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt
+@@ -23,4 +23,4 @@
+ "${apbs_uis}"
+ )
+
+-target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient)
++target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient
AvogadroMoleQueue)
+--- avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt
++++ avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt
+@@ -7,3 +7,5 @@
+ ""
+ playertool.qrc
+ )
++
++target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL)
+--- avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt
++++ avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt
+@@ -8,3 +8,5 @@
+ "povray.cpp"
+ ""
+ )
++
++target_link_libraries(POVRay LINK_PRIVATE AvogadroRendering)
+--- avogadrolibs-0.8.0/avogadro/qtplugins/qtaim/CMakeLists.txt
++++ avogadrolibs-0.8.0/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-0.9.0-fix-cmake-libdir.patch
b/sci-libs/avogadrolibs/files/avogadrolibs-0.9.0-fix-cmake-libdir.patch
new file mode 100644
index 0000000..5125d7e
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-0.9.0-fix-cmake-libdir.patch
@@ -0,0 +1,13 @@
+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/metadata.xml
b/sci-libs/avogadrolibs/metadata.xml
new file mode 100644
index 0000000..b9237e1
--- /dev/null
+++ b/sci-libs/avogadrolibs/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci-chemis...@gentoo.org</email>
+ <name>Gentoo Chemistry Project</name>
+ </maintainer>
+ <use>
+ <flag name="static-plugins">
+ build all plugins statically into main plugin modules
+ </flag>
+ <flag name="vtk">include vtk support</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">avogadro</remote-id>
+ </upstream>
+</pkgmetadata>
