| 1 |
commit: 435145064c0507cf536e3d3090f6d8ebeee873c5 |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 28 21:20:25 2013 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 28 21:20:38 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=43514506 |
| 7 |
|
| 8 |
[kde-base/kalzium] Fix dependency mess |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha170 |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/kalzium/kalzium-4.10.49.9999.ebuild | 14 ++++++++------ |
| 14 |
kde-base/kalzium/kalzium-9999.ebuild | 14 ++++++++------ |
| 15 |
2 files changed, 16 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-base/kalzium/kalzium-4.10.49.9999.ebuild b/kde-base/kalzium/kalzium-4.10.49.9999.ebuild |
| 18 |
index 11f2d96..3d7bd15 100644 |
| 19 |
--- a/kde-base/kalzium/kalzium-4.10.49.9999.ebuild |
| 20 |
+++ b/kde-base/kalzium/kalzium-4.10.49.9999.ebuild |
| 21 |
@@ -13,15 +13,16 @@ DESCRIPTION="KDE: periodic table of the elements." |
| 22 |
KEYWORDS="" |
| 23 |
IUSE="editor debug +plasma solver" |
| 24 |
|
| 25 |
-RDEPEND=" |
| 26 |
+DEPEND=" |
| 27 |
$(add_kdebase_dep libkdeedu) |
| 28 |
- editor? ( >=sci-chemistry/openbabel-2.2 ) |
| 29 |
-" |
| 30 |
-DEPEND="${RDEPEND} |
| 31 |
- sci-chemistry/avogadro |
| 32 |
- editor? ( >=dev-cpp/eigen-2.0.3:2 ) |
| 33 |
+ editor? ( |
| 34 |
+ >=dev-cpp/eigen-2.0.3:2 |
| 35 |
+ sci-chemistry/avogadro |
| 36 |
+ >=sci-chemistry/openbabel-2.2 |
| 37 |
+ ) |
| 38 |
solver? ( dev-ml/facile[ocamlopt] ) |
| 39 |
" |
| 40 |
+RDEPEND=${DEPEND} |
| 41 |
|
| 42 |
KMEXTRACTONLY=" |
| 43 |
libkdeedu/kdeeduui/ |
| 44 |
@@ -34,6 +35,7 @@ src_configure(){ |
| 45 |
|
| 46 |
mycmakeargs=( |
| 47 |
$(cmake-utils_use_with editor Eigen2) |
| 48 |
+ $(cmake-utils_use_with editor Avogadro) |
| 49 |
$(cmake-utils_use_with editor OpenBabel2) |
| 50 |
$(cmake-utils_use_with editor OpenGL) |
| 51 |
$(cmake-utils_use_with solver OCaml) |
| 52 |
|
| 53 |
diff --git a/kde-base/kalzium/kalzium-9999.ebuild b/kde-base/kalzium/kalzium-9999.ebuild |
| 54 |
index 11f2d96..3d7bd15 100644 |
| 55 |
--- a/kde-base/kalzium/kalzium-9999.ebuild |
| 56 |
+++ b/kde-base/kalzium/kalzium-9999.ebuild |
| 57 |
@@ -13,15 +13,16 @@ DESCRIPTION="KDE: periodic table of the elements." |
| 58 |
KEYWORDS="" |
| 59 |
IUSE="editor debug +plasma solver" |
| 60 |
|
| 61 |
-RDEPEND=" |
| 62 |
+DEPEND=" |
| 63 |
$(add_kdebase_dep libkdeedu) |
| 64 |
- editor? ( >=sci-chemistry/openbabel-2.2 ) |
| 65 |
-" |
| 66 |
-DEPEND="${RDEPEND} |
| 67 |
- sci-chemistry/avogadro |
| 68 |
- editor? ( >=dev-cpp/eigen-2.0.3:2 ) |
| 69 |
+ editor? ( |
| 70 |
+ >=dev-cpp/eigen-2.0.3:2 |
| 71 |
+ sci-chemistry/avogadro |
| 72 |
+ >=sci-chemistry/openbabel-2.2 |
| 73 |
+ ) |
| 74 |
solver? ( dev-ml/facile[ocamlopt] ) |
| 75 |
" |
| 76 |
+RDEPEND=${DEPEND} |
| 77 |
|
| 78 |
KMEXTRACTONLY=" |
| 79 |
libkdeedu/kdeeduui/ |
| 80 |
@@ -34,6 +35,7 @@ src_configure(){ |
| 81 |
|
| 82 |
mycmakeargs=( |
| 83 |
$(cmake-utils_use_with editor Eigen2) |
| 84 |
+ $(cmake-utils_use_with editor Avogadro) |
| 85 |
$(cmake-utils_use_with editor OpenBabel2) |
| 86 |
$(cmake-utils_use_with editor OpenGL) |
| 87 |
$(cmake-utils_use_with solver OCaml) |
Archives