1 |
commit: 6211876af04121597fbc222dbe8ed5f7f6a16c68 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 31 16:55:08 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 31 16:55:08 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6211876a |
7 |
|
8 |
kde-apps/kalzium: Franeworks merged to master |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
kde-apps/kalzium/kalzium-5.9999.ebuild | 67 ---------------------------------- |
13 |
kde-apps/kalzium/kalzium-9999.ebuild | 49 ++++++++++++++++++------- |
14 |
2 files changed, 35 insertions(+), 81 deletions(-) |
15 |
|
16 |
diff --git a/kde-apps/kalzium/kalzium-5.9999.ebuild b/kde-apps/kalzium/kalzium-5.9999.ebuild |
17 |
deleted file mode 100644 |
18 |
index 2e727fc..0000000 |
19 |
--- a/kde-apps/kalzium/kalzium-5.9999.ebuild |
20 |
+++ /dev/null |
21 |
@@ -1,67 +0,0 @@ |
22 |
-# Copyright 1999-2016 Gentoo Foundation |
23 |
-# Distributed under the terms of the GNU General Public License v2 |
24 |
-# $Id$ |
25 |
- |
26 |
-EAPI=6 |
27 |
- |
28 |
-EGIT_BRANCH="frameworks" |
29 |
-KDE_HANDBOOK="forceoptional" |
30 |
-inherit kde5 flag-o-matic |
31 |
- |
32 |
-DESCRIPTION="Periodic table of the elements" |
33 |
-HOMEPAGE="https://www.kde.org/applications/education/kalzium |
34 |
-https://edu.kde.org/kalzium" |
35 |
-KEYWORDS="" |
36 |
-IUSE="editor solver" |
37 |
- |
38 |
-DEPEND=" |
39 |
- $(add_frameworks_dep karchive) |
40 |
- $(add_frameworks_dep kcompletion) |
41 |
- $(add_frameworks_dep kconfig) |
42 |
- $(add_frameworks_dep kconfigwidgets) |
43 |
- $(add_frameworks_dep kcoreaddons) |
44 |
- $(add_frameworks_dep kdelibs4support) |
45 |
- $(add_frameworks_dep ki18n) |
46 |
- $(add_frameworks_dep kio) |
47 |
- $(add_frameworks_dep kitemviews) |
48 |
- $(add_frameworks_dep khtml) |
49 |
- $(add_frameworks_dep knewstuff) |
50 |
- $(add_frameworks_dep kparts) |
51 |
- $(add_frameworks_dep kplotting) |
52 |
- $(add_frameworks_dep ktextwidgets) |
53 |
- $(add_frameworks_dep kwidgetsaddons) |
54 |
- $(add_frameworks_dep kunitconversion) |
55 |
- $(add_frameworks_dep kxmlgui) |
56 |
- $(add_frameworks_dep solid) |
57 |
- $(add_kdeapps_dep libkdegames) |
58 |
- $(add_qt_dep qtdeclarative) |
59 |
- $(add_qt_dep qtgui) |
60 |
- $(add_qt_dep qtsvg) |
61 |
- $(add_qt_dep qtopengl) |
62 |
- $(add_qt_dep qtwidgets) |
63 |
- $(add_qt_dep qtxml) |
64 |
- editor? ( |
65 |
- dev-cpp/eigen:3 |
66 |
- sci-chemistry/avogadro |
67 |
- sci-chemistry/openbabel |
68 |
- ) |
69 |
- solver? ( dev-ml/facile[ocamlopt] ) |
70 |
-" |
71 |
-RDEPEND="${DEPEND} |
72 |
- sci-chemistry/chemical-mime-data |
73 |
-" |
74 |
- |
75 |
-src_configure(){ |
76 |
- # Fix missing finite() |
77 |
- [[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H |
78 |
- |
79 |
- local mycmakeargs=( |
80 |
- $(cmake-utils_use_find_package editor Eigen3) |
81 |
- $(cmake-utils_use_find_package editor AvogadroLibs) |
82 |
- $(cmake-utils_use_find_package editor OpenBabel2) |
83 |
- $(cmake-utils_use_find_package solver OCaml) |
84 |
- $(cmake-utils_use_find_package solver Libfacile) |
85 |
- ) |
86 |
- |
87 |
- kde5_src_configure |
88 |
-} |
89 |
|
90 |
diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild |
91 |
index 36f488c..0974434 100644 |
92 |
--- a/kde-apps/kalzium/kalzium-9999.ebuild |
93 |
+++ b/kde-apps/kalzium/kalzium-9999.ebuild |
94 |
@@ -4,23 +4,45 @@ |
95 |
|
96 |
EAPI=6 |
97 |
|
98 |
-KDE_HANDBOOK="optional" |
99 |
-CPPUNIT_REQUIRED="optional" |
100 |
-OPENGL_REQUIRED="always" |
101 |
-inherit kde4-base flag-o-matic |
102 |
+KDE_HANDBOOK="forceoptional" |
103 |
+inherit kde5 flag-o-matic |
104 |
|
105 |
DESCRIPTION="Periodic table of the elements" |
106 |
HOMEPAGE="https://www.kde.org/applications/education/kalzium |
107 |
https://edu.kde.org/kalzium" |
108 |
KEYWORDS="" |
109 |
-IUSE="debug editor +plasma solver" |
110 |
+IUSE="editor solver" |
111 |
|
112 |
DEPEND=" |
113 |
+ $(add_frameworks_dep karchive) |
114 |
+ $(add_frameworks_dep kcompletion) |
115 |
+ $(add_frameworks_dep kconfig) |
116 |
+ $(add_frameworks_dep kconfigwidgets) |
117 |
+ $(add_frameworks_dep kcoreaddons) |
118 |
+ $(add_frameworks_dep kdelibs4support) |
119 |
+ $(add_frameworks_dep ki18n) |
120 |
+ $(add_frameworks_dep kio) |
121 |
+ $(add_frameworks_dep kitemviews) |
122 |
+ $(add_frameworks_dep khtml) |
123 |
+ $(add_frameworks_dep knewstuff) |
124 |
+ $(add_frameworks_dep kparts) |
125 |
+ $(add_frameworks_dep kplotting) |
126 |
+ $(add_frameworks_dep ktextwidgets) |
127 |
+ $(add_frameworks_dep kwidgetsaddons) |
128 |
+ $(add_frameworks_dep kunitconversion) |
129 |
+ $(add_frameworks_dep kxmlgui) |
130 |
+ $(add_frameworks_dep solid) |
131 |
+ $(add_kdeapps_dep libkdegames) |
132 |
+ $(add_qt_dep qtdeclarative) |
133 |
+ $(add_qt_dep qtgui) |
134 |
+ $(add_qt_dep qtsvg) |
135 |
+ $(add_qt_dep qtopengl) |
136 |
+ $(add_qt_dep qtwidgets) |
137 |
+ $(add_qt_dep qtxml) |
138 |
editor? ( |
139 |
dev-cpp/eigen:3 |
140 |
sci-chemistry/avogadro |
141 |
- >=sci-chemistry/openbabel-2.2 |
142 |
- dev-qt/qtopengl:4 |
143 |
+ sci-chemistry/openbabel |
144 |
) |
145 |
solver? ( dev-ml/facile[ocamlopt] ) |
146 |
" |
147 |
@@ -33,13 +55,12 @@ src_configure(){ |
148 |
[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H |
149 |
|
150 |
local mycmakeargs=( |
151 |
- -DBUILD_plasmoid=$(usex plasma) |
152 |
- -DWITH_Eigen3=$(usex editor) |
153 |
- -DWITH_Avogadro=$(usex editor) |
154 |
- -DWITH_OpenBabel2=$(usex editor) |
155 |
- -DWITH_OCaml=$(usex solver) |
156 |
- -DWITH_Libfacile=$(usex solver) |
157 |
+ $(cmake-utils_use_find_package editor Eigen3) |
158 |
+ $(cmake-utils_use_find_package editor AvogadroLibs) |
159 |
+ $(cmake-utils_use_find_package editor OpenBabel2) |
160 |
+ $(cmake-utils_use_find_package solver OCaml) |
161 |
+ $(cmake-utils_use_find_package solver Libfacile) |
162 |
) |
163 |
|
164 |
- kde4-base_src_configure |
165 |
+ kde5_src_configure |
166 |
} |