commit: 46111e1999ba8aef000edb69e7ea110922cff989
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 10:33:58 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 11:00:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46111e19
kde-apps/kalzium: Add missing avogadro[qt5] USE, fix cmake
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/kalzium/files/kalzium-18.12.1-deps.patch | 79 +++++++++++++++++++++++
kde-apps/kalzium/kalzium-18.12.1-r1.ebuild | 62 ++++++++++++++++++
2 files changed, 141 insertions(+)
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 00000000000..f0a1a834bc5
--- /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 <ast...@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-r1.ebuild
b/kde-apps/kalzium/kalzium-18.12.1-r1.ebuild
new file mode 100644
index 00000000000..aac0fcfa4cc
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-18.12.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 flag-o-matic
+
+DESCRIPTION="Periodic table of the elements"
+HOMEPAGE="https://www.kde.org/applications/education/kalzium
https://edu.kde.org/kalzium/";
+KEYWORDS="~amd64 ~x86"
+IUSE="editor solver"
+
+DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep khtml)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kplotting)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kunitconversion)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ editor? (
+ $(add_qt_dep qtopengl)
+ $(add_frameworks_dep knewstuff)
+ dev-cpp/eigen:3
+ sci-chemistry/openbabel
+ sci-libs/avogadrolibs
+ )
+ solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND="${DEPEND}
+ sci-chemistry/chemical-mime-data
+"
+
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+
+src_configure() {
+ # Fix missing finite()
+ [[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package editor Eigen3)
+ $(cmake-utils_use_find_package editor AvogadroLibs)
+ $(cmake-utils_use_find_package editor OpenBabel2)
+ $(cmake-utils_use_find_package solver OCaml)
+ $(cmake-utils_use_find_package solver Libfacile)
+ )
+
+ kde5_src_configure
+}
