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.

Package-Manager: portage-2.1_pre9-r4

3 files changed, 35 insertions, 65 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/Manifest b/kde-misc/kxdocker/Manifest
index 602ccbbd27b0..632ab9ad39a5 100644
--- a/kde-misc/kxdocker/Manifest
+++ b/kde-misc/kxdocker/Manifest
@@ -1,40 +1,40 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4e7ed5e77a8260a8e30d12c9f47a7254 ChangeLog 1428
-RMD160 ef7742c4c1c599f5398fa0b7fd8b18ed98f4ad06 ChangeLog 1428
-SHA256 ee7bbe10e0c81381773f3ff9caa72794534d4f510b305b285a06e65a7858e1df ChangeLog 1428
-MD5 93c158a428e555c9c380b5b4f63cee36 files/digest-kxdocker-0.39 66
-RMD160 40a3c617d23c26f7a74f5526d3124947caf1dc78 files/digest-kxdocker-0.39 66
-SHA256 679fc1de97721c9ba4df04ff5dab6f1668178d625cfbe25e593a1beea2ebe505 files/digest-kxdocker-0.39 66
-MD5 0221f82c463ed3d7ef291a3336544a36 files/digest-kxdocker-1.0.0a 250
-RMD160 433a49622a8d5d546e2dc41359efd02299b96e88 files/digest-kxdocker-1.0.0a 250
-SHA256 c4c59546b1493e6f1a07952cf06ae2445c9b7a94e750bb5f0f7352a06e8287e1 files/digest-kxdocker-1.0.0a 250
-MD5 672c4e39e4cc8345cd7862280f47896e files/digest-kxdocker-1.1.4a 250
-RMD160 0f5cbc253216f6c486f2258657f687eff9bfa705 files/digest-kxdocker-1.1.4a 250
-SHA256 fc5cd3b3be564c3526b21bf84c44ef00e54a7ba3a31404c41c4bc9ecc032745e files/digest-kxdocker-1.1.4a 250
+AUX kxdocker-1.0.0a-parallelmake.patch 1862 RMD160 ed5b9e166d3a5422df7edd4533949163dfb2adb3 SHA1 789306053348a0dd9a59259c5f170a28607b6f6a SHA256 551b1f79bd02531d3cdb2f513050a1913939f3e9a7849757cce0ffc9114a7e86 size 1862
 MD5 9d1d723246a9c68ade1a9069043b9c85 files/kxdocker-1.0.0a-parallelmake.patch 1862
 RMD160 ed5b9e166d3a5422df7edd4533949163dfb2adb3 files/kxdocker-1.0.0a-parallelmake.patch 1862
 SHA256 551b1f79bd02531d3cdb2f513050a1913939f3e9a7849757cce0ffc9114a7e86 files/kxdocker-1.0.0a-parallelmake.patch 1862
+AUX kxdocker-1.1.4a-parallelmake.patch 601 RMD160 8d94ba699fd6d404799780a3a3108d327b651f9e SHA1 a091c61ffeaeb15dd801a38c451d85dbf2461305 SHA256 4d654337ea28b80d3ef7eac7ce29ff9445fe0f2cd41f246fefea00f4b79e68b3 size 601
 MD5 3e7990856d699b29788d46dfc1a294ad files/kxdocker-1.1.4a-parallelmake.patch 601
 RMD160 8d94ba699fd6d404799780a3a3108d327b651f9e files/kxdocker-1.1.4a-parallelmake.patch 601
 SHA256 4d654337ea28b80d3ef7eac7ce29ff9445fe0f2cd41f246fefea00f4b79e68b3 files/kxdocker-1.1.4a-parallelmake.patch 601
+DIST kxdocker-0.39.tar.bz2 683690 size 683690
+DIST kxdocker-1.0.0a.tar.bz2 730016 RMD160 ead4f5b4fc7d6212b49fb81bcbeb9187d624562d SHA256 950fdddfceb05fc9b9ce8e4ca299b87fc5249b461fa8e52fd53bfab650774e59 size 730016
+DIST kxdocker-1.1.4a.tar.bz2 762506 RMD160 f5da7f62ab94483e4795e08985b3b1b18b963e0e SHA256 612de18481473cdbaa6fe958e6cf5c5e429cbbbbf9a09b8c5613445b02c7efca size 762506
+EBUILD kxdocker-0.39.ebuild 912 RMD160 12df9116be40070539a7dbed6149ff5725637a0b SHA1 890605b17396979f02677db829e77a88573807a9 SHA256 0966a5a06c06e5c4e9516947cb244a86680c0dbbe991b5b828638d6f8fd42a79 size 912
 MD5 7f02c6ca06b5b201f7df728e560e4772 kxdocker-0.39.ebuild 912
 RMD160 12df9116be40070539a7dbed6149ff5725637a0b kxdocker-0.39.ebuild 912
 SHA256 0966a5a06c06e5c4e9516947cb244a86680c0dbbe991b5b828638d6f8fd42a79 kxdocker-0.39.ebuild 912
+EBUILD kxdocker-1.0.0a.ebuild 2068 RMD160 62b78f664058fdf4ad10996f1a5d0491ec5c66a2 SHA1 e341811a6d0dadc5b8d9c4a97f1bae65e3f93029 SHA256 e996176ac2ce2095994a281bab5169c2d039d8b5f707cdcdfad105fa0ae1e981 size 2068
 MD5 6d75368b4fb2c8947d891b422bb132e2 kxdocker-1.0.0a.ebuild 2068
 RMD160 62b78f664058fdf4ad10996f1a5d0491ec5c66a2 kxdocker-1.0.0a.ebuild 2068
 SHA256 e996176ac2ce2095994a281bab5169c2d039d8b5f707cdcdfad105fa0ae1e981 kxdocker-1.0.0a.ebuild 2068
-MD5 f453ef2bd62b6aad2961b1ee41ea1cf3 kxdocker-1.1.4a.ebuild 2385
-RMD160 549a5c8ca61d4392c301676cfccffa12cee8f676 kxdocker-1.1.4a.ebuild 2385
-SHA256 ab316ebb7beb63fe73f80c8070a1f8ea5f476ecb0bb60d49a4200e93e52955ce kxdocker-1.1.4a.ebuild 2385
+EBUILD kxdocker-1.1.4a.ebuild 1206 RMD160 66be42677a14fe5a60aa4121dcf8933e0722a72d SHA1 fefaa604f58ac995d3085f2c1128584f4c6d7b3c SHA256 9ffb2a3412db3c8b0d28de053a4a80cb2c663bc1a542fb056b77a070342c38b1 size 1206
+MD5 aea9fdd3e69ee614278fbc5dd40d8f2b kxdocker-1.1.4a.ebuild 1206
+RMD160 66be42677a14fe5a60aa4121dcf8933e0722a72d kxdocker-1.1.4a.ebuild 1206
+SHA256 9ffb2a3412db3c8b0d28de053a4a80cb2c663bc1a542fb056b77a070342c38b1 kxdocker-1.1.4a.ebuild 1206
+MISC ChangeLog 1751 RMD160 d86f8f23be80339341d6f634ea89e86e2f5cd484 SHA1 c1a84609a0ae6b874296b77519bba420a589661e SHA256 76423019ccf6c90994d2e833273fccff6de2395b139280349dcf3f2c273f412b size 1751
+MD5 b8e93166463a5e254aa30b91df090b6b ChangeLog 1751
+RMD160 d86f8f23be80339341d6f634ea89e86e2f5cd484 ChangeLog 1751
+SHA256 76423019ccf6c90994d2e833273fccff6de2395b139280349dcf3f2c273f412b ChangeLog 1751
+MISC metadata.xml 349 RMD160 d2ff75e9ad34ca5bd7bf1af21510d2c4e20ca084 SHA1 68ed7d4ed3ff016fb8c6236e9a8902b0ea3f97ca SHA256 56e8b49cdda4e9edda2aa32fd91aae96b0c89d3b4774867a5cea4c5c58c62545 size 349
 MD5 af0f2c1aa4185c52dd4f4ea588f22286 metadata.xml 349
 RMD160 d2ff75e9ad34ca5bd7bf1af21510d2c4e20ca084 metadata.xml 349
 SHA256 56e8b49cdda4e9edda2aa32fd91aae96b0c89d3b4774867a5cea4c5c58c62545 metadata.xml 349
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFESiLnmdTrptrqvGERAuOuAJoDQiz9mURZ79VNJ/sW8SctKaDxiQCePPx/
-CEDhmDFptDOhecsPO+WN2oo=
-=dJhu
------END PGP SIGNATURE-----
+MD5 93c158a428e555c9c380b5b4f63cee36 files/digest-kxdocker-0.39 66
+RMD160 40a3c617d23c26f7a74f5526d3124947caf1dc78 files/digest-kxdocker-0.39 66
+SHA256 679fc1de97721c9ba4df04ff5dab6f1668178d625cfbe25e593a1beea2ebe505 files/digest-kxdocker-0.39 66
+MD5 0221f82c463ed3d7ef291a3336544a36 files/digest-kxdocker-1.0.0a 250
+RMD160 433a49622a8d5d546e2dc41359efd02299b96e88 files/digest-kxdocker-1.0.0a 250
+SHA256 c4c59546b1493e6f1a07952cf06ae2445c9b7a94e750bb5f0f7352a06e8287e1 files/digest-kxdocker-1.0.0a 250
+MD5 672c4e39e4cc8345cd7862280f47896e files/digest-kxdocker-1.1.4a 250
+RMD160 0f5cbc253216f6c486f2258657f687eff9bfa705 files/digest-kxdocker-1.1.4a 250
+SHA256 fc5cd3b3be564c3526b21bf84c44ef00e54a7ba3a31404c41c4bc9ecc032745e files/digest-kxdocker-1.1.4a 250
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() {