From 725be3ac0107f4f8429f9b3d4564e03888780d4d Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sun, 15 Mar 2009 14:21:23 +0000 Subject: Merge missed ebuild from kde-testing. Package-Manager: portage-2.2_rc25/cvs/Linux x86_64 --- kde-base/kalzium/ChangeLog | 5 ++++- kde-base/kalzium/Manifest | 4 ++-- kde-base/kalzium/kalzium-4.2.1.ebuild | 26 +++++++++++++++----------- 3 files changed, 21 insertions(+), 14 deletions(-) (limited to 'kde-base/kalzium') 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 kalzium-4.2.1.ebuild: + Merge missed ebuild from kde-testing. 12 Mar 2009; Marcus D. Hanwell +files/kalzium-4.2.1-include-order.patch, kalzium-4.2.1.ebuild: diff --git a/kde-base/kalzium/Manifest b/kde-base/kalzium/Manifest index 26ba0267960b..ec5c6511439f 100644 --- a/kde-base/kalzium/Manifest +++ b/kde-base/kalzium/Manifest @@ -5,6 +5,6 @@ DIST kdeedu-3.5.9.tar.bz2 30174459 RMD160 8b1afa1e80e1f688ab86ad3de62eb294293fca DIST kdeedu-4.2.1.tar.bz2 59459156 RMD160 1d934e175d4897c224d3a9843e1fbdd18e5e7e80 SHA1 f2381f33f6586b950e925423d135b9e66b7bf428 SHA256 768e05f1bc99b307e348fb97ad77a2d266fefb47dfc5fa2e28badbfebaae22a6 EBUILD kalzium-3.5.10.ebuild 1671 RMD160 a638271b3ed94c945c70fb879ca2f42a57d8fd78 SHA1 699c4c679f1e4123c7ca06b43ae1f5d20449e26d SHA256 cf55e531ad238d8d8e37e289391b8b3fd0d6992356dbe5758aa28db295251b5b EBUILD kalzium-3.5.9.ebuild 1667 RMD160 f7bf2c995e7178c31d34852f249782a5e7a28568 SHA1 ec24d6af9d11523ffefaf1635e7dcd69d72a8cc3 SHA256 e5fd7c899502ac19e7577d64f698700e520d671b6b858295e743cb29b2afd47b -EBUILD kalzium-4.2.1.ebuild 1579 RMD160 7bebe4bb2b594d0169e8dfe6deff294b0c2ba44b SHA1 19cae2aaf9629b10500ca76c48a82b2f7cb04bee SHA256 3fd41c6651446913ce3e6644c9cdc1b0f121ea3ec429f63454e7b62afc5a2e79 -MISC ChangeLog 14435 RMD160 8f138459e0a512ecac4fc82dd9187563a95f66b0 SHA1 986b3cb2a46f33a74c043a0fbafa2d46f494ab37 SHA256 4b598a70cb63b7eca61c3fcb62a3dfb8c9696796d118b762b553eac5491f5b33 +EBUILD kalzium-4.2.1.ebuild 1636 RMD160 9fe8f954780e3173583b7f56337fb507af884147 SHA1 6ad82522f863003aa44a60f6017aec4b012e63f2 SHA256 8cb186d27c4a9131e8ab7d98d04ac1d98c20343645c4b25f9644f45a092da3ab +MISC ChangeLog 14554 RMD160 64a22b0912df949ecd34ab38e612d8a872cfa038 SHA1 5a4da64e16bc950b83cc242a317986898554d2c8 SHA256 1189b3dd12452aae1e564a6ab2035251b2cbfbaeae50b359d5f92ae2aa6f5666 MISC metadata.xml 295 RMD160 398bff32e939c3fbd95b9c2f0fe26b088ea12b7c SHA1 bf599c6c0998b2b9f7a172f4561dec68b6d31d08 SHA256 568cc42713217c2057a2d61f81a385eed081cdb70b4aac4044b2fb63a1e401bc 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" ) -- cgit v1.2.3-65-gdbad