gentoo resync : 15.02.2018

3 files changed, 2 insertions, 63 deletions

diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 7ad78c0bf445..875dba1609d4 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,6 +1,5 @@
-AUX kalzium-17.12.1-knewstuff-optional.patch 1614 BLAKE2B 66cb70494818194741b53e979292bb018730f0e21d5054d156fac7b77e4820172e3b7a449bd2ac4ba5c6af1d5b4e8ffec4070fabcb0c7141e0cfce837738aa5c SHA512 20b0278fe8d569bd609be10cbfdb6a95951616d2cee448d51b286c5d745af4e20fc4c4effec0afe82aee098992ab97f250f004906a588966e307f00b07b14f22
 DIST kalzium-17.08.3.tar.xz 24450828 BLAKE2B 2586dd46a0847e6ef7becb5773e6b32f67bc24e3d91166287fd6df10c498eaeb0f8d2ba777d951db3226b47b2a94a7ef1e01a5623ee7c3c89ee6f035ae3567f5 SHA512 a421091154d9de89ce70c79b093e716c925c6573958bb8b3f02279d890d0c7c7dbf91ff3ee455688df6628059804a377d571bb8b75a68748d1b9f4eb003b1dbe
-DIST kalzium-17.12.1.tar.xz 24451344 BLAKE2B 0bd94b87dec53c37f170765e302e2b8cb948c8a4bd2203bc0ba293552f1dbabd4cf0d8668ab63d7b840b34e88692e539165cd946f2992929427cb89a0ef5bfa8 SHA512 35d5cdb803d261da248276746fea8eedf2eb16b62cfdde7320a6c1383b14b4b13654671e5775a1db00b533a645a98b1638f05009b661894554c6bd5539a4af50
+DIST kalzium-17.12.2.tar.xz 24448980 BLAKE2B 649388a6135c4e4584838bdf28639dc426e3255990bb8139c45d6bedfe9e5fed40eb3440acc6641cf720157c4cdf9ce8559e94169463524f6d0847d582dc6bcf SHA512 2f2c4ed44cd0302b63819a4b6ec0ec15038aae74f825b30ae84ccb15eb593380b77a6de84a11d94dd20ae9e66225ad977e8d127b3c120bcaa02950ffe62737c7
 EBUILD kalzium-17.08.3.ebuild 1559 BLAKE2B 308da3c1790106361a169df03109b8f60666763e36f1d8d39fa3e094b402cad5ae4839195909237fca26f9899faee2bc63b6bf990fd1b65c21d4b306cafb4df5 SHA512 6a21f9fde13a7f7d36df5b99a70dc5c58f7e4c4b27e338b61117a72832fcc5fdd087f89e72b763265cd3b59f4b38dced9345a667d7ce47376e0c157e779cd02b
-EBUILD kalzium-17.12.1-r1.ebuild 1622 BLAKE2B 89ab7537e35ae06da459c2c8060f1fe9b7f812d29ccd3bec8d3c6e9863f0cc7af582f78e2629eb318b5a548473a7902530d0a4b25ec243be5019457aca313f52 SHA512 5af6784cf7ba5a4295492c136b73cd4891f87cf999c670e9db5d56dbd5e84d8394eb4198acabd9149c4465dad29a2c22a090443b3d41d09e03205814e120c10d
+EBUILD kalzium-17.12.2.ebuild 1565 BLAKE2B 82ff5893bb85a36dfde441498f18b06c40065bb016f34258ac89847d01342c6a4d4b5c59b2b913f7ce4bf3044ec562a1568e37581c0947ff0b9bdae903f4322c SHA512 9fa365ee681ff9c3d906fe027280eabc0bd7c5a343450fce9c550d00d14e2b140213da51bcf092e7ec7db6a09b9356aaa8f46f7f996b83d2ef51e940af671866
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch b/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch
deleted file mode 100644
index e60a6594a34c..000000000000
--- a/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4f7922a93bbea8582d29eebb194932708f9e21cd Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 16 Jan 2018 12:53:56 +0100
-Subject: [PATCH] KF5NewStuff is only used in moleculeview, conditional on
- Eigen3 and AvogadroLibs
-
----
- CMakeLists.txt     | 2 +-
- src/CMakeLists.txt | 3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4309a683..a12d4e36 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,7 +55,6 @@ find_package(KF5 REQUIRED COMPONENTS
-     I18n
-     KDELibs4Support
-     KHtml
--    NewStuff
-     Parts
-     Plotting
-     Solid
-@@ -93,6 +92,7 @@ add_definitions(-DUSING_DYNAMIC_LIBS)
- endif(MSVC)
- 
- if (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND)
-+  find_package(KF5NewStuff REQUIRED)
-   # avoid compilerwarnings about redefinitions
-   # todo: use check_function_exits() ?
-   message(STATUS "Kalzium molecular editor enabled")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 623ba2e5..0b1936eb 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -139,18 +139,17 @@ target_link_libraries(kalzium
-     KF5::Plotting
-     KF5::KHtml
-     KF5::KDELibs4Support
--    KF5::NewStuff
-     KF5::UnitConversion
-     Qt5::Script
-     Qt5::Svg
-     Qt5::Quick
-     science
--    ${OPENBABEL2_LIBRARIES}
- )
- if (OPENBABEL2_FOUND)
-    target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
-    if (EIGEN3_FOUND AND AvogadroLibs_FOUND)
-       target_link_libraries(kalzium
-+         KF5::NewStuff
-          Qt5::OpenGL
-          compoundviewer
-          AvogadroQtGui
--- 
-2.15.1
-
diff --git a/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild b/kde-apps/kalzium/kalzium-17.12.2.ebuild
index 9aa752c327f0..18d761888717 100644
--- a/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild
+++ b/kde-apps/kalzium/kalzium-17.12.2.ebuild
@@ -43,8 +43,6 @@ RDEPEND="${DEPEND}
 	sci-chemistry/chemical-mime-data
 "
 
-PATCHES=( "${FILESDIR}/${P}-knewstuff-optional.patch" )
-
 src_configure(){
 	# Fix missing finite()
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H