gentoo resync : 02.08.2019

4 files changed, 2 insertions, 146 deletions

diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 8f16c8310edf..a86e869b6766 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,6 +1,3 @@
-AUX kalzium-18.12.1-deps.patch 2589 BLAKE2B 4ad2efb6ed0db05c82faf6f6851e8ef1fe549cedf25c79c67c5c350d9bdf58fcf1d921cbee6334bf971aba22a52b58c016d48bf2d60efe8591ce6f69c4360441 SHA512 a8619cdcda7080726460da58b8fbfc196712ead98db2e56d563cb82c9e76bcc2daebf4377d1d32e6c0280c39fd9887bc4224b3936357864a73d773636a7a22db
-DIST kalzium-18.12.3.tar.xz 26573732 BLAKE2B 4ee0e241c2fd0b3ae96e5e8ec977ad5b0b8340abdc610f6fcbb8f4658626d7748dd785f07a5bc6ab5111b080430898fa40ba185fa37bd884a964d8a5d5d5ed2b SHA512 a03c477fc535784ed6d8007373bc172a01fb72148282858cdb4d2560daa2c31bd3daf068e5ecaa28564888573cb14997840d26bbd922a1fe0c1cf3e77e17f711
 DIST kalzium-19.04.3.tar.xz 26404792 BLAKE2B 524077674be45b62a042bd33de3dc6f3fb5bb2a02ac4e636b9989847ef4f1903686cdf6bc89b2c92a0b873616237897a5f70df8f566e7c4689a8e80a98e6d5f7 SHA512 405f5102b7e8326aca4934167f34fcdc0770132ed93bda1d5069b42503bdd4cf8c9b1b080632a776a38625deca0ee1d9cbf20858b64ae1083d6ab160f94d1146
-EBUILD kalzium-18.12.3.ebuild 1649 BLAKE2B c0a82e7fad1337cc1d243846e90ba68677b458b8a00581c0d349c4bdf3a8494c2e77d03d800d782dc87265822946b1501e21bf90e64657713e5aaec1d0fd941d SHA512 978938af4216c0abfdd0d1f53dd444bd969e0a3994ccd82752a2e48c7984d3904d724a5f21b862c218bcfa4c69df4365a1827a90103639cd3e4f46c785b5ae97
-EBUILD kalzium-19.04.3.ebuild 1556 BLAKE2B b03e335dbafbef98ce4ddbff7dddb3e2ace5ef81d46c2c00fb0fc6d0b242531c786896148ad255ee294eecbce2e2be54bca304824f3eb73458a3c03a3b2d3b69 SHA512 94e68b01bdd0da0294c3a717d66e0f6c37e599036787469cb6dc34d27ea3e73ae4e911926e1505ca9e5593d473e1800d3e981727b590a8ec4837da2cebf32a17
+EBUILD kalzium-19.04.3.ebuild 1553 BLAKE2B a976004a732eac69818757732cda84dc81d7cddc3cc43868a456d50511476bb24176481bd49dee56b9b5c6f7b8565e53d1bd44d71257e1004c911c805bd5ac27 SHA512 732388ce7a2300b2330661635df11d874a72c559bc190d5a7b2eb5cc55de35b409a8896610d53a0188fc61bbca9f1984815d9198465795d63ca81c398915a917
 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
deleted file mode 100644
index f0a1a834bc55..000000000000
--- a/kde-apps/kalzium/files/kalzium-18.12.1-deps.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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.3.ebuild b/kde-apps/kalzium/kalzium-18.12.3.ebuild
deleted file mode 100644
index 3f8f55252fe0..000000000000
--- a/kde-apps/kalzium/kalzium-18.12.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~arm64 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_frameworks_dep knewstuff)
-		$(add_qt_dep qtopengl)
-		dev-cpp/eigen:3
-		sci-chemistry/openbabel
-		sci-libs/avogadrolibs[qt5]
-	)
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-RDEPEND="${DEPEND}
-	sci-chemistry/chemical-mime-data
-"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.1-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
-}
diff --git a/kde-apps/kalzium/kalzium-19.04.3.ebuild b/kde-apps/kalzium/kalzium-19.04.3.ebuild
index db1dcf41c0be..4e406fa2ef2b 100644
--- a/kde-apps/kalzium/kalzium-19.04.3.ebuild
+++ b/kde-apps/kalzium/kalzium-19.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5 flag-o-matic
 
 DESCRIPTION="Periodic table of the elements"
 HOMEPAGE="https://kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="editor solver"
 
 DEPEND="