summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2013-03-28 21:18:27 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2013-03-28 21:18:27 +0000
commitc241591a81bcc87433568793531ced5d6ab00900 (patch)
tree131185e4cf3d76238325a58c75185e8575dfd243 /kde-base/kalzium
parentDepend on glew/glu unconditionally, bug #463650. (diff)
downloadgentoo-2-c241591a81bcc87433568793531ced5d6ab00900.tar.gz
gentoo-2-c241591a81bcc87433568793531ced5d6ab00900.tar.bz2
gentoo-2-c241591a81bcc87433568793531ced5d6ab00900.zip
Fix dependency mess
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'kde-base/kalzium')
-rw-r--r--kde-base/kalzium/ChangeLog6
-rw-r--r--kde-base/kalzium/kalzium-4.10.0.ebuild16
-rw-r--r--kde-base/kalzium/kalzium-4.10.1.ebuild16
3 files changed, 23 insertions, 15 deletions
diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 85462a6a6ae0..2ecdd7fd1173 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kalzium
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.255 2013/03/06 13:41:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.256 2013/03/28 21:18:27 dilfridge Exp $
+
+ 28 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> kalzium-4.10.0.ebuild,
+ kalzium-4.10.1.ebuild:
+ Fix dependency mess
*kalzium-4.10.1 (06 Mar 2013)
diff --git a/kde-base/kalzium/kalzium-4.10.0.ebuild b/kde-base/kalzium/kalzium-4.10.0.ebuild
index 895d972c8f01..e3dc06a4b788 100644
--- a/kde-base/kalzium/kalzium-4.10.0.ebuild
+++ b/kde-base/kalzium/kalzium-4.10.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.10.0.ebuild,v 1.2 2013/02/23 16:03:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.10.0.ebuild,v 1.3 2013/03/28 21:18:27 dilfridge Exp $
EAPI=5
@@ -13,15 +13,16 @@ DESCRIPTION="KDE: periodic table of the elements."
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="editor debug +plasma solver"
-RDEPEND="
+DEPEND="
$(add_kdebase_dep libkdeedu)
- editor? ( >=sci-chemistry/openbabel-2.2 )
-"
-DEPEND="${RDEPEND}
- sci-chemistry/avogadro
- editor? ( >=dev-cpp/eigen-2.0.3:2 )
+ editor? (
+ >=dev-cpp/eigen-2.0.3:2
+ sci-chemistry/avogadro
+ >=sci-chemistry/openbabel-2.2
+ )
solver? ( dev-ml/facile[ocamlopt] )
"
+RDEPEND=${DEPEND}
KMEXTRACTONLY="
libkdeedu/kdeeduui/
@@ -34,6 +35,7 @@ src_configure(){
mycmakeargs=(
$(cmake-utils_use_with editor Eigen2)
+ $(cmake-utils_use_with editor Avogadro)
$(cmake-utils_use_with editor OpenBabel2)
$(cmake-utils_use_with editor OpenGL)
$(cmake-utils_use_with solver OCaml)
diff --git a/kde-base/kalzium/kalzium-4.10.1.ebuild b/kde-base/kalzium/kalzium-4.10.1.ebuild
index 37ce9993ab34..f2ede017173f 100644
--- a/kde-base/kalzium/kalzium-4.10.1.ebuild
+++ b/kde-base/kalzium/kalzium-4.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.10.1.ebuild,v 1.1 2013/03/06 13:41:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.10.1.ebuild,v 1.2 2013/03/28 21:18:27 dilfridge Exp $
EAPI=5
@@ -13,15 +13,16 @@ DESCRIPTION="KDE: periodic table of the elements."
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="editor debug +plasma solver"
-RDEPEND="
+DEPEND="
$(add_kdebase_dep libkdeedu)
- editor? ( >=sci-chemistry/openbabel-2.2 )
-"
-DEPEND="${RDEPEND}
- sci-chemistry/avogadro
- editor? ( >=dev-cpp/eigen-2.0.3:2 )
+ editor? (
+ >=dev-cpp/eigen-2.0.3:2
+ sci-chemistry/avogadro
+ >=sci-chemistry/openbabel-2.2
+ )
solver? ( dev-ml/facile[ocamlopt] )
"
+RDEPEND=${DEPEND}
KMEXTRACTONLY="
libkdeedu/kdeeduui/
@@ -34,6 +35,7 @@ src_configure(){
mycmakeargs=(
$(cmake-utils_use_with editor Eigen2)
+ $(cmake-utils_use_with editor Avogadro)
$(cmake-utils_use_with editor OpenBabel2)
$(cmake-utils_use_with editor OpenGL)
$(cmake-utils_use_with solver OCaml)