Fix dependency mess

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 41 insertions, 31 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/Manifest b/kde-base/kalzium/Manifest
index 41c1b71af9b4..260bb681f5d2 100644
--- a/kde-base/kalzium/Manifest
+++ b/kde-base/kalzium/Manifest
@@ -4,25 +4,27 @@ Hash: SHA256
 DIST kalzium-4.10.0.tar.xz 3693760 SHA256 94ae3e3fc5fdb28b472c1821f9e8aeffc6f1d37af5ee0b683f0fae7e98582b0f SHA512 b3d2aae3472d51dc33536e17cd63d3a39465db2b84e48460c630b1f901f87947c79cc8889910ff432ce40312fea13fa0a7bdcdb862215d399b10a5e9fb9a9169 WHIRLPOOL 493bf6efd4ea8bb47bbf741a70d489107f32f46a210965384d94f383508d77c4213f0ce3424735ab3a8d42649837c5f4aa56c0e1b598fb79782d7088d7d5ff39
 DIST kalzium-4.10.1.tar.xz 3718352 SHA256 03dcf3cdf44f4a68f3f6322f097c5f3e561caa328bad1ce5fad729f167c5497e SHA512 a0c4a3cd10eca44e818df73638949f9805ceb53a1551f39e7df930b4b9c2a8ea3a14306b9a9e1c6eec4218369d6bbcd60d6f2c02f300717a1fc04071940327bd WHIRLPOOL 608d66ebd4407a191a68d2641042dbd00bc0958ccfb56536c51397720c346422e01fc43d54d890de49449fc2f031fdcfa653b8f7a9ddb468cc4bd6aa95e69f2f
 DIST kalzium-4.9.5.tar.xz 3715476 SHA256 dcaabb3fe996741494f94b44f782dccf340e2d346ca0892b7b18f63b79fd2158 SHA512 a6d3d188e0a49372942842f8de8b7c04be9a68f9b48a11a5855daa167d5a0d2669efff1d0e3c45b342c62c114db3d9c60c03d2f7c4fb21ef23652f45cc4385c4 WHIRLPOOL 068dc0a7139df7e729308718c5ecf205dba6a2e75eb7ca13eb611bef461855ce2d94907c83eb26038198b2c233238c18200d2a2895f66138a12892b20ada6db5
-EBUILD kalzium-4.10.0.ebuild 1113 SHA256 830d2af28191ecf32b6eb78c1d28e03340cbcd427831845684ac264b04933328 SHA512 57c8de37686c13eaa24efc9c8b057559afdbab2dedd6233ab656132bd867728de65ca3012b189b7db598ca726d77111993c67da27bf8bac216ffcf47a2c7f3f6 WHIRLPOOL dab3150c3eb939507a410c4d1c79ce4803f96f68eb7e00d0a09a0ac61f3547b266f2fc54e5c7aa8659671dbb559a577d2d590356fbe9f1d52bccc56a59d1bafc
-EBUILD kalzium-4.10.1.ebuild 1119 SHA256 e5a991edb20e552014060c35ed96f9a215b14cf086d4010e487201ec5d4829e8 SHA512 1242ec31b2c3c89933e80d854d1b15cfc9246773dec7f9b7e1962891fb76ee010ca75887cbc45e435000e0900757fd19a6af744c1fbc49fa5cba75e7908685a9 WHIRLPOOL 901826bb1c331d2252c8d1752f24a20607f8eb7615bfe92e1d94c40512500555e93aef6b62da71c5249849dd2bb11f29468e1525ce67192774b679bc931bddae
+EBUILD kalzium-4.10.0.ebuild 1150 SHA256 721aad4e4177699da62def8a4e9ccbd60b48648380704bb75d9c0957e00b1d7c SHA512 211cd2ffc2294253b9affbc67a06666c7db7d4d6ef48cf7d75bb4c3409ce70d29b65f0a279e337761e9c377ea8b5493f43a07a8cd70ab292d02ea8acb1418b07 WHIRLPOOL 30a9c518f8e9a01312ccee019446c53b106b5e0370c9bf7352c896f2604985d2792c460b6f8a2c17f53604e384c60b21b996a672c31e8223240fbad6114ddf3f
+EBUILD kalzium-4.10.1.ebuild 1150 SHA256 aac6c7bdb4c4e57c165b66c8b1b48d57f16bb446bf9ae61a433e501732efbc2a SHA512 cee37d5349cf06de64881f23cedf1a0f27e85427e94f3742df868dbc718d641d60df7733cbab8f265c405870c680e1206ac4614894f62e11907db1913e061854 WHIRLPOOL a0f81f66eead80be9b30a66d35efbbb25c0ebb3e9386fc6d7cdf0ac9e3aa6e67cdd7daf22d6e826c05eb9ab4693d99cfc69e3c833aff39b9c8dc4e6438bec5d3
 EBUILD kalzium-4.9.5.ebuild 1085 SHA256 ef73ee0c09b3503ff5dd7ff0a20a0f18fd4388900504244a841c1cc71e35b701 SHA512 f5775d0aabe98e8a65dc80532379a0b37457403378f5a7610399662d675fcc3e173d65bc4f6109480ebe323e3c775f668903b0707a35e0a22b967e0b4e651856 WHIRLPOOL e5a22195163ef35a2fd443add732a2ef304fd121c2cc1eeba46a593dd09983187ddb6a3e33cc4b2e10140474db03d3b33f236c320e1f9172bb1f8c5f3db5207c
-MISC ChangeLog 30463 SHA256 77a0f843fb2eaa140f502ab86fc643307bcd8a05167850d8cc04d7b28e340469 SHA512 484b1ad12d8c6f4db3044ece5a3ccab8882c624e75ff5bc9c593b86246a5030ab7d458aa0dbaa7d8fa302a19db8e938b6a6f459d9b7940c7dfe7e0973efa1aeb WHIRLPOOL be787c101636f91ef3bf5be19419dd37ba98f010ceda96cee7bac4cad7b7b10b50fc52476d6ce865dc5ffc3617d7ddc0a589047fc1a1f8e8cb7f5d5ebc72eeb9
+MISC ChangeLog 30591 SHA256 9eaca7910ad967923661c7f97b2a4019728c2eb3db63b0410f21bb2b93fccda0 SHA512 c4bc913e96514bc70d0dce6a2cb4e569e69417d5abd7235343aac3002da3990dc614a1ee540c8cabd7e0eabed9bc22d8b84a850c3b200ee4f4c45ea3ee86e35c WHIRLPOOL 36f9cb1db0302bc70b151000cfe34345726a4e5b685d0be9876fad19f3092baf3aad4c47886e2087372c2de1f6a5ea5b939842125af4090a5930b383a696f9a9
 MISC metadata.xml 295 SHA256 568cc42713217c2057a2d61f81a385eed081cdb70b4aac4044b2fb63a1e401bc SHA512 ebc359590e6cb4a6838fcae6b27dbab6a934ce78c015e039978b2168b15bea5630232241c43e66e1b5e509dc8d35c00e91f1af32c52ce64b696f9fdec19cd648 WHIRLPOOL 1a7a74cd55c7f8260fa3c98064ac3875a05696ae168897c40f10d5c5e120bbc49c92ff8fc6752190df0758ff928387193d059944c861b0cc75dfffefe53d33c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRN0iQAAoJEEb+UGWnxTyHf00P/AhMjOpPAs+Ivul1fi6wECVX
-KJYmcXJRRmB4sYrzVSY+EQqnYSAzSCKusoC7yY0KLhjq/Z4YDaBc6p5VYjqlz60A
-5SioHFbtU37q2kvjuHNcLi662jkn1yUE74nG8DLExz90vRIELlM3xrkAV/G/Me8u
-r2B9BQdXw0z51GlTdN4B9OvAudbggBNC0nLnOFmZrsCdpVVcrAJwqt/1cvILyIY9
-N9WYpb0RPMBvEzT9CfeFCIPKbokdNfhQnsWuAZucjeDAH7SXXUOdriN71w8/WfZA
-YdRGNwBJdXIf6TtoXhhV8z+5qMYRndufcYXB/m4LqPM/zDMx6BbOgOWSePDZ1gUc
-l1g12CyWysZsWdu9rk/XwIOY91Dbc2iUrodT1inkU4bueUktqaqqeq4H5UegMD5T
-LFFGwxhKgCHQMyW1AAXrxEo9yNS0tDK20q8pNG3SfaOZn794aolg5iTPGE6nmNt5
-ddxh53XJH0NnZtKy7T+/tbl08hXD4VpQ42h2D6gwJYpun+p3bqPVvYcY5sIUuwp6
-c/WnvZFylMaqsxKbC070+uuwrwmfvROHSinJ1S7SEwrLpDDkPlsvJzHgMsvQwnc8
-XwJuAnOeLO0ypiR87AsO2rzAS8scX4H+XBeGPJN8+/zAMFrjrsxOci5atoO1QNUC
-fv+2qIh7NU61zqSOQiva
-=+1aT
+iQJ8BAEBCABmBQJRVLPgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcIE0QANTup4OZC3ip7X+k4Oduh+ST
+GZt0vPJ7Ml/jzONaZ87sv0sQbIwZBbfqhzB6hyx96nQURkHWgfw9ggbfaa+dzbQF
+7uiew+ehCSwvgaRxIDe4kD3qOXbqDdD7QSVYwvXic3sMGw3/5cE/Ov+Fk3+AIIxZ
+4LAvpRFTq6VY+2RcDma7eQsJwoP/RRah74N4SQtNtj3RHKYlI/TVo+A/ASUAuK4z
+6rXtMecGb8RUgVAkRaEC+HvDdKGR1tJvyj5jOzXC2IVAktA33Gs5ljvoTfpE5FRN
+X/xaJaHq6Y6U5IT7IBTHU6ePOkAvAq+7qfG1NH3b36Mo+M7MP/tsmrgNw05damsT
+QmYAQ0s6Y2w5KuPc5bdIWcPFI07suQlid20obADwqu/LjA9ohuP55+GimeXeWOE3
+k8pY1n2oDz7SsZYkKLlPFn7AfRhozYm9Wlr6AHW5qm38naFWTMd55Av20edBZxaT
+Auj1LQJJMS6FjLHd2lb6aK6tsNv0LEAVtDjbYOEz/ccWOZ8K9Lz9B34bibrk4njv
+XPosOtR3ETkGywfF8X8vrxBtcGOZ5p3Xk84F+o8GBPFOZUpNV9phGBqARSg3dumu
+X9C9ckr4KjKb24Y3OAcCW/be+w9WdRjcGQIJ9xcW/7fxn10OeiHZjCRfhV0roVdV
+Lv5UGrr9N1En1+PsRc1d
+=Rg96
 -----END PGP SIGNATURE-----
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)