We try to symlink kicker,konqueror libraries, so they should be in DEPEND, not just...

Package-Manager: portage-2.1.4.4

diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index f92154d46e4d5e9f31cbc7eb7727f0edec02de88..025e0311f97036e8fc28d1cbc12d9e024265888c 100644 (file)
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kcontrol
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.108 2008/03/04 02:40:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.109 2008/03/07 11:57:24 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kcontrol-3.5.8-r2.ebuild, kcontrol-3.5.9.ebuild:
+  We try to symlink kicker,konqueror libraries, so they should be in DEPEND,
+  not just in RDEPEND.
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kcontrol-3.5.8-r2.ebuild,
   kcontrol-3.5.9.ebuild, kcontrol-4.0.1.ebuild:

diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest
index d7483692d2ab0cd84cf9b8435dd0ca16e7df2e7c..6513111c69e86776107a4efc54a0f50e5d568e32 100644 (file)
--- a/kde-base/kcontrol/Manifest
+++ b/kde-base/kcontrol/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST kdebase-3.5-patchset-10.tar.bz2 38090 RMD160 b3fdca9c5220a213c1390ef558542640e810834a SHA1 a2a1a638bb6b7ac0b00d7588c53a1b60013cb3bb SHA256 73d3541312366a1aedf9ebe5187e565458224682ef188a20b735f7e54718e572
 DIST kdebase-3.5.8.tar.bz2 24200172 RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea SHA1 07f2e33aef101e97237676719ef2bf8418d894b2 SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493
 DIST kdebase-3.5.9.tar.bz2 24239563 RMD160 2552d850e62efd044c178e2eb04efdcce90e4a33 SHA1 a6a19e0b26ed7a2b138a4a7594c8486e26610de8 SHA256 6e958803055928cda73273996696e5f7aaad803a3854853f4ec44428c49c831e
 DIST kdebase-runtime-4.0.1.tar.bz2 48268169 RMD160 af620141d235ed39427390251a056ed73e486a2b SHA1 8a0d85ccdbba072f0951f694150dd87b074c5ec4 SHA256 648de8cd517caf24e018475e462eacda0801e49be09b1f6202652052c0f9c515
-EBUILD kcontrol-3.5.8-r2.ebuild 2460 RMD160 5fd96e5c1b3b6b48b4feb94eb1c60be0c5bf70f8 SHA1 007e759c1026556b4b6ba1bfbd06e184e15856b5 SHA256 dbcbeadb9bd56547ee8ab05772b787d3bf3bf92791b440b088cbee58e42b3c55
-EBUILD kcontrol-3.5.9.ebuild 2334 RMD160 19b3feaa51791ba4fc05e3de29e519075be84b4c SHA1 535526d727fdd82a4ef64a541bfa1b8a11e644b9 SHA256 743f9362257b5a41be47837fe60f9edeedcf7585af7ff9cd81daf3deb5baeec1
+EBUILD kcontrol-3.5.8-r2.ebuild 2463 RMD160 4906f4a352200ee1fbfdbcb07de9a985f7871f3d SHA1 1f7ee54710b7de57dde4988c35e21bf26981520c SHA256 a9cc2c84e4f0ed0ff51dee7cbf95208703020a8bb648e4791cc331879a953a7a
+EBUILD kcontrol-3.5.9.ebuild 2336 RMD160 e5b80cba19928a5124677d224743521023bd9e54 SHA1 486dad4cfd73aff3f86ec1e8447c4546d4407cab SHA256 03bbaa6b102d1c782bab739b1da6064bea91c233a40ad643623e6e8740e3eb1e
 EBUILD kcontrol-4.0.1.ebuild 1283 RMD160 75a802542020b37223694a0c04db6fe201626518 SHA1 96d7563eea0f64de23e19eccc1e800a143c79d89 SHA256 df8d8772d6977219d1ffbb26cae2a509dcc86d54349dce44e93ce64d5b7d373e
-MISC ChangeLog 14358 RMD160 716278d73ccdbc123157189a309eaf8e3169d451 SHA1 117a78ad36286528093361298ee0ad3631db6a7c SHA256 57eddcb988a9f3f1037a98d39d4d484cdf34d41cc444b04ba71f80fe56dad6de
+MISC ChangeLog 14565 RMD160 a655124a6180ad65b8fad79e8e8f055df148eb05 SHA1 88b0cc028a0df1e5052a09dd144f63537d8c57d8 SHA256 7acfb1752931339cb53d2d8c554491b4519d07150c0e363e3e9d30a9e03a0f28
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH0S2PB18eXLOpYdkRApQRAKCE/MeIDN+/6osnK16aJ0fM1oxYsgCffxOc
+xkML0f6DaSXXe1Ab9BUCKHU=
+=MCtt
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kcontrol/kcontrol-3.5.8-r2.ebuild b/kde-base/kcontrol/kcontrol-3.5.8-r2.ebuild
index da84ecfe925dd4c61e55d9498566469111406e16..7a754ce0e23942ae04533d3c5e8fb63290bd25cd 100644 (file)
--- a/kde-base/kcontrol/kcontrol-3.5.8-r2.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.5.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.8-r2.ebuild,v 1.7 2008/03/04 02:40:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.8-r2.ebuild,v 1.8 2008/03/07 11:57:24 ingmar Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -20,7 +20,9 @@ DEPEND=">=media-libs/freetype-2.3
        arts? ( $(deprange 3.5.5 $MAXKDEVER kde-base/arts) )
        opengl? ( virtual/opengl )
        ieee1394? ( sys-libs/libraw1394 )
-       logitech-mouse? ( >=dev-libs/libusb-0.1.10a )"
+       logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
+       $(deprange $PV $MAXKDEVER kde-base/libkonq)
+       $(deprange $PV $MAXKDEVER kde-base/kicker)"
 
 RDEPEND="${DEPEND}
        sys-apps/usbutils
@@ -28,9 +30,7 @@ RDEPEND="${DEPEND}
        $(deprange $PV $MAXKDEVER kde-base/kdebase-data)
        $(deprange 3.5.7-r1 $MAXKDEVER kde-base/kdesu)
        $(deprange $PV $MAXKDEVER kde-base/khelpcenter)
-       $(deprange $PV $MAXKDEVER kde-base/khotkeys)
-       $(deprange $PV $MAXKDEVER kde-base/libkonq)
-       $(deprange $PV $MAXKDEVER kde-base/kicker)"
+       $(deprange $PV $MAXKDEVER kde-base/khotkeys)"
 
 KMEXTRACTONLY="kwin/kwinbindings.cpp
                kicker/kicker/core/kickerbindings.cpp

diff --git a/kde-base/kcontrol/kcontrol-3.5.9.ebuild b/kde-base/kcontrol/kcontrol-3.5.9.ebuild
index 3a12571b19d4382e84396e101dbaea732e5bd5c9..5155e9937316a3264aa7e153ecc50f1a8e708877 100644 (file)
--- a/kde-base/kcontrol/kcontrol-3.5.9.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.9.ebuild,v 1.2 2008/03/04 02:40:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.9.ebuild,v 1.3 2008/03/07 11:57:24 ingmar Exp $
 
 KMNAME=kdebase
 EAPI="1"
@@ -19,17 +19,16 @@ DEPEND=">=media-libs/freetype-2.3
        arts? ( >=kde-base/arts-${PV}:${SLOT} )
        opengl? ( virtual/opengl )
        ieee1394? ( sys-libs/libraw1394 )
-       logitech-mouse? ( >=dev-libs/libusb-0.1.10a )"
-
+       logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
+       >=kde-base/libkonq-${PV}:${SLOT}
+       >=kde-base/kicker-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
        sys-apps/usbutils
        >=kde-base/kcminit-${PV}:${SLOT}
        >=kde-base/kdebase-data-${PV}:${SLOT}
        >=kde-base/kdesu-${PV}:${SLOT}
        >=kde-base/khelpcenter-${PV}:${SLOT}
-       >=kde-base/khotkeys-${PV}:${SLOT}
-       >=kde-base/libkonq-${PV}:${SLOT}
-       >=kde-base/kicker-${PV}:${SLOT}"
+       >=kde-base/khotkeys-${PV}:${SLOT}"
 
 KMEXTRACTONLY="kwin/kwinbindings.cpp
                kicker/kicker/core/kickerbindings.cpp