[gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/files/, sci-libs/avogadrolibs/

[Andreas Sturmlechner]

commit:     d38044ae854dae2c28301beeb32066b2c75089ba
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  7 21:31:38 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 09:53:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d38044ae

sci-libs/avogadrolibs: Drop 0.9.0, fails to build

Bug: https://bugs.gentoo.org/645248
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-libs/avogadrolibs/Manifest                     |  1 -
 sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild    | 66 ----------------------
 .../files/avogadrolibs-0.8.0-underlinking.patch    | 34 -----------
 3 files changed, 101 deletions(-)

diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 1a7ac4c9fe8..1651cd867a2 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,3 +1,2 @@
-DIST avogadrolibs-0.9.0.tar.gz 742370 BLAKE2B cd104cea48b82a1ac86fdb9e93717e2647f57a0d713673d8b340d259f73d6d9985decf0c4e4d83f13d54d12ae2aefee8e75b5d04861f8ab67b9b42690c3c74f7 SHA512 7cb000cd6399f33483c38b4f8a9c4a4688f5054cba35e101bed0f2371cea614ace6b3fc65c3ed1418976afef4462a09be868500435a5ae9c98a7ac496c10c36f
 DIST avogadrolibs-1.91.0_pre20180406.tar.gz 857345 BLAKE2B 8e5c6b0a838a2a6b7dc925c1b544ab4d4de8b7769b1fe8d787127a1014b1243da89a2a6f6cfc871181f81a443c3ee63d758369f003afaf591c9373c9d5122ee3 SHA512 1814b2105615aabc1df78b14c581e78fea20a1e4ace8979bb2ad123ab0994d90c3935e37f0cc58b60d3307ffe682599a93d8cadddc22b4ba524caaec1a2c5319
 DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8

diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
deleted file mode 100644
index 7c4a4362b85..00000000000
--- a/sci-libs/avogadrolibs/avogadrolibs-0.9.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
-HOMEPAGE="http://www.openchemistry.org/"
-SRC_URI="https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc hdf5 opengl qt5 static-plugins test vtk"
-
-REQUIRED_USE="qt5? ( opengl )"
-
-RDEPEND="
-	>=sci-chemistry/molequeue-0.7
-	sci-libs/chemkit
-	hdf5? ( sci-libs/hdf5:= )
-	opengl? (
-		dev-qt/qtopengl:5
-		media-libs/glew
-	)
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
-	vtk? ( sci-libs/vtk )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.2-6464.patch
-	"${FILESDIR}/"${PN}-0.8.0-underlinking.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_PROTOCALL=OFF
-		-DBUILD_GPL_PLUGINS=ON
-		-DUSE_MOLEQUEUE=ON
-		-DUSE_HDF5=$(usex hdf5)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_QT=$(usex qt5)
-		-DBUILD_STATIC_PLUGINS=$(usex static-plugins)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_VTK=$(usex vtk)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# TODO: bundles jsoncpp
-	rm "${ED%/}"/usr/lib64/libjsoncpp.a || die
-}

diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
deleted file mode 100644
index b29f3afe761..00000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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})