Merge branch 'SoapZaNet-avogadro'

* SoapZaNet-avogadro:
  sci-libs/avogadrolibs: Add patch to fix underlinking with -Wl,--no-undefined.
  sci-chemistry/molequeue: Version bump, required to unbundle third-party libraries.

4 files changed, 100 insertions, 1 deletions

diff --git a/sci-chemistry/molequeue/Manifest b/sci-chemistry/molequeue/Manifest
index 8511144b0f00..6f70e3d7a221 100644
--- a/sci-chemistry/molequeue/Manifest
+++ b/sci-chemistry/molequeue/Manifest
@@ -1 +1,2 @@
 DIST molequeue-0.7.1.tar.gz 658745 SHA256 cdf184936a73e382b8cbff02768b9a04a3a64fec658d6dde4f6574236a73d3bf SHA512 09bdd45c1b2833be3a4f4cd3a0ade8d51276f8da150b0206d9c4a0d3b4999c58bc6cb3df48b9be70907d47c11bbd22aacc7c8d9ae401aa2f21a43405d6a8e3cd WHIRLPOOL 7ea17582495145b9d616bf1df58fbae3d4a6876c1490d5efdcefae1804cf7d29b08543a112ac7c033e2d2e18aa1537ed73a80f75484c90c7319f52dd469b5812
+DIST molequeue-0.8.0.tar.gz 643072 SHA256 c191e396f3d882c911e331e6325ed4e2666b70d4316e458964e61d5af7c8cbba SHA512 b9539d2ad2c67188ad254f186c1d67c122a15a32047801c632a1613a4f9c887f38baf2da1bb80cb123391948c2a44604fb1082e475ca6de1e683fbe51266ac84 WHIRLPOOL 4ea157d2c644ab3e35648d731f9e48f0b4f4a05f70055646f55474ef37500626794e7def8dba8bdd1d60e1d98724fd5886995d1680e47a8c9e834833ba545e41
diff --git a/sci-chemistry/molequeue/molequeue-0.8.0.ebuild b/sci-chemistry/molequeue/molequeue-0.8.0.ebuild
new file mode 100644
index 000000000000..50bd1f93e7f1
--- /dev/null
+++ b/sci-chemistry/molequeue/molequeue-0.8.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils multilib python-single-r1 versionator virtualx
+
+DESCRIPTION="Abstract, manage and coordinate execution of tasks"
+HOMEPAGE="http://www.openchemistry.org/OpenChemistry/project/molequeue.html"
+SRC_URI="https://github.com/OpenChemistry/molequeue/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+client doc server test +zeromq"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	server? ( client )
+	test? ( server )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	zeromq? ( net-libs/cppzmq:0= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	# delete bundled Qt5Json library
+	rm -r thirdparty || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable test TESTING)
+		$(cmake-utils_use_use zeromq ZERO_MQ)
+		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use client MoleQueue_BUILD_CLIENT)
+		$(cmake-utils_use server MoleQueue_BUILD_APPLICATION)
+		-DINSTALL_LIBRARY_DIR=$(get_libdir)
+		)
+	use zeromq && \
+		mycmakeargs+=( -DZeroMQ_ROOT_DIR=\"${EPREFIX}/usr\" )
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all $(usex doc documentation "")
+}
+
+src_test() {
+	VIRTUALX_COMMAND=cmake-utils_src_test
+	virtualmake
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	cmake-utils_src_install
+}
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
index 2472a69c9c02..f2a19da0b99a 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
@@ -38,7 +38,7 @@ DEPEND="${DEPEND}
 	dev-cpp/eigen:3
 	test? ( dev-cpp/gtest )"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch "${FILESDIR}/"${P}-underlinking.patch )
 
 src_configure() {
 	local mycmakeargs=(
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 000000000000..b29f3afe7613
--- /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})