gentoo resync : 22.01.2019

3 files changed, 84 insertions, 2 deletions

diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 90486a7d28d3..dd2f8b1234cb 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,6 @@
+AUX kalzium-18.12.1-deps.patch 2589 BLAKE2B 4ad2efb6ed0db05c82faf6f6851e8ef1fe549cedf25c79c67c5c350d9bdf58fcf1d921cbee6334bf971aba22a52b58c016d48bf2d60efe8591ce6f69c4360441 SHA512 a8619cdcda7080726460da58b8fbfc196712ead98db2e56d563cb82c9e76bcc2daebf4377d1d32e6c0280c39fd9887bc4224b3936357864a73d773636a7a22db
 DIST kalzium-18.08.3.tar.xz 24377636 BLAKE2B 094167e7014afe89a17d2be3331e546c2079793b3a76e3262f5f390a13e9c0bbfdde094bcbde0b61e95b28582f76d7bc870709968d5ac1c9846151474d27fa5c SHA512 844fccca678b7909675cee73a76dc0b38e901b3dbae42884fe803f773bdf678b2aa9957caebb9aac50ddc58e177169e284de9303ad40886f16f5c51c72347d32
 DIST kalzium-18.12.1.tar.xz 26573788 BLAKE2B 567441e1e397ea25246157db11a31a4b148ae280bdf5afde2ad9f04f85c333dd5f6f08815c50babbf66466db0e6e9787abe846ae21562b6bc46ed6fbe5b2d05b SHA512 6f9e7c16e64b8c690200440e80be8f036ef6254c9e367cf1fc369250c47bebec47b7918d1fdd1194efbda65685ac03f2e3191c7f6d6380aa678b197dc28d6b97
 EBUILD kalzium-18.08.3.ebuild 1585 BLAKE2B ad0493cd738cf48edae09e0937014782aff796d1c0449df3b7276f9cb2573ebdfaf0e154906a054a4a8efb65762acff2a17723332de474f54133c9fa77f5f53d SHA512 efda0462b109b2f01402351d2c0b84366e834f7515099cf61e841f791b3e21a16877948d28f249493e53ffb8587bf9b7b0e612ebd0487333c08a52e879dffdfc
-EBUILD kalzium-18.12.1.ebuild 1587 BLAKE2B bd1a97edba9423ede6e2cc290e616e815f9e6683a9b9656a94f24215cae8082c41b66e24436e1ca863ee0ca55649a9a3bca3cee2c799fbc0f80cbe4598cdc36a SHA512 3fc243be6d83dcd4bb9d4ee2a0f59126349a015ad6a93d7f0319d9d87bd1c342adeb446d7eff7a47f621378fca5312fb2c4f9afcb0cfae1a193feabbbd491947
+EBUILD kalzium-18.12.1-r1.ebuild 1631 BLAKE2B c16de2ce1b9d9f29b5d99712fb0d49391c3d61cae24e5e6b584a01ddb1bf996023b588ab2bd28a95343455e7d8f14332e96a6f19b449ea57cd45cbfca9337f3f SHA512 ee1456a8f3eec26bd1a86f7242f79674050374efe22d4f22e9660b4dd4512e83a8f6401c678773fe10a23c8bbffdb0abc0d2d3ebd4256afc49163d5a182f9434
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/files/kalzium-18.12.1-deps.patch b/kde-apps/kalzium/files/kalzium-18.12.1-deps.patch
new file mode 100644
index 000000000000..f0a1a834bc55
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-18.12.1-deps.patch
@@ -0,0 +1,79 @@
+From dd38aba1dfbc18c8e094fce2f8b167d0e12e93fb Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 17 Jan 2019 10:45:42 +0100
+Subject: [PATCH] Qt5OpenGL is only required in optional compoundviewer
+
+Add missing search for Qt5Xml
+Add missing Qt5Widgets to compoundviewer target_link_libraries
+Remove Qt5OpenGL from libscience target_link_libraries, not used
+---
+ CMakeLists.txt                | 7 ++++---
+ compoundviewer/CMakeLists.txt | 3 ++-
+ libscience/CMakeLists.txt     | 2 +-
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a48c9046..9c55aafe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,12 +42,12 @@ configure_file(
+ include_directories(${AvogadroLibs_INCLUDE_DIRS})
+ 
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+-    Widgets
+-    Script
+     Core
+     Gui
+-    OpenGL
++    Script
+     Svg
++    Widgets
++    Xml
+ )
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+@@ -92,6 +92,7 @@ add_definitions(-DUSING_DYNAMIC_LIBS)
+ endif(MSVC)
+ 
+ if (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND)
++  find_package(Qt5OpenGL ${QT_MIN_VERSION} REQUIRED)
+   find_package(KF5NewStuff REQUIRED)
+   # avoid compilerwarnings about redefinitions
+   # todo: use check_function_exits() ?
+diff --git a/compoundviewer/CMakeLists.txt b/compoundviewer/CMakeLists.txt
+index d6f6f4ab..54734a02 100644
+--- a/compoundviewer/CMakeLists.txt
++++ b/compoundviewer/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ include_directories(
+     ${CMAKE_CURRENT_BINARY_DIR}/..
+     ${EIGEN3_INCLUDE_DIR}
+-    ${OPENBABEL2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS}
++    ${OPENBABEL2_INCLUDE_DIR}
+     ${AvogadroLibs_INCLUDE_DIRS}
+     ${PROJECT_SOURCE_DIR}/compoundviewer
+ )
+@@ -21,6 +21,7 @@ target_link_libraries(compoundviewer
+     KF5::CoreAddons
+     Qt5::OpenGL
+     Qt5::Gui
++    Qt5::Widgets
+     ${OPENBABEL2_LIBRARIES}
+     AvogadroQtGui
+     AvogadroQtOpenGL
+diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
+index f25e4090..4d4d6979 100644
+--- a/libscience/CMakeLists.txt
++++ b/libscience/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(science_LIB_SRCS
+ 
+ add_library(science SHARED ${science_LIB_SRCS})
+ 
+-target_link_libraries(science Qt5::OpenGL Qt5::Xml KF5::UnitConversion KF5::WidgetsAddons KF5::KDELibs4Support)
++target_link_libraries(science Qt5::Xml KF5::UnitConversion KF5::WidgetsAddons KF5::KDELibs4Support)
+ set_target_properties(science PROPERTIES VERSION ${KALZIUMLIB_VERSION} SOVERSION ${KALZIUMLIB_SOVERSION} )
+ install(TARGETS science  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-- 
+2.20.1
+
diff --git a/kde-apps/kalzium/kalzium-18.12.1.ebuild b/kde-apps/kalzium/kalzium-18.12.1-r1.ebuild
index 6d9fd5d6f8c3..aac0fcfa4ccc 100644
--- a/kde-apps/kalzium/kalzium-18.12.1.ebuild
+++ b/kde-apps/kalzium/kalzium-18.12.1-r1.ebuild
@@ -44,7 +44,9 @@ RDEPEND="${DEPEND}
 	sci-chemistry/chemical-mime-data
 "
 
-src_configure(){
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+
+src_configure() {
 	# Fix missing finite()
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H