summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-15 14:21:23 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-15 14:21:23 +0000
commitd79ae9d3acd614b8c3e23a5c6c7383457d85c451 (patch)
tree4be9818c3c0fe74fe1d332bd5cab4cad44084dc3 /kde-base/kalzium
parentAutomatic-merge: merge updates for 4.2.1 from kde-testing. (diff)
downloadgentoo-2-d79ae9d3acd614b8c3e23a5c6c7383457d85c451.tar.gz
gentoo-2-d79ae9d3acd614b8c3e23a5c6c7383457d85c451.tar.bz2
gentoo-2-d79ae9d3acd614b8c3e23a5c6c7383457d85c451.zip
Merge missed ebuild from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kalzium')
-rw-r--r--kde-base/kalzium/ChangeLog5
-rw-r--r--kde-base/kalzium/kalzium-4.2.1.ebuild26
2 files changed, 19 insertions, 12 deletions
diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 92e8358600e4..22f84ec371b1 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kalzium
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.115 2009/03/12 02:52:37 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.116 2009/03/15 14:21:23 scarabeus Exp $
+
+ 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kalzium-4.2.1.ebuild:
+ Merge missed ebuild from kde-testing.
12 Mar 2009; Marcus D. Hanwell <cryos@gentoo.org>
+files/kalzium-4.2.1-include-order.patch, kalzium-4.2.1.ebuild:
diff --git a/kde-base/kalzium/kalzium-4.2.1.ebuild b/kde-base/kalzium/kalzium-4.2.1.ebuild
index 4457e0a6b688..27367327588b 100644
--- a/kde-base/kalzium/kalzium-4.2.1.ebuild
+++ b/kde-base/kalzium/kalzium-4.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.2.1.ebuild,v 1.3 2009/03/12 02:52:37 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.2.1.ebuild,v 1.4 2009/03/15 14:21:23 scarabeus Exp $
EAPI="2"
@@ -13,16 +13,20 @@ DESCRIPTION="KDE: periodic table of the elements."
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="editor debug +plasma solver"
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}[kdeprefix=]
- editor? (
- >=dev-cpp/eigen-1.0.5
- >=sci-chemistry/openbabel-2.2
- )
- solver? ( dev-ml/facile[ocamlopt] )"
-RDEPEND="${RDEPEND}"
-
-KMEXTRACTONLY=" libkdeedu/kdeeduui/
- libkdeedu/libscience/"
+COMMON_DEPEND="
+ >=kde-base/libkdeedu-${PV}:${SLOT}[kdeprefix=]
+ editor? ( >=sci-chemistry/openbabel-2.2 )
+"
+DEPEND="${COMMON_DEPEND}
+ editor? ( >=dev-cpp/eigen-1.0.5 )
+ solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+KMEXTRACTONLY="
+ libkdeedu/kdeeduui/
+ libkdeedu/libscience/
+"
PATCHES=( "${FILESDIR}/${P}-include-order.patch" )