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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     8eb6b1584b942c1d81ecedc7e87868e14a85f280
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 13:30:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 13:30:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb6b158

sci-libs/avogadrolibs: Update patch after review, drop unused DEPEND

Package-Manager: Portage-2.3.29, Repoman-2.3.9

 .../avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild |  5 +----
 .../avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch     | 17 +++++------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
index df8f4182395..0936e94a44c 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
@@ -39,10 +39,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:3
-	qt5? (
-		dev-qt/linguist-tools:5
-		dev-qt/qtopengl:5
-	)
+	qt5? ( dev-qt/linguist-tools:5 )
 	test? ( dev-cpp/gtest )"
 
 S="${WORKDIR}/${PN}-${COMMIT}"

diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
index 2aacee8e5b7..11816e438c2 100644
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
@@ -1,4 +1,4 @@
-From fdac6931c24986d377e06d77dbc607bb3c1654dd Mon Sep 17 00:00:00 2001
+From 03dd55beb878b5e15d891535a3c8b7ffa6133c92 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
 Date: Tue, 17 Apr 2018 11:31:22 +0200
 Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
@@ -9,8 +9,8 @@ Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
  avogadro/qtopengl/CMakeLists.txt  | 3 +--
  avogadro/vtk/CMakeLists.txt       | 3 +--
  tests/qtgui/CMakeLists.txt        | 3 +--
- tests/qtopengl/CMakeLists.txt     | 5 ++---
- 6 files changed, 7 insertions(+), 13 deletions(-)
+ tests/qtopengl/CMakeLists.txt     | 2 --
+ 6 files changed, 5 insertions(+), 12 deletions(-)
 
 diff --git a/avogadro/molequeue/CMakeLists.txt b/avogadro/molequeue/CMakeLists.txt
 index 43a9195..37431cd 100644
@@ -76,10 +76,10 @@ index 1cfd51a..da08078 100644
  # Now add all of the tests, using the gtest_filter argument so that only those
  # cases are run in each test invocation.
 diff --git a/tests/qtopengl/CMakeLists.txt b/tests/qtopengl/CMakeLists.txt
-index 370f28f..5843a38 100644
+index 370f28f..60fc5ae 100644
 --- a/tests/qtopengl/CMakeLists.txt
 +++ b/tests/qtopengl/CMakeLists.txt
-@@ -44,13 +44,12 @@ create_test_sourcelist(testDriver qtopengltests.cpp ${testSrcs})
+@@ -44,8 +44,6 @@ create_test_sourcelist(testDriver qtopengltests.cpp ${testSrcs})
  
  add_executable(AvogadroQtOpenGLTests ${testDriver})
  
@@ -88,13 +88,6 @@ index 370f28f..5843a38 100644
  target_link_libraries(AvogadroQtOpenGLTests
    AvogadroQtOpenGL
    vtkImagingCore
-   vtkIOImage
--  vtkRenderingQt)
-+  vtkRenderingQt
-+  Qt5::OpenGL)
- 
- foreach(test ${tests})
-   string(TOLOWER ${test} testname)
 -- 
 2.17.0