Resolves bug #131354. Replaced RDEPEND with PDEPEND to resolve cyclic dependency: kxdocker cannot depend on its plugins, however we can force the installation of the essential ones this way.

(Portage version: 2.1_pre9-r4)

2 files changed, 10 insertions, 40 deletions

diff --git a/kde-misc/kxdocker/ChangeLog b/kde-misc/kxdocker/ChangeLog
index 8cf35a3385ae..62b1c16a5d2c 100644
--- a/kde-misc/kxdocker/ChangeLog
+++ b/kde-misc/kxdocker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/kxdocker
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/ChangeLog,v 1.7 2006/04/22 12:32:04 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/ChangeLog,v 1.8 2006/04/27 01:03:01 deathwing00 Exp $
+
+  27 Apr 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  kxdocker-1.1.4a.ebuild:
+  Resolves bug #131354. Restored PDEPEND because the other packages
+  need to be merged after kxdocker is installed. This will force
+  the essential kxdocker plugins to be merged compulsorily, after
+  kxdocker, because they depend on it.
 
   22 Apr 2006; Daniel Black <dragonheart@gentoo.org> kxdocker-1.1.4a.ebuild:
   moved PDEPEND to RDEPEND after consultation with Alessio Cassibba (X-Drum)
diff --git a/kde-misc/kxdocker/kxdocker-1.1.4a.ebuild b/kde-misc/kxdocker/kxdocker-1.1.4a.ebuild
index 2894b557ba36..dee975cd27bc 100644
--- a/kde-misc/kxdocker/kxdocker-1.1.4a.ebuild
+++ b/kde-misc/kxdocker/kxdocker-1.1.4a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/kxdocker-1.1.4a.ebuild,v 1.3 2006/04/22 12:32:04 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/kxdocker-1.1.4a.ebuild,v 1.4 2006/04/27 01:03:01 deathwing00 Exp $
 
 inherit kde
 
@@ -13,49 +13,12 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="nls"
 
-RDEPEND=">=kde-misc/kxdocker-resources-1.1.0
+PDEPEND=">=kde-misc/kxdocker-resources-1.1.0
 			>=kde-misc/kxdocker-trayiconlogger-1.0.0-r1
 			>=kde-misc/kxdocker-dcop-1.0.0-r1
 			>=kde-misc/kxdocker-configurator-1.0.2
 			nls? ( >=kde-misc/kxdocker-i18n-1.0.2 )"
 
-#PDEPEND="bluetooth? ( >=kde-misc/kxdocker-bluetooth-1.0.0 )
-#		net? ( >=kde-misc/kxdocker-networker-1.0.0
-#		>=kde-misc/kxdocker-gnetio-1.0.0
-#		>=kde-misc/kxdocker-gipcontrack-1.0.0
-#		>=kde-misc/kxdocker-arpmanager-1.0.0
-#		>=kde-misc/kxdocker-gpipe-1.0.0 )
-
-
-# List of needed plugins (to run kxdocker)
-#kde-misc/kxdocker-resources-1.1.0
-#kde-misc/kxdocker-trayiconlogger-1.0.0-r1
-#kde-misc/kxdocker-dcop-1.0.0-r1
-#kde-misc/kxdocker-configurator-1.0.2
-#
-#
-# List of optional/aviable plugins
-#kde-misc/kxdocker-thememanager-1.0.0
-#kde-misc/kxdocker-taskmanager-1.0.0
-#kde-misc/kxdocker-mountmanager-1.0.0
-#kde-misc/kxdocker-i18n-1.0.2
-#kde-misc/kxdocker-wizard-1.0.0
-#kde-misc/kxdocker-arpmanager-1.0.0
-#kde-misc/kxdocker-gipcontrack-1.0.0
-#kde-misc/kxdocker-gmount-1.0.0
-#kde-misc/kxdocker-gnetio-1.0.0
-#kde-misc/kxdocker-gpipe-1.0.0
-#kde-misc/kxdocker-networker-1.0.0
-#kde-misc/kxdocker-gamarok ~amd64
-#kde-misc/kxdocker-gaclock ~amd64
-#kde-misc/kxdocker-gapager ~amd64
-#kde-misc/kxdocker-gbattery ~amd64
-#kde-misc/kxdocker-gdate ~amd64
-#kde-misc/kxdocker-gmail ~amd64
-#kde-misc/kxdocker-bluetooth ~amd64
-#kde-misc/kxdocker-gthrottle ~amd64
-#kde-misc/kxdocker-gtrash ~amd64
-
 need-kde 3.2
 
 src_unpack() {